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.

Sign up for GitHub

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

Integrate RN Nightly Build 0.78.0-nightly-20241210-6d235853f #14235

Merged
merged 5 commits into from
Jan 6, 2025
+448 −1,568
Merged

Integrate RN Nightly Build 0.78.0-nightly-20241210-6d235853f #14235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d63f67
Integrate 12/10
chiaramooney Jan 2, 2025
fc80270
Change files
chiaramooney Jan 2, 2025
a47ed45
Disable Test Case
chiaramooney Jan 2, 2025
5d8ea82
Fix TextInput
chiaramooney Jan 3, 2025
9f928f1
Fix Snapshots
chiaramooney Jan 3, 2025
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
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-3ba47e36-878e-48d3-8013-b27450565d97.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 12/10",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@react-native-windows-automation-channel-51dc9ea4-7c63-4224-a607-763b21375a11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 12/10",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-24fcdda6-e835-4e12-bee8-5699ae6ca2af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 12/10",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32-tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.78.0-nightly-20241201-91e217ff5",
"baseVersion": "0.78.0-nightly-20241210-6d235853f",
"overrides": [
{
"type": "patch",
Expand Down
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
View file
Open in desktop
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.277",
"react": "18.0.0",
"react-native": "0.78.0-nightly-20241201-91e217ff5"
"react-native": "0.78.0-nightly-20241210-6d235853f"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.277",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.78.0-nightly-20241201-91e217ff5",
"react-native": "0.78.0-nightly-20241210-6d235853f",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@office-iss/react-native-win32/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.78.0-nightly-20241201-91e217ff5",
"baseVersion": "0.78.0-nightly-20241210-6d235853f",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -420,7 +420,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.d.ts",
"baseFile": "packages/react-native/Libraries/Text/Text.d.ts",
"baseHash": "4b523469a5c8dcfe53749d1739ccf77c0106375e"
"baseHash": "21dab7f71254c429d592827ab313f77c18baeda1"
},
{
"type": "derived",
Expand All @@ -439,7 +439,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/TextProps.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextProps.js",
"baseHash": "8e56a028dee989ebb8b06f4c01a1d038f074597d"
"baseHash": "ef1efdc0fb302273cd98be71aef2986677dda184"
},
{
"type": "patch",
Expand Down
19 changes: 9 additions & 10 deletions packages/@office-iss/react-native-win32/package.json
View file
Open in desktop
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-alpha.2",
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/codegen": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/community-cli-plugin": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/gradle-plugin": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/js-polyfills": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/normalize-colors": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/virtualized-lists": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/assets-registry": "0.78.0-nightly-20241210-6d235853f",
"@react-native/codegen": "0.78.0-nightly-20241210-6d235853f",
"@react-native/community-cli-plugin": "0.78.0-nightly-20241210-6d235853f",
"@react-native/gradle-plugin": "0.78.0-nightly-20241210-6d235853f",
"@react-native/js-polyfills": "0.78.0-nightly-20241210-6d235853f",
"@react-native/normalize-colors": "0.78.0-nightly-20241210-6d235853f",
"@react-native/virtualized-lists": "0.78.0-nightly-20241210-6d235853f",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -51,7 +51,6 @@
"glob": "^7.1.1",
"invariant": "^2.2.4",
"jest-environment-node": "^29.6.3",
"jsc-android": "^250231.0.0",
"memoize-one": "^5.0.0",
"metro-runtime": "^0.81.0",
"metro-source-map": "^0.81.0",
Expand Down Expand Up @@ -90,14 +89,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.3.1",
"react-native": "0.78.0-nightly-20241201-91e217ff5",
"react-native": "0.78.0-nightly-20241210-6d235853f",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^18.2.0",
"react-native": "0.78.0-nightly-20241201-91e217ff5"
"react-native": "0.78.0-nightly-20241210-6d235853f"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
7 changes: 6 additions & 1 deletion packages/@office-iss/react-native-win32/src-win/Libraries/Text/Text.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Constructor} from '../../types/private/Utilities';
import {AccessibilityProps} from '../Components/View/ViewAccessibility';
import {NativeMethods} from '../../types/public/ReactNativeTypes';
import {ColorValue, StyleProp} from '../StyleSheet/StyleSheet';
import {TextStyle} from '../StyleSheet/StyleSheetTypes';
import {TextStyle, ViewStyle} from '../StyleSheet/StyleSheetTypes';
import {
GestureResponderEvent,
LayoutChangeEvent,
Expand Down Expand Up @@ -294,6 +294,11 @@ export interface TextProps
* Specifies smallest possible scale a font can reach when adjustsFontSizeToFit is enabled. (values 0.01-1.0).
*/
minimumFontScale?: number | undefined;

/**
* Controls how touch events are handled. Similar to `View`'s `pointerEvents`.
*/
pointerEvents?: ViewStyle['pointerEvents'] | undefined;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32/src-win/Libraries/Text/TextProps.win32.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type {
AccessibilityState,
Role,
} from '../Components/View/ViewAccessibility';
import type {TextStyleProp} from '../StyleSheet/StyleSheet';
import type {ColorValue, TextStyleProp} from '../StyleSheet/StyleSheet';
import type {
LayoutEvent,
PointerEvent,
Expand Down Expand Up @@ -225,7 +225,7 @@ export type TextProps = $ReadOnly<{
*
* See https://reactnative.dev/docs/text#selectioncolor
*/
selectionColor?: ?string,
selectionColor?: ?ColorValue,

dataDetectorType?: ?('phoneNumber' | 'link' | 'email' | 'none' | 'all'),

Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/automation-channel/package.json
View file
Open in desktop
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.78.0-nightly-20241201-91e217ff5",
"react-native": "0.78.0-nightly-20241210-6d235853f",
"react-native-windows": "^0.0.0-canary.904",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.78.0-nightly-20241201-91e217ff5",
"baseVersion": "0.78.0-nightly-20241210-6d235853f",
"overrides": [
{
"type": "derived",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.78.0-nightly-20241201-91e217ff5",
"react-native": "0.78.0-nightly-20241210-6d235853f",
"react-native-windows": "^0.0.0-canary.904",
"react-native-xaml": "^0.0.78"
},
Expand All @@ -32,7 +32,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.78.0-nightly-20241201-91e217ff5",
"react-native": "0.78.0-nightly-20241210-6d235853f",
"react-native-platform-override": "^1.9.49",
"react-native-windows": "^0.0.0-canary.904",
"typescript": "5.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"baseVersion": "0.78.0-nightly-20241201-91e217ff5",
"baseVersion": "0.78.0-nightly-20241210-6d235853f",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "6957ef21e10235b5be842ed31760651dbe98b429"
"baseHash": "16f7f88737390cba0931fedf86142b3003c6caeb"
}
]
}
5 changes: 3 additions & 2 deletions packages/@react-native/monorepo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"test-typescript-offline": "dtslint --localTs node_modules/typescript/lib packages/react-native/types",
"test-typescript": "dtslint packages/react-native/types",
"test": "jest",
"fantom": "JS_DIR='..' yarn jest --config packages/react-native-fantom/config/jest.config.js",
"trigger-react-native-release": "node ./scripts/releases-local/trigger-react-native-release.js",
"update-lock": "npx yarn-deduplicate"
},
Expand All @@ -47,8 +48,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.78.0-nightly-20241201-91e217ff5",
"@react-native/metro-config": "0.78.0-nightly-20241201-91e217ff5",
"@react-native/metro-babel-transformer": "0.78.0-nightly-20241210-6d235853f",
"@react-native/metro-config": "0.78.0-nightly-20241210-6d235853f",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native/tester/js/examples/DisplayContents/DisplayContentsExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import type {RNTesterModule} from '../../types/RNTesterTypes';

import * as React from 'react';
import {StyleSheet, TextInput, View, Text} from 'react-native';
import {StyleSheet, Text, TextInput, View} from 'react-native';

const styles = StyleSheet.create({
contents: {
Expand Down
8 changes: 4 additions & 4 deletions ...react-native/tester/js/examples/IntersectionObserver/IntersectionObserverRootThreshold.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {Button, ScrollView, StyleSheet, Text, View} from 'react-native';
export const name = 'IntersectionObserver Root Threshold';
export const title = name;
export const description =
'Examples of setting threshold and rn_rootThreshold. Views will change background color if they meet their threshold.';
'Examples of setting threshold and rnRootThreshold. Views will change background color if they meet their threshold.';

export function render(): React.Node {
return <IntersectionObserverRootThreshold />;
Expand Down Expand Up @@ -112,10 +112,10 @@ function ListItem(props: {
entries.forEach(entry => {
setIntersectionRatio(entry.intersectionRatio);
// $FlowFixMe[prop-missing] - React Native specific entry property
setIntersectionRootRatio(entry.rn_intersectionRootRatio);
setIntersectionRootRatio(entry.rnRootIntersectionRatio);
});
},
{threshold: props.threshold, rn_rootThreshold: props.rootThreshold},
{threshold: props.threshold, rnRootThreshold: props.rootThreshold},
);

// $FlowFixMe[incompatible-call]
Expand All @@ -138,7 +138,7 @@ function ListItem(props: {
]}
ref={itemRef}>
<Text style={styles.description}>{props.description}</Text>
<Text>rn_rootThreshold: {props.rootThreshold}</Text>
<Text>rnRootThreshold: {props.rootThreshold}</Text>
<Text>threshold: {props.threshold}</Text>

<IntersectionRatioIndicator
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native/tester/js/examples/TextInput/TextInputExample.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const {
StyleSheet,
Switch,
Text,
View,
TextInput,
View,
} = require('react-native');

class WithLabel extends React.Component<$FlowFixMeProps> {
Expand Down
3 changes: 2 additions & 1 deletion packages/@react-native/tester/js/examples/TurboModule/SampleLegacyModuleExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ function stringify(obj: mixed): string {
return value;
}

return (JSON.stringify(obj, replacer) || '').replaceAll('"', "'");
// Change this to don't use replaceAll
return (JSON.stringify(obj, replacer) || '').replace(/"/g, "'");
}

class SampleLegacyModuleExample extends React.Component<{||}, State> {
Expand Down
10 changes: 5 additions & 5 deletions packages/@react-native/tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"baseVersion": "0.78.0-nightly-20241201-91e217ff5",
"baseVersion": "0.78.0-nightly-20241210-6d235853f",
"overrides": [
{
"type": "copy",
Expand Down Expand Up @@ -124,7 +124,7 @@
"type": "copy",
"directory": "js/examples/DisplayContents",
"baseDirectory": "packages/rn-tester/js/examples/DisplayContents",
"baseHash": "d4976497a0120350f329b460d3c1ff41567ec906",
"baseHash": "c23c101587a77d4e96fca087eef9760792e23f4b",
"issue": 4054
},
{
Expand Down Expand Up @@ -173,7 +173,7 @@
"type": "copy",
"directory": "js/examples/IntersectionObserver",
"baseDirectory": "packages/rn-tester/js/examples/IntersectionObserver",
"baseHash": "18fa6bfda63981e386186916fd7a0f7530015b89",
"baseHash": "e472434c26d83ac79b0c56c84c5715a64e56fb00",
"issue": 4054
},
{
Expand Down Expand Up @@ -446,7 +446,7 @@
"type": "copy",
"directory": "js/examples/TextInput",
"baseDirectory": "packages/rn-tester/js/examples/TextInput",
"baseHash": "0a16660c5859076cf463c784bc640e8631d8b2c6",
"baseHash": "c39b13df578338a4bae259138e31b47e15e42c22",
"issue": 4054
},
{
Expand Down Expand Up @@ -488,7 +488,7 @@
"type": "copy",
"directory": "js/examples/TurboModule",
"baseDirectory": "packages/rn-tester/js/examples/TurboModule",
"baseHash": "a71adf0cb5d86bc8dfc6904f584f575ffbaa3f61",
"baseHash": "2f582e83efe8cb05db597f6bfb126f4de49e7836",
"issue": 4054
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-test-app-fabric/package.json
View file
Open in desktop
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.78.0-nightly-20241201-91e217ff5",
"react-native": "0.78.0-nightly-20241210-6d235853f",
"react-native-windows": "^0.0.0-canary.904"
},
"devDependencies": {
Expand Down
Loading
Loading