@office-iss/react-native-win32 0.68.0 → 0.69.0-preview.3

package/overrides.json

@@ -7,19 +7,19 @@
     "**/__snapshots__/**",
     "src/rntypes/**"
   ],
-  "baseVersion": "0.68.0",
+  "baseVersion": "0.69.0-rc.3",
   "overrides": [
     {
       "type": "derived",
       "file": ".flowconfig",
       "baseFile": ".flowconfig",
-      "baseHash": "2c2e7e50f6f0583ed3ddd91463abdb13902d7ac1"
+      "baseHash": "22398587d11b601a2ec98362fa3879779983e898"
     },
     {
       "type": "derived",
       "file": "src/index.win32.js",
       "baseFile": "index.js",
-      "baseHash": "7218b8a8a31e7dc23cb45e131af209c72363972c"
+      "baseHash": "2a0bd511c691be2ac3da45a3c77250aaf55414e1"
     },
     {
       "type": "patch",
@@ -78,7 +78,7 @@
       "type": "patch",
       "file": "src/Libraries/Components/Pressable/Pressable.win32.js",
       "baseFile": "Libraries/Components/Pressable/Pressable.js",
-      "baseHash": "ffd4c8875dc3c2936677577666050a5fe2124c09",
+      "baseHash": "b6e9d331a959f84314be9a0efcf40ce8eca4a6d8",
       "issue": 6240
     },
     {
@@ -100,13 +100,6 @@
       "baseFile": "Libraries/Components/SafeAreaView/SafeAreaView.js",
       "baseHash": "d13d67c91a9096989776ba7d7b0f8537c46b87a8"
     },
-    {
-      "type": "copy",
-      "file": "src/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.js",
-      "baseFile": "Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js",
-      "baseHash": "a7b7561ee80510fb3a45bad5ad18bc9076152144",
-      "issue": 4378
-    },
     {
       "type": "platform",
       "file": "src/Libraries/Components/Text/Tests/TextWin32Test.tsx"
@@ -131,13 +124,13 @@
       "type": "derived",
       "file": "src/Libraries/Components/TextInput/TextInput.win32.tsx",
       "baseFile": "Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "50e32c48b4a9a47055de000fed2ed38ea243154e"
+      "baseHash": "567ebad070a2fb9020ef177ee30defba9f0c54ec"
     },
     {
       "type": "patch",
       "file": "src/Libraries/Components/TextInput/TextInputState.win32.js",
       "baseFile": "Libraries/Components/TextInput/TextInputState.js",
-      "baseHash": "53e9f8f6739e958e84709d02201a76527534b367"
+      "baseHash": "a5802e5d8b960912293d0069a99bbf346c8ecc4c"
     },
     {
       "type": "copy",
@@ -174,13 +167,7 @@
       "type": "patch",
       "file": "src/Libraries/Components/View/ReactNativeViewAttributes.win32.js",
       "baseFile": "Libraries/Components/View/ReactNativeViewAttributes.js",
-      "baseHash": "14b7dc745d010a375eb89ac56d803a53e19427e5"
-    },
-    {
-      "type": "patch",
-      "file": "src/Libraries/Components/View/ReactNativeViewViewConfig.win32.js",
-      "baseFile": "Libraries/Components/View/ReactNativeViewViewConfig.js",
-      "baseHash": "7b24fd09a0d0f7e7c6d87ceeb86610d4c9b78d3a"
+      "baseHash": "1e2900121c17ba9f58a7f6d0b3604456a13642bf"
     },
     {
       "type": "platform",
@@ -196,7 +183,7 @@
       "type": "patch",
       "file": "src/Libraries/Components/View/ViewPropTypes.win32.js",
       "baseFile": "Libraries/Components/View/ViewPropTypes.js",
-      "baseHash": "eae7117392dc0e670a4e38389a7b7e3bca4d55b7",
+      "baseHash": "d2a2c68a374e334a4ff211353c534a795433bd7d",
       "issue": 6240
     },
     {
@@ -218,7 +205,7 @@
       "type": "derived",
       "file": "src/Libraries/Image/Image.win32.js",
       "baseFile": "Libraries/Image/Image.ios.js",
-      "baseHash": "920050b9f70e56c9f40c242e8cae26de5e4eaf8d",
+      "baseHash": "282cd9cc008400b06b617543b9f5f8429d91b87e",
       "issue": 4320
     },
     {
@@ -272,7 +259,7 @@
       "type": "patch",
       "file": "src/Libraries/Inspector/Inspector.win32.js",
       "baseFile": "Libraries/Inspector/Inspector.js",
-      "baseHash": "25898a7ef40a69a00de8cd42b6d9834b2aeeb293"
+      "baseHash": "a335353c8e7299f8de2601104e2056eeb16ea041"
     },
     {
       "type": "patch",
@@ -287,25 +274,25 @@
       "baseHash": "bfb778c766301230ffb3b2aab0c25954e993419a"
     },
     {
-      "type": "patch",
-      "file": "src/Libraries/Lists/__tests__/FillRateHelper-test.windows.js",
+      "type": "copy",
+      "file": "src/Libraries/Lists/__tests__/FillRateHelper-test.js",
       "baseFile": "Libraries/Lists/__tests__/FillRateHelper-test.js",
       "baseHash": "784563e3f8414828196288c01b833b7cdb05608f",
-      "issue": 9217
+      "issue": 0
     },
     {
-      "type": "patch",
-      "file": "src/Libraries/Lists/__tests__/FlatList-test.windows.js",
+      "type": "copy",
+      "file": "src/Libraries/Lists/__tests__/FlatList-test.js",
       "baseFile": "Libraries/Lists/__tests__/FlatList-test.js",
       "baseHash": "524bd967f806a01272162bdec906780acdea064c",
-      "issue": 9217
+      "issue": 0
     },
     {
-      "type": "patch",
-      "file": "src/Libraries/Lists/__tests__/SectionList-test.windows.js",
+      "type": "copy",
+      "file": "src/Libraries/Lists/__tests__/SectionList-test.js",
       "baseFile": "Libraries/Lists/__tests__/SectionList-test.js",
       "baseHash": "e277498e347542679adf37df904688002d641c37",
-      "issue": 9217
+      "issue": 0
     },
     {
       "type": "copy",
@@ -314,25 +301,25 @@
       "baseHash": "ab22d57f3ed7af8382dc2fac72eaca53073d9a41"
     },
     {
-      "type": "patch",
-      "file": "src/Libraries/Lists/__tests__/VirtualizedList-test.windows.js",
+      "type": "copy",
+      "file": "src/Libraries/Lists/__tests__/VirtualizedList-test.js",
       "baseFile": "Libraries/Lists/__tests__/VirtualizedList-test.js",
-      "baseHash": "20e330dbe984f22feaf44c0558d0b9451df43c05",
-      "issue": 9217
+      "baseHash": "6eb2a875d4eeb9ab65476661ff3fc4f6c03b329c",
+      "issue": 0
     },
     {
-      "type": "patch",
-      "file": "src/Libraries/Lists/__tests__/VirtualizedSectionList-test.windows.js",
+      "type": "copy",
+      "file": "src/Libraries/Lists/__tests__/VirtualizedSectionList-test.js",
       "baseFile": "Libraries/Lists/__tests__/VirtualizedSectionList-test.js",
       "baseHash": "09e687ceb59ca9b35b42a641d597f84c8ee7d078",
-      "issue": 9217
+      "issue": 0
     },
     {
-      "type": "patch",
-      "file": "src/Libraries/Lists/__tests__/VirtualizeUtils-test.windows.js",
+      "type": "copy",
+      "file": "src/Libraries/Lists/__tests__/VirtualizeUtils-test.js",
       "baseFile": "Libraries/Lists/__tests__/VirtualizeUtils-test.js",
       "baseHash": "7cbd1e3cfa7adab44c9508066bf77e29d2c55b46",
-      "issue": 9217
+      "issue": 0
     },
     {
       "type": "platform",
@@ -342,7 +329,7 @@
       "type": "patch",
       "file": "src/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
       "baseFile": "Libraries/LogBox/UI/LogBoxInspectorHeader.js",
-      "baseHash": "79086d48f6601410773436dd1a20612db9ad42e9",
+      "baseHash": "623cbed5356a6d12537d417d47af5ffda03631cd",
       "issue": 7952
     },
     {
@@ -359,6 +346,12 @@
       "baseHash": "63954df6e04ba9bc97148e04668729f4a8ca9847",
       "issue": 5886
     },
+    {
+      "type": "derived",
+      "file": "src/Libraries/NativeComponent/BaseViewConfig.win32.js",
+      "baseFile": "Libraries/NativeComponent/BaseViewConfig.ios.js",
+      "baseHash": "ff335415e43399b3cdaf4fd2dd2063d495f39ec5"
+    },
     {
       "type": "derived",
       "file": "src/Libraries/Network/RCTNetworking.win32.js",
@@ -389,7 +382,7 @@
       "type": "patch",
       "file": "src/Libraries/Pressability/Pressability.win32.js",
       "baseFile": "Libraries/Pressability/Pressability.js",
-      "baseHash": "9ad7624c5cfa58134e226cbe7e8594ceb18d3b43",
+      "baseHash": "87349e7a4175694c25df80538885fac1e0df96d1",
       "issue": 6240
     },
     {
@@ -442,14 +435,14 @@
       "type": "derived",
       "file": "src/Libraries/Text/TextNativeComponent.win32.js",
       "baseFile": "Libraries/Text/TextNativeComponent.js",
-      "baseHash": "cd1ff3f3c9e841847f77cdb2799abcf1a83e79e3",
+      "baseHash": "27d6b7e72f84abed594050d86808190add804b87",
       "issue": 7074
     },
     {
       "type": "patch",
       "file": "src/Libraries/Types/CoreEventTypes.win32.js",
       "baseFile": "Libraries/Types/CoreEventTypes.js",
-      "baseHash": "b7ed94c49c38a6b3579349e6940bb663328c1f4e",
+      "baseHash": "d9fb8f9555d98ec994eaa472fce31594d37ddfd6",
       "issue": 6240
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.68.0",
+  "version": "0.69.0-preview.3",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "license": "MIT",
   "main": "./index.win32.js",
@@ -12,9 +12,9 @@
     "flow-check": "flow check",
     "lint:fix": "rnw-scripts lint:fix",
     "lint": "rnw-scripts lint",
-    "run-win32-dev-web": "npx @office-iss/rex-win32@0.63.36-devmain.14419.10000 --bundle js/RNTesterApp --component RNTesterApp --basePath ./dist/win32/dev --jsEngine v8 --useDevMain --useWebDebugger",
-    "run-win32-devmain": "npx @office-iss/rex-win32@0.63.36-devmain.14419.10000 --bundle js/RNTesterApp --component RNTesterApp --basePath ./dist/win32/dev --jsEngine v8 --useDevMain",
-    "run-win32": "npx @office-iss/rex-win32@0.63.36-devmain.14419.10000 --bundle js/RNTesterApp --component RNTesterApp --basePath ./dist/win32/dev --jsEngine v8",
+    "run-win32-dev-web": "npx @office-iss/rex-win32@0.66.15-devmain.15226.10000 --bundle js/RNTesterApp --component RNTesterApp --basePath ./dist/win32/dev --jsEngine v8 --useDevMain --useWebDebugger",
+    "run-win32-devmain": "npx @office-iss/rex-win32@0.66.15-devmain.15226.10000 --bundle js/RNTesterApp --component RNTesterApp --basePath ./dist/win32/dev --jsEngine v8 --useDevMain",
+    "run-win32": "npx @office-iss/rex-win32@0.66.15-devmain.15226.10000 --bundle js/RNTesterApp --component RNTesterApp --basePath ./dist/win32/dev --jsEngine v8 --useWebDebugger",
     "start": "react-native start --projectRoot ../react-native-win32-tester",
     "test": "jest",
     "validate-overrides": "react-native-platform-override validate"
@@ -22,10 +22,10 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^7.0.3",
-    "@react-native-community/cli-platform-android": "^7.0.1",
-    "@react-native-community/cli-platform-ios": "^7.0.1",
-    "@react-native-windows/virtualized-list": "0.68.0",
+    "@react-native-community/cli": "^8.0.0",
+    "@react-native-community/cli-platform-android": "^8.0.0",
+    "@react-native-community/cli-platform-ios": "^8.0.0",
+    "@react-native-windows/virtualized-list": "0.69.0-preview.2",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -33,60 +33,63 @@
     "anser": "^1.4.9",
     "art": "^0.10.0",
     "base64-js": "^1.1.2",
-    "deprecated-react-native-prop-types": "^2.3.0",
     "event-target-shim": "^5.0.1",
     "hermes-engine": "~0.11.0",
     "invariant": "^2.2.4",
     "jsc-android": "^250230.2.1",
-    "metro-react-native-babel-transformer": "0.67.0",
-    "metro-runtime": "0.67.0",
-    "metro-source-map": "0.67.0",
+    "memoize-one": "^5.0.0",
+    "metro-react-native-babel-transformer": "0.70.3",
+    "metro-runtime": "0.70.3",
+    "metro-source-map": "0.70.3",
+    "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "react-clone-referenced-element": "^1.0.1",
-    "react-devtools-core": "^4.23.0",
-    "react-native-codegen": "^0.0.13",
-    "react-native-gradle-plugin": "^0.0.5",
+    "react-devtools-core": "4.24.0",
+    "react-native-codegen": "^0.69.1",
+    "react-native-gradle-plugin": "^0.0.7",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.20.2",
+    "scheduler": "^0.21.0",
+    "shelljs": "^0.8.5",
     "stacktrace-parser": "^0.1.3",
-    "use-subscription": "^1.0.0",
+    "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "@rnw-scripts/eslint-config": "1.1.10",
-    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.4",
+    "@rnw-scripts/eslint-config": "1.1.12",
+    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.6",
+    "@rnw-scripts/metro-dev-config": "0.0.0",
     "@rnx-kit/jest-preset": "^0.1.0",
     "@types/node": "^14.14.22",
     "@types/prop-types": "15.7.1",
-    "@types/react": "^17.0.21",
-    "@types/react-native": "^0.66.0",
+    "@types/react": "^18.0.0",
+    "@types/react-native": "^0.66.17",
     "babel-eslint": "^10.1.0",
     "eslint": "^7.32.0",
-    "flow-bin": "^0.170.0",
+    "flow-bin": "^0.176.3",
     "jscodeshift": "^0.13.1",
     "just-scripts": "^1.3.3",
     "prettier": "^2.4.1",
-    "react": "17.0.2",
-    "react-native": "^0.68.0",
-    "react-native-platform-override": "^1.6.4",
+    "react": "18.0.0",
+    "react-native": "0.69.0-rc.3",
+    "react-native-platform-override": "^1.6.11",
     "react-shallow-renderer": "16.14.1",
     "typescript": "^4.4.4"
   },
   "peerDependencies": {
-    "react": "17.0.2",
-    "react-native": "^0.68.0"
+    "react": "18.0.0",
+    "react-native": "0.69.0-rc.3"
   },
   "beachball": {
-    "defaultNpmTag": "latest",
+    "defaultNpmTag": "preview",
     "disallowedChangeTypes": [
       "major",
       "minor",
-      "prerelease"
+      "patch"
     ]
   },
   "promoteRelease": true,

package/rntypes/index.d.ts

@@ -31,7 +31,6 @@
 //                 Dominique Richard <https://github.com/doumart>
 //                 Mohamed Shaban <https://github.com/drmas>
 //                 Jérémy Barbet <https://github.com/jeremybarbet>
-//                 Christian Ost <https://github.com/ca057>
 //                 David Sheldrick <https://github.com/ds300>
 //                 Natsathorn Yuthakovit <https://github.com/natsathorn>
 //                 ConnectDotz <https://github.com/connectdotz>
@@ -41,6 +40,7 @@
 //                 Arafat Zahan <https://github.com/kuasha420>
 //                 Pedro Hernández <https://github.com/phvillegas>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Zihan Chen <https://github.com/ZihanChen-MSFT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 
@@ -3220,12 +3220,6 @@ export interface RefreshControlPropsAndroid extends ViewProps {
      * Size of the refresh indicator, see RefreshControl.SIZE.
      */
     size?: number | undefined;
-
-    /**
-     * Progress view top offset
-     * @platform android
-     */
-    progressViewOffset?: number | undefined;
 }
 
 export interface RefreshControlProps extends RefreshControlPropsIOS, RefreshControlPropsAndroid {
@@ -3238,6 +3232,11 @@ export interface RefreshControlProps extends RefreshControlPropsIOS, RefreshCont
      * Whether the view should be indicating an active refresh.
      */
     refreshing: boolean;
+
+    /**
+     * Progress view top offset
+     */
+    progressViewOffset?: number | undefined;
 }
 
 /**
@@ -9159,6 +9158,19 @@ export interface ImageStoreStatic {
     getBase64ForTag(uri: string, success: (base64ImageData: string) => void, failure: (error: any) => void): void;
 }
 
+//
+// Turbo Module
+//
+
+export interface TurboModule {
+    getConstants?(): {}
+}
+
+export const TurboModuleRegistry: {
+    get<T extends TurboModule>(name: string): T | null;
+    getEnforcing<T extends TurboModule>(name: string): T;
+}
+
 //
 // Interfacing with Native Modules
 // https://reactnative.dev/docs/native-modules-ios

package/src/Libraries/Components/Touchable/Tests/TouchableWin32Test.tsx

@@ -170,7 +170,7 @@ class TouchableWin32WithoutFeedback extends React.Component<ITouchableWin32Witho
   };
 }
 
-interface ITouchableWin32HighlightProps extends IViewWin32Props {
+interface ITouchableWin32HighlightProps extends Omit <IViewWin32Props, 'children'> {
   delayLongPress?: number;
   delayLongPressIn?: number;
   delayPressOut?: number;

package/src/Libraries/Components/Touchable/TouchableWin32.Props.tsx

@@ -9,7 +9,9 @@ export interface ITouchableWin32State {
   isHovered: boolean;
 }
 
-export interface ITouchableWin32Props extends IViewWin32Props {
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
+
+export interface ITouchableWin32Props extends Omit <IViewWin32Props, 'children'> {
   rejectResponderTermination?: boolean;
   disabled?: boolean;
   touchableHandleActivePressIn?: (e: IPressEvent) => void;

package/src/Libraries/Components/View/ViewWin32.Props.ts

@@ -45,6 +45,7 @@ export type ARIARole =
   | 'dialog'
   | 'group'
   | 'link'
+  | 'listitem'
   | 'menu'
   | 'menubar'
   | 'menuitem'