Avoid .valueOf to close #20594 (#20617)

facebook · Jan 20, 2021 · 2e948e0 · 2e948e0
1 parent 2a646f7
commit 2e948e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/react-reconciler/src/ReactChildFiber.new.js b/packages/react-reconciler/src/ReactChildFiber.new.js
@@ -222,14 +222,15 @@ function coerceRef(
 
 function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
  if (returnFiber.type !== 'textarea') {
+ const childString = Object.prototype.toString.call(newChild);
  invariant(
  false,
  'Objects are not valid as a React child (found: %s). ' +
  'If you meant to render a collection of children, use an array ' +
  'instead.',
- Object.prototype.toString.call(newChild) === '[object Object]'
+ childString === '[object Object]'
  ? 'object with keys {' + Object.keys(newChild).join(', ') + '}'
- : newChild,
+ : childString,
  );
  }
 }

diff --git a/packages/react-reconciler/src/ReactChildFiber.old.js b/packages/react-reconciler/src/ReactChildFiber.old.js
@@ -222,14 +222,15 @@ function coerceRef(
 
 function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
  if (returnFiber.type !== 'textarea') {
+ const childString = Object.prototype.toString.call(newChild);
  invariant(
  false,
  'Objects are not valid as a React child (found: %s). ' +
  'If you meant to render a collection of children, use an array ' +
  'instead.',
- Object.prototype.toString.call(newChild) === '[object Object]'
+ childString === '[object Object]'
  ? 'object with keys {' + Object.keys(newChild).join(', ') + '}'
- : newChild,
+ : childString,
  );
  }
 }