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": "prerelease",
"comment": "Integrate RN 0.85.0-nightly-20260224-42cd0f041",
"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-20260224-42cd0f041",
"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-20260224-42cd0f041",
"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-20260224-42cd0f041",
"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-20260224-42cd0f041",
"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-20260224-42cd0f041",
"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-20260210-4535df4f6",
"react-native": "0.85.0-nightly-20260224-42cd0f041",
"react-native-platform-override": "workspace:*",
"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-20260210-4535df4f6",
"baseVersion": "0.85.0-nightly-20260224-42cd0f041",
"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": "21f111f08b53ae5d60a7c03044ae64d867d93dbb"
"baseHash": "d0b6e7eccdc020d76d263b3e88becfb565b4671d"
}
]
}
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-20260210-4535df4f6",
"@react-native/tester": "0.85.0-nightly-20260224-42cd0f041",
"@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-20260210-4535df4f6"
"react-native": "0.85.0-nightly-20260224-42cd0f041"
},
"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-20260210-4535df4f6",
"react-native": "0.85.0-nightly-20260224-42cd0f041",
"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 @@ -186,6 +186,12 @@ const APIs: Array<RNTesterModuleInfo> = ([
category: 'UI',
module: require('../examples/Animated/AnimatedIndex').default,
},
{
key: 'AnimationBackendIndex',
category: 'UI',
module: require('../examples/AnimationBackend/AnimationBackendIndex')
.default,
},
{
key: 'Animation - GratuitousAnimation',
category: 'UI',
Expand Down
1 change: 1 addition & 0 deletions packages/@office-iss/react-native-win32/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/ReactCopies
/rntypes
/src
/src-win/Libraries/LogBox
/src-win/rntypes
/types
/flow-typed
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 @@ -172,4 +172,4 @@ untyped-import
untyped-type-import

[version]
^0.299.0
^0.302.0
20 changes: 10 additions & 10 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-20260210-4535df4f6",
"baseVersion": "0.85.0-nightly-20260224-42cd0f041",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "4fee2cd64a351324f27b4ce4a99586f7e47d5dc3"
"baseHash": "baf585dd3e43f5433a04cb6b912333a0dd68b16b"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "9007cd545c708aefc4ab3b9fb7418a210a6e879c"
"baseHash": "36c619cbe063dcd12ab4003886209d00e80ab249"
},
{
"type": "derived",
"file": "src-win/index.win32.js.flow",
"baseFile": "packages/react-native/index.js.flow",
"baseHash": "62783de689e8711d7ea287966283974956d797d5"
"baseHash": "d1e1f6a15bd8659d03fb763a86a4de0c855f05c1"
},
{
"type": "platform",
Expand Down Expand Up @@ -120,7 +120,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "dd89cd7044a790007febaeb8ef6c40e4c9cbdf41"
"baseHash": "cedca6e0b5e98b29759cc1ca806313ffa7937eb2"
},
{
"type": "patch",
Expand Down Expand Up @@ -296,7 +296,7 @@
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js",
"baseHash": "c53eedb18ebef127f2306a42708b032ce03307c5"
"baseHash": "a40c0f275fe317de0aece23c7c26e923545c7ece"
},
{
"type": "patch",
Expand All @@ -309,19 +309,19 @@
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
"baseHash": "b495dafadab54ad429e4bf9be28d4e7ae405df56"
"baseHash": "12bd90c6572e19e7c23c0cc702d179f04dc8d7bc"
},
{
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
"baseHash": "cebcc81fbc845286a04ffa5c1585155b058fd0b0"
"baseHash": "245082e81b6274f96a8da37d1e9a21fcd0ff0e18"
},
{
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorStackFrame.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js",
"baseHash": "b498a05f1276dca29f4e44d0eb5fd80bcc8a4222",
"baseHash": "95e584184ae16ef23a57f7ebc3fba6b5c54a5268",
"issue": 5885
},
{
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": "618b750401e9066b212477f3c5d5484e4d181e32"
"baseHash": "14e1085587ef8b8a506594599c1aea8cf40ef140"
},
{
"type": "derived",
Expand Down
23 changes: 12 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,14 @@
"@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-20260210-4535df4f6",
"@react-native/codegen": "0.85.0-nightly-20260210-4535df4f6",
"@react-native/community-cli-plugin": "0.85.0-nightly-20260210-4535df4f6",
"@react-native/gradle-plugin": "0.85.0-nightly-20260210-4535df4f6",
"@react-native/js-polyfills": "0.85.0-nightly-20260210-4535df4f6",
"@react-native/normalize-colors": "0.85.0-nightly-20260210-4535df4f6",
"@react-native/virtualized-lists": "0.85.0-nightly-20260210-4535df4f6",
"@react-native/assets-registry": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/codegen": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/community-cli-plugin": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/gradle-plugin": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/jest-preset": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/js-polyfills": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/normalize-colors": "0.85.0-nightly-20260224-42cd0f041",
"@react-native/virtualized-lists": "0.85.0-nightly-20260224-42cd0f041",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -75,7 +76,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-20260210-4535df4f6",
"@react-native/metro-config": "0.85.0-nightly-20260224-42cd0f041",
"@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 +88,19 @@
"@types/prop-types": "15.7.1",
"@types/react": "^19.2.3",
"eslint": "^8.19.0",
"flow-bin": "^0.299.0",
"flow-bin": "^0.302.0",
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "^3.6.2",
"react": "19.2.3",
"react-native": "0.85.0-nightly-20260210-4535df4f6",
"react-native": "0.85.0-nightly-20260224-42cd0f041",
"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-20260210-4535df4f6"
"react-native": "0.85.0-nightly-20260224-42cd0f041"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -489,12 +489,11 @@ function InternalTextInput(props: TextInputProps): React.Node {
getNativeRef(): ?TextInputInstance {
return inputRef.current;
},
// TODO: Fix this returning true on null === null, when no input is focused
isFocused(): boolean {
const currentlyFocusedInput =
TextInputState.currentlyFocusedInput();
return (
currentlyFocusedInput !== null &&
currentlyFocusedInput != null &&
currentlyFocusedInput === inputRef.current
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@ import LogBoxInspectorSection from './LogBoxInspectorSection';
import * as LogBoxStyle from './LogBoxStyle';
import * as React from 'react';

type Props = Readonly<{
componentCodeFrame: ?CodeFrame,
codeFrame: ?CodeFrame,
}>;

function CodeFrameDisplay({codeFrame}: {codeFrame: CodeFrame}): React.Node {
component CodeFrameDisplay(codeFrame: CodeFrame) {
function getFileName() {
// $FlowFixMe[incompatible-use]
const matches = /[^/]*$/.exec(codeFrame.fileName);
Expand Down Expand Up @@ -77,8 +72,10 @@ function CodeFrameDisplay({codeFrame}: {codeFrame: CodeFrame}): React.Node {
);
}

function LogBoxInspectorCodeFrame(props: Props): React.Node {
const {codeFrame, componentCodeFrame} = props;
component LogBoxInspectorCodeFrame(
componentCodeFrame: ?CodeFrame,
codeFrame: ?CodeFrame,
) {
let sources = [];
if (codeFrame != null) {
sources.push(codeFrame);
Expand All @@ -103,7 +100,7 @@ function LogBoxInspectorCodeFrame(props: Props): React.Node {
);
}

function AppInfo() {
component AppInfo() {
const appInfo = LogBoxData.getAppInfo();
if (appInfo == null) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ import * as LogBoxStyle from './LogBoxStyle';
import * as React from 'react';
import {useState} from 'react';

type Props = Readonly<{
log: LogBoxLog,
}>;

const BEFORE_SLASH_RE = /^(.*)[\\/]/;

// Taken from React https://github.com/facebook/react/blob/206d61f72214e8ae5b935f0bf8628491cb7f0797/packages/react-devtools-shared/src/backend/describeComponentFrame.js#L27-L41
Expand All @@ -49,29 +45,30 @@ function getPrettyFileName(path: string) {

return fileName;
}
function LogBoxInspectorReactFrames(props: Props): React.Node {

component LogBoxInspectorReactFrames(log: LogBoxLog) {
const [collapsed, setCollapsed] = useState(true);
if (
props.log.getAvailableComponentStack() == null ||
props.log.getAvailableComponentStack().length < 1
log.getAvailableComponentStack() == null ||
log.getAvailableComponentStack().length < 1
) {
return null;
}

function getStackList() {
if (collapsed) {
return props.log.getAvailableComponentStack().slice(0, 3);
return log.getAvailableComponentStack().slice(0, 3);
} else {
return props.log.getAvailableComponentStack();
return log.getAvailableComponentStack();
}
}

function getCollapseMessage() {
if (props.log.getAvailableComponentStack().length <= 3) {
if (log.getAvailableComponentStack().length <= 3) {
return;
}

const count = props.log.getAvailableComponentStack().length - 3;
const count = log.getAvailableComponentStack().length - 3;
if (collapsed) {
return `See ${count} more components`;
} else {
Expand Down Expand Up @@ -167,6 +164,7 @@ const componentStyles = StyleSheet.create({
fontFamily: Platform.select({
android: 'monospace',
ios: 'Menlo',
macos: 'Menlo',
win32: 'Consolas', // Win32
}),
color: LogBoxStyle.getTextColor(1),
Expand All @@ -178,6 +176,7 @@ const componentStyles = StyleSheet.create({
fontFamily: Platform.select({
android: 'monospace',
ios: 'Menlo',
macos: 'Menlo',
win32: 'Consolas', // Win32
}),
color: LogBoxStyle.getTextColor(0.4),
Expand Down
Loading
Loading