Consolidate responder implementation logic

Reduces the minified size most. Smaller percentage improvement for gzip.
facebook · Sep 4, 2019 · c8aa125 · c8aa125
1 parent d04887d
commit c8aa125
Show file tree

Hide file tree

Showing 7 changed files with 369 additions and 444 deletions.
diff --git a/packages/react-dom/src/events/DOMEventResponderSystem.js b/packages/react-dom/src/events/DOMEventResponderSystem.js
@@ -116,7 +116,7 @@ const eventResponderContext: ReactDOMResponderContext = {
       }
     }
   },
-  isTargetWithinResponder(target: Element | Document): boolean {
+  isTargetWithinResponder(target: null | Element | Document): boolean {
     validateResponderContext();
     if (target != null) {
       let fiber = getClosestInstanceFromNode(target);
@@ -132,7 +132,7 @@ const eventResponderContext: ReactDOMResponderContext = {
     }
     return false;
   },
-  isTargetWithinResponderScope(target: Element | Document): boolean {
+  isTargetWithinResponderScope(target: null | Element | Document): boolean {
     validateResponderContext();
     const componentInstance = ((currentInstance: any): ReactDOMEventResponderInstance);
     const responder = componentInstance.responder;
@@ -155,7 +155,7 @@ const eventResponderContext: ReactDOMResponderContext = {
     return false;
   },
   isTargetWithinNode(
-    childTarget: Element | Document,
+    childTarget: null | Element | Document,
     parentTarget: Element | Document,
   ): boolean {
     validateResponderContext();
@@ -380,19 +380,16 @@ function processTimers(
 
 function createDOMResponderEvent(
   topLevelType: string,
-  responderTarget: Element,
   nativeEvent: AnyNativeEvent,
   nativeEventTarget: Element | Document,
   passive: boolean,
   passiveSupported: boolean,
 ): ReactDOMResponderEvent {
   const {buttons, pointerType} = (nativeEvent: any);
   let eventPointerType = '';
-  let pointerId = null;
 
   if (pointerType !== undefined) {
     eventPointerType = pointerType;
-    pointerId = (nativeEvent: any).pointerId;
   } else if (nativeEvent.key !== undefined) {
     eventPointerType = 'keyboard';
   } else if (buttons !== undefined) {
@@ -405,7 +402,6 @@ function createDOMResponderEvent(
     nativeEvent: nativeEvent,
     passive,
     passiveSupported,
-    pointerId,
     pointerType: eventPointerType,
     target: nativeEventTarget,
     type: topLevelType,

diff --git a/packages/react-events/src/dom/Press.js b/packages/react-events/src/dom/Press.js
@@ -521,7 +521,7 @@ const pressResponderImpl = {
     props: PressProps,
     state: PressState,
   ): void {
-    const {pointerId, pointerType, type} = event;
+    const {pointerType, type} = event;
 
     if (props.disabled) {
       removeRootEventTypes(context, state);
@@ -584,7 +584,7 @@ const pressResponderImpl = {
           state.pointerType = pointerType;
           const pressTarget = (state.pressTarget = context.getResponderNode());
           if (isPointerEvent) {
-            state.activePointerId = pointerId;
+            state.activePointerId = nativeEvent.pointerId;
           } else if (isTouchEvent) {
             const touchEvent = getTouchFromPressEvent(nativeEvent);
             if (touchEvent === null) {
@@ -652,7 +652,7 @@ const pressResponderImpl = {
     props: PressProps,
     state: PressState,
   ): void {
-    let {pointerId, pointerType, target, type} = event;
+    let {pointerType, target, type} = event;
 
     const nativeEvent: any = event.nativeEvent;
     const isPressed = state.isPressed;
@@ -672,7 +672,10 @@ const pressResponderImpl = {
         if (previousPointerType !== pointerType) {
           return;
         }
-        if (type === 'pointermove' && activePointerId !== pointerId) {
+        if (
+          type === 'pointermove' &&
+          activePointerId !== nativeEvent.pointerId
+        ) {
           return;
         } else if (type === 'touchmove') {
           touchEvent = getTouchById(nativeEvent, activePointerId);
@@ -733,7 +736,10 @@ const pressResponderImpl = {
           const buttons = state.buttons;
           let isKeyboardEvent = false;
           let touchEvent;
-          if (type === 'pointerup' && activePointerId !== pointerId) {
+          if (
+            type === 'pointerup' &&
+            activePointerId !== nativeEvent.pointerId
+          ) {
             return;
           } else if (type === 'touchend') {
             touchEvent = getTouchById(nativeEvent, activePointerId);