Skip to content

Integrate RN Nightly 10/20 #14092

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

Merged
merged 41 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
446966d
Integrate 10/20
Yajur-Grover Nov 7, 2024
b573cdf
Change files
Yajur-Grover Nov 7, 2024
dfb501d
add new file to shared.vcxitems
Yajur-Grover Nov 7, 2024
ddef9eb
Merge branch 'main' into yg-int-10-20
Yajur-Grover Nov 7, 2024
598851b
apply fabric changes from upstream
Yajur-Grover Nov 8, 2024
0f47e72
Merge branch 'yg-int-10-20' of https://github.com/Yajur-Grover/react-…
Yajur-Grover Nov 8, 2024
09e0a1e
Merge branch 'main' into yg-int-10-20
Yajur-Grover Nov 8, 2024
1cbc1a3
fix errorinfor stackframe
Yajur-Grover Nov 8, 2024
637b441
Merge branch 'yg-int-10-20' of https://github.com/Yajur-Grover/react-…
Yajur-Grover Nov 8, 2024
5c4a9bd
fix stackframe declaration
Yajur-Grover Nov 8, 2024
294dcca
Merge branch 'main' into yg-int-10-20
Yajur-Grover Nov 8, 2024
e533c11
fix onJSError implementation and usage
Yajur-Grover Nov 8, 2024
13d775c
add include and issue number for old follow up
Yajur-Grover Nov 8, 2024
cf31b62
fix merge and update snapshots
Yajur-Grover Nov 11, 2024
6409514
fix tester issues
Yajur-Grover Nov 11, 2024
82f2761
update snapshots
Yajur-Grover Nov 11, 2024
0395f93
fix linting
Yajur-Grover Nov 11, 2024
86a9388
edit package.json
Yajur-Grover Nov 12, 2024
7d9d4ee
fix lockfile
Yajur-Grover Nov 12, 2024
b31ced6
Merge branch 'main' into yg-int-10-20
Yajur-Grover Nov 12, 2024
26b80ec
bump node-api-jsi to include queueMicrotask
Yajur-Grover Nov 13, 2024
073272a
Merge branch 'yg-int-10-20' of https://github.com/Yajur-Grover/react-…
Yajur-Grover Nov 13, 2024
81d4319
Merge branch 'main' into yg-int-10-20
Yajur-Grover Nov 13, 2024
9e303a3
Merge branch 'main' into yg-int-10-20
Yajur-Grover Nov 13, 2024
4927cfe
try override
Yajur-Grover Nov 13, 2024
4f26059
Add feature flags and default turbomodules
rnbot Nov 21, 2024
ac133bf
Merge remote-tracking branch 'upstream/main' into yg-int-10-20
rnbot Nov 21, 2024
7c3ef78
lint fixes
rnbot Nov 21, 2024
84b85c3
remove timermanager override
rnbot Nov 21, 2024
f2aaafd
fix
rnbot Nov 21, 2024
6f035d0
MS.RN.Cxx shouldn't include files from RN
rnbot Nov 21, 2024
e43beee
format
rnbot Nov 21, 2024
2f4c528
fix
rnbot Nov 21, 2024
9b73a6d
Revert NodeApi bump
rnbot Nov 21, 2024
577ba20
fix
rnbot Nov 21, 2024
9f07b0f
fix
rnbot Nov 21, 2024
8b9a195
fix
rnbot Nov 21, 2024
6b66318
fix
rnbot Nov 21, 2024
12582e4
fix compilation of react_native_assert from MS.RN.Cxx
rnbot Nov 21, 2024
987513c
Update snapshots
rnbot Nov 22, 2024
2c06ee0
Merge remote-tracking branch 'upstream/main' into yg-int-10-20
rnbot Nov 22, 2024
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": "Integrate 10/20",
"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": "Integrate 10/20",
"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": "Integrate 10/20",
"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": "Integrate 10/20",
"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.77.0-nightly-20241015-3485e9ed8",
"baseVersion": "0.77.0-nightly-20241020-e7a3f479f",
"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": "a4a186470316624bcd693e7f8b67739f87e5729c"
"baseHash": "27576bedd435d2e9f130ebfdf8e872d30f0b7855"
}
]
}
6 changes: 3 additions & 3 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.272",
"react": "18.0.0",
"react-native": "0.77.0-nightly-20241015-3485e9ed8"
"react-native": "0.77.0-nightly-20241020-e7a3f479f"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.272",
Expand All @@ -30,11 +30,11 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.77.0-nightly-20241015-3485e9ed8",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
"engines": {
"node": ">= 18"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

import type {RNTesterModuleInfo, RNTesterModule} from '../types/RNTesterTypes';
import type {RNTesterModule, RNTesterModuleInfo} from '../types/RNTesterTypes';

import ReactNativeFeatureFlags from 'react-native/Libraries/ReactNative/ReactNativeFeatureFlags';

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 @@ -160,4 +160,4 @@ untyped-import
untyped-type-import

[version]
^0.248.1
^0.250.0
16 changes: 8 additions & 8 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.77.0-nightly-20241015-3485e9ed8",
"baseVersion": "0.77.0-nightly-20241020-e7a3f479f",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "fa800520804222b3f944f7ffbb6a82f5ad89dc76"
"baseHash": "d824685eb9983c3aecb6d8207eeb0312f3d5a743"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "ad455e241e35ebd718a6304f3de9d04c1f9e4f2b"
"baseHash": "2c80856075b7979d9119fb5e2b4b66b43456c068"
},
{
"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": "d7364ef8dd1c0bc25cc189d135e846522b02b3a7"
"baseHash": "87f676e0bfd031b3dd8c79cf78b64af3c525b151"
},
{
"type": "patch",
Expand Down Expand Up @@ -232,7 +232,7 @@
"type": "derived",
"file": "src-win/Libraries/Image/Image.win32.js",
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
"baseHash": "e5cd104f5060ad354072889937ea92d508a32490",
"baseHash": "a5abee6de7dca3cb043b834925de3f6f0443c738",
"issue": 4320
},
{
Expand Down Expand Up @@ -286,7 +286,7 @@
"type": "patch",
"file": "src-win/Libraries/Inspector/Inspector.win32.js",
"baseFile": "packages/react-native/Libraries/Inspector/Inspector.js",
"baseHash": "ac4d1824877906651f2d82ab7910dda3ecb2bd80"
"baseHash": "ad3ed5cb941f304f5751c6d12274ffe81753162c"
},
{
"type": "patch",
Expand Down Expand Up @@ -497,13 +497,13 @@
"type": "copy",
"file": "src-win/Libraries/Utilities/useMergeRefs.js",
"baseFile": "packages/react-native/Libraries/Utilities/useMergeRefs.js",
"baseHash": "1f1ca637132e6e0fe1549ba520d98508269ca2bd"
"baseHash": "4ba42e1b43ef55a1a9e3095336979fa712f4dc8d"
},
{
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "96fb410d7d408c49297f9f99a760f954264bce91",
"baseHash": "8c67d57575cccb7281b15ca2591e4edf5c5c36dd",
"issue": 11041
},
{
Expand Down
24 changes: 12 additions & 12 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.77.0-nightly-20241015-3485e9ed8",
"@react-native/codegen": "0.77.0-nightly-20241015-3485e9ed8",
"@react-native/community-cli-plugin": "0.77.0-nightly-20241015-3485e9ed8",
"@react-native/gradle-plugin": "0.77.0-nightly-20241015-3485e9ed8",
"@react-native/js-polyfills": "0.77.0-nightly-20241015-3485e9ed8",
"@react-native/normalize-colors": "0.77.0-nightly-20241015-3485e9ed8",
"@react-native/virtualized-lists": "0.77.0-nightly-20241015-3485e9ed8",
"@react-native/assets-registry": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/codegen": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/community-cli-plugin": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/gradle-plugin": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/js-polyfills": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/normalize-colors": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/virtualized-lists": "0.77.0-nightly-20241020-e7a3f479f",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -60,7 +60,7 @@
"pretty-format": "^29.7.0",
"promise": "^8.3.0",
"react-clone-referenced-element": "^1.0.1",
"react-devtools-core": "^6.0.0",
"react-devtools-core": "^6.0.1",
"react-refresh": "^0.14.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
Expand All @@ -85,19 +85,19 @@
"@types/prop-types": "15.7.1",
"@types/react": "^18.2.6",
"eslint": "^8.19.0",
"flow-bin": "^0.245.2",
"flow-bin": "^0.250.0",
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241015-3485e9ed8",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241015-3485e9ed8"
"react-native": "0.77.0-nightly-20241020-e7a3f479f"
},
"beachball": {
"defaultNpmTag": "canary",
Expand All @@ -114,4 +114,4 @@
"engines": {
"node": ">= 18"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ export type TextContentType =
| 'birthdateDay'
| 'birthdateMonth'
| 'birthdateYear'
| 'cellularEID'
| 'cellularIMEI'
| 'dateTime'
| 'flightNumber'
| 'shipmentTrackingNumber';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,7 @@ let BaseImage: AbstractImageIOS = React.forwardRef((props, forwardedRef) => {
'aria-multiselectable': ariaMultiselectable, // Win32
'aria-required': ariaRequired, // Win32
'aria-selected': ariaSelected,
height,
src,
width,
...restProps
} = props;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type {
} from '../Renderer/shims/ReactNativeTypes';
import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
import type {ReactDevToolsAgent} from '../Types/ReactDevToolsTypes';

import SafeAreaView from '../../src/private/components/SafeAreaView_INTERNAL_DO_NOT_USE';

const PressabilityDebug = require('../Pressability/PressabilityDebug');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FocusManager {
// This function takes in a ref to a React Component and a bool value. If setWindowFocus = true, call aggressive focus.
// Else, call polite focus

static focus(ref: React.Ref<any>, setWindowFocus: boolean) {
static focus(ref: React.RefObject<any>, setWindowFocus: boolean) {
if (ref) {
if (setWindowFocus) {
UIManager.dispatchViewManagerCommand(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* @format
*/

import useRefEffect from './useRefEffect';
import * as React from 'react';
import {useCallback} from 'react';

Expand All @@ -22,19 +23,37 @@ import {useCallback} from 'react';
*/
export default function useMergeRefs<Instance>(
...refs: $ReadOnlyArray<?React.RefSetter<Instance>>
): (Instance | null) => void {
return useCallback(
(current: Instance | null) => {
for (const ref of refs) {
if (ref != null) {
): React.RefSetter<Instance> {
const refEffect = useCallback(
(current: Instance) => {
const cleanups: $ReadOnlyArray<void | (() => void)> = refs.map(ref => {
if (ref == null) {
return undefined;
} else {
if (typeof ref === 'function') {
ref(current);
// $FlowIssue[incompatible-type] - Flow does not understand ref cleanup.
const cleanup: void | (() => void) = ref(current);
return typeof cleanup === 'function'
? cleanup
: () => {
ref(null);
};
} else {
ref.current = current;
return () => {
ref.current = null;
};
}
}
}
});

return () => {
for (const cleanup of cleanups) {
cleanup?.();
}
};
},
[...refs], // eslint-disable-line react-hooks/exhaustive-deps
);
return useRefEffect(refEffect);
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ import typeof UTFSequence from './Libraries/UTFSequence';
import typeof * as Appearance from './Libraries/Utilities/Appearance';
import typeof BackHandler from './Libraries/Utilities/BackHandler';
import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
import typeof DevMenu from './src/private/devmenu/DevMenu';
import typeof DevSettings from './Libraries/Utilities/DevSettings';
import typeof Dimensions from './Libraries/Utilities/Dimensions';
import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
Expand All @@ -97,6 +96,7 @@ import typeof useColorScheme from './Libraries/Utilities/useColorScheme';
import typeof useWindowDimensions from './Libraries/Utilities/useWindowDimensions';
import typeof Vibration from './Libraries/Vibration/Vibration';
import typeof YellowBox from './Libraries/YellowBox/YellowBoxDeprecated';
import typeof DevMenu from './src/private/devmenu/DevMenu';

const warnOnce = require('./Libraries/Utilities/warnOnce');
const invariant = require('invariant');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* @format
*/

import type {EventSubscription} from '../../../Libraries/vendor/emitter/EventEmitter';
import type {EventConfig} from '../../../Libraries/Animated/AnimatedEvent';
import type {
AnimationConfig,
Expand All @@ -18,13 +17,14 @@ import type {
AnimatedNodeConfig,
EventMapping,
} from '../../../Libraries/Animated/NativeAnimatedModule';
import type {EventSubscription} from '../../../Libraries/vendor/emitter/EventEmitter';

import * as ReactNativeFeatureFlags from '../featureflags/ReactNativeFeatureFlags';
import NativeAnimatedNonTurboModule from '../../../Libraries/Animated/NativeAnimatedModule';
import NativeAnimatedTurboModule from '../../../Libraries/Animated/NativeAnimatedTurboModule';
import NativeEventEmitter from '../../../Libraries/EventEmitter/NativeEventEmitter';
import RCTDeviceEventEmitter from '../../../Libraries/EventEmitter/RCTDeviceEventEmitter';
import Platform from '../../../Libraries/Utilities/Platform';
import NativeAnimatedNonTurboModule from '../../../Libraries/Animated/NativeAnimatedModule';
import NativeAnimatedTurboModule from '../../../Libraries/Animated/NativeAnimatedTurboModule';
import * as ReactNativeFeatureFlags from '../featureflags/ReactNativeFeatureFlags';
import invariant from 'invariant';
import nullthrows from 'nullthrows';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241015-3485e9ed8",
"react-native-windows": "^0.0.0-canary.895",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native-windows": "^0.0.0-canary.892",
"typescript": "5.0.4"
},
"files": [
Expand All @@ -45,4 +45,4 @@
"engines": {
"node": ">= 18"
}
}
}
Loading
Loading