[react-interactions] Ensure props on scope query function is always object (#17212)

trueadm · web-flow · commit 048879edadfc · 2019-10-29T13:26:46.000-07:00
diff --git a/packages/react-reconciler/src/ReactFiberScope.js b/packages/react-reconciler/src/ReactFiberScope.js
@@ -31,6 +31,8 @@ function getSuspenseFallbackChild(fiber: Fiber): Fiber | null {
   return ((((fiber.child: any): Fiber).sibling: any): Fiber).child;
 }
 
+const emptyObject = {};
+
 function collectScopedNodes(
   node: Fiber,
   fn: (type: string | Object, props: Object) => boolean,
@@ -39,7 +41,7 @@ function collectScopedNodes(
   if (enableScopeAPI) {
     if (node.tag === HostComponent) {
       const {type, memoizedProps} = node;
-      if (fn(type, memoizedProps) === true) {
+      if (fn(type, memoizedProps || emptyObject) === true) {
         scopedNodes.push(getPublicInstance(node.stateNode));
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ function getSuspenseFallbackChild(fiber: Fiber): Fiber \| null {`
`31`	`31`	`return ((((fiber.child: any): Fiber).sibling: any): Fiber).child;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+const emptyObject = {};`
	`35`	`+`
`34`	`36`	`function collectScopedNodes(`
`35`	`37`	`node: Fiber,`
`36`	`38`	`fn: (type: string \| Object, props: Object) => boolean,`
`@@ -39,7 +41,7 @@ function collectScopedNodes(`
`39`	`41`	`if (enableScopeAPI) {`
`40`	`42`	`if (node.tag === HostComponent) {`
`41`	`43`	`const {type, memoizedProps} = node;`
`42`		`- if (fn(type, memoizedProps) === true) {`
	`44`	`+ if (fn(type, memoizedProps \|\| emptyObject) === true) {`
`43`	`45`	`scopedNodes.push(getPublicInstance(node.stateNode));`
`44`	`46`	`}`
`45`	`47`	`}`