From 048879edadfc43de699765688e9ebfcdf4a681b7 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Tue, 29 Oct 2019 13:26:46 -0700
Subject: [PATCH] [react-interactions] Ensure props on scope query function is
 always object (#17212)

---
 packages/react-reconciler/src/ReactFiberScope.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-reconciler/src/ReactFiberScope.js b/packages/react-reconciler/src/ReactFiberScope.js
index 1b33b78cadfa4..34eb261f24d2e 100644
--- 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));
       }
     }