Integrate RN Nightly 6/1/23 (#11698)

* integrate RN Nightly 6/1/23 * Change files * yarn lint
microsoft · Jun 6, 2023 · 0ea8d03 · 0ea8d03
1 parent 44ee46e
commit 0ea8d03
Show file tree

Hide file tree

Showing 39 changed files with 819 additions and 118 deletions.
diff --git a/change/@office-iss-react-native-win32-9b0c9afb-4a2b-4026-81d9-9d99e097fca3.json b/change/@office-iss-react-native-win32-9b0c9afb-4a2b-4026-81d9-9d99e097fca3.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "integrate RN Nightly 6/1/23",
+  "packageName": "@office-iss/react-native-win32",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-automation-channel-93de4bc9-1afd-4d1c-a3af-86607ec140df.json b/change/@react-native-windows-automation-channel-93de4bc9-1afd-4d1c-a3af-86607ec140df.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "integrate RN Nightly 6/1/23",
+  "packageName": "@react-native-windows/automation-channel",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@rnw-scripts-babel-node-config-89fe5f05-3ada-4d89-b379-0b35817ed0d7.json b/change/@rnw-scripts-babel-node-config-89fe5f05-3ada-4d89-b379-0b35817ed0d7.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "integrate RN Nightly 6/1/23",
+  "packageName": "@rnw-scripts/babel-node-config",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-d503f1ed-a4ed-4c09-8529-9b8bfed4cc7c.json b/change/react-native-windows-d503f1ed-a4ed-4c09-8529-9b8bfed4cc7c.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "integrate RN Nightly 6/1/23",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/@office-iss/react-native-win32-tester/overrides.json b/packages/@office-iss/react-native-win32-tester/overrides.json
@@ -5,7 +5,7 @@
   "excludePatterns": [
     "src/js/examples-win32/**"
   ],
-  "baseVersion": "0.73.0-nightly-20230519-de1e9f5d1",
+  "baseVersion": "0.73.0-nightly-20230601-d9b3339ef",
   "overrides": [
     {
       "type": "patch",

diff --git a/packages/@office-iss/react-native-win32-tester/package.json b/packages/@office-iss/react-native-win32-tester/package.json
@@ -19,7 +19,7 @@
   "peerDependencies": {
     "@office-iss/react-native-win32": "^0.0.0-canary.198",
     "react": "18.0.0",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1"
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef"
   },
   "devDependencies": {
     "@office-iss/react-native-win32": "^0.0.0-canary.198",
@@ -30,11 +30,11 @@
     "@types/node": "^16.0.0",
     "eslint": "^8.19.0",
     "just-scripts": "^1.3.3",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1",
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef",
     "react-native-platform-override": "^1.9.8",
     "typescript": "^4.9.5"
   },
   "engines": {
     "node": ">= 16"
   }
-}
+}
diff --git a/packages/@office-iss/react-native-win32/.flowconfig b/packages/@office-iss/react-native-win32/.flowconfig
@@ -136,4 +136,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.206.0
+^0.207.0
diff --git a/packages/@office-iss/react-native-win32/overrides.json b/packages/@office-iss/react-native-win32/overrides.json
@@ -7,13 +7,13 @@
     "**/__snapshots__/**",
     "src/rntypes/**"
   ],
-  "baseVersion": "0.73.0-nightly-20230519-de1e9f5d1",
+  "baseVersion": "0.73.0-nightly-20230601-d9b3339ef",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "0a1676c98b55af1089d3696194a0d7dd14aedf12"
+      "baseHash": "dc6c68bc12e76498f4935a43bb2f188efb02f0c5"
     },
     {
       "type": "derived",
@@ -123,7 +123,7 @@
       "type": "derived",
       "file": "src/Libraries/Components/TextInput/TextInput.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "04757d209b80c0b9ed2bb11a8b36cd5a3b3f878e"
+      "baseHash": "a817f8d62ee3ba4c56b772bd0cfb852739cb4aa7"
     },
     {
       "type": "patch",
@@ -380,7 +380,7 @@
       "type": "patch",
       "file": "src/Libraries/Pressability/Pressability.win32.js",
       "baseFile": "packages/react-native/Libraries/Pressability/Pressability.js",
-      "baseHash": "9b1c05c59ddcf30c6b5938ff8ed26ec7633ebdce",
+      "baseHash": "087060bb677adb35353dcf83bea2d4eb09c4fd40",
       "issue": 6240
     },
     {

diff --git a/packages/@office-iss/react-native-win32/package.json b/packages/@office-iss/react-native-win32/package.json
@@ -77,18 +77,18 @@
     "@types/prop-types": "15.7.1",
     "@types/react": "^18.0.18",
     "eslint": "^8.19.0",
-    "flow-bin": "^0.206.0",
+    "flow-bin": "^0.207.0",
     "jscodeshift": "^0.14.0",
     "just-scripts": "^1.3.3",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1",
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef",
     "react-native-platform-override": "^1.9.8",
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "react": "18.2.0",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1"
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef"
   },
   "beachball": {
     "defaultNpmTag": "canary",
@@ -102,4 +102,4 @@
   "engines": {
     "node": ">= 16"
   }
-}
+}
diff --git a/...ages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js b/...ages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js
@@ -1109,27 +1109,19 @@ function InternalTextInput(props: Props): React.Node {
     accessibilityState,
     id,
     tabIndex,
+    selection: propsSelection,
     ...otherProps
   } = props;
 
   const inputRef = useRef<null | React.ElementRef<HostComponent<mixed>>>(null);
 
-  // Android sends a "onTextChanged" event followed by a "onSelectionChanged" event, for
-  // the same "most recent event count".
-  // For controlled selection, that means that immediately after text is updated,
-  // a controlled component will pass in the *previous* selection, even if the controlled
-  // component didn't mean to modify the selection at all.
-  // Therefore, we ignore selections and pass them through until the selection event has
-  // been sent.
-  // Note that this mitigation is NOT needed for Fabric.
-  // discovered when upgrading react-hooks
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  let selection: ?Selection =
-    props.selection == null
+  const selection: ?Selection =
+    propsSelection == null
       ? null
       : {
-          start: props.selection.start,
-          end: props.selection.end ?? props.selection.start,
+          start: propsSelection.start,
+          end: propsSelection.end ?? propsSelection.start,
         };
 
   const [mostRecentEventCount, setMostRecentEventCount] = useState<number>(0);
@@ -1141,12 +1133,6 @@ function InternalTextInput(props: Props): React.Node {
   |}>({selection, mostRecentEventCount});
 
   const lastNativeSelection = lastNativeSelectionState.selection;
-  const lastNativeSelectionEventCount =
-    lastNativeSelectionState.mostRecentEventCount;
-
-  if (lastNativeSelectionEventCount < mostRecentEventCount) {
-    selection = null;
-  }
 
   let viewCommands;
   if (AndroidTextInputCommands) {
@@ -1611,7 +1597,6 @@ function InternalTextInput(props: Props): React.Node {
         onScroll={_onScroll}
         onSelectionChange={_onSelectionChange}
         placeholder={placeholder}
-        selection={selection}
         style={style}
         text={text}
         textBreakStrategy={props.textBreakStrategy}

diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Pressability/Pressability.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Pressability/Pressability.win32.js
@@ -584,6 +584,13 @@ export default class Pressability {
           return;
         }
 
+        // for non-pointer click events (e.g. accessibility clicks), we should only dispatch when we're the "real" target
+        // in particular, we shouldn't respond to clicks from nested pressables
+        if (event?.currentTarget !== event?.target) {
+          event?.stopPropagation();
+          return;
+        }
+
         const {onPress, disabled} = this._config;
         if (onPress != null && disabled !== true) {
           onPress(event);

diff --git a/packages/@react-native-windows/automation-channel/package.json b/packages/@react-native-windows/automation-channel/package.json
@@ -31,7 +31,7 @@
     "just-scripts": "^1.3.2",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1",
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef",
     "react-native-windows": "^0.0.0-canary.660",
     "typescript": "^4.9.5"
   },
@@ -42,4 +42,4 @@
   "engines": {
     "node": ">= 16"
   }
-}
+}
diff --git a/packages/@react-native-windows/tester/overrides.json b/packages/@react-native-windows/tester/overrides.json
@@ -5,7 +5,7 @@
   "excludePatterns": [
     "src/js/examples-win/**"
   ],
-  "baseVersion": "0.73.0-nightly-20230519-de1e9f5d1",
+  "baseVersion": "0.73.0-nightly-20230601-d9b3339ef",
   "overrides": [
     {
       "type": "patch",

diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json
@@ -18,7 +18,7 @@
   "peerDependencies": {
     "@react-native-picker/picker": "2.4.10",
     "react": "18.0.0",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1",
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef",
     "react-native-windows": "^0.0.0-canary.660",
     "react-native-xaml": "^0.0.50"
   },
@@ -31,12 +31,12 @@
     "@types/node": "^16.0.0",
     "eslint": "^8.19.0",
     "just-scripts": "^1.3.3",
-    "react-native": "0.73.0-nightly-20230519-de1e9f5d1",
+    "react-native": "0.73.0-nightly-20230601-d9b3339ef",
     "react-native-platform-override": "^1.9.8",
     "react-native-windows": "^0.0.0-canary.660",
     "typescript": "^4.9.5"
   },
   "engines": {
     "node": ">= 16"
   }
-}
+}
diff --git a/packages/@react-native/monorepo/overrides.json b/packages/@react-native/monorepo/overrides.json
@@ -1,11 +1,11 @@
 {
-  "baseVersion": "0.73.0-nightly-20230519-de1e9f5d1",
+  "baseVersion": "0.73.0-nightly-20230601-d9b3339ef",
   "overrides": [
     {
       "type": "patch",
       "file": "package.json",
       "baseFile": "package.json",
-      "baseHash": "95461a2cbf1926210972ce607b106d391d1dd53a"
+      "baseHash": "7d954539669a8fd7d83cac31506fb9f2006a5dac"
     }
   ]
 }
diff --git a/packages/@react-native/monorepo/package.json b/packages/@react-native/monorepo/package.json
@@ -77,8 +77,8 @@
     "eslint-plugin-react-native": "^4.0.0",
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
-    "flow-bin": "^0.206.0",
-    "hermes-eslint": "0.8.0",
+    "flow-bin": "^0.207.0",
+    "hermes-eslint": "0.12.0",
     "inquirer": "^7.1.0",
     "jest": "^29.2.1",
     "jest-junit": "^10.0.0",
@@ -96,4 +96,4 @@
     "typescript": "5.0.4",
     "ws": "^6.2.2"
   }
-}
+}