Skip to content
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": "none",
"comment": "Apply build fixes for RN 0.85.0-nightly-20260114-f15985f4f integration",
"packageName": "@office-iss/react-native-win32",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
"packageName": "@react-native-windows/automation-channel",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
"packageName": "@react-native-windows/cli",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
"packageName": "@react-native-windows/perf-testing",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
"packageName": "react-native-windows",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
"packageName": "react-native-windows-init",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "none"
}
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.84.0-nightly-20260107-58bc6c3e3",
"react-native": "0.85.0-nightly-20260114-f15985f4f",
"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.84.0-nightly-20260107-58bc6c3e3",
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
"overrides": [
{
"type": "patch",
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.84.0-nightly-20260107-58bc6c3e3",
"@react-native/tester": "0.85.0-nightly-20260114-f15985f4f",
"@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.84.0-nightly-20260107-58bc6c3e3"
"react-native": "0.85.0-nightly-20260114-f15985f4f"
},
"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.84.0-nightly-20260107-58bc6c3e3",
"react-native": "0.85.0-nightly-20260114-f15985f4f",
"react-native-platform-override": "0.0.0-canary.1022",
"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 @@ -175,4 +175,4 @@ untyped-import
untyped-type-import

[version]
^0.295.0
^0.296.1
42 changes: 21 additions & 21 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.84.0-nightly-20260107-58bc6c3e3",
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "49be0404a6bbdf103616a7506ad8a27874048119"
"baseHash": "3e63114f0431abfd021daff6285787377f3f464f"
},
{
"type": "derived",
Expand Down Expand Up @@ -66,7 +66,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Button.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Button.js",
"baseHash": "ef86e2343f5213a5f230c63a1ddf12cbe6fa946c"
"baseHash": "86868c251bb5f5f62af9562cd6513ca1d5ee172d"
},
{
"type": "platform",
Expand All @@ -91,7 +91,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
"baseHash": "b8d87e48400468e702509ad24dab05f0a492aa19",
"baseHash": "5ff66c1735078860d360204d9e4471c05cf0fb1e",
"issue": 6240
},
{
Expand All @@ -114,13 +114,13 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
"baseHash": "e36bacf69caef9e59e1f62f9ee4335c6879ef0ed"
"baseHash": "6ea370fcabb5bb0db9682ed28ed832d971937caa"
},
{
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "cc397bb3c850bb0a02f4b3134fdcbc2d9b597b80"
"baseHash": "dd89cd7044a790007febaeb8ef6c40e4c9cbdf41"
},
{
"type": "patch",
Expand Down Expand Up @@ -159,7 +159,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
"baseHash": "d48f21572fc72cf6d79df5aac775fb67d4f1abb4"
"baseHash": "7adb86e9810269266c8d1f9d252dc541a7030b75"
},
{
"type": "platform",
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": "3cc8eebf202cb43189f4c2cb91db01b622572411"
"baseHash": "a4e4e6f4bf2df4685da8fa72a0dc63aee8c4b5db"
},
{
"type": "derived",
Expand All @@ -207,7 +207,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/View/ViewPropTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js",
"baseHash": "3f85fd36b8c098a91f965e9150e53d77ff3aa432",
"baseHash": "138a0f01dfe3524a61cf585461867fd522e49964",
"issue": 6240
},
{
Expand Down Expand Up @@ -296,32 +296,32 @@
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js",
"baseHash": "9554eb5c48570b8a84a6fa77addccd816d0dbacf"
"baseHash": "c53eedb18ebef127f2306a42708b032ce03307c5"
},
{
"type": "patch",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js",
"baseHash": "614a9137be35124ce4d555c3e766568a690a9937",
"baseHash": "3d342d4c28ce5deafecf22682522fdb275ae41bf",
"issue": 7952
},
{
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
"baseHash": "cdf958aebabbe9067d34a2df3e6f2fe7ce09f51e"
"baseHash": "47de16261eb2a5397b4bab247153fbcd8d7a3076"
},
{
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
"baseHash": "ccbfc8413dc7bd26eb7bc9726b273f1cf23b1c70"
"baseHash": "cebcc81fbc845286a04ffa5c1585155b058fd0b0"
},
{
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorStackFrame.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js",
"baseHash": "f91edc40bb2bb20bb94be69e6d8af2aa8d53ca8e",
"baseHash": "b498a05f1276dca29f4e44d0eb5fd80bcc8a4222",
"issue": 5885
},
{
Expand Down Expand Up @@ -371,7 +371,7 @@
"type": "patch",
"file": "src-win/Libraries/Pressability/Pressability.win32.js",
"baseFile": "packages/react-native/Libraries/Pressability/Pressability.js",
"baseHash": "10801e10120946aa4c721d13f3b8f455d0f43db8",
"baseHash": "623bd2db2402499786aa79161ec7bfa10577a404",
"issue": 6240
},
{
Expand Down Expand Up @@ -431,26 +431,26 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "914f50544d09bc3bfe2ea3e34951e47e52d2dd87"
"baseHash": "74cfb0cdb33d310206989381bccd0e00a7900078"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
"baseHash": "e1c95809fd0819c130f77dc2a61399b01b5dd687",
"baseHash": "48d3dec45a0737147f7dbaa53b81bd4514ec3773",
"issue": 7074
},
{
"type": "derived",
"file": "src-win/Libraries/Text/TextProps.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextProps.js",
"baseHash": "ddeedf097aec999824c4e9d246fdf6fefd61dc76"
"baseHash": "7c4f916e4b08bcffaed10144506ff99b0781fc20"
},
{
"type": "patch",
"file": "src-win/Libraries/Types/CoreEventTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Types/CoreEventTypes.js",
"baseHash": "5834bb306dcf85772546feae7af58a875196d309",
"baseHash": "f28ed059b210c9552fde4b43521980ba02f18c33",
"issue": 6240
},
{
Expand All @@ -464,7 +464,7 @@
"type": "derived",
"file": "src-win/Libraries/Utilities/Dimensions.win32.js",
"baseFile": "packages/react-native/Libraries/Utilities/Dimensions.js",
"baseHash": "58a45ebaadbfa79e4e1463738ff85d6dcf8348ea"
"baseHash": "23420f7f7fe6d90fc8c9cc84aaf6424cbf12c0b2"
},
{
"type": "platform",
Expand Down Expand Up @@ -503,7 +503,7 @@
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "90277c8c54231153433c8e5ef9d0478a41a9138c",
"baseHash": "8d8ffd25d13e27e78900e3e90a686df9e2339159",
"issue": 11041
},
{
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": "20.0.0",
"@react-native-community/cli-platform-ios": "20.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.84.0-nightly-20260107-58bc6c3e3",
"@react-native/codegen": "0.84.0-nightly-20260107-58bc6c3e3",
"@react-native/community-cli-plugin": "0.84.0-nightly-20260107-58bc6c3e3",
"@react-native/gradle-plugin": "0.84.0-nightly-20260107-58bc6c3e3",
"@react-native/js-polyfills": "0.84.0-nightly-20260107-58bc6c3e3",
"@react-native/normalize-colors": "0.84.0-nightly-20260107-58bc6c3e3",
"@react-native/virtualized-lists": "0.84.0-nightly-20260107-58bc6c3e3",
"@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",
"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.84.0-nightly-20260107-58bc6c3e3",
"@react-native/metro-config": "0.85.0-nightly-20260114-f15985f4f",
"@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 @@ -87,19 +87,19 @@
"@types/prop-types": "15.7.1",
"@types/react": "^19.2.3",
"eslint": "^8.19.0",
"flow-bin": "^0.295.0",
"flow-bin": "^0.296.1",
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "^3.6.2",
"react": "19.2.3",
"react-native": "0.84.0-nightly-20260107-58bc6c3e3",
"react-native": "0.85.0-nightly-20260114-f15985f4f",
"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.84.0-nightly-20260107-58bc6c3e3"
"react-native": "0.85.0-nightly-20260114-f15985f4f"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import View from './View/View';
import invariant from 'invariant';
import * as React from 'react';

export type ButtonProps = $ReadOnly<{
export type ButtonProps = Readonly<{
/**
Text to display inside the button. On Android the given title will be
converted to the uppercased form.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ import View from '../View/View';

export type {PressableAndroidRippleConfig};

export type PressableStateCallbackType = $ReadOnly<{
export type PressableStateCallbackType = Readonly<{
pressed: boolean,
}>;

type PressableBaseProps = $ReadOnly<{
type PressableBaseProps = Readonly<{
/**
* Whether a press gesture can be interrupted by a parent gesture such as a
* scroll event. Defaults to true.
Expand Down Expand Up @@ -203,7 +203,7 @@ type PressableBaseProps = $ReadOnly<{
unstable_pressDelay?: ?number,
}>;

export type PressableProps = $ReadOnly<{
export type PressableProps = Readonly<{
// Pressability may override `onMouseEnter` and `onMouseLeave` to
// implement `onHoverIn` and `onHoverOut` in a platform-agnostic way.
// Hover events should be used instead of mouse events.
Expand Down
Loading
Loading