From 852f10b5cf188f8aa797f9a809f0caeaa95a4231 Mon Sep 17 00:00:00 2001
From: "Mengdi \"Monday\" Chen" <mengdi@fb.com>
Date: Thu, 12 May 2022 10:29:36 -0400
Subject: [PATCH] fix a bug in console.log with non-string args (#24546)

---
 packages/react-devtools-shared/src/backend/utils.js | 3 ++-
 packages/react-devtools-shared/src/hook.js          | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/react-devtools-shared/src/backend/utils.js b/packages/react-devtools-shared/src/backend/utils.js
index 4a01b1804b..169623a163 100644
--- a/packages/react-devtools-shared/src/backend/utils.js
+++ b/packages/react-devtools-shared/src/backend/utils.js
@@ -181,8 +181,9 @@ export function formatWithStyles(
     inputArgs === undefined ||
     inputArgs === null ||
     inputArgs.length === 0 ||
+    typeof inputArgs[0] !== 'string' ||
     // Matches any of %c but not %%c
-    (typeof inputArgs[0] === 'string' && inputArgs[0].match(/([^%]|^)(%c)/g)) ||
+    inputArgs[0].match(/([^%]|^)(%c)/g) ||
     style === undefined
   ) {
     return inputArgs;
diff --git a/packages/react-devtools-shared/src/hook.js b/packages/react-devtools-shared/src/hook.js
index 8250bebc93..d41ea45591 100644
--- a/packages/react-devtools-shared/src/hook.js
+++ b/packages/react-devtools-shared/src/hook.js
@@ -180,9 +180,9 @@ export function installHook(target: any): DevToolsHook | null {
       inputArgs === undefined ||
       inputArgs === null ||
       inputArgs.length === 0 ||
+      typeof inputArgs[0] !== 'string' ||
       // Matches any of %c but not %%c
-      (typeof inputArgs[0] === 'string' &&
-        inputArgs[0].match(/([^%]|^)(%c)/g)) ||
+      inputArgs[0].match(/([^%]|^)(%c)/g) ||
       style === undefined
     ) {
       return inputArgs;