React Native sync for revisions c0c71a8...c1220eb

Summary: This sync includes the following changes: - **[c1220ebdd](https://github.com/facebook/react/commit/c1220ebdd )**: treat empty string as null ([#22807](https://github.com/facebook/react/pull/22807)) //<salazarm>// - **[09d9b1775](https://github.com/facebook/react/commit/09d9b1775 )**: Update deprecated features in ESLint configuration files. ([#22767](https://github.com/facebook/react/pull/22767)) //<Esteban>// - **[bddbfb86d](https://github.com/facebook/react/commit/bddbfb86d )**: Revert "Fix Node package.json ./ exports deprecation warning ([#22783](https://github.com/facebook/react/pull/22783))" ([#22792](https://github.com/facebook/react/pull/22792)) //<Sebastian Silbermann>// - **[b831aec48](https://github.com/facebook/react/commit/b831aec48 )**: chore(fast-refresh): double check wasMounted ([#22740](https://github.com/facebook/react/pull/22740)) //<anc95>// - **[8edeb787b](https://github.com/facebook/react/commit/8edeb787b )**: Fix Node package.json ./ exports deprecation warning ([#22783](https://github.com/facebook/react/pull/22783)) //<Rin Arakaki>// - **[fdc1d617a](https://github.com/facebook/react/commit/fdc1d617a )**: Flag for client render fallback behavior on hydration mismatch ([#22787](https://github.com/facebook/react/pull/22787)) //<salazarm>// - **[aa19d569b](https://github.com/facebook/react/commit/aa19d569b )**: Add test selectors to experimental build ([#22760](https://github.com/facebook/react/pull/22760)) //<Brian Vaughn>// - **[520ffc77a](https://github.com/facebook/react/commit/520ffc77a )**: Use globalThis if possible for native fetch in browser build ([#22777](https://github.com/facebook/react/pull/22777)) //<Jiachi Liu>// - **[afbc2d08f](https://github.com/facebook/react/commit/afbc2d08f )**: Remove unused react-internal/invariant-args ESLint rule. ([#22778](https://github.com/facebook/react/pull/22778)) //<Esteban>// - **[ca94e2680](https://github.com/facebook/react/commit/ca94e2680 )**: Remove 'packages/shared/invariant.js' ([#22779](https://github.com/facebook/react/pull/22779)) //<Esteban>// - **[83564712b](https://github.com/facebook/react/commit/83564712b )**: Move SuspenseList to experimental channel ([#22765](https://github.com/facebook/react/pull/22765)) //<Andrew Clark>// - **[d4144e6e5](https://github.com/facebook/react/commit/d4144e6e5 )**: fix : grammatical typo for test description ([#22764](https://github.com/facebook/react/pull/22764)) //<Brijesh Prasad>// - **[0b329511b](https://github.com/facebook/react/commit/0b329511b )**: chore: fix comment typo ([#22657](https://github.com/facebook/react/pull/22657)) //<Han Han>// - **[e6f60d2ad](https://github.com/facebook/react/commit/e6f60d2ad )**: fix typos ([#22715](https://github.com/facebook/react/pull/22715)) //<180909>// Changelog: [General][Changed] - React Native sync for revisions c0c71a8...c1220eb jest_e2e[run_all_tests] Reviewed By: yungsters Differential Revision: D32646433 fbshipit-source-id: c534ee7a17141634700c90fc2c7b34bfbe17887a
2025-11-01 09:14:26 +00:00 · 2021-11-29 04:37:28 -08:00
parent e21f8ec349
commit a596e98611
8 changed files with 112 additions and 50 deletions
@@ -1 +1 @@
-c0c71a868560b3042847722659579418bfe2d7e1
+c1220ebdde506de91c8b9693b5cb67ac710c8c89
@@ -7,7 +7,7 @@
 * @noflow
 * @nolint
 * @preventMunge
- * @generated SignedSource<<86bcbed641a7044e773a303487a93758>>
+ * @generated SignedSource<<c63c5718d1b40bee38ff92020247d874>>
 */

 'use strict';
@@ -6008,7 +6008,7 @@ function flushSyncCallbacks() {
  return null;
 }

-var ReactVersion = "18.0.0-c0c71a868-20211112";
+var ReactVersion = "18.0.0-c1220ebdd-20211123";

 var SCHEDULING_PROFILER_VERSION = 1;

@@ -9441,7 +9441,10 @@ function ChildReconciler(shouldTrackSideEffects) {
  }

  function createChild(returnFiber, newChild, lanes) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      // Text nodes don't have keys. If the previous node is implicitly keyed
      // we can continue to replace it without aborting even if it is not a text
      // node.
@@ -9504,7 +9507,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    // Update the fiber if the keys match, otherwise return null.
    var key = oldFiber !== null ? oldFiber.key : null;

-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      // Text nodes don't have keys. If the previous node is implicitly keyed
      // we can continue to replace it without aborting even if it is not a text
      // node.
@@ -9561,7 +9567,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    newChild,
    lanes
  ) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      // Text nodes don't have keys, so we neither have to check the old nor
      // new node for the key. If both are text nodes, they match.
      var matchedFiber = existingChildren.get(newIdx) || null;
