Skip to content

[0.76] Integrate react-native 0.76.9 #14616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 0.76-stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate changes for 0.76.9 and update with custom modifications",
"packageName": "@office-iss/react-native-win32",
"email": "abhijeetjha@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate changes for 0.76.9 and update with custom modifications",
"packageName": "react-native-windows",
"email": "abhijeetjha@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.76.6",
"baseVersion": "0.76.9",
"overrides": [
{
"type": "patch",
Expand Down
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 @@ -11,7 +11,7 @@
"validate-overrides": "react-native-platform-override validate"
},
"dependencies": {
"@react-native/tester": "0.76.0",
"@react-native/tester": "0.76.9",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"flow-enums-runtime": "^0.0.5"
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-platform-override": "^1.9.46",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion 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-win/rntypes/**"
],
"baseVersion": "0.76.6",
"baseVersion": "0.76.9",
"overrides": [
{
"type": "derived",
Expand Down
16 changes: 8 additions & 8 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"@react-native-community/cli-platform-android": "^15.0.0",
"@react-native-community/cli-platform-ios": "^15.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.76.6",
"@react-native/codegen": "0.76.6",
"@react-native/community-cli-plugin": "0.76.6",
"@react-native/gradle-plugin": "0.76.6",
"@react-native/js-polyfills": "0.76.6",
"@react-native/normalize-colors": "0.76.6",
"@react-native/virtualized-lists": "0.76.6",
"@react-native/assets-registry": "0.76.9",
"@react-native/codegen": "0.76.9",
"@react-native/community-cli-plugin": "0.76.9",
"@react-native/gradle-plugin": "0.76.9",
"@react-native/js-polyfills": "0.76.9",
"@react-native/normalize-colors": "0.76.9",
"@react-native/virtualized-lists": "0.76.9",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -90,7 +90,7 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-platform-override": "^1.9.46",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13",
"typescript": "5.0.4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-native-windows/tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.76.6",
"baseVersion": "0.76.9",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -70,7 +70,7 @@
"type": "derived",
"file": "src/js/examples/Text/TextExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/Text/TextExample.android.js",
"baseHash": "985cb24e1f56c30288537e72db20c602614b64c3"
"baseHash": "f3b1d78e7c2d3f62a80a5414d15df915c0eedfb8"
},
{
"type": "derived",
Expand All @@ -82,7 +82,7 @@
"type": "patch",
"file": "src/js/examples/TextInput/TextInputExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/TextInput/TextInputExample.android.js",
"baseHash": "c4d61d6e76488c48b8256e6abc9bb38ef8e54c44",
"baseHash": "941b11f72b198477df92f1bc0ec3d2c24e651cb9",
"issue": 5688
},
{
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"react-native-xaml": "^0.0.78"
},
"devDependencies": {
"@react-native/tester": "0.76.0",
"@react-native/tester": "0.76.9",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.27",
"@rnw-scripts/just-task": "2.3.44",
"@rnw-scripts/ts-config": "2.0.5",
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-platform-override": "^1.9.46",
"react-native-windows": "0.76.13",
"typescript": "5.0.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,37 @@ function AllowFontScalingExample(props: {}): React.Node {
);
}

function MaxFontSizeMultiplierExample(props: {}): React.Node {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because these example files changed, the snapshots are failing for the e2etest-app tests. You'll need to update the snapshots for these to pass.

return (
<View testID={'max-font-size-multiplier'}>
<Text>
When allowFontScaling is enabled, you can use the maxFontSizeMultiplier
prop to set an upper limit on how much the font size will be scaled.
</Text>
<Text
allowFontScaling={true}
maxFontSizeMultiplier={1}
style={{marginTop: 10}}>
This text will not scale up (max 1x)
</Text>
<Text allowFontScaling={true} maxFontSizeMultiplier={1.5}>
This text will scale up (max 1.5x)
</Text>
<Text allowFontScaling={true} maxFontSizeMultiplier={1}>
<Text>Inherit max (max 1x)</Text>
</Text>
<Text allowFontScaling={true} maxFontSizeMultiplier={1}>
<Text maxFontSizeMultiplier={1.5}>
Override inherited max (max 1.5x)
</Text>
</Text>
<Text allowFontScaling={true} maxFontSizeMultiplier={1}>
<Text maxFontSizeMultiplier={0}>Ignore inherited max (no max)</Text>
</Text>
</View>
);
}

function NumberOfLinesExample(props: {}): React.Node {
return (
<>
Expand Down Expand Up @@ -1448,6 +1479,13 @@ const examples = [
return <AllowFontScalingExample />;
},
},
{
title: 'maxFontSizeMultiplier attribute',
name: 'maxFontSizeMultiplier',
render(): React.Node {
return <MaxFontSizeMultiplierExample />;
},
},
{
title: 'selectable attribute',
name: 'selectable',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,59 @@ const examples: Array<RNTesterModuleExample> = [
);
},
},
{
title: 'allowFontScaling attribute',
render: function (): React.Node {
return (
<View>
<Text>
By default, text will respect Text Size accessibility setting on
Android. It means that all font sizes will be increased or decreased
depending on the value of the Text Size setting in the OS's Settings
app.
</Text>
<ExampleTextInput
placeholder="allowFontScaling = false"
allowFontScaling={false}
/>
<ExampleTextInput
style={{marginTop: 10}}
placeholder="allowFontScaling = false"
allowFontScaling={true}
/>
</View>
);
},
},
{
title: 'maxFontSizeMultiplier attribute',
name: 'maxFontSizeMultiplier',
render(): React.Node {
return (
<View testID={'max-font-size-multiplier'}>
<Text>
When allowFontScaling is enabled, you can use the
maxFontSizeMultiplier prop to set an upper limit on how much the
font size will be scaled.
</Text>
<ExampleTextInput
allowFontScaling={true}
maxFontSizeMultiplier={1}
placeholder="This text will not scale up (max 1x)"
style={{marginTop: 10}}
testID={'non-scalable-text-input'}
/>
<ExampleTextInput
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
placeholder="This text will scale up (max 1.5x)"
style={{marginTop: 10}}
testID={'scalable-text-input'}
/>
</View>
);
},
},
{
title: 'Text Auto Complete',
render: function (): React.Node {
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/overrides.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"baseVersion": "0.76.6",
"baseVersion": "0.76.9",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "6dd9663c1f92f42f8201eace0bd3946e557c3c33"
"baseHash": "23d6c0fe61ca9ce2045296000f4c35333704f0b2"
}
]
}
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@definitelytyped/dtslint": "^0.0.127",
"@jest/create-cache-key-function": "^29.6.3",
"@pkgjs/parseargs": "^0.11.0",
"@react-native/metro-babel-transformer": "0.76.6",
"@react-native/metro-config": "0.76.6",
"@react-native/metro-babel-transformer": "0.76.9",
"@react-native/metro-config": "0.76.9",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^7.1.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-native/tester/overrides.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"baseVersion": "0.76.6",
"baseVersion": "0.76.9",
"overrides": [
{
"type": "copy",
Expand Down Expand Up @@ -390,14 +390,14 @@
"type": "copy",
"directory": "js/examples/Text",
"baseDirectory": "packages/rn-tester/js/examples/Text",
"baseHash": "528bba6e7f5938ec8c81c54471962883047e68f3",
"baseHash": "eafda2ddc809145094056ad5f4ac96146f60061f",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like changes were made to these files (hence the hash change) but those changes weren't applied to the new files. Did you forget to check in these files?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

files from rn-tester we've been updating manually however these files are caught by yarn validate-override thus linting is failing! Adding the changes to Text should fix this.

"issue": 4054
},
{
"type": "copy",
"directory": "js/examples/TextInput",
"baseDirectory": "packages/rn-tester/js/examples/TextInput",
"baseHash": "986ccca321c59084c52956bbaf32dbe72e844006",
"baseHash": "b96f575fa4290b7b0ce4873f5839702c279c3804",
"issue": 4054
},
{
Expand Down Expand Up @@ -572,7 +572,7 @@
"type": "patch",
"file": "package.json",
"baseFile": "packages/rn-tester/package.json",
"baseHash": "7a5508a9edb058986ca34c4032d6e4feb6d1e841",
"baseHash": "41f392a7f733c301300e2baffb2d2a133a3a86c4",
"issue": 13228
}
]
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-native/tester/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-native/tester",
"version": "0.76.0",
"version": "0.76.9",
"private": true,
"description": "React Native tester app.",
"license": "MIT",
Expand All @@ -23,7 +23,7 @@
"clean-ios": "rm -rf build/generated/ios Pods Podfile.lock"
},
"dependencies": {
"@react-native/popup-menu-android": "0.76.6",
"@react-native/popup-menu-android": "0.76.9",
"flow-enums-runtime": "^0.0.6",
"invariant": "^2.2.4",
"nullthrows": "^1.1.1"
Expand All @@ -45,4 +45,4 @@
"@react-native-community/cli-platform-android": "15.0.1",
"@react-native-community/cli-platform-ios": "15.0.1"
}
}
}
2 changes: 1 addition & 1 deletion packages/e2e-test-app-fabric/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13",
"react-native-xaml": "^0.0.78"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@typescript-eslint/parser": "^7.1.1",
"chai": "^4.2.0",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-app-fabric/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-custom-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"@types/react": "^18.2.6",
"react": "^18.2.0",
"react-native": "0.76.6",
"react-native": "0.76.9",
"react-native-windows": "0.76.13"
},
"devDependencies": {
Expand Down
Loading
Loading