diff --git a/change/@office-iss-react-native-win32-9f6db859-044b-41d5-a4db-4e7de4a05f90.json b/change/@office-iss-react-native-win32-9f6db859-044b-41d5-a4db-4e7de4a05f90.json new file mode 100644 index 00000000000..f57b57b6ea2 --- /dev/null +++ b/change/@office-iss-react-native-win32-9f6db859-044b-41d5-a4db-4e7de4a05f90.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Integrate 3/22/23", + "packageName": "@office-iss/react-native-win32", + "email": "tatianakapos@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@react-native-windows-automation-channel-f6af2720-0e5c-4b28-9479-d0a1861f367b.json b/change/@react-native-windows-automation-channel-f6af2720-0e5c-4b28-9479-d0a1861f367b.json new file mode 100644 index 00000000000..ab6570a3d45 --- /dev/null +++ b/change/@react-native-windows-automation-channel-f6af2720-0e5c-4b28-9479-d0a1861f367b.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Integrate 3/22/23", + "packageName": "@react-native-windows/automation-channel", + "email": "tatianakapos@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/react-native-windows-5e92e28d-f165-48b8-b06f-5947376f30a0.json b/change/react-native-windows-5e92e28d-f165-48b8-b06f-5947376f30a0.json new file mode 100644 index 00000000000..db7b5ed9b0c --- /dev/null +++ b/change/react-native-windows-5e92e28d-f165-48b8-b06f-5947376f30a0.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Integrate 3/22/23", + "packageName": "react-native-windows", + "email": "tatianakapos@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/@office-iss/react-native-win32-tester/overrides.json b/packages/@office-iss/react-native-win32-tester/overrides.json index bdb6335b9e5..db85ecc92b7 100644 --- 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.0.0-20230308-2111-d41e95fb1", + "baseVersion": "0.0.0-20230321-2153-7b86e3aae", "overrides": [ { "type": "patch", @@ -24,7 +24,7 @@ "type": "patch", "file": "src/js/components/RNTesterExampleFilter.win32.js", "baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js", - "baseHash": "91b349ecb666e3c44c14fecc5d8ac2a5fdba4ae6" + "baseHash": "76f3d045c6f4cdbd1538735c7c923da66de6974c" }, { "type": "platform", diff --git a/packages/@office-iss/react-native-win32-tester/package.json b/packages/@office-iss/react-native-win32-tester/package.json index d870d0474a3..6689ca4cf58 100644 --- 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.188", "react": "18.0.0", - "react-native": "0.0.0-20230308-2111-d41e95fb1" + "react-native": "0.0.0-20230321-2153-7b86e3aae" }, "devDependencies": { "@office-iss/react-native-win32": "^0.0.0-canary.188", @@ -30,7 +30,7 @@ "@types/node": "^14.14.22", "eslint": "^8.19.0", "just-scripts": "^1.3.3", - "react-native": "0.0.0-20230308-2111-d41e95fb1", + "react-native": "0.0.0-20230321-2153-7b86e3aae", "react-native-platform-override": "^1.9.4", "typescript": "^4.9.5" }, diff --git a/packages/@office-iss/react-native-win32-tester/src/js/components/RNTesterExampleFilter.win32.js b/packages/@office-iss/react-native-win32-tester/src/js/components/RNTesterExampleFilter.win32.js index f1583de5ffa..abe0586e536 100644 --- a/packages/@office-iss/react-native-win32-tester/src/js/components/RNTesterExampleFilter.win32.js +++ b/packages/@office-iss/react-native-win32-tester/src/js/components/RNTesterExampleFilter.win32.js @@ -92,11 +92,6 @@ class RNTesterExampleFilter extends React.Component, State> { keyboardShouldPersistTaps="handled" keyboardDismissMode="interactive"> {this.props.render({filteredSections})} - {/** - * This is a fake list item. It is needed to provide the ScrollView some bottom padding. - * The height of this item is basically ScreenHeight - the height of (Header + bottom navbar) - * */} - ); } else { diff --git a/packages/@office-iss/react-native-win32/.flowconfig b/packages/@office-iss/react-native-win32/.flowconfig index 6f94e7cb536..225f607637d 100644 --- a/packages/@office-iss/react-native-win32/.flowconfig +++ b/packages/@office-iss/react-native-win32/.flowconfig @@ -61,6 +61,8 @@ ; Ignore "BUCK" generated dirs /\.buckd/ +; Flow doesn't support platforms +.*/packages/react-native/Libraries/Utilities/LoadingView.js ; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder .*/react-native-win32/src/.* @@ -81,6 +83,7 @@ [libs] interface.js flow/ +flow-typed/ [options] enums=true @@ -100,7 +103,7 @@ munge_underscores=true module.name_mapper='^react-native$' -> '/index.win32.js' module.name_mapper='^@office-iss/react-native-win32$' -> '/index.win32.js' module.name_mapper='^react-native/\(.*\)$' -> '/\1' -module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '/\1' +module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '\/1' module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/Libraries/Image/RelativeImageStub' suppress_type=$FlowIssue @@ -109,8 +112,6 @@ suppress_type=$FlowFixMeProps suppress_type=$FlowFixMeState suppress_type=$FlowFixMeEmpty -experimental.array_literal_providers=true -inference_mode=experimental.lti sharedmemory.hash_table_pow=21 @@ -134,4 +135,4 @@ untyped-import untyped-type-import [version] -^0.201.0 +^0.202.0 diff --git a/packages/@office-iss/react-native-win32/overrides.json b/packages/@office-iss/react-native-win32/overrides.json index cc557c9351d..bbcd9ee862d 100644 --- a/packages/@office-iss/react-native-win32/overrides.json +++ b/packages/@office-iss/react-native-win32/overrides.json @@ -7,18 +7,18 @@ "**/__snapshots__/**", "src/rntypes/**" ], - "baseVersion": "0.0.0-20230308-2111-d41e95fb1", + "baseVersion": "0.0.0-20230321-2153-7b86e3aae", "overrides": [ { "type": "derived", "file": ".flowconfig", "baseFile": ".flowconfig", - "baseHash": "5a64dc6294bdb475c9725d6924993128b50f9196" + "baseHash": "5809dbf6ba753657688e76c63f9114c2e0efbfd8" }, { "type": "derived", "file": "src/index.win32.js", - "baseFile": "index.js", + "baseFile": "packages/react-native/index.js", "baseHash": "287445ef805383901c37da6026f8cf423ab0f078" }, { @@ -28,34 +28,34 @@ { "type": "patch", "file": "src/Libraries/Alert/Alert.win32.js", - "baseFile": "Libraries/Alert/Alert.js", + "baseFile": "packages/react-native/Libraries/Alert/Alert.js", "baseHash": "897569d77df852480332b7ce7ec1b594cf40aa28" }, { "type": "derived", "file": "src/Libraries/Animated/NativeAnimatedHelper.win32.js", - "baseFile": "Libraries/Animated/NativeAnimatedHelper.js", - "baseHash": "38e4960f0e3abf809b327396645722e66c277ff9", + "baseFile": "packages/react-native/Libraries/Animated/NativeAnimatedHelper.js", + "baseHash": "e0365ebe34de05757962476b84fb581a3c007a19", "issue": 11041 }, { "type": "patch", "file": "src/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js", - "baseFile": "Libraries/Components/AccessibilityInfo/AccessibilityInfo.js", + "baseFile": "packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js", "baseHash": "163927cc271b53109f06eaf5fc6d30a9af8cb27e", "issue": 4578 }, { "type": "copy", "file": "src/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.win32.js", - "baseFile": "Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js", + "baseFile": "packages/react-native/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js", "baseHash": "d37b2f72125246ababf3260e99ef790ce76fe3bb", "issue": 4578 }, { "type": "derived", "file": "src/Libraries/Components/Button.win32.js", - "baseFile": "Libraries/Components/Button.js", + "baseFile": "packages/react-native/Libraries/Components/Button.js", "baseHash": "31731fd48736bfcd3c36eb60a242b187236e124b" }, { @@ -69,7 +69,7 @@ { "type": "copy", "file": "src/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js", - "baseFile": "Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js", + "baseFile": "packages/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js", "baseHash": "09f143fc3f2ee80463764e1c2b3f23107d501a4c", "issue": 4378 }, @@ -80,27 +80,27 @@ { "type": "patch", "file": "src/Libraries/Components/Pressable/Pressable.win32.js", - "baseFile": "Libraries/Components/Pressable/Pressable.js", - "baseHash": "2b94e1efd3838e2537829e8935cf2c4a57cb48e4", + "baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js", + "baseHash": "319edc1911def764992d91bdb8b028a64273fa27", "issue": 6240 }, { "type": "copy", "file": "src/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js", - "baseFile": "Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js", + "baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js", "baseHash": "09f143fc3f2ee80463764e1c2b3f23107d501a4c", "issue": 4378 }, { "type": "patch", "file": "src/Libraries/Components/SafeAreaView/SafeAreaView.win32.js", - "baseFile": "Libraries/Components/SafeAreaView/SafeAreaView.js", + "baseFile": "packages/react-native/Libraries/Components/SafeAreaView/SafeAreaView.js", "baseHash": "8982fc8b7295200e987eea3454adddc5d650896c" }, { "type": "derived", "file": "src/Libraries/Components/ScrollView/ScrollView.win32.js", - "baseFile": "Libraries/Components/ScrollView/ScrollView.js", + "baseFile": "packages/react-native/Libraries/Components/ScrollView/ScrollView.js", "baseHash": "7d162bb43bce3f9da78b7c304530b3f804d21658" }, { @@ -126,19 +126,19 @@ { "type": "derived", "file": "src/Libraries/Components/TextInput/TextInput.win32.js", - "baseFile": "Libraries/Components/TextInput/TextInput.js", - "baseHash": "67f133655ca2a4cb62a1723ae5623895b7a647c0" + "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js", + "baseHash": "058fa050230bbb1710b64156f2e3680fc16aa252" }, { "type": "patch", "file": "src/Libraries/Components/TextInput/TextInputState.win32.js", - "baseFile": "Libraries/Components/TextInput/TextInputState.js", + "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInputState.js", "baseHash": "60655baaca427e1c7c1b8884833b848335c4033b" }, { "type": "copy", "file": "src/Libraries/Components/ToastAndroid/ToastAndroid.win32.js", - "baseFile": "Libraries/Components/ToastAndroid/ToastAndroid.ios.js", + "baseFile": "packages/react-native/Libraries/Components/ToastAndroid/ToastAndroid.ios.js", "baseHash": "081bef4803b72c50eb6e8379451201afbde9806e", "issue": 4378 }, @@ -149,20 +149,20 @@ { "type": "patch", "file": "src/Libraries/Components/Touchable/Touchable.win32.js", - "baseFile": "Libraries/Components/Touchable/Touchable.js", + "baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js", "baseHash": "ddfc674fe37ab886bd73a263786a4049b3cc73ff", "issue": 0 }, { "type": "derived", "file": "src/Libraries/Components/Touchable/TouchableNativeFeedback.win32.d.ts", - "baseFile": "Libraries/Components/Touchable/TouchableNativeFeedback.d.ts", + "baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts", "baseHash": "b38a2d4fb0c6a08c3ada7748fffded9949c97c2a" }, { "type": "derived", "file": "src/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js", - "baseFile": "Libraries/Components/Touchable/TouchableNativeFeedback.js", + "baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js", "baseHash": "d28c8ae97892811292cd9624a4a05525a1e2e1a3" }, { @@ -180,7 +180,7 @@ { "type": "patch", "file": "src/Libraries/Components/View/ReactNativeViewAttributes.win32.js", - "baseFile": "Libraries/Components/View/ReactNativeViewAttributes.js", + "baseFile": "packages/react-native/Libraries/Components/View/ReactNativeViewAttributes.js", "baseHash": "1e2900121c17ba9f58a7f6d0b3604456a13642bf" }, { @@ -190,38 +190,38 @@ { "type": "patch", "file": "src/Libraries/Components/View/View.win32.js", - "baseFile": "Libraries/Components/View/View.js", - "baseHash": "e1e15345be1d7794284bca007299ca5814969983" + "baseFile": "packages/react-native/Libraries/Components/View/View.js", + "baseHash": "a5ff7c1a8aeb920613c2e39aa00278af7902cfed" }, { "type": "derived", "file": "src/Libraries/Components/View/ViewAccessibility.win32.d.ts", - "baseFile": "Libraries/Components/View/ViewAccessibility.d.ts", - "baseHash": "e1fb452bb78657766b57f092f1021b388b5e7e4b" + "baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.d.ts", + "baseHash": "085982a44202765d099caf13785e8b4a42628d86" }, { "type": "derived", "file": "src/Libraries/Components/View/ViewAccessibility.win32.js", - "baseFile": "Libraries/Components/View/ViewAccessibility.js", + "baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.js", "baseHash": "d12245b45ccdc5f473ba9484b5ec994cb45dae75" }, { "type": "derived", "file": "src/Libraries/Components/View/ViewPropTypes.win32.d.ts", - "baseFile": "Libraries/Components/View/ViewPropTypes.d.ts", + "baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.d.ts", "baseHash": "91d96e475fc55da6c6456a240edbd650c1ca4a26" }, { "type": "patch", "file": "src/Libraries/Components/View/ViewPropTypes.win32.js", - "baseFile": "Libraries/Components/View/ViewPropTypes.js", + "baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js", "baseHash": "6ef6e875149d8c9c6da9b72703890736dd665463", "issue": 6240 }, { "type": "derived", "file": "src/Libraries/Components/View/ViewWin32.d.ts", - "baseFile": "Libraries/Components/View/View.d.ts", + "baseFile": "packages/react-native/Libraries/Components/View/View.d.ts", "baseHash": "c71957187cbae0b40995198a2d7a18d5cae6d662" }, { @@ -231,20 +231,20 @@ { "type": "patch", "file": "src/Libraries/Core/ReactNativeVersionCheck.win32.js", - "baseFile": "Libraries/Core/ReactNativeVersionCheck.js", + "baseFile": "packages/react-native/Libraries/Core/ReactNativeVersionCheck.js", "baseHash": "a7a9ebb513e71e59d61124f358c8cb9c8846e2eb", "issue": 5170 }, { "type": "copy", "file": "src/Libraries/DevToolsSettings/DevToolsSettingsManager.win32.js", - "baseFile": "Libraries/DevToolsSettings/DevToolsSettingsManager.android.js", + "baseFile": "packages/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.android.js", "baseHash": "1c9eb481e8ed077fa650e3ea34837e2a31310366" }, { "type": "derived", "file": "src/Libraries/Image/Image.win32.js", - "baseFile": "Libraries/Image/Image.ios.js", + "baseFile": "packages/react-native/Libraries/Image/Image.ios.js", "baseHash": "7d73c2d79bc09080618747146ebbba9b9da7dbca", "issue": 4320 }, @@ -255,7 +255,7 @@ { "type": "derived", "file": "src/Libraries/Image/NativeImageLoaderWin32.js", - "baseFile": "Libraries/Image/NativeImageLoaderIOS.js", + "baseFile": "packages/react-native/Libraries/Image/NativeImageLoaderIOS.js", "baseHash": "d4720d31916ce29c66a1c06906343e31fcd45036", "issue": 4320 }, @@ -298,58 +298,58 @@ { "type": "patch", "file": "src/Libraries/Inspector/Inspector.win32.js", - "baseFile": "Libraries/Inspector/Inspector.js", + "baseFile": "packages/react-native/Libraries/Inspector/Inspector.js", "baseHash": "db933614c0c15f0ce69907e37baae6b31dd39867" }, { "type": "patch", "file": "src/Libraries/Inspector/InspectorOverlay.win32.js", - "baseFile": "Libraries/Inspector/InspectorOverlay.js", - "baseHash": "e4137335e108a5c562966fae485f98ef99a55efc" + "baseFile": "packages/react-native/Libraries/Inspector/InspectorOverlay.js", + "baseHash": "e485323ee22cfae5c8b5e58b1283e2c00d650145" }, { "type": "derived", "file": "src/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.win32.js", - "baseFile": "Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js", + "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js", "baseHash": "dff994bb88b8c91090c381c871e6dc83d2511004" }, { "type": "patch", "file": "src/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js", - "baseFile": "Libraries/LogBox/UI/LogBoxInspectorHeader.js", + "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js", "baseHash": "e7ceb23d0449269b419414000fb5938898418a67", "issue": 7952 }, { "type": "derived", "file": "src/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js", - "baseFile": "Libraries/LogBox/UI/LogBoxInspectorReactFrames.js", + "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js", "baseHash": "04c1210d0198315af8358b22a81dc74dc76ef752" }, { "type": "derived", "file": "src/Libraries/LogBox/UI/LogBoxInspectorStackFrame.win32.js", - "baseFile": "Libraries/LogBox/UI/LogBoxInspectorStackFrame.js", + "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js", "baseHash": "663d3325298404d7c012a6aa53e833eb5fc2ec76", "issue": 5885 }, { "type": "derived", "file": "src/Libraries/LogBox/UI/LogBoxStyle.win32.js", - "baseFile": "Libraries/LogBox/UI/LogBoxStyle.js", + "baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxStyle.js", "baseHash": "63954df6e04ba9bc97148e04668729f4a8ca9847", "issue": 5886 }, { "type": "derived", "file": "src/Libraries/NativeComponent/BaseViewConfig.win32.js", - "baseFile": "Libraries/NativeComponent/BaseViewConfig.ios.js", + "baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js", "baseHash": "3c1918ff2ab3e43b4900e9b1e8549537d273d575" }, { "type": "derived", "file": "src/Libraries/Network/RCTNetworking.win32.js", - "baseFile": "Libraries/Network/RCTNetworking.android.js", + "baseFile": "packages/react-native/Libraries/Network/RCTNetworking.android.js", "baseHash": "67d0d4757fcd7a1c2c0f6de642f713f0fa300e28", "issue": 4318 }, @@ -372,15 +372,15 @@ { "type": "patch", "file": "src/Libraries/Pressability/HoverState.win32.js", - "baseFile": "Libraries/Pressability/HoverState.js", + "baseFile": "packages/react-native/Libraries/Pressability/HoverState.js", "baseHash": "50800642b413cb469ced8d1d6b32ee0e249f4d1e", "issue": 6240 }, { "type": "patch", "file": "src/Libraries/Pressability/Pressability.win32.js", - "baseFile": "Libraries/Pressability/Pressability.js", - "baseHash": "341cc5f4f57c16994ee78c06819a70dd2e993bba", + "baseFile": "packages/react-native/Libraries/Pressability/Pressability.js", + "baseHash": "6bc21b9d2a0fd8592b112a0c3752070d6c1fd079", "issue": 6240 }, { @@ -402,13 +402,13 @@ { "type": "patch", "file": "src/Libraries/ReactNative/PaperUIManager.win32.js", - "baseFile": "Libraries/ReactNative/PaperUIManager.js", + "baseFile": "packages/react-native/Libraries/ReactNative/PaperUIManager.js", "baseHash": "64504c716b2c64116d1ec74702ce7754fa651c6f" }, { "type": "derived", "file": "src/Libraries/Settings/Settings.win32.js", - "baseFile": "Libraries/Settings/Settings.android.js", + "baseFile": "packages/react-native/Libraries/Settings/Settings.android.js", "baseHash": "b76a462d5b5213cbf24aa4432b26f0080ed1b4ae" }, { @@ -426,46 +426,46 @@ { "type": "patch", "file": "src/Libraries/StyleSheet/StyleSheet.win32.js", - "baseFile": "Libraries/StyleSheet/StyleSheet.js", + "baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js", "baseHash": "b279b836217a0870546010c935fb53e6a889f0dd" }, { "type": "derived", "file": "src/Libraries/Text/TextNativeComponent.win32.js", - "baseFile": "Libraries/Text/TextNativeComponent.js", + "baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js", "baseHash": "abcdb74e2fe1e491baaefdd0ba6369199b8032d0", "issue": 7074 }, { "type": "patch", "file": "src/Libraries/Types/CoreEventTypes.win32.js", - "baseFile": "Libraries/Types/CoreEventTypes.js", + "baseFile": "packages/react-native/Libraries/Types/CoreEventTypes.js", "baseHash": "7fe2b87cf49f4674d731d07f0883bab2f5cfc356", "issue": 6240 }, { "type": "derived", "file": "src/Libraries/Utilities/AcessibilityMapping.win32.js", - "baseFile": "Libraries/Utilities/AcessibilityMapping.js", + "baseFile": "packages/react-native/Libraries/Utilities/AcessibilityMapping.js", "baseHash": "7a662ddd93c6cd0a7193e3002120aeb196991340" }, { "type": "copy", "file": "src/Libraries/Utilities/BackHandler.win32.js", - "baseFile": "Libraries/Utilities/BackHandler.android.js", + "baseFile": "packages/react-native/Libraries/Utilities/BackHandler.android.js", "baseHash": "796868f6764037baf433afd88053bb51f3194ddc", "issue": 4629 }, { "type": "derived", "file": "src/Libraries/Utilities/DeviceInfo.win32.js", - "baseFile": "Libraries/Utilities/DeviceInfo.js", + "baseFile": "packages/react-native/Libraries/Utilities/DeviceInfo.js", "baseHash": "9d473fcf9fd449b7c021116c3187d4ffcbdbe83d" }, { "type": "derived", "file": "src/Libraries/Utilities/Dimensions.win32.js", - "baseFile": "Libraries/Utilities/Dimensions.js", + "baseFile": "packages/react-native/Libraries/Utilities/Dimensions.js", "baseHash": "c37d2da5361a472af0c97e7c7a3ceba573b73d73" }, { @@ -479,19 +479,19 @@ { "type": "derived", "file": "src/Libraries/Utilities/NativePlatformConstantsWin.js", - "baseFile": "Libraries/Utilities/NativePlatformConstantsIOS.js", + "baseFile": "packages/react-native/Libraries/Utilities/NativePlatformConstantsIOS.js", "baseHash": "05b7359f0b5476a745789ca857c64cf2661d1e7b" }, { "type": "derived", "file": "src/Libraries/Utilities/Platform.win32.js", - "baseFile": "Libraries/Utilities/Platform.android.js", + "baseFile": "packages/react-native/Libraries/Utilities/Platform.android.js", "baseHash": "a8b6131f20d78db59b5efc33c4f8de86aad527dc" }, { "type": "copy", "file": "src/Libraries/Utilities/useMergeRefs.js", - "baseFile": "Libraries/Utilities/useMergeRefs.js", + "baseFile": "packages/react-native/Libraries/Utilities/useMergeRefs.js", "baseHash": "d21cc9b2de5af9f398429e7a03c5f13ea7dc7227" } ] diff --git a/packages/@office-iss/react-native-win32/package.json b/packages/@office-iss/react-native-win32/package.json index e3a2b53e6dc..8ff1e6be8d8 100644 --- a/packages/@office-iss/react-native-win32/package.json +++ b/packages/@office-iss/react-native-win32/package.json @@ -48,7 +48,6 @@ "jest-environment-node": "^29.2.1", "jsc-android": "^250231.0.0", "memoize-one": "^5.0.0", - "metro-react-native-babel-transformer": "0.75.1", "metro-runtime": "0.75.1", "metro-source-map": "0.75.1", "mkdirp": "^0.5.1", @@ -61,8 +60,7 @@ "react-shallow-renderer": "^16.15.0", "regenerator-runtime": "^0.13.2", "scheduler": "^0.23.0", - "stacktrace-parser": "^0.1.3", - "use-sync-external-store": "^1.0.0", + "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0", "ws": "^6.2.2", "yargs": "^17.6.2" @@ -80,18 +78,18 @@ "@types/prop-types": "15.7.1", "@types/react": "^18.0.18", "eslint": "^8.19.0", - "flow-bin": "^0.201.0", + "flow-bin": "^0.202.0", "jscodeshift": "^0.14.0", "just-scripts": "^1.3.3", "prettier": "^2.4.1", "react": "18.2.0", - "react-native": "0.0.0-20230308-2111-d41e95fb1", + "react-native": "0.0.0-20230321-2153-7b86e3aae", "react-native-platform-override": "^1.9.4", "typescript": "^4.9.5" }, "peerDependencies": { "react": "18.2.0", - "react-native": "0.0.0-20230308-2111-d41e95fb1" + "react-native": "0.0.0-20230321-2153-7b86e3aae" }, "beachball": { "defaultNpmTag": "canary", @@ -105,4 +103,4 @@ "engines": { "node": ">= 14" } -} +} \ No newline at end of file diff --git a/packages/@react-native-windows/automation-channel/package.json b/packages/@react-native-windows/automation-channel/package.json index c85fea28bf1..29768a00077 100644 --- 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.0.0-20230308-2111-d41e95fb1", + "react-native": "0.0.0-20230321-2153-7b86e3aae", "react-native-windows": "^0.0.0-canary.635", "typescript": "^4.9.5" }, @@ -42,4 +42,4 @@ "engines": { "node": ">= 14" } -} +} \ No newline at end of file diff --git a/packages/@react-native-windows/tester/overrides.json b/packages/@react-native-windows/tester/overrides.json index 686f81026dd..209aac1eeff 100644 --- 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.0.0-20230308-2111-d41e95fb1", + "baseVersion": "0.0.0-20230321-2153-7b86e3aae", "overrides": [ { "type": "patch", diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json index 46887b1e6a9..068b80dafd5 100644 --- 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.2.0", "react": "18.0.0", - "react-native": "0.0.0-20230308-2111-d41e95fb1", + "react-native": "0.0.0-20230321-2153-7b86e3aae", "react-native-windows": "^0.0.0-canary.635", "react-native-xaml": "^0.0.50" }, @@ -31,7 +31,7 @@ "@types/node": "^14.14.22", "eslint": "^8.19.0", "just-scripts": "^1.3.3", - "react-native": "0.0.0-20230308-2111-d41e95fb1", + "react-native": "0.0.0-20230321-2153-7b86e3aae", "react-native-platform-override": "^1.9.4", "react-native-windows": "^0.0.0-canary.635", "typescript": "^4.9.5" @@ -39,4 +39,4 @@ "engines": { "node": ">= 14" } -} +} \ No newline at end of file diff --git a/packages/@react-native/repo-config/overrides.json b/packages/@react-native/repo-config/overrides.json index 08c3b023c45..2641054f7b4 100644 --- a/packages/@react-native/repo-config/overrides.json +++ b/packages/@react-native/repo-config/overrides.json @@ -1,11 +1,11 @@ { - "baseVersion": "0.0.0-20230308-2111-d41e95fb1", + "baseVersion": "0.0.0-20230321-2153-7b86e3aae", "overrides": [ { - "type": "copy", + "type": "patch", "file": "package.json", - "baseFile": "repo-config/package.json", - "baseHash": "680d8666e009bc6267cf80fa218a4745f5de2756" + "baseFile": "package.json", + "baseHash": "50c9e35b8af70b1ce27733d938b82fa42254ac2b" } ] } \ No newline at end of file diff --git a/packages/@react-native/repo-config/package.json b/packages/@react-native/repo-config/package.json index 9c2bce798c5..812f848b1bc 100644 --- a/packages/@react-native/repo-config/package.json +++ b/packages/@react-native/repo-config/package.json @@ -1,30 +1,29 @@ { - "name": "@react-native/repo-config", + "name": "@react-native/monorepo", "private": true, - "version": "0.0.0", - "description": "Meta package for the React Native repository.", + "version": "1000.0.0", + "description": "A framework for building native apps using React", "license": "MIT", - "repository": { - "type": "git", - "url": "git@github.com:facebook/react-native.git" + "repository": "github:facebook/react-native", + "types": "types", + "jest-junit": { + "outputDirectory": "reports/junit", + "outputName": "js-test-results.xml" }, - "dependencies": { + "devDependencies": { "@babel/core": "^7.20.0", "@babel/eslint-parser": "^7.19.0", "@babel/generator": "^7.20.0", "@babel/plugin-transform-regenerator": "^7.0.0", "@definitelytyped/dtslint": "^0.0.127", - "@react-native/codegen": "^0.72.3", - "@react-native/eslint-config": "*", - "@react-native/eslint-plugin": "*", - "@react-native/eslint-plugin-specs": "^0.72.2", + "@jest/create-cache-key-function": "^29.2.1", "@reactions/component": "^2.0.2", "@types/react": "^18.0.18", "@typescript-eslint/parser": "^5.30.5", "async": "^3.2.2", + "babel-plugin-transform-flow-enums": "^0.0.2", "clang-format": "^1.8.0", "connect": "^3.6.5", - "coveralls": "^3.1.1", "eslint": "^8.19.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-babel": "^5.3.1", @@ -39,14 +38,17 @@ "eslint-plugin-react-native": "^4.0.0", "eslint-plugin-redundant-undefined": "^0.4.0", "eslint-plugin-relay": "^1.8.3", - "flow-bin": "^0.201.0", + "flow-bin": "^0.202.0", + "hermes-eslint": "0.8.0", "inquirer": "^7.1.0", "jest": "^29.2.1", "jest-junit": "^10.0.0", "jscodeshift": "^0.14.0", "metro-babel-register": "0.75.1", "metro-memory-fs": "0.75.1", + "metro-react-native-babel-transformer": "0.75.1", "mkdirp": "^0.5.1", + "mock-fs": "^5.1.4", "prettier": "^2.4.1", "react": "18.2.0", "react-test-renderer": "18.2.0", @@ -55,4 +57,4 @@ "typescript": "4.1.3", "ws": "^6.2.2" } -} +} \ No newline at end of file diff --git a/packages/@react-native/tester/NativeComponentExample/js/MyNativeView.js b/packages/@react-native/tester/NativeComponentExample/js/MyNativeView.js index f48233a0829..24eefb84fc5 100644 --- a/packages/@react-native/tester/NativeComponentExample/js/MyNativeView.js +++ b/packages/@react-native/tester/NativeComponentExample/js/MyNativeView.js @@ -16,6 +16,7 @@ import RNTMyNativeView, { } from './MyNativeViewNativeComponent'; import RNTMyLegacyNativeView from './MyLegacyViewNativeComponent'; import type {MyNativeViewType} from './MyNativeViewNativeComponent'; +import {UIManager} from 'react-native'; const colors = [ '#0000FF', @@ -26,11 +27,35 @@ const colors = [ '#000033', ]; +class HSBA { + hue: number; + saturation: number; + brightness: number; + alpha: number; + + constructor( + hue: number = 0.0, + saturation: number = 0.0, + brightness: number = 0.0, + alpha: number = 0.0, + ) { + this.hue = hue; + this.saturation = saturation; + this.brightness = brightness; + this.alpha = alpha; + } + + toString(): string { + return `h: ${this.hue}, s: ${this.saturation}, b: ${this.brightness}, a: ${this.alpha}`; + } +} + // This is an example component that migrates to use the new architecture. export default function MyNativeView(props: {}): React.Node { const ref = useRef | null>(null); const [opacity, setOpacity] = useState(1.0); const [color, setColor] = useState('#FF0000'); + const [hsba, setHsba] = useState(new HSBA()); return ( Fabric View @@ -40,7 +65,22 @@ export default function MyNativeView(props: {}): React.Node { style={{flex: 1}} opacity={opacity} color={color} + onColorChanged={event => + setHsba( + new HSBA( + event.nativeEvent.backgroundColor.hue, + event.nativeEvent.backgroundColor.saturation, + event.nativeEvent.backgroundColor.brightness, + event.nativeEvent.backgroundColor.alpha, + ), + ) + } /> + HSBA: {hsba.toString()} + + Constants From Interop Layer:{' '} + {UIManager.RNTMyLegacyNativeView.Constants.PI} +