From a68a8a1f34f47253bff9140b201e36d4b5d4e222 Mon Sep 17 00:00:00 2001 From: Anukrati Agrawal Date: Mon, 10 Aug 2026 15:54:23 -0700 Subject: [PATCH 1/2] Integrate RN 0.86.0-nightly-20260310-621592d1f (with conflicts) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- package.json | 2 +- .../react-native-win32-tester/overrides.json | 4 +- .../react-native-win32-tester/package.json | 6 +- .../src/js/utils/RNTesterList.win32.js | 5 + .../react-native-win32/.flowconfig | 2 +- .../react-native-win32/overrides.json | 12 +- .../react-native-win32/package.json | 24 +- .../AccessibilityInfo.win32.js | 14 +- .../Libraries/Components/View/View.win32.js | 103 ++++++ .../NativeComponent/BaseViewConfig.win32.js | 15 + .../Libraries/Network/RCTNetworking.win32.js | 2 +- .../automation-channel/package.json | 2 +- .../@react-native-windows/cli/package.json | 2 +- .../perf-testing/package.json | 2 +- .../tester/overrides.json | 18 +- .../@react-native-windows/tester/package.json | 9 +- .../Button/ButtonExample.windows.js | 5 + .../ActivityIndicatorExample.windows.js | 2 + .../js/examples/Image/ImageExample.windows.js | 36 ++ .../Pressable/PressableExample.windows.js | 4 + .../js/examples/Text/TextExample.windows.js | 72 +++- .../Text/TextSharedExamples.windows.js | 15 +- .../Touchable/TouchableExample.windows.js | 6 +- .../src/js/utils/RNTesterList.windows.js | 5 + .../@react-native/monorepo/overrides.json | 4 +- packages/@react-native/monorepo/package.json | 6 +- .../tester/js/utils/RNTesterList.android.js | 5 + .../tester/js/utils/RNTesterList.ios.js | 4 + packages/@react-native/tester/overrides.json | 30 +- packages/@react-native/tester/package.json | 8 +- .../babel-react-native-config/package.json | 4 +- .../@rnw-scripts/eslint-config/package.json | 2 +- .../@rnw-scripts/integrate-rn/package.json | 4 +- .../metro-dev-config/package.json | 4 +- packages/e2e-test-app-fabric/package.json | 6 +- packages/playground/package.json | 6 +- .../react-native-windows-init/package.json | 2 +- packages/sample-app-fabric/package.json | 6 +- packages/sample-custom-component/package.json | 6 +- vnext/.flowconfig | 2 +- .../jsinspector-modern/NetworkIOAgent.cpp | 2 +- .../components/view/TouchEventEmitter.cpp | 28 +- .../components/view/TouchEventEmitter.h | 1 + .../react/renderer/uimanager/UIManager.cpp | 11 + vnext/Scripts/Warm-RnwFeedCache.ps1 | 2 +- vnext/Scripts/creaternwapp.cmd | 2 +- vnext/overrides.json | 24 +- vnext/package.json | 26 +- .../AccessibilityInfo.windows.js | 14 +- .../Libraries/Components/View/View.windows.js | 121 +++++-- .../NativeComponent/BaseViewConfig.windows.js | 15 + .../ViewConfigIgnore.windows.js | 15 + .../Network/RCTNetworking.windows.js | 2 +- .../ReactNativeFeatureFlagsBase.js | 6 +- yarn.lock | 337 +++++++++--------- 55 files changed, 717 insertions(+), 355 deletions(-) diff --git a/package.json b/package.json index 6b4d250a438..47f691bfb16 100644 --- a/package.json +++ b/package.json @@ -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-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-native-platform-override": "workspace:*", "typescript": "5.0.4" }, diff --git a/packages/@office-iss/react-native-win32-tester/overrides.json b/packages/@office-iss/react-native-win32-tester/overrides.json index 9f16f06fdec..d6ff82d7157 100644 --- a/packages/@office-iss/react-native-win32-tester/overrides.json +++ b/packages/@office-iss/react-native-win32-tester/overrides.json @@ -5,7 +5,7 @@ "excludePatterns": [ "src/js/examples-win32/**" ], - "baseVersion": "0.85.0-nightly-20260303-c26dbe286", + "baseVersion": "0.86.0-nightly-20260310-621592d1f", "overrides": [ { "type": "patch", @@ -42,7 +42,7 @@ "type": "derived", "file": "src/js/utils/RNTesterList.win32.js", "baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js", - "baseHash": "d0b6e7eccdc020d76d263b3e88becfb565b4671d" + "baseHash": "6c9c1b36ee77323fa1b76235eaab9907ee7c733c" } ] } \ No newline at end of file diff --git a/packages/@office-iss/react-native-win32-tester/package.json b/packages/@office-iss/react-native-win32-tester/package.json index 728eebed4d0..6a771db39b0 100644 --- a/packages/@office-iss/react-native-win32-tester/package.json +++ b/packages/@office-iss/react-native-win32-tester/package.json @@ -11,7 +11,7 @@ "validate-overrides": "react-native-platform-override validate" }, "dependencies": { - "@react-native/tester": "0.85.0-nightly-20260303-c26dbe286", + "@react-native/tester": "0.86.0-nightly-20260310-621592d1f", "@typescript-eslint/eslint-plugin": "^8.36.0", "@typescript-eslint/parser": "^8.36.0", "flow-enums-runtime": "^0.0.6" @@ -19,7 +19,7 @@ "peerDependencies": { "@office-iss/react-native-win32": "^0.0.0-canary.312", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286" + "react-native": "0.86.0-nightly-20260310-621592d1f" }, "devDependencies": { "@office-iss/react-native-win32": "^0.0.0-canary.312", @@ -32,7 +32,7 @@ "just-scripts": "^1.3.3", "prettier": "^3.6.2", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-native-platform-override": "0.0.0-canary.1023", "typescript": "5.0.4" }, diff --git a/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js b/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js index c40b7223a32..aeecc2212f1 100644 --- a/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js +++ b/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js @@ -380,6 +380,11 @@ const APIs: Array = ([ key: 'LegacyModuleExample', module: require('../examples/TurboModule/LegacyModuleExample'), }, + { + key: 'TurboCxxModuleExample', + category: 'Basic', + module: require('../examples/TurboModule/TurboCxxModuleExample'), + }, // Basic check to detect the availability of the IntersectionObserver API. // $FlowExpectedError[cannot-resolve-name] ...(typeof IntersectionObserver === 'function' diff --git a/packages/@office-iss/react-native-win32/.flowconfig b/packages/@office-iss/react-native-win32/.flowconfig index a36f99881da..74aaf4dadec 100644 --- a/packages/@office-iss/react-native-win32/.flowconfig +++ b/packages/@office-iss/react-native-win32/.flowconfig @@ -171,4 +171,4 @@ untyped-import untyped-type-import [version] -^0.303.0 +^0.304.0 diff --git a/packages/@office-iss/react-native-win32/overrides.json b/packages/@office-iss/react-native-win32/overrides.json index 5df910d47d1..3310a89e3e7 100644 --- a/packages/@office-iss/react-native-win32/overrides.json +++ b/packages/@office-iss/react-native-win32/overrides.json @@ -7,13 +7,13 @@ "**/__snapshots__/**", "src-win/rntypes/**" ], - "baseVersion": "0.85.0-nightly-20260303-c26dbe286", + "baseVersion": "0.86.0-nightly-20260310-621592d1f", "overrides": [ { "type": "derived", "file": ".flowconfig", "baseFile": ".flowconfig", - "baseHash": "56a63445d9d20e6c25fea831d9d0d41b9c5b6463" + "baseHash": "007a05886f74a088134c955545ce174d75d8178a" }, { "type": "derived", @@ -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": "ee6f102be5d4b456d16900499a01abd0ca1ce1ba" + "baseHash": "decdc9e7b2af21254c017402ca81b45dbec5018f" }, { "type": "copy", @@ -177,7 +177,7 @@ "type": "patch", "file": "src-win/Libraries/Components/View/View.win32.js", "baseFile": "packages/react-native/Libraries/Components/View/View.js", - "baseHash": "60eab5df574b43200494005fc3f00d11576d515b" + "baseHash": "194eebd6a94c61218461d08ef879e852e8503883" }, { "type": "derived", @@ -329,13 +329,13 @@ "type": "derived", "file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js", "baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js", - "baseHash": "5b9617aa1bedd5c70b30dac1f3b35aa535976b54" + "baseHash": "0e417b1f78fd687a14b84df695eb02e434db4262" }, { "type": "copy", "file": "src-win/Libraries/Network/RCTNetworking.win32.js", "baseFile": "packages/react-native/Libraries/Network/RCTNetworking.ios.js", - "baseHash": "475b803e357811f6989d8d116bb040cfb1735b7c", + "baseHash": "0044e93421915bb8da461a5660141ae69dff17c7", "issue": 4318 }, { diff --git a/packages/@office-iss/react-native-win32/package.json b/packages/@office-iss/react-native-win32/package.json index b97e85d845b..291cbcd47ee 100644 --- a/packages/@office-iss/react-native-win32/package.json +++ b/packages/@office-iss/react-native-win32/package.json @@ -30,14 +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-20260303-c26dbe286", - "@react-native/codegen": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/community-cli-plugin": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/gradle-plugin": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/jest-preset": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/js-polyfills": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/normalize-colors": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/virtualized-lists": "0.85.0-nightly-20260303-c26dbe286", + "@react-native/assets-registry": "0.86.0-nightly-20260310-621592d1f", + "@react-native/codegen": "0.86.0-nightly-20260310-621592d1f", + "@react-native/community-cli-plugin": "0.86.0-nightly-20260310-621592d1f", + "@react-native/gradle-plugin": "0.86.0-nightly-20260310-621592d1f", + "@react-native/jest-preset": "0.86.0-nightly-20260310-621592d1f", + "@react-native/js-polyfills": "0.86.0-nightly-20260310-621592d1f", + "@react-native/normalize-colors": "0.86.0-nightly-20260310-621592d1f", + "@react-native/virtualized-lists": "0.86.0-nightly-20260310-621592d1f", "abort-controller": "^3.0.0", "anser": "^1.4.9", "ansi-regex": "^5.0.0", @@ -76,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-20260303-c26dbe286", + "@react-native/metro-config": "0.86.0-nightly-20260310-621592d1f", "@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", @@ -93,15 +93,15 @@ "just-scripts": "^1.3.3", "prettier": "^3.6.2", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-native-platform-override": "0.0.0-canary.1023", "typescript": "5.0.4" }, "peerDependencies": { - "@react-native/jest-preset": "0.85.0-nightly-20260303-c26dbe286", + "@react-native/jest-preset": "0.86.0-nightly-20260310-621592d1f", "@types/react": "^19.1.1", "react": "^19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286" + "react-native": "0.86.0-nightly-20260310-621592d1f" }, "beachball": { "defaultNpmTag": "canary", diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js index 7404dacc8a5..9acfd19a7d6 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js @@ -287,10 +287,10 @@ const AccessibilityInfo = { * See https://reactnative.dev/docs/accessibilityinfo#prefersCrossFadeTransitions */ prefersCrossFadeTransitions(): Promise { - return new Promise((resolve, reject) => { - if (Platform.OS === 'android') { - return Promise.resolve(false); - } else { + if (Platform.OS === 'android') { + return Promise.resolve(false); + } else { + return new Promise((resolve, reject) => { if ( NativeAccessibilityManagerIOS?.getCurrentPrefersCrossFadeTransitionsState != null @@ -306,8 +306,8 @@ const AccessibilityInfo = { ), ); } - } - }); + }); + } }, /** @@ -448,7 +448,7 @@ const AccessibilityInfo = { * * See https://reactnative.dev/docs/accessibilityinfo#addeventlistener */ - addEventListener( + addEventListener( eventName: K, // $FlowFixMe[incompatible-type] - Flow bug with unions and generics (T128099423) handler: (...AccessibilityEventDefinitions[K]) => void, diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/Components/View/View.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/Components/View/View.win32.js index d881641e46d..914ac81a422 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/Components/View/View.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/Components/View/View.win32.js @@ -10,7 +10,12 @@ import type {ViewProps} from './ViewPropTypes'; +<<<<<<< Upstream +import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags'; +import TextAncestorContext from '../../Text/TextAncestorContext'; +======= import TextAncestor from '../../Text/TextAncestor'; +>>>>>>> Override import ViewNativeComponent from './ViewNativeComponent'; import * as React from 'react'; import invariant from 'invariant'; // [Windows] @@ -76,6 +81,103 @@ const View: component( const _accessibilityLabelledBy = ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy; +<<<<<<< Upstream + let resolvedProps = props; + if (!ReactNativeFeatureFlags.enableNativeViewPropTransformations()) { + const { + accessibilityState, + accessibilityValue, + 'aria-busy': ariaBusy, + 'aria-checked': ariaChecked, + 'aria-disabled': ariaDisabled, + 'aria-expanded': ariaExpanded, + 'aria-hidden': ariaHidden, + 'aria-label': ariaLabel, + 'aria-labelledby': ariaLabelledBy, + 'aria-live': ariaLive, + 'aria-selected': ariaSelected, + 'aria-valuemax': ariaValueMax, + 'aria-valuemin': ariaValueMin, + 'aria-valuenow': ariaValueNow, + 'aria-valuetext': ariaValueText, + id, + tabIndex, + ...otherProps + } = props; + + const processedProps = otherProps as {...ViewProps}; + + const parsedAriaLabelledBy = ariaLabelledBy?.split(/\s*,\s*/g); + if (parsedAriaLabelledBy !== undefined) { + processedProps.accessibilityLabelledBy = parsedAriaLabelledBy; + } + + if (ariaLabel !== undefined) { + processedProps.accessibilityLabel = ariaLabel; + } + + if (ariaLive !== undefined) { + processedProps.accessibilityLiveRegion = + ariaLive === 'off' ? 'none' : ariaLive; + } + + if (ariaHidden !== undefined) { + processedProps.accessibilityElementsHidden = ariaHidden; + if (ariaHidden === true) { + processedProps.importantForAccessibility = 'no-hide-descendants'; + } + } + + if (id !== undefined) { + processedProps.nativeID = id; + } + + if (tabIndex !== undefined) { + processedProps.focusable = !tabIndex; + } + + if ( + accessibilityState != null || + ariaBusy != null || + ariaChecked != null || + ariaDisabled != null || + ariaExpanded != null || + ariaSelected != null + ) { + processedProps.accessibilityState = { + busy: ariaBusy ?? accessibilityState?.busy, + checked: ariaChecked ?? accessibilityState?.checked, + disabled: ariaDisabled ?? accessibilityState?.disabled, + expanded: ariaExpanded ?? accessibilityState?.expanded, + selected: ariaSelected ?? accessibilityState?.selected, + }; + } + + if ( + accessibilityValue != null || + ariaValueMax != null || + ariaValueMin != null || + ariaValueNow != null || + ariaValueText != null + ) { + processedProps.accessibilityValue = { + max: ariaValueMax ?? accessibilityValue?.max, + min: ariaValueMin ?? accessibilityValue?.min, + now: ariaValueNow ?? accessibilityValue?.now, + text: ariaValueText ?? accessibilityValue?.text, + }; + } + + resolvedProps = processedProps; + } + + const actualView = + ref == null ? ( + + ) : ( + + ); +======= const _accessibilityState = accessibilityState != null || ariaBusy != null || @@ -214,6 +316,7 @@ const View: component( }); }; // Windows] +>>>>>>> Override return ( // [Windows diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/NativeComponent/BaseViewConfig.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/NativeComponent/BaseViewConfig.win32.js index 9da3aaa9226..8af7da5e5cd 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/NativeComponent/BaseViewConfig.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/NativeComponent/BaseViewConfig.win32.js @@ -216,7 +216,22 @@ const validAttributesForNonEventProps = { transformOrigin: true, accessibilityRole: true, accessibilityState: true, + 'aria-busy': true, + 'aria-checked': true, + 'aria-disabled': true, + 'aria-expanded': true, + 'aria-hidden': true, + 'aria-label': true, + 'aria-labelledby': true, + 'aria-live': true, + 'aria-selected': true, + 'aria-valuemax': true, + 'aria-valuemin': true, + 'aria-valuenow': true, + 'aria-valuetext': true, + tabIndex: true, nativeID: true, + id: true, pointerEvents: true, removeClippedSubviews: true, role: true, diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/Network/RCTNetworking.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/Network/RCTNetworking.win32.js index ec4720f9f46..a97c96dec1f 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/Network/RCTNetworking.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/Network/RCTNetworking.win32.js @@ -18,7 +18,7 @@ import {type RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinition import {type NativeResponseType} from './XMLHttpRequest'; const RCTNetworking = { - addListener( + addListener( eventType: K, listener: (...RCTNetworkingEventDefinitions[K]) => unknown, context?: unknown, diff --git a/packages/@react-native-windows/automation-channel/package.json b/packages/@react-native-windows/automation-channel/package.json index ee4260c9f06..7a09ec5e264 100644 --- a/packages/@react-native-windows/automation-channel/package.json +++ b/packages/@react-native-windows/automation-channel/package.json @@ -33,7 +33,7 @@ "just-scripts": "^1.3.2", "prettier": "^3.6.2", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-native-windows": "^0.0.0-canary.1058", "typescript": "5.0.4" }, diff --git a/packages/@react-native-windows/cli/package.json b/packages/@react-native-windows/cli/package.json index 832c25e6373..011efc8c7df 100644 --- a/packages/@react-native-windows/cli/package.json +++ b/packages/@react-native-windows/cli/package.json @@ -66,7 +66,7 @@ "jest": "^29.7.0", "prettier": "^3.6.2", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "typescript": "5.0.4" }, "peerDependencies": { diff --git a/packages/@react-native-windows/perf-testing/package.json b/packages/@react-native-windows/perf-testing/package.json index daec3e760ba..118a842f6a3 100644 --- a/packages/@react-native-windows/perf-testing/package.json +++ b/packages/@react-native-windows/perf-testing/package.json @@ -36,7 +36,7 @@ "peerDependencies": { "jest": ">=29.0.3", "react": ">=18.0.0", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-test-renderer": ">=18.0.0" }, "peerDependenciesMeta": { diff --git a/packages/@react-native-windows/tester/overrides.json b/packages/@react-native-windows/tester/overrides.json index d977e1b8ed8..a8308afb90c 100644 --- a/packages/@react-native-windows/tester/overrides.json +++ b/packages/@react-native-windows/tester/overrides.json @@ -5,7 +5,7 @@ "excludePatterns": [ "src/js/examples-win/**" ], - "baseVersion": "0.85.0-nightly-20260303-c26dbe286", + "baseVersion": "0.86.0-nightly-20260310-621592d1f", "overrides": [ { "type": "copy", @@ -24,7 +24,7 @@ "type": "derived", "file": "src/js/examples-win/Button/ButtonExample.windows.js", "baseFile": "packages/rn-tester/js/examples/Button/ButtonExample.js", - "baseHash": "e50ed3ad268f9a4d34cbb720650c53fad379e0fe" + "baseHash": "69d270a73a83ff51ba78d174600e50edd1fe2c42" }, { "type": "derived", @@ -36,7 +36,7 @@ "type": "patch", "file": "src/js/examples/ActivityIndicator/ActivityIndicatorExample.windows.js", "baseFile": "packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js", - "baseHash": "f8ef473352cc6bc67ef28df8eb1889d394d8e481", + "baseHash": "35832d0f01bfc434ce7ebadb4aeb6b6a4b21cc64", "issue": 12869 }, { @@ -85,7 +85,7 @@ "type": "patch", "file": "src/js/examples/Image/ImageExample.windows.js", "baseFile": "packages/rn-tester/js/examples/Image/ImageExample.js", - "baseHash": "b119f46dbe33a567e7649f7197874d5b066403aa", + "baseHash": "885ebdd53ac7f33e1fd4d81b4d41de15e530ebe9", "issue": 12869 }, { @@ -104,20 +104,20 @@ "type": "patch", "file": "src/js/examples/Pressable/PressableExample.windows.js", "baseFile": "packages/rn-tester/js/examples/Pressable/PressableExample.js", - "baseHash": "93996033b79921b0572adbbbe84d2422cf8f6ea7", + "baseHash": "e80fa7c12100c3744d39be075d3a09d5ac2466af", "issue": 6240 }, { "type": "derived", "file": "src/js/examples/Text/TextExample.windows.js", "baseFile": "packages/rn-tester/js/examples/Text/TextExample.android.js", - "baseHash": "ea9a9fec30ff987396c4be119eb4b38492a37e65" + "baseHash": "f69c13423c37eb7de8864b9c846249dce4e77d29" }, { "type": "patch", "file": "src/js/examples/Text/TextSharedExamples.windows.js", "baseFile": "packages/rn-tester/js/examples/Text/TextSharedExamples.js", - "baseHash": "66789820f73a9ea8f6044df08cef5726112cc8cd", + "baseHash": "b8ab41b7cf494708eebce6c6227fe066f247f2ce", "issue": 15125 }, { @@ -131,7 +131,7 @@ "type": "derived", "file": "src/js/examples/Touchable/TouchableExample.windows.js", "baseFile": "packages/rn-tester/js/examples/Touchable/TouchableExample.js", - "baseHash": "03b4d8b4c97e998cf488bfc889dcdc047378c306" + "baseHash": "d56cdb355fd6edfcec3ce22eef7ef50223f709ff" }, { "type": "patch", @@ -156,7 +156,7 @@ "type": "derived", "file": "src/js/utils/RNTesterList.windows.js", "baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js", - "baseHash": "d0b6e7eccdc020d76d263b3e88becfb565b4671d" + "baseHash": "6c9c1b36ee77323fa1b76235eaab9907ee7c733c" } ] } \ No newline at end of file diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json index 44308f712bb..3db2ed04eae 100644 --- a/packages/@react-native-windows/tester/package.json +++ b/packages/@react-native-windows/tester/package.json @@ -19,7 +19,7 @@ "peerDependencies": { "@react-native-picker/picker": "2.11.0", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-native-windows": "^0.0.0-canary.1058", "react-native-xaml": "^0.0.80" }, @@ -32,8 +32,9 @@ } }, "devDependencies": { - "@react-native/new-app-screen": "0.85.0-nightly-20260303-c26dbe286", - "@react-native/tester": "0.85.0-nightly-20260303-c26dbe286", + "@react-native-picker/picker": "2.11.0", + "@react-native/new-app-screen": "0.86.0-nightly-20260310-621592d1f", + "@react-native/tester": "0.86.0-nightly-20260310-621592d1f", "@rnw-scripts/babel-react-native-config": "0.0.0", "@rnw-scripts/eslint-config": "1.2.38", "@rnw-scripts/just-task": "2.3.58", @@ -43,7 +44,7 @@ "just-scripts": "^1.3.3", "prettier": "^3.6.2", "react": "19.2.3", - "react-native": "0.85.0-nightly-20260303-c26dbe286", + "react-native": "0.86.0-nightly-20260310-621592d1f", "react-native-platform-override": "0.0.0-canary.1023", "react-native-windows": "^0.0.0-canary.1058", "typescript": "5.0.4" diff --git a/packages/@react-native-windows/tester/src/js/examples-win/Button/ButtonExample.windows.js b/packages/@react-native-windows/tester/src/js/examples-win/Button/ButtonExample.windows.js index 7df0f59288c..e2757c7e9ac 100644 --- a/packages/@react-native-windows/tester/src/js/examples-win/Button/ButtonExample.windows.js +++ b/packages/@react-native-windows/tester/src/js/examples-win/Button/ButtonExample.windows.js @@ -30,6 +30,7 @@ exports.description = 'Simple React Native button component.'; exports.examples = [ { title: 'Button with default styling', + name: 'default-styling', render: function (): React.Node { return (