Integrate RN Nightly 10/1 (223e98cc4) (#13938)

* 0.77.0-nightly-20240925-0cb32d5ac * 0.77.0-nightly-20241001-223e98cc4 * fix validate-overrides * Change files * fix build * fix playground * fix composition * fix overrides * fix snapshot + lint * Change files * try removing babel plugin * add change back in * bump dep
microsoft · Oct 15, 2024 · e265163 · e265163
1 parent c1f1304
commit e265163
Show file tree

Hide file tree

Showing 81 changed files with 1,293 additions and 1,092 deletions.
diff --git a/change/@office-iss-react-native-win32-2d07f553-9add-4253-9cc5-4ca4e0d15886.json b/change/@office-iss-react-native-win32-2d07f553-9add-4253-9cc5-4ca4e0d15886.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
+  "packageName": "@office-iss/react-native-win32",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-automation-channel-fb4516ce-25c4-411e-a799-9faa152a9fba.json b/change/@react-native-windows-automation-channel-fb4516ce-25c4-411e-a799-9faa152a9fba.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
+  "packageName": "@react-native-windows/automation-channel",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-codegen-ffddf935-ed21-45ac-997f-85379ec7afd0.json b/change/@react-native-windows-codegen-ffddf935-ed21-45ac-997f-85379ec7afd0.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "0.77.0-nightly-20241001-223e98cc4",
+  "packageName": "@react-native-windows/codegen",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@rnw-scripts-integrate-rn-f35c1fab-4437-4fe8-afd7-645bea940939.json b/change/@rnw-scripts-integrate-rn-f35c1fab-4437-4fe8-afd7-645bea940939.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
+  "packageName": "@rnw-scripts/integrate-rn",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-cfd2a167-6d85-4883-82f6-0828a66802ff.json b/change/react-native-windows-cfd2a167-6d85-4883-82f6-0828a66802ff.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "integrate rn nightly 0.77.0-nightly-20241001-223e98cc4",
+  "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.77.0-nightly-20240921-1747f57c6",
+  "baseVersion": "0.77.0-nightly-20241001-223e98cc4",
   "overrides": [
     {
       "type": "patch",
@@ -42,7 +42,7 @@
       "type": "derived",
       "file": "src/js/utils/RNTesterList.win32.js",
       "baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
-      "baseHash": "b40cdc34295381fbd40d38ade093cc0d198edd13"
+      "baseHash": "a4a186470316624bcd693e7f8b67739f87e5729c"
     }
   ]
 }
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.266",
     "react": "18.0.0",
-    "react-native": "0.77.0-nightly-20240921-1747f57c6"
+    "react-native": "0.77.0-nightly-20241001-223e98cc4"
   },
   "devDependencies": {
     "@office-iss/react-native-win32": "^0.0.0-canary.266",
@@ -30,7 +30,7 @@
     "@types/node": "^18.0.0",
     "eslint": "^8.19.0",
     "just-scripts": "^1.3.3",
-    "react-native": "0.77.0-nightly-20240921-1747f57c6",
+    "react-native": "0.77.0-nightly-20241001-223e98cc4",
     "react-native-platform-override": "^1.9.48",
     "typescript": "5.0.4"
   },

diff --git a/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js b/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {RNTesterModuleInfo} from '../types/RNTesterTypes';
+import type {RNTesterModuleInfo, RNTesterModule} from '../types/RNTesterTypes';
 
 import ReactNativeFeatureFlags from 'react-native/Libraries/ReactNative/ReactNativeFeatureFlags';
 
@@ -368,9 +368,16 @@ if (ReactNativeFeatureFlags.shouldEmitW3CPointerEvents()) {
   });
 }
 
-const Modules: any = {};
+const Playgrounds: Array<RNTesterModuleInfo> = [
+  {
+    key: 'PlaygroundExample',
+    module: require('../examples/Playground/PlaygroundExample'),
+  },
+];
+
+const Modules: {[key: string]: RNTesterModule} = {};
 
