fix(remax): 修复在父元素阻止冒泡时，点击子事件有可能不执行的问题 (#553)

fix #552
remaxjs · Jan 1, 2020 · 4d60af3 · 4d60af3
1 parent a5649dc
commit 4d60af3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/packages/remax/src/SyntheticEvent/Pool.ts b/packages/remax/src/SyntheticEvent/Pool.ts
@@ -20,16 +20,20 @@ export default class SyntheticEventPool {
     );
   }
 
-  public initialEventState(eventType: string, eventId?: string) {
+  public initialEventState(
+    eventType: string,
+    eventId?: string,
+    currentEventID?: string
+  ) {
     if (!this.state[eventType]) {
       this.state[eventType] = {};
     }
 
-    if (eventId) {
+    if (eventId && currentEventID) {
       this.state[eventType] = {
         [eventId]: {
           propagationStopped: false,
-          currentEventId: eventId,
+          currentEventId: currentEventID,
         },
       };
     }

diff --git a/packages/remax/src/SyntheticEvent/index.ts b/packages/remax/src/SyntheticEvent/index.ts
@@ -90,7 +90,7 @@ export function createCallbackProxy(
 
     if (isNewEvent(eventType, nativeEvent)) {
       // 新的事件流，初始化 store 数据
-      eventPool.initialEventState(eventType, eventId);
+      eventPool.initialEventState(eventType, eventId, currentEventId);
     } else {
       // 记录当前冒泡到的事件 ID
       eventPool.setLatestEvent(eventType, eventId, currentEventId);

diff --git a/packages/remax/src/__tests__/SyntheticEvent.test.ts b/packages/remax/src/__tests__/SyntheticEvent.test.ts
@@ -326,5 +326,30 @@ describe('synthetic event', () => {
 
       expect(bar).toBeCalledTimes(2);
     });
+
+    it('invoke parent onClick callback every time with stopPropagation called', () => {
+      const foo = jest.fn(e => {
+        e.stopPropagation();
+      });
+      const fooProxy = createCallbackProxy('onClick', foo);
+
+      const event = {
+        target: {
+          dataset: {
+            rid: 1,
+          },
+        },
+        currentTarget: {
+          dataset: {
+            rid: 2,
+          },
+        },
+      };
+
+      fooProxy(event);
+      fooProxy(event);
+
+      expect(foo).toBeCalledTimes(2);
+    });
   });
 });