Skip to content
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

Integration 04/20/24 (03a51da72) #13255

Merged
merged 10 commits into from
May 21, 2024
Merged
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": "prerelease",
"comment": "RN Integration 04/20",
"packageName": "@office-iss/react-native-win32",
"email": "1422161+marlenecota@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "RN Integration 04/20",
"packageName": "@react-native-windows/automation-channel",
"email": "1422161+marlenecota@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "RN Integration 04/20",
"packageName": "@rnw-scripts/eslint-config",
"email": "1422161+marlenecota@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "RN Integration 04/20",
"packageName": "react-native-windows",
"email": "1422161+marlenecota@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.75.0-nightly-20240413-1b152f6ec",
"baseVersion": "0.75.0-nightly-20240420-03a51da72",
"overrides": [
{
"type": "patch",
Expand Down Expand Up @@ -42,7 +42,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.win32.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "c40d0a03a89b9017cbb08a0449d5a0c32cadc5f2"
"baseHash": "17abcd7c97a27d4d970d27c1449107222ffb6c85"
}
]
}
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.0.0-canary.246",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240413-1b152f6ec"
"react-native": "0.75.0-nightly-20240420-03a51da72"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.246",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native": "0.75.0-nightly-20240420-03a51da72",
"react-native-platform-override": "^1.9.33",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,18 @@ const APIs: Array<RNTesterModuleInfo> = ([
category: 'Basic',
module: require('../examples/PanResponder/PanResponderExample'),
},
{
key: 'PixelRatio',
category: 'UI',
module: require('../examples/PixelRatio/PixelRatioExample'),
},
/*
{
key: 'PermissionsExampleAndroid',
category: 'Android',
module: require('../examples/PermissionsAndroid/PermissionsExample'),
},
*/
{
key: 'PlatformColorExample',
category: 'UI',
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@ untyped-import
untyped-type-import

[version]
^0.233.0
^0.234.0
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,13 +7,13 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.75.0-nightly-20240413-1b152f6ec",
"baseVersion": "0.75.0-nightly-20240420-03a51da72",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "207887dce4d232e4ded4dbeefe4188766b24144a"
"baseHash": "4f8e1f39d8ed29d7d0e21455cac407d352a6824d"
},
{
"type": "derived",
Expand Down
22 changes: 11 additions & 11 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": "14.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "14.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/codegen": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/community-cli-plugin": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/gradle-plugin": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/js-polyfills": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/normalize-colors": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/virtualized-lists": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/assets-registry": "0.75.0-nightly-20240420-03a51da72",
"@react-native/codegen": "0.75.0-nightly-20240420-03a51da72",
"@react-native/community-cli-plugin": "0.75.0-nightly-20240420-03a51da72",
"@react-native/gradle-plugin": "0.75.0-nightly-20240420-03a51da72",
"@react-native/js-polyfills": "0.75.0-nightly-20240420-03a51da72",
"@react-native/normalize-colors": "0.75.0-nightly-20240420-03a51da72",
"@react-native/virtualized-lists": "0.75.0-nightly-20240420-03a51da72",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -56,7 +56,7 @@
"pretty-format": "^26.5.2",
"promise": "^8.3.0",
"react-clone-referenced-element": "^1.0.1",
"react-devtools-core": "^5.0.2",
"react-devtools-core": "5.1.0",
"react-refresh": "^0.14.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
Expand All @@ -70,7 +70,7 @@
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
"@react-native/metro-config": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/metro-config": "0.75.0-nightly-20240420-03a51da72",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.16",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.20",
Expand All @@ -86,14 +86,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.2.0",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native": "0.75.0-nightly-20240420-03a51da72",
"react-native-platform-override": "^1.9.33",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "18.2.0",
"react-native": "0.75.0-nightly-20240413-1b152f6ec"
"react-native": "0.75.0-nightly-20240420-03a51da72"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "18.2.0",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native": "0.75.0-nightly-20240420-03a51da72",
"react-native-windows": "^0.0.0-canary.817",
"typescript": "5.0.4"
},
Expand Down
4 changes: 2 additions & 2 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.75.0-nightly-20240413-1b152f6ec",
"baseVersion": "0.75.0-nightly-20240420-03a51da72",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -78,7 +78,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.windows.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "c40d0a03a89b9017cbb08a0449d5a0c32cadc5f2"
"baseHash": "17abcd7c97a27d4d970d27c1449107222ffb6c85"
}
]
}
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 @@ -18,7 +18,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native": "0.75.0-nightly-20240420-03a51da72",
"react-native-windows": "^0.0.0-canary.817",
"react-native-xaml": "^0.0.78"
},
Expand All @@ -31,7 +31,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native": "0.75.0-nightly-20240420-03a51da72",
"react-native-platform-override": "^1.9.33",
"react-native-windows": "^0.0.0-canary.817",
"typescript": "5.0.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,18 @@ const APIs: Array<RNTesterModuleInfo> = ([
category: 'Basic',
module: require('../examples/PanResponder/PanResponderExample'),
},
{
key: 'PixelRatio',
category: 'UI',
module: require('../examples/PixelRatio/PixelRatioExample'),
},
/*
{
key: 'PermissionsExampleAndroid',
category: 'Android',
module: require('../examples/PermissionsAndroid/PermissionsExample'),
},
*/
{
key: 'PlatformColorExample',
category: 'UI',
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.75.0-nightly-20240413-1b152f6ec",
"baseVersion": "0.75.0-nightly-20240420-03a51da72",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "81f7183581b4f3efc83807acf9d13acf11cbbc6e"
"baseHash": "d3015ceabe0cf60dff4ad9eb59b102608b40c8ca"
}
]
}
16 changes: 3 additions & 13 deletions packages/@react-native/monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@
"name": "@react-native/monorepo",
"private": true,
"version": "1000.0.0",
"description": "A framework for building native apps using React",
"license": "MIT",
"repository": "github:facebook/react-native",
"types": "types",
"jest-junit": {
"outputDirectory": "reports/junit",
"outputName": "js-test-results.xml"
},
"scripts": {
"android": "cd packages/rn-tester && npm run android",
"build-android": "./gradlew :packages:react-native:ReactAndroid:build",
Expand Down Expand Up @@ -42,9 +35,6 @@
"packages/*",
"tools/*"
],
"peerDependencies": {
"react": "18.2.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
Expand All @@ -55,8 +45,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.75.0-nightly-20240413-1b152f6ec",
"@react-native/metro-config": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/metro-babel-transformer": "0.75.0-nightly-20240420-03a51da72",
"@react-native/metro-config": "0.75.0-nightly-20240420-03a51da72",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^7.1.1",
Expand All @@ -83,7 +73,7 @@
"eslint-plugin-redundant-undefined": "^0.4.0",
"eslint-plugin-relay": "^1.8.3",
"flow-api-translator": "0.20.1",
"flow-bin": "^0.233.0",
"flow-bin": "^0.234.0",
"glob": "^7.1.1",
"hermes-eslint": "0.20.0",
"hermes-transform": "0.20.0",
Expand Down
7 changes: 2 additions & 5 deletions packages/@react-native/tester/js/components/RNTOption.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export default function RNTOption(props: Props): React.Node {
testID={props.testID}>
<View
style={[
{borderColor: theme.BorderColor},
styles.container,
props.selected === true ? styles.selected : null,
pressed && props.selected !== true ? styles.pressed : null,
Expand All @@ -60,7 +61,7 @@ export default function RNTOption(props: Props): React.Node {
: null,
props.style,
]}>
<Text style={styles.label}>{props.label}</Text>
<Text style={{color: theme.SecondaryLabelColor}}>{props.label}</Text>
</View>
</Pressable>
);
Expand All @@ -70,16 +71,12 @@ const styles = StyleSheet.create({
pressed: {
backgroundColor: 'rgba(100,215,255,.3)',
},
label: {
color: 'black',
},
selected: {
backgroundColor: 'rgba(100,215,255,.3)',
borderColor: 'rgba(100,215,255,.3)',
},
disabled: {borderWidth: 0},
container: {
borderColor: 'rgba(0,0,0, 0.1)',
borderWidth: 1,
borderRadius: 16,
padding: 6,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@ function RNTTestDetails({
)}
{expect == null ? null : (
<View style={styles.section}>
<Text style={styles.heading}>Expectation</Text>
<Text style={styles.paragraph}>{expect}</Text>
<Text style={[styles.heading, {color: theme.LabelColor}]}>
Expectation
</Text>
<Text style={[styles.paragraph, {color: theme.LabelColor}]}>
{expect}
</Text>
</View>
)}
</>
Expand Down
Loading