Skip to content

Commit

Permalink
Integrate v0.72.0 (#11801)
Browse files Browse the repository at this point in the history
* fix flow bin

* Add dep for `eslint-plugin-ft-flow`

* yarn integrate-rn 0.72.0 && yarn react-native-platform-override upgrade

* Change files

* policheck update from main
  • Loading branch information
jonthysell committed Jun 23, 2023
1 parent ebb6cb5 commit e3c5696
Show file tree
Hide file tree
Showing 42 changed files with 1,159 additions and 512 deletions.
Binary file modified .ado/config/PoliCheckRules.mdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.72.0",
"packageName": "@office-iss/react-native-win32",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.72.0",
"packageName": "react-native-windows",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
20 changes: 10 additions & 10 deletions packages/@office-iss/react-native-win32-tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.72.0-rc.3",
"baseVersion": "0.72.0",
"overrides": [
{
"type": "patch",
"file": "src/js/components/ListExampleShared.win32.js",
"baseFile": "packages/rn-tester/js/components/ListExampleShared.js",
"baseHash": "66abd6b53ecdcd41fd06156620a5f679b9fc9103"
"baseHash": "9858605235f92f728f0e1abe412038062f853052"
},
{
"type": "patch",
Expand All @@ -26,6 +26,14 @@
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
"baseHash": "91b349ecb666e3c44c14fecc5d8ac2a5fdba4ae6"
},
{
"type": "platform",
"file": "src/js/components/TextWin32Test.tsx"
},
{
"type": "platform",
"file": "src/js/components/ViewWin32Test.tsx"
},
{
"type": "platform",
"file": "src/js/examples/PlatformColor/PlatformColorExample.win32.js"
Expand All @@ -42,14 +50,6 @@
"file": "src/js/utils/RNTesterList.win32.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "8954573b49f8321edea6bd2bdddf814ba2a7226c"
},
{
"type": "platform",
"file": "src/js/components/TextWin32Test.tsx"
},
{
"type": "platform",
"file": "src/js/components/ViewWin32Test.tsx"
}
]
}
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "0.72.0-preview.5",
"react": "18.0.0",
"react-native": "0.0.0-20230321-2153-7b86e3aae"
"react-native": "^0.72.0"
},
"devDependencies": {
"@office-iss/react-native-win32": "0.72.0-preview.5",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^16.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.72.0-rc.3",
"react-native": "0.72.0",
"react-native-platform-override": "^1.9.4",
"typescript": "^4.9.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
const React = require('react');

const {
ActivityIndicator,
Animated,
Image,
Platform,
Expand All @@ -33,16 +34,28 @@ export type Item = {
...
};

function genItemData(count: number, start: number = 0): Array<Item> {
function genItemData(i: number): Item {
const itemHash = Math.abs(hashCode('Item ' + i));
return {
title: 'Item ' + i,
text: LOREM_IPSUM.substr(0, (itemHash % 301) + 20),
key: String(i),
pressed: false,
};
}

function genNewerItems(count: number, start: number = 0): Array<Item> {
const dataBlob = [];
for (let i = start; i < count + start; i++) {
dataBlob.push(genItemData(i));
}
return dataBlob;
}

function genOlderItems(count: number, start: number = 0): Array<Item> {
const dataBlob = [];
for (let ii = start; ii < count + start; ii++) {
const itemHash = Math.abs(hashCode('Item ' + ii));
dataBlob.push({
title: 'Item ' + ii,
text: LOREM_IPSUM.substr(0, (itemHash % 301) + 20),
key: String(ii),
pressed: false,
});
for (let i = count; i > 0; i--) {
dataBlob.push(genItemData(start - i));
}
return dataBlob;
}
Expand Down Expand Up @@ -149,6 +162,12 @@ class SeparatorComponent extends React.PureComponent<{...}> {
}
}

const LoadingComponent: React.ComponentType<{}> = React.memo(() => (
<View style={styles.loadingContainer}>
<ActivityIndicator />
</View>
));

class ItemSeparatorComponent extends React.PureComponent<$FlowFixMeProps> {
render(): React.Node {
const style = this.props.highlighted
Expand Down Expand Up @@ -359,6 +378,13 @@ const styles = StyleSheet.create({
text: {
flex: 1,
},
loadingContainer: {
alignItems: 'center',
justifyContent: 'center',
height: 100,
borderTopWidth: 1,
borderTopColor: 'rgb(200, 199, 204)',
},
});

module.exports = {
Expand All @@ -369,8 +395,10 @@ module.exports = {
ItemSeparatorComponent,
PlainInput,
SeparatorComponent,
LoadingComponent,
Spindicator,
genItemData,
genNewerItems,
genOlderItems,
getItemLayout,
pressItem,
renderSmallSwitchOption,
Expand Down
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"**/__snapshots__/**",
"src/rntypes/**"
],
"baseVersion": "0.72.0-rc.3",
"baseVersion": "0.72.0",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -123,7 +123,7 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "058fa050230bbb1710b64156f2e3680fc16aa252"
"baseHash": "a817f8d62ee3ba4c56b772bd0cfb852739cb4aa7"
},
{
"type": "patch",
Expand Down
25 changes: 13 additions & 12 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^29.2.1",
"@react-native-community/cli": "11.2.3",
"@react-native-community/cli-platform-android": "11.2.3",
"@react-native-community/cli-platform-ios": "11.2.3",
"@react-native-community/cli": "11.3.2",
"@react-native-community/cli-platform-android": "11.3.2",
"@react-native-community/cli-platform-ios": "11.3.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "^0.72.0",
"@react-native/codegen": "^0.72.3",
"@react-native/gradle-plugin": "^0.72.5",
"@react-native/codegen": "^0.72.6",
"@react-native/gradle-plugin": "^0.72.10",
"@react-native/js-polyfills": "^0.72.1",
"@react-native/normalize-colors": "^0.72.0",
"@react-native/virtualized-lists": "^0.72.2",
"@react-native/virtualized-lists": "^0.72.5",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"art": "^0.10.0",
"base64-js": "^1.1.2",
"deprecated-react-native-prop-types": "^4.1.0",
"deprecated-react-native-prop-types": "4.1.0",
"event-target-shim": "^5.0.1",
"flow-enums-runtime": "^0.0.5",
"invariant": "^2.2.4",
"jest-environment-node": "^29.2.1",
"jsc-android": "^250231.0.0",
"memoize-one": "^5.0.0",
"metro-runtime": "0.76.4",
"metro-source-map": "0.76.4",
"metro-runtime": "0.76.5",
"metro-source-map": "0.76.5",
"mkdirp": "^0.5.1",
"nullthrows": "^1.1.1",
"pretty-format": "^26.5.2",
Expand All @@ -58,8 +58,9 @@
"react-refresh": "^0.4.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
"scheduler": "^0.23.0",
"scheduler": "0.24.0-canary-efb381bbf-20230505",
"stacktrace-parser": "^0.1.10",
"use-sync-external-store": "^1.0.0",
"whatwg-fetch": "^3.0.0",
"ws": "^6.2.2",
"yargs": "^17.6.2"
Expand All @@ -82,13 +83,13 @@
"just-scripts": "^1.3.3",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.72.0-rc.3",
"react-native": "0.72.0",
"react-native-platform-override": "^1.9.4",
"typescript": "^4.9.5"
},
"peerDependencies": {
"react": "18.2.0",
"react-native": "0.0.0-20230321-2153-7b86e3aae"
"react-native": "^0.72.0"
},
"beachball": {
"defaultNpmTag": "preview",
Expand Down

0 comments on commit e3c5696

Please sign in to comment.