@@ -10246,7 +10255,10 @@ function ChildReconciler(shouldTrackSideEffects) {
      throwOnInvalidObjectType(returnFiber, newChild);
    }

-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      return placeSingleChild(
        reconcileSingleTextNode(
          returnFiber,
@@ -14562,7 +14574,7 @@ function completeWork(current, workInProgress, renderLanes) {
          // Schedule an effect to clear this container at the start of the next commit.
          // This handles the case of React rendering into a container with previous children.
          // It's also safe to do for updates too, because current.child would only be null
-          // if the previous render was null (so the the container would already be empty).
+          // if the previous render was null (so the container would already be empty).
          workInProgress.flags |= Snapshot;
        }
      }
@@ -20817,7 +20829,7 @@ function finishConcurrentRender(root, exitStatus, lanes) {

 function isRenderConsistentWithExternalStores(finishedWork) {
  // Search the rendered tree for external store reads, and check whether the
-  // stores were mutated in a concurrent event. Intentionally using a iterative
+  // stores were mutated in a concurrent event. Intentionally using an iterative
  // loop instead of recursion so we can exit early.
  var node = finishedWork;

@@ -7,7 +7,7 @@
 * @noflow
 * @nolint
 * @preventMunge
- * @generated SignedSource<<b80a65da6d07065eb2cb1fb8dca0c565>>
+ * @generated SignedSource<<d2675ef49da99531a7fa8940f853bd5f>>
 */

 "use strict";
@@ -2840,7 +2840,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    return current;
  }
  function createChild(returnFiber, newChild, lanes) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (newChild = createFiberFromText(
          "" + newChild,
@@ -2894,7 +2897,10 @@ function ChildReconciler(shouldTrackSideEffects) {
  }
  function updateSlot(returnFiber, oldFiber, newChild, lanes) {
    var key = null !== oldFiber ? oldFiber.key : null;
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return null !== key
        ? null
        : updateTextNode(returnFiber, oldFiber, "" + newChild, lanes);
@@ -2924,7 +2930,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    newChild,
    lanes
  ) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (existingChildren = existingChildren.get(newIdx) || null),
        updateTextNode(returnFiber, existingChildren, "" + newChild, lanes)
@@ -3250,7 +3259,8 @@ function ChildReconciler(shouldTrackSideEffects) {
        );
      throwOnInvalidObjectType(returnFiber, newChild);
    }
-    return "string" === typeof newChild || "number" === typeof newChild
+    return ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
      ? ((newChild = "" + newChild),
        null !== currentFirstChild && 6 === currentFirstChild.tag
          ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
@@ -8166,7 +8176,7 @@ var roots = new Map(),
  devToolsConfig$jscomp$inline_925 = {
    findFiberByHostInstance: getInstanceFromInstance,
    bundleType: 0,
-    version: "18.0.0-c0c71a868-20211112",
+    version: "18.0.0-c1220ebdd-20211123",
    rendererPackageName: "react-native-renderer",
    rendererConfig: {
      getInspectorDataForViewTag: function() {
@@ -8208,7 +8218,7 @@ var internals$jscomp$inline_1179 = {
  scheduleRoot: null,
  setRefreshHandler: null,
  getCurrentFiber: null,
-  reconcilerVersion: "18.0.0-c0c71a868-20211112"
+  reconcilerVersion: "18.0.0-c1220ebdd-20211123"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
  var hook$jscomp$inline_1180 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -7,7 +7,7 @@
 * @noflow
 * @nolint
 * @preventMunge
- * @generated SignedSource<<84b02666b89c30d381a8cdd2ef587911>>
+ * @generated SignedSource<<d9e820a361c20b62bc9a8c1f8ab34868>>
 */


@@ -3025,7 +3025,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    return current;
  }
  function createChild(returnFiber, newChild, lanes) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (newChild = createFiberFromText(
          "" + newChild,
@@ -3079,7 +3082,10 @@ function ChildReconciler(shouldTrackSideEffects) {
  }
  function updateSlot(returnFiber, oldFiber, newChild, lanes) {
    var key = null !== oldFiber ? oldFiber.key : null;
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return null !== key
        ? null
        : updateTextNode(returnFiber, oldFiber, "" + newChild, lanes);
@@ -3109,7 +3115,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    newChild,
    lanes
  ) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (existingChildren = existingChildren.get(newIdx) || null),
        updateTextNode(returnFiber, existingChildren, "" + newChild, lanes)
@@ -3435,7 +3444,8 @@ function ChildReconciler(shouldTrackSideEffects) {
        );
      throwOnInvalidObjectType(returnFiber, newChild);
    }
-    return "string" === typeof newChild || "number" === typeof newChild
+    return ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
      ? ((newChild = "" + newChild),
        null !== currentFirstChild && 6 === currentFirstChild.tag
          ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
@@ -7612,7 +7622,7 @@ function commitRootImpl(root, renderPriorityLevel) {
    lanes = root.finishedLanes;
  supportsUserTimingV3 &&
    (markAndClear("--commit-start-" + lanes),
-    markAndClear("--react-version-18.0.0-c0c71a868-20211112"),
+    markAndClear("--react-version-18.0.0-c1220ebdd-20211123"),
    markAndClear("--profiler-version-1"),
    getLaneLabels(),
    markAndClear("--react-lane-labels-" + laneLabels.join(",")),
@@ -8868,7 +8878,7 @@ var roots = new Map(),
  devToolsConfig$jscomp$inline_1020 = {
    findFiberByHostInstance: getInstanceFromInstance,
    bundleType: 0,
-    version: "18.0.0-c0c71a868-20211112",
+    version: "18.0.0-c1220ebdd-20211123",
    rendererPackageName: "react-native-renderer",
    rendererConfig: {
      getInspectorDataForViewTag: function() {
@@ -8910,7 +8920,7 @@ var internals$jscomp$inline_1308 = {
  scheduleRoot: null,
  setRefreshHandler: null,
  getCurrentFiber: null,
-  reconcilerVersion: "18.0.0-c0c71a868-20211112"
+  reconcilerVersion: "18.0.0-c1220ebdd-20211123"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
  var hook$jscomp$inline_1309 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -7,7 +7,7 @@
 * @noflow
 * @nolint
 * @preventMunge
- * @generated SignedSource<<74aab8e89c3a533591d19aa80a7790da>>
+ * @generated SignedSource<<8b128574fdea8d0a11f1cf1c1aefe59b>>
 */

 'use strict';
@@ -6241,7 +6241,7 @@ function flushSyncCallbacks() {
  return null;
 }

-var ReactVersion = "18.0.0-c0c71a868-20211112";
+var ReactVersion = "18.0.0-c1220ebdd-20211123";

 var SCHEDULING_PROFILER_VERSION = 1;

@@ -9674,7 +9674,10 @@ function ChildReconciler(shouldTrackSideEffects) {
  }

  function createChild(returnFiber, newChild, lanes) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      // Text nodes don't have keys. If the previous node is implicitly keyed
      // we can continue to replace it without aborting even if it is not a text
      // node.
@@ -9737,7 +9740,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    // Update the fiber if the keys match, otherwise return null.
    var key = oldFiber !== null ? oldFiber.key : null;

-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      // Text nodes don't have keys. If the previous node is implicitly keyed
      // we can continue to replace it without aborting even if it is not a text
      // node.
@@ -9794,7 +9800,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    newChild,
    lanes
  ) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      // Text nodes don't have keys, so we neither have to check the old nor
      // new node for the key. If both are text nodes, they match.
      var matchedFiber = existingChildren.get(newIdx) || null;
@@ -10479,7 +10488,10 @@ function ChildReconciler(shouldTrackSideEffects) {
      throwOnInvalidObjectType(returnFiber, newChild);
    }

-    if (typeof newChild === "string" || typeof newChild === "number") {
+    if (
+      (typeof newChild === "string" && newChild !== "") ||
+      typeof newChild === "number"
+    ) {
      return placeSingleChild(
        reconcileSingleTextNode(
          returnFiber,
@@ -14592,7 +14604,7 @@ function completeWork(current, workInProgress, renderLanes) {
          // Schedule an effect to clear this container at the start of the next commit.
          // This handles the case of React rendering into a container with previous children.
          // It's also safe to do for updates too, because current.child would only be null
-          // if the previous render was null (so the the container would already be empty).
+          // if the previous render was null (so the container would already be empty).
          workInProgress.flags |= Snapshot;
        }
      }
@@ -21232,7 +21244,7 @@ function finishConcurrentRender(root, exitStatus, lanes) {

 function isRenderConsistentWithExternalStores(finishedWork) {
  // Search the rendered tree for external store reads, and check whether the
-  // stores were mutated in a concurrent event. Intentionally using a iterative
+  // stores were mutated in a concurrent event. Intentionally using an iterative
  // loop instead of recursion so we can exit early.
  var node = finishedWork;

@@ -7,7 +7,7 @@
 * @noflow
 * @nolint
 * @preventMunge
- * @generated SignedSource<<6fc8d6b12f7d5605a1f7ab5894718cb3>>
+ * @generated SignedSource<<c587a7b3e41dfa079412f1481033cff7>>
 */

 "use strict";
@@ -2811,7 +2811,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    return current;
  }
  function createChild(returnFiber, newChild, lanes) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (newChild = createFiberFromText(
          "" + newChild,
@@ -2865,7 +2868,10 @@ function ChildReconciler(shouldTrackSideEffects) {
  }
  function updateSlot(returnFiber, oldFiber, newChild, lanes) {
    var key = null !== oldFiber ? oldFiber.key : null;
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return null !== key
        ? null
        : updateTextNode(returnFiber, oldFiber, "" + newChild, lanes);
@@ -2895,7 +2901,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    newChild,
    lanes
  ) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (existingChildren = existingChildren.get(newIdx) || null),
        updateTextNode(returnFiber, existingChildren, "" + newChild, lanes)
@@ -3221,7 +3230,8 @@ function ChildReconciler(shouldTrackSideEffects) {
        );
      throwOnInvalidObjectType(returnFiber, newChild);
    }
-    return "string" === typeof newChild || "number" === typeof newChild
+    return ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
      ? ((newChild = "" + newChild),
        null !== currentFirstChild && 6 === currentFirstChild.tag
          ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
@@ -8253,7 +8263,7 @@ var roots = new Map(),
  devToolsConfig$jscomp$inline_966 = {
    findFiberByHostInstance: getInstanceFromTag,
    bundleType: 0,
-    version: "18.0.0-c0c71a868-20211112",
+    version: "18.0.0-c1220ebdd-20211123",
    rendererPackageName: "react-native-renderer",
    rendererConfig: {
      getInspectorDataForViewTag: function() {
@@ -8295,7 +8305,7 @@ var internals$jscomp$inline_1230 = {
  scheduleRoot: null,
  setRefreshHandler: null,
  getCurrentFiber: null,
-  reconcilerVersion: "18.0.0-c0c71a868-20211112"
+  reconcilerVersion: "18.0.0-c1220ebdd-20211123"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
  var hook$jscomp$inline_1231 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -7,7 +7,7 @@
 * @noflow
 * @nolint
 * @preventMunge
- * @generated SignedSource<<bbacb11ee462ae80c14f12baf55dfb71>>
+ * @generated SignedSource<<d52f24e9901f9340c97ef19e63d99705>>
 */


@@ -2996,7 +2996,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    return current;
  }
  function createChild(returnFiber, newChild, lanes) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (newChild = createFiberFromText(
          "" + newChild,
@@ -3050,7 +3053,10 @@ function ChildReconciler(shouldTrackSideEffects) {
  }
  function updateSlot(returnFiber, oldFiber, newChild, lanes) {
    var key = null !== oldFiber ? oldFiber.key : null;
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return null !== key
        ? null
        : updateTextNode(returnFiber, oldFiber, "" + newChild, lanes);
@@ -3080,7 +3086,10 @@ function ChildReconciler(shouldTrackSideEffects) {
    newChild,
    lanes
  ) {
-    if ("string" === typeof newChild || "number" === typeof newChild)
+    if (
+      ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
+    )
      return (
        (existingChildren = existingChildren.get(newIdx) || null),
        updateTextNode(returnFiber, existingChildren, "" + newChild, lanes)
@@ -3406,7 +3415,8 @@ function ChildReconciler(shouldTrackSideEffects) {
        );
      throwOnInvalidObjectType(returnFiber, newChild);
    }
-    return "string" === typeof newChild || "number" === typeof newChild
+    return ("string" === typeof newChild && "" !== newChild) ||
+      "number" === typeof newChild
      ? ((newChild = "" + newChild),
        null !== currentFirstChild && 6 === currentFirstChild.tag
          ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
@@ -7691,7 +7701,7 @@ function commitRootImpl(root, renderPriorityLevel) {
    lanes = root.finishedLanes;
  supportsUserTimingV3 &&
    (markAndClear("--commit-start-" + lanes),
-    markAndClear("--react-version-18.0.0-c0c71a868-20211112"),
+    markAndClear("--react-version-18.0.0-c1220ebdd-20211123"),
    markAndClear("--profiler-version-1"),
    getLaneLabels(),
    markAndClear("--react-lane-labels-" + laneLabels.join(",")),
@@ -8947,7 +8957,7 @@ var roots = new Map(),
  devToolsConfig$jscomp$inline_1061 = {
    findFiberByHostInstance: getInstanceFromTag,
    bundleType: 0,
-    version: "18.0.0-c0c71a868-20211112",
+    version: "18.0.0-c1220ebdd-20211123",
    rendererPackageName: "react-native-renderer",
    rendererConfig: {
      getInspectorDataForViewTag: function() {
@@ -8989,7 +8999,7 @@ var internals$jscomp$inline_1359 = {
  scheduleRoot: null,
  setRefreshHandler: null,
  getCurrentFiber: null,
-  reconcilerVersion: "18.0.0-c0c71a868-20211112"
+  reconcilerVersion: "18.0.0-c1220ebdd-20211123"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
  var hook$jscomp$inline_1360 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -6,13 +6,11 @@
 *
 * @noformat
 * @flow strict-local
- * @generated SignedSource<<cfc4aafaa6b6af5b0a69d4463b8d214d>>
+ * @generated SignedSource<<a81ed33269e71024fedad145e843fab0>>
 *
 * This file was sync'd from the facebook/react repository.
 */

-/* eslint-disable react-internal/invariant-args */
-
 'use strict';

 import {type ViewConfig} from './ReactNativeTypes';