-APIs.concat(Components).forEach(Example => {
+[...APIs, ...Components, ...Playgrounds].forEach(Example => {
   Modules[Example.key] = Example.module;
 });
 

diff --git a/packages/@office-iss/react-native-win32/.flowconfig b/packages/@office-iss/react-native-win32/.flowconfig
@@ -160,4 +160,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.246.0
+^0.247.1
diff --git a/packages/@office-iss/react-native-win32/overrides.json b/packages/@office-iss/react-native-win32/overrides.json
@@ -7,19 +7,19 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.77.0-nightly-20240921-1747f57c6",
+  "baseVersion": "0.77.0-nightly-20241001-223e98cc4",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "3fbaf9dcd4027fa382894d06f330d0c68ceff9fb"
+      "baseHash": "0ef50a705dc56608e4a8bd11d3b0d3daedfc0012"
     },
     {
       "type": "derived",
       "file": "src-win/index.win32.js",
       "baseFile": "packages/react-native/index.js",
-      "baseHash": "da5d9e79c8c14c56ba00f73c8514c06e6fffe8ed"
+      "baseHash": "70b04f859a60e3752e6937b9fc294ffee30e6366"
     },
     {
       "type": "platform",
@@ -74,7 +74,7 @@
       "type": "copy",
       "file": "src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
       "baseFile": "packages/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
-      "baseHash": "09f143fc3f2ee80463764e1c2b3f23107d501a4c",
+      "baseHash": "b9a6866d03ca389af38734ffed24199505b05402",
       "issue": 4378
     },
     {
@@ -136,7 +136,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
-      "baseHash": "27e19d3bf49ff28629fdad544aad04939c2ce030",
+      "baseHash": "b06bb9da5282d7559f283a7d535797a0417808a6",
       "issue": 0
     },
     {
@@ -224,12 +224,6 @@
       "baseHash": "453c4da8036736aefbd950bb7c90603859933f4e",
       "issue": 5170
     },
-    {
-      "type": "copy",
-      "file": "src-win/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js",
-      "baseFile": "packages/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.android.js",
-      "baseHash": "1c9eb481e8ed077fa650e3ea34837e2a31310366"
-    },
     {
       "type": "platform",
       "file": "src-win/Libraries/Image/assetPaths.js"
@@ -337,7 +331,7 @@
       "type": "derived",
       "file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
       "baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
-      "baseHash": "0b4642542c2865c5cd3d542a82b295a1aca21c1a"
+      "baseHash": "af602af3c3acc6521f5535f2fe14bfe08cf1b5e9"
     },
     {
       "type": "copy",
@@ -529,6 +523,12 @@
       "file": "src-win/src/private/specs/modules/NativePlatformConstantsWin.js",
       "baseFile": "packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js",
       "baseHash": "fa0f34a2de33b641bd63863629087644796d8b59"
+    },
+    {
+      "type": "copy",
+      "file": "src-win/src/private/reactdevtools/ReactDevToolsSettingsManager.win32.js",
+      "baseFile": "packages/react-native/src/private/reactdevtools/ReactDevToolsSettingsManager.android.js",
+      "baseHash": "df41b76dc3d2df9455fae588748261d7b0a22d01"
     }
   ]
 }
diff --git a/packages/@office-iss/react-native-win32/package.json b/packages/@office-iss/react-native-win32/package.json
@@ -30,13 +30,13 @@
     "@react-native-community/cli-platform-android": "15.0.0-alpha.2",
     "@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.77.0-nightly-20240921-1747f57c6",
-    "@react-native/codegen": "0.77.0-nightly-20240921-1747f57c6",
-    "@react-native/community-cli-plugin": "0.77.0-nightly-20240921-1747f57c6",
-    "@react-native/gradle-plugin": "0.77.0-nightly-20240921-1747f57c6",
-    "@react-native/js-polyfills": "0.77.0-nightly-20240921-1747f57c6",
-    "@react-native/normalize-colors": "0.77.0-nightly-20240921-1747f57c6",
-    "@react-native/virtualized-lists": "0.77.0-nightly-20240921-1747f57c6",
+    "@react-native/assets-registry": "0.77.0-nightly-20241001-223e98cc4",
+    "@react-native/codegen": "0.77.0-nightly-20241001-223e98cc4",
+    "@react-native/community-cli-plugin": "0.77.0-nightly-20241001-223e98cc4",
+    "@react-native/gradle-plugin": "0.77.0-nightly-20241001-223e98cc4",
+    "@react-native/js-polyfills": "0.77.0-nightly-20241001-223e98cc4",
+    "@react-native/normalize-colors": "0.77.0-nightly-20241001-223e98cc4",
+    "@react-native/virtualized-lists": "0.77.0-nightly-20241001-223e98cc4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -60,7 +60,7 @@
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",
     "react-clone-referenced-element": "^1.0.1",
-    "react-devtools-core": "^5.3.1",
+    "react-devtools-core": "^6.0.0",
     "react-refresh": "^0.14.0",
     "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
@@ -90,14 +90,14 @@
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "19.0.0-rc-fb9a90fa48-20240614",
-    "react-native": "0.77.0-nightly-20240921-1747f57c6",
+    "react-native": "0.77.0-nightly-20241001-223e98cc4",
     "react-native-platform-override": "^1.9.48",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
     "@types/react": "^18.2.6",
     "react": "^19.0.0-rc-fb9a90fa48-20240614",
