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

Integrate RN Nightly Build 0.78.0-nightly-20250113-d4407d6f7 #14278

Merged
merged 22 commits into from
Jan 23, 2025
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": "Initial integrate",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Initial integrate",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Initial integrate",
"packageName": "@react-native-windows/codegen",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Initial integrate",
"packageName": "react-native-windows",
"email": "[email protected]",
"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.78.0-nightly-20241231-a3c8e2137",
"baseVersion": "0.78.0-nightly-20250113-d4407d6f7",
"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 @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.280",
"react": "19.0.0",
"react-native": "0.78.0-nightly-20241231-a3c8e2137"
"react-native": "0.78.0-nightly-20250113-d4407d6f7"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.280",
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-20241231-a3c8e2137",
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
"react-native-platform-override": "^1.9.51",
"typescript": "5.0.4"
},
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 @@ -164,4 +164,4 @@ untyped-import
untyped-type-import

[version]
^0.257.1
^0.258.1
12 changes: 6 additions & 6 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.78.0-nightly-20241231-a3c8e2137",
"baseVersion": "0.78.0-nightly-20250113-d4407d6f7",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "5b40175690b07272a61410d4fc6437a82248e8cc"
"baseHash": "efd6eb0780d7f3b6717feac846e0e7fe8dae1ee9"
},
{
"type": "derived",
Expand Down Expand Up @@ -71,11 +71,11 @@
"file": "src-win/Libraries/Components/Button/ButtonWin32.tsx"
},
{
"type": "copy",
"type": "patch",
"file": "src-win/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
"baseFile": "packages/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.js",
"baseHash": "b9a6866d03ca389af38734ffed24199505b05402",
"issue": 4378
"baseHash": "7664e2616540fd4ecc398009216314675f6e3f86",
"issue": 14290
},
{
"type": "platform",
Expand Down Expand Up @@ -109,7 +109,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "1f9adcb7ca64fa536372ed28b7af5e03b05458ac"
"baseHash": "437a56337e8b6fabd440538af48167c2bbc59704"
},
{
"type": "patch",
Expand Down
18 changes: 9 additions & 9 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-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-20241231-a3c8e2137",
"@react-native/codegen": "0.78.0-nightly-20241231-a3c8e2137",
"@react-native/community-cli-plugin": "0.78.0-nightly-20241231-a3c8e2137",
"@react-native/gradle-plugin": "0.78.0-nightly-20241231-a3c8e2137",
"@react-native/js-polyfills": "0.78.0-nightly-20241231-a3c8e2137",
"@react-native/normalize-colors": "0.78.0-nightly-20241231-a3c8e2137",
"@react-native/virtualized-lists": "0.78.0-nightly-20241231-a3c8e2137",
"@react-native/assets-registry": "0.78.0-nightly-20250113-d4407d6f7",
"@react-native/codegen": "0.78.0-nightly-20250113-d4407d6f7",
"@react-native/community-cli-plugin": "0.78.0-nightly-20250113-d4407d6f7",
"@react-native/gradle-plugin": "0.78.0-nightly-20250113-d4407d6f7",
"@react-native/js-polyfills": "0.78.0-nightly-20250113-d4407d6f7",
"@react-native/normalize-colors": "0.78.0-nightly-20250113-d4407d6f7",
"@react-native/virtualized-lists": "0.78.0-nightly-20250113-d4407d6f7",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -89,14 +89,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0",
"react-native": "0.78.0-nightly-20241231-a3c8e2137",
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
"react-native-platform-override": "^1.9.51",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^19.0.0",
"react": "^19.0.0",
"react-native": "0.78.0-nightly-20241231-a3c8e2137"
"react-native": "0.78.0-nightly-20250113-d4407d6f7"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@

'use strict';

// $FlowFixMe[cannot-resolve-module]
import typeof DrawerLayoutAndroid from './DrawerLayoutAndroid.android';

module.exports =
require('../UnimplementedViews/UnimplementedView') as $FlowFixMe;
require('../UnimplementedViews/UnimplementedView') as $FlowFixMe as DrawerLayoutAndroid;
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ export type enterKeyHintType =
type PasswordRules = string;

type IOSProps = $ReadOnly<{|
/**
* If true, the keyboard shortcuts (undo/redo and copy buttons) are disabled. The default value is false.
* @platform ios
*/
disableKeyboardShortcuts?: ?boolean,

/**
* When the clear button should appear on the right side of the text view.
* This property is supported only for single-line TextInput component.
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": "19.0.0",
"react-native": "0.78.0-nightly-20241231-a3c8e2137",
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
"react-native-windows": "^0.0.0-canary.911",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
NativeModuleStringTypeAnnotation,
NativeModuleFunctionTypeAnnotation,
NativeModuleStringLiteralTypeAnnotation,
NativeModuleStringLiteralUnionTypeAnnotation,
StringLiteralUnionTypeAnnotation,
UnsafeAnyTypeAnnotation,
Nullable,
} from '@react-native/codegen/lib/CodegenSchema';
Expand Down Expand Up @@ -56,7 +56,7 @@ export function translateFieldOrReturnType(
| NativeModuleStringTypeAnnotation
| NativeModuleFunctionTypeAnnotation
| NativeModuleStringLiteralTypeAnnotation
| NativeModuleStringLiteralUnionTypeAnnotation
| StringLiteralUnionTypeAnnotation
>
| UnsafeAnyTypeAnnotation,
aliases: AliasMap,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export function translateComponentPropsFieldType(type: PropTypeAnnotation,
case 'BooleanTypeAnnotation':
return { type: 'bool', initializer: type.default ? `{${type.default}}` : '{}', alreadySupportsOptionalOrHasDefault: !!type.default };
case 'ArrayTypeAnnotation':

let arrayTemplateArg = '';
switch (type.elementType.type) {
case 'BooleanTypeAnnotation':
Expand Down Expand Up @@ -143,7 +142,7 @@ export function translateComponentEventType(type: EventTypeAnnotation,
case 'ObjectTypeAnnotation':
arrayTemplateArg = translateComponentEventType(type.elementType, aliases, baseAliasName, options).type;
break;
case 'StringEnumTypeAnnotation':
case 'StringLiteralUnionTypeAnnotation':
arrayTemplateArg = options.cppStringType; // TODO - better enum type handling than just passing a string
break;
default:
Expand All @@ -158,7 +157,7 @@ export function translateComponentEventType(type: EventTypeAnnotation,
case 'MixedTypeAnnotation': {
return { type: 'winrt::Microsoft::ReactNative::JSValue', initializer: '{nullptr}', alreadySupportsOptionalOrHasDefault: true };
}
case 'StringEnumTypeAnnotation':
case 'StringLiteralUnionTypeAnnotation':
return { type: options.cppStringType, initializer: '' }; // TODO - better enum type handling than just passing a string
default:
throw new Error(`Unhandled type: ${(type as any).type}`);
Expand Down Expand Up @@ -200,19 +199,10 @@ export function translateCommandParamType(type: CommandParamTypeAnnotation,
case 'StringTypeAnnotation':
arrayTemplateArg = options.cppStringType;
break;
case 'ArrayTypeAnnotation':
const innerType = translateCommandParamType(type.elementType, aliases, baseAliasName, options);
arrayTemplateArg = `std::vector<${innerType.type}>`;
break;
case 'ReservedPropTypeAnnotation':
case 'MixedTypeAnnotation':
// TODO - not sure what exact value to be used here
arrayTemplateArg = 'winrt::Microsoft::ReactNative::JSValue';
break;
case 'ObjectTypeAnnotation':
arrayTemplateArg = 'winrt::Microsoft::ReactNative::JSValueObject'; // TODO - better typing
break;
case 'StringEnumTypeAnnotation':
arrayTemplateArg = options.cppStringType; // TODO - better enum type handling than just passing a string
break;
case 'GenericTypeAnnotation' as any: // TODO verify schema - Getting this type when running codegen on all the built in types
arrayTemplateArg = 'winrt::Microsoft::ReactNative::JSValue';
break;
Expand Down
8 changes: 4 additions & 4 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.78.0-nightly-20241231-a3c8e2137",
"baseVersion": "0.78.0-nightly-20250113-d4407d6f7",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -38,7 +38,7 @@
"type": "patch",
"file": "src/js/examples/Image/ImageExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/Image/ImageExample.js",
"baseHash": "8583dee020400ce4d2754c3e04fd08dfde341c49",
"baseHash": "e840e1c091d2644d0a682b8baffad3b3dda2b207",
"issue": 12869
},
{
Expand All @@ -58,13 +58,13 @@
"type": "derived",
"file": "src/js/examples/Text/TextExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/Text/TextExample.android.js",
"baseHash": "4a4b00574c473a730168785dc0ec9dfa3f89f5e5"
"baseHash": "05e9aba7bc765ca0f9e15313bb60a92a9c7688eb"
},
{
"type": "patch",
"file": "src/js/examples/TextInput/TextInputExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/TextInput/TextInputExample.android.js",
"baseHash": "c4d61d6e76488c48b8256e6abc9bb38ef8e54c44",
"baseHash": "fcd8e5e42372bb200be07d8339c644e76dfdb12e",
"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 @@ -19,7 +19,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "19.0.0",
"react-native": "0.78.0-nightly-20241231-a3c8e2137",
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
"react-native-windows": "^0.0.0-canary.911",
"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-20241231-a3c8e2137",
"react-native": "0.78.0-nightly-20250113-d4407d6f7",
"react-native-platform-override": "^1.9.51",
"react-native-windows": "^0.0.0-canary.911",
"typescript": "5.0.4"
Expand Down
Loading
Loading