Skip to content
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": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
"packageName": "@office-iss/react-native-win32",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
"packageName": "@react-native-windows/automation-channel",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
"packageName": "@react-native-windows/cli",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
"packageName": "@react-native-windows/perf-testing",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
"packageName": "react-native-windows",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
"packageName": "react-native-windows-init",
"email": "email not defined",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"prettier": "^3.6.2",
"prettier-plugin-hermes-parser": "0.21.1",
"react": "19.2.3",
"react-native": "0.85.0-nightly-20260114-f15985f4f",
"react-native": "0.85.0-nightly-20260128-36f07a1b2",
"react-native-platform-override": "0.0.0-canary.1017",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
"baseVersion": "0.85.0-nightly-20260128-36f07a1b2",
"overrides": [
{
"type": "patch",
Expand All @@ -17,7 +17,7 @@
"type": "patch",
"file": "src/js/components/RNTesterExampleFilter.win32.js",
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
"baseHash": "142194524dd3dfc8d28f2b77fb26cd819ce0236c"
"baseHash": "6766d57ee45d36991c8c2ec6ef20f6602bc924f9"
},
{
"type": "platform",
Expand Down
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 @@ -11,15 +11,15 @@
"validate-overrides": "react-native-platform-override validate"
},
"dependencies": {
"@react-native/tester": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/tester": "0.85.0-nightly-20260128-36f07a1b2",
"@typescript-eslint/eslint-plugin": "^8.36.0",
"@typescript-eslint/parser": "^8.36.0",
"flow-enums-runtime": "^0.0.6"
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.311",
"react": "19.2.3",
"react-native": "0.85.0-nightly-20260114-f15985f4f"
"react-native": "0.85.0-nightly-20260128-36f07a1b2"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.311",
Expand All @@ -32,7 +32,7 @@
"just-scripts": "^1.3.3",
"prettier": "^3.6.2",
"react": "19.2.3",
"react-native": "0.85.0-nightly-20260114-f15985f4f",
"react-native": "0.85.0-nightly-20260128-36f07a1b2",
"react-native-platform-override": "0.0.0-canary.1022",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Props<T> = {
testID?: string,
hideFilterPills?: boolean,
page: 'examples_page' | 'components_page' | 'bookmarks_page',
sections: $ReadOnlyArray<SectionData<T>>,
sections: ReadonlyArray<SectionData<T>>,
...
};

Expand Down Expand Up @@ -81,7 +81,7 @@ class RNTesterExampleFilter<T> extends React.Component<Props<T>, State> {
}

_renderFilteredSections(
filteredSections: $ReadOnlyArray<{
filteredSections: ReadonlyArray<{
data: Array<T>,
key: string,
title: string,
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 @@ -175,4 +175,4 @@ untyped-import
untyped-type-import

[version]
^0.296.1
^0.298.0
32 changes: 16 additions & 16 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
"baseVersion": "0.85.0-nightly-20260128-36f07a1b2",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "3e63114f0431abfd021daff6285787377f3f464f"
"baseHash": "66b23b57dc30a5834c9ee619d0381828b103a341"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "43b61164095fb1f33793316908d5f974e7c46651"
"baseHash": "9007cd545c708aefc4ab3b9fb7418a210a6e879c"
},
{
"type": "derived",
"file": "src-win/index.win32.js.flow",
"baseFile": "packages/react-native/index.js.flow",
"baseHash": "da9cb1941e2b3d395d157e64a56b71a26396f2bf"
"baseHash": "62783de689e8711d7ea287966283974956d797d5"
},
{
"type": "platform",
Expand All @@ -47,7 +47,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js",
"baseFile": "packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js",
"baseHash": "c0c7037e52d48caae88cffaac7f60d4dd1c32b3e"
"baseHash": "ee6f102be5d4b456d16900499a01abd0ca1ce1ba"
},
{
"type": "copy",
Expand All @@ -66,7 +66,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Button.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Button.js",
"baseHash": "86868c251bb5f5f62af9562cd6513ca1d5ee172d"
"baseHash": "c3f8d0874549590ba8d2d020fd1c13d604d74be9"
},
{
"type": "platform",
Expand Down Expand Up @@ -98,7 +98,7 @@
"type": "copy",
"file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
"baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
"baseHash": "85efdbe556a087175fb9328f8d6e8d1f2cf29447"
"baseHash": "5eb51a48b73b5c1ccc24fe34fd91c67c01b969d4"
},
{
"type": "copy",
Expand All @@ -114,7 +114,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
"baseHash": "6ea370fcabb5bb0db9682ed28ed832d971937caa"
"baseHash": "89dae9a6774a2fd24d7468702a616752e314d727"
},
{
"type": "derived",
Expand Down Expand Up @@ -147,7 +147,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
"baseHash": "c71e7df7fbdeb6b2c1e9766e95725a56643fa28d"
"baseHash": "a9e38223753e718c5410a8ca9973064e699c1ab4"
},
{
"type": "derived",
Expand Down Expand Up @@ -195,7 +195,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/View/ViewAccessibility.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.js",
"baseHash": "a4e4e6f4bf2df4685da8fa72a0dc63aee8c4b5db"
"baseHash": "7f8b076ccf47b528c604d2b1086754c351689b2e"
},
{
"type": "derived",
Expand Down Expand Up @@ -341,7 +341,7 @@
"type": "copy",
"file": "src-win/Libraries/Network/RCTNetworking.win32.js",
"baseFile": "packages/react-native/Libraries/Network/RCTNetworking.ios.js",
"baseHash": "6cc93d00e1b6f541d08102cdc5363184f7ed6025",
"baseHash": "475b803e357811f6989d8d116bb040cfb1735b7c",
"issue": 4318
},
{
Expand Down Expand Up @@ -400,7 +400,7 @@
"type": "patch",
"file": "src-win/Libraries/Renderer/shims/ReactNativeTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js",
"baseHash": "41da351b1e8d090e5ecf0859738218a5dcd4c08f",
"baseHash": "333afc05f5a42a5321196f5f7a14d14c8fd5dd0f",
"issue": 0
},
{
Expand Down Expand Up @@ -431,7 +431,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "74cfb0cdb33d310206989381bccd0e00a7900078"
"baseHash": "618b750401e9066b212477f3c5d5484e4d181e32"
},
{
"type": "derived",
Expand All @@ -450,7 +450,7 @@
"type": "patch",
"file": "src-win/Libraries/Types/CoreEventTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Types/CoreEventTypes.js",
"baseHash": "f28ed059b210c9552fde4b43521980ba02f18c33",
"baseHash": "a171d222c66e809419656decb12be33185f35952",
"issue": 6240
},
{
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": "4ab145e150c82f4f82547122896e02f45103d1a1"
"baseHash": "a4f8be3b9ee884407be60acd32755eea5490ac45"
},
{
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "8d8ffd25d13e27e78900e3e90a686df9e2339159",
"baseHash": "b2f5d15fcf7b7b26fbd49e0196037fbb8175bb17",
"issue": 11041
},
{
Expand Down
20 changes: 10 additions & 10 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": "20.0.0",
"@react-native-community/cli-platform-ios": "20.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/codegen": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/community-cli-plugin": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/gradle-plugin": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/js-polyfills": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/normalize-colors": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/virtualized-lists": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/assets-registry": "0.85.0-nightly-20260128-36f07a1b2",
"@react-native/codegen": "0.85.0-nightly-20260128-36f07a1b2",
"@react-native/community-cli-plugin": "0.85.0-nightly-20260128-36f07a1b2",
"@react-native/gradle-plugin": "0.85.0-nightly-20260128-36f07a1b2",
"@react-native/js-polyfills": "0.85.0-nightly-20260128-36f07a1b2",
"@react-native/normalize-colors": "0.85.0-nightly-20260128-36f07a1b2",
"@react-native/virtualized-lists": "0.85.0-nightly-20260128-36f07a1b2",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -75,7 +75,7 @@
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@babel/preset-env": "^7.25.3",
"@react-native/metro-config": "0.85.0-nightly-20260114-f15985f4f",
"@react-native/metro-config": "0.85.0-nightly-20260128-36f07a1b2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.38",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.42",
Expand All @@ -92,14 +92,14 @@
"just-scripts": "^1.3.3",
"prettier": "^3.6.2",
"react": "19.2.3",
"react-native": "0.85.0-nightly-20260114-f15985f4f",
"react-native": "0.85.0-nightly-20260128-36f07a1b2",
"react-native-platform-override": "0.0.0-canary.1022",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^19.2.3",
"react": "^19.2.3",
"react-native": "0.85.0-nightly-20260114-f15985f4f"
"react-native": "0.85.0-nightly-20260128-36f07a1b2"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,36 +51,34 @@ type AccessibilityEventTypes =
| 'windowStateChange';

// Mapping of public event names to platform-specific event names.
const EventNames: Map<
$Keys<AccessibilityEventDefinitions>,
string,
> = Platform.OS === 'android'
? new Map([
['change', 'touchExplorationDidChange'],
['reduceMotionChanged', 'reduceMotionDidChange'],
['highTextContrastChanged', 'highTextContrastDidChange'],
['screenReaderChanged', 'touchExplorationDidChange'],
['accessibilityServiceChanged', 'accessibilityServiceDidChange'],
['invertColorsChanged', 'invertColorDidChange'],
['grayscaleChanged', 'grayscaleModeDidChange'],
])
: Platform.OS === 'win32'
const EventNames: Map<keyof AccessibilityEventDefinitions, string> =
Platform.OS === 'android'
? new Map([
['change', 'TOUCH_EXPLORATION_EVENT'],
['reduceMotionChanged', 'REDUCE_MOTION_EVENT'],
['screenReaderChanged', 'TOUCH_EXPLORATION_EVENT'],
['change', 'touchExplorationDidChange'],
['reduceMotionChanged', 'reduceMotionDidChange'],
['highTextContrastChanged', 'highTextContrastDidChange'],
['screenReaderChanged', 'touchExplorationDidChange'],
['accessibilityServiceChanged', 'accessibilityServiceDidChange'],
['invertColorsChanged', 'invertColorDidChange'],
['grayscaleChanged', 'grayscaleModeDidChange'],
])
: new Map([
['announcementFinished', 'announcementFinished'],
['boldTextChanged', 'boldTextChanged'],
['change', 'screenReaderChanged'],
['grayscaleChanged', 'grayscaleChanged'],
['invertColorsChanged', 'invertColorsChanged'],
['reduceMotionChanged', 'reduceMotionChanged'],
['reduceTransparencyChanged', 'reduceTransparencyChanged'],
['screenReaderChanged', 'screenReaderChanged'],
['darkerSystemColorsChanged', 'darkerSystemColorsChanged'],
]);
: Platform.OS === 'win32'
? new Map([
['change', 'TOUCH_EXPLORATION_EVENT'],
['reduceMotionChanged', 'REDUCE_MOTION_EVENT'],
['screenReaderChanged', 'TOUCH_EXPLORATION_EVENT'],
])
: new Map([
['announcementFinished', 'announcementFinished'],
['boldTextChanged', 'boldTextChanged'],
['change', 'screenReaderChanged'],
['grayscaleChanged', 'grayscaleChanged'],
['invertColorsChanged', 'invertColorsChanged'],
['reduceMotionChanged', 'reduceMotionChanged'],
['reduceTransparencyChanged', 'reduceTransparencyChanged'],
['screenReaderChanged', 'screenReaderChanged'],
['darkerSystemColorsChanged', 'darkerSystemColorsChanged'],
]);

/**
* Sometimes it's useful to know whether or not the device has a screen reader
Expand Down Expand Up @@ -450,7 +448,7 @@ const AccessibilityInfo = {
*
* See https://reactnative.dev/docs/accessibilityinfo#addeventlistener
*/
addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
addEventListener<K: keyof AccessibilityEventDefinitions>(
eventName: K,
// $FlowFixMe[incompatible-type] - Flow bug with unions and generics (T128099423)
handler: (...AccessibilityEventDefinitions[K]) => void,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export type ButtonProps = Readonly<{
* Accessibility props.
*/
accessible?: ?boolean,
accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
accessibilityActions?: ?ReadonlyArray<AccessibilityActionInfo>,
onAccessibilityAction?: ?(event: AccessibilityActionEvent) => unknown,
accessibilityState?: ?AccessibilityState,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export type {ProgressBarAndroidProps};
// of ProgressBarAndroidProps. TS's Omit does not distribute over unions, so
// we define our own version which does. This does not affect Flow.
// $FlowExpectedError[unclear-type]
type Omit<T, K> = T extends any ? Pick<T, Exclude<$Keys<T>, K>> : T;
type Omit<T, K> = T extends any ? Pick<T, Exclude<keyof T, K>> : T;

/**
* ProgressBarAndroid has been extracted from react-native core and will be removed in a future release.
Expand Down
Loading
Loading