-    "react-native": "0.77.0-nightly-20240921-1747f57c6"
+    "react-native": "0.77.0-nightly-20241001-223e98cc4"
   },
   "beachball": {
     "defaultNpmTag": "canary",

diff --git a/...-iss/react-native-win32/src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js b/...-iss/react-native-win32/src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js
@@ -5,8 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow strict-local
  */
 
 'use strict';
 
-module.exports = require('../UnimplementedViews/UnimplementedView');
+module.exports =
+  require('../UnimplementedViews/UnimplementedView') as $FlowFixMe;
diff --git a/.../@office-iss/react-native-win32/src-win/Libraries/Components/Touchable/Touchable.win32.js b/.../@office-iss/react-native-win32/src-win/Libraries/Components/Touchable/Touchable.win32.js
@@ -718,13 +718,17 @@ const TouchableMixin = {
       return;
     }
     this.state.touchable.positionOnActivate &&
+      // $FlowFixMe[prop-missing]
       Position.release(this.state.touchable.positionOnActivate);
     this.state.touchable.dimensionsOnActivate &&
+      // $FlowFixMe[prop-missing]
       BoundingDimensions.release(this.state.touchable.dimensionsOnActivate);
+    // $FlowFixMe[prop-missing]
     this.state.touchable.positionOnActivate = Position.getPooled(
       globalX,
       globalY,
     );
+    // $FlowFixMe[prop-missing]
     this.state.touchable.dimensionsOnActivate = BoundingDimensions.getPooled(
       w,
       h,

diff --git a/...ss/react-native-win32/src-win/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js b/...ss/react-native-win32/src-win/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js
diff --git a/.../@office-iss/react-native-win32/src-win/Libraries/NativeComponent/BaseViewConfig.win32.js b/.../@office-iss/react-native-win32/src-win/Libraries/NativeComponent/BaseViewConfig.win32.js
@@ -228,7 +228,7 @@ const validAttributesForNonEventProps = {
   boxShadow: {
     process: require('../StyleSheet/processBoxShadow').default,
   },
-  experimental_mixBlendMode: true,
+  mixBlendMode: true,
   isolation: true,
 
   borderTopWidth: true,

diff --git a/packages/@office-iss/react-native-win32/src-win/index.win32.js b/packages/@office-iss/react-native-win32/src-win/index.win32.js
@@ -85,6 +85,7 @@ import typeof UTFSequence from './Libraries/UTFSequence';
 import typeof * as Appearance from './Libraries/Utilities/Appearance';
 import typeof BackHandler from './Libraries/Utilities/BackHandler';
 import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
+import typeof DevMenu from './src/private/devmenu/DevMenu';
 import typeof DevSettings from './Libraries/Utilities/DevSettings';
 import typeof Dimensions from './Libraries/Utilities/Dimensions';
 import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
@@ -240,6 +241,9 @@ module.exports = {
   get DeviceInfo(): DeviceInfo {
     return require('./Libraries/Utilities/DeviceInfo');
   },
+  get DevMenu(): DevMenu {
+    return require('./src/private/devmenu/DevMenu');
+  },
   get DevSettings(): DevSettings {
     return require('./Libraries/Utilities/DevSettings');
   },

diff --git a/...eact-native-win32/src-win/src/private/reactdevtools/ReactDevToolsSettingsManager.win32.js b/...eact-native-win32/src-win/src/private/reactdevtools/ReactDevToolsSettingsManager.win32.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import NativeReactDevToolsSettingsManager from '../specs/modules/NativeReactDevToolsSettingsManager';
+
+module.exports = {
+  setGlobalHookSettings(settings: string) {
+    NativeReactDevToolsSettingsManager?.setGlobalHookSettings(settings);
+  },
+  getGlobalHookSettings(): ?string {
+    return NativeReactDevToolsSettingsManager?.getGlobalHookSettings();
+  },
+};
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.8.8",
     "react": "19.0.0-rc-fb9a90fa48-20240614",
-    "react-native": "0.77.0-nightly-20240921-1747f57c6",
+    "react-native": "0.77.0-nightly-20241001-223e98cc4",
     "react-native-windows": "^0.0.0-canary.876",
     "typescript": "5.0.4"
   },

diff --git a/packages/@react-native-windows/codegen/src/generators/ValidateMethods.ts b/packages/@react-native-windows/codegen/src/generators/ValidateMethods.ts
@@ -33,6 +33,7 @@ function getPossibleMethodSignatures(
 ): string[] {
   const args = translateArgs(funcType.params, aliases, baseAliasName, options);
   if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (funcType.returnTypeAnnotation.elementType) {
       args.push(
         `::React::ReactPromise<${translateImplReturnType(
@@ -120,6 +121,7 @@ function renderProperties(
       );
 
       if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (funcType.returnTypeAnnotation.elementType) {
           traversedArgs.push(
             `Promise<${translateSpecReturnType(

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.77.0-nightly-20240921-1747f57c6",
+  "baseVersion": "0.77.0-nightly-20241001-223e98cc4",
   "overrides": [
     {
       "type": "derived",
@@ -91,7 +91,7 @@
       "type": "derived",
       "file": "src/js/utils/RNTesterList.windows.js",
       "baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
-      "baseHash": "b40cdc34295381fbd40d38ade093cc0d198edd13"
+      "baseHash": "a4a186470316624bcd693e7f8b67739f87e5729c"
     }
   ]
 }