Skip to content
Draft
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
3 changes: 3 additions & 0 deletions .ado/templates/prep-and-pack-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ steps:
artifact: ${{ parameters.artifactName2 }}.${{ slice.platform }}.${{ slice.configuration }}
path: ${{parameters.nugetroot}}/${{ parameters.artifactName2 }}/${{ slice.platform }}/${{ slice.configuration }}

- pwsh: yarn build
displayName: Run yarn build

- task: PowerShell@2
displayName: Copy MSRN Resources to NuGet layout
inputs:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 0.82.0-nightly-20250806-5936f29d6",
"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 0.82.0-nightly-20250806-5936f29d6",
"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": "patch",
"comment": "Integrate 0.82.0-nightly-20250806-5936f29d6",
"packageName": "@rnw-scripts/integrate-rn",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 0.82.0-nightly-20250806-5936f29d6",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.81.0-nightly-20250709-6892dde36",
"baseVersion": "0.82.0-nightly-20250806-5936f29d6",
"overrides": [
{
"type": "patch",
"file": "src/js/components/ListExampleShared.win32.js",
"baseFile": "packages/rn-tester/js/components/ListExampleShared.js",
"baseHash": "885ca16a7587f79d6404679ee1b1309d3844afe9"
"baseHash": "5eddedbaff0a785757713beb25750aac98e40fcb"
},
{
"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": "c89e65c8063b338c86ec9db173b05b96c589f69e"
"baseHash": "8cd219abae140e98f9578432954fc9ef62421308"
}
]
}
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.80.0-main",
"@react-native/tester": "0.82.0-main",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"flow-enums-runtime": "^0.0.6"
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.298",
"react": "19.1.0",
"react-native": "0.81.0-nightly-20250709-6892dde36"
"react-native": "0.82.0-nightly-20250806-5936f29d6"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.298",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^22.14.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.81.0-nightly-20250709-6892dde36",
"react-native": "0.82.0-nightly-20250806-5936f29d6",
"react-native-platform-override": "^1.9.59",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ const LoadingComponent: React.ComponentType<{}> = memo(() => (
</View>
));

class ItemSeparatorComponent extends React.PureComponent<$FlowFixMeProps> {
class ItemSeparatorComponent extends React.PureComponent<$FlowFixMe> {
render(): React.Node {
const style = this.props.highlighted
? [
Expand All @@ -183,7 +183,7 @@ class ItemSeparatorComponent extends React.PureComponent<$FlowFixMeProps> {
}
}

class Spindicator extends React.PureComponent<$FlowFixMeProps> {
class Spindicator extends React.PureComponent<$FlowFixMe> {
render(): React.Node {
return (
<Animated.View
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import type {RNTesterModule, RNTesterModuleInfo} from '../types/RNTesterTypes';

import * as RNTesterListFbInternal from './RNTesterListFbInternal';
import ReactNativeFeatureFlags from 'react-native/Libraries/ReactNative/ReactNativeFeatureFlags';

const Components: Array<RNTesterModuleInfo> = [
/*{
Expand Down Expand Up @@ -154,12 +153,6 @@ const Components: Array<RNTesterModuleInfo> = [
category: 'Basic',
module: require('../examples/Performance/PerformanceComparisonExample'),
},
/*
{
key: 'OSSLibraryExample',
module: require('../examples/OSSLibraryExample/OSSLibraryExample'),
},
*/
...RNTesterListFbInternal.Components,
];

Expand Down Expand Up @@ -374,14 +367,6 @@ const APIs: Array<RNTesterModuleInfo> = ([
...RNTesterListFbInternal.APIs,
]: Array<?RNTesterModuleInfo>).filter(Boolean);

if (ReactNativeFeatureFlags.shouldEmitW3CPointerEvents()) {
APIs.push({
key: 'W3C PointerEvents',
category: 'Experimental',
module: require('../examples/Experimental/W3CPointerEventsExample').default,
});
}

const Playgrounds: Array<RNTesterModuleInfo> = [
{
key: 'PlaygroundExample',
Expand Down
6 changes: 1 addition & 5 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ module.system.haste.module_ref_prefix=m#

react.runtime=automatic

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FlowFixMeEmpty

ban_spread_key_props=true

Expand All @@ -180,4 +176,4 @@ untyped-import
untyped-type-import

[version]
^0.274.2
^0.278.0
22 changes: 11 additions & 11 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.81.0-nightly-20250709-6892dde36",
"baseVersion": "0.82.0-nightly-20250806-5936f29d6",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "a5a50b87e779ba343919454cb5f7c1e77c2db982"
"baseHash": "373bd1b0dfbd85e02605d9526e7b08b41a67435f"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "c5d0dfd40d0fb7c197790b1f23f4f8b9ca835047"
"baseHash": "e4e8dc864521ce28adf8cfa2fb29059484206a05"
},
{
"type": "platform",
Expand All @@ -41,7 +41,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js",
"baseFile": "packages/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js",
"baseHash": "5a43c9cf537c5cb89e7f634e45be708f4b021493"
"baseHash": "692b825d9db6a6da9c3ae9595e4dfb5c202b879d"
},
{
"type": "copy",
Expand Down Expand Up @@ -85,7 +85,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
"baseHash": "5909b509ee835f2b6eb0dbd3e223180efe602f98",
"baseHash": "08a6e1c0dd895af70ea1c8448a3be028d9cd2587",
"issue": 6240
},
{
Expand Down Expand Up @@ -114,7 +114,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "b6289ef53abc941f6f0aed50f80d3852b6682215"
"baseHash": "d6f92b47afedf2e31f4066e50c2900477c4d6c31"
},
{
"type": "patch",
Expand Down Expand Up @@ -153,7 +153,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
"baseHash": "5608d67cf2684b855fb32403fea01b8c22c66f3b"
"baseHash": "2ded2efb727d7544aa8a0b249dd3f2502bb57129"
},
{
"type": "platform",
Expand All @@ -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": "83a4fc8e982845619abb121bb860ad63366260c7"
"baseHash": "60eab5df574b43200494005fc3f00d11576d515b"
},
{
"type": "derived",
Expand Down Expand Up @@ -365,7 +365,7 @@
"type": "patch",
"file": "src-win/Libraries/Pressability/Pressability.win32.js",
"baseFile": "packages/react-native/Libraries/Pressability/Pressability.js",
"baseHash": "54f2a508c9378c1d9240ff27a460a8815e2b8ebd",
"baseHash": "a4205b3bea276e65da3ce0aeb6753bc8e7c5ead0",
"issue": 6240
},
{
Expand Down Expand Up @@ -491,13 +491,13 @@
"type": "copy",
"file": "src-win/Libraries/Utilities/useMergeRefs.js",
"baseFile": "packages/react-native/Libraries/Utilities/useMergeRefs.js",
"baseHash": "4ba42e1b43ef55a1a9e3095336979fa712f4dc8d"
"baseHash": "4ab145e150c82f4f82547122896e02f45103d1a1"
},
{
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "8ed20ecc1b2a1967539fee0d53a47f25432746f4",
"baseHash": "ecb4418a11a56257962be8ca273d3dbfb7d9862c",
"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": "17.0.0",
"@react-native-community/cli-platform-ios": "17.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.81.0-nightly-20250709-6892dde36",
"@react-native/codegen": "0.81.0-nightly-20250709-6892dde36",
"@react-native/community-cli-plugin": "0.81.0-nightly-20250709-6892dde36",
"@react-native/gradle-plugin": "0.81.0-nightly-20250709-6892dde36",
"@react-native/js-polyfills": "0.81.0-nightly-20250709-6892dde36",
"@react-native/normalize-colors": "0.81.0-nightly-20250709-6892dde36",
"@react-native/virtualized-lists": "0.81.0-nightly-20250709-6892dde36",
"@react-native/assets-registry": "0.82.0-nightly-20250806-5936f29d6",
"@react-native/codegen": "0.82.0-nightly-20250806-5936f29d6",
"@react-native/community-cli-plugin": "0.82.0-nightly-20250806-5936f29d6",
"@react-native/gradle-plugin": "0.82.0-nightly-20250806-5936f29d6",
"@react-native/js-polyfills": "0.82.0-nightly-20250806-5936f29d6",
"@react-native/normalize-colors": "0.82.0-nightly-20250806-5936f29d6",
"@react-native/virtualized-lists": "0.82.0-nightly-20250806-5936f29d6",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -72,7 +72,7 @@
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@react-native/metro-config": "0.81.0-nightly-20250709-6892dde36",
"@react-native/metro-config": "0.82.0-nightly-20250806-5936f29d6",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.37",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.41",
Expand All @@ -83,19 +83,19 @@
"@types/prop-types": "15.7.1",
"@types/react": "^19.0.0",
"eslint": "^8.19.0",
"flow-bin": "^0.272.0",
"flow-bin": "^0.278.0",
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.1.0",
"react-native": "0.81.0-nightly-20250709-6892dde36",
"react-native": "0.82.0-nightly-20250806-5936f29d6",
"react-native-platform-override": "^1.9.59",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^19.1.0",
"react": "^19.1.0",
"react-native": "0.81.0-nightly-20250709-6892dde36"
"react-native": "0.82.0-nightly-20250806-5936f29d6"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ const AccessibilityInfo = {
*/
addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
eventName: K,
// $FlowIssue[incompatible-type] - Flow bug with unions and generics (T128099423)
// $FlowFixMe[incompatible-type] - Flow bug with unions and generics (T128099423)
handler: (...AccessibilityEventDefinitions[K]) => void,
): EventSubscription {
const deviceEventName = EventNames.get(eventName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ type PressableBaseProps = $ReadOnly<{
*/
onPressOut?: ?(event: GestureResponderEvent) => mixed,

/**
* Whether to prevent any other native components from becoming responder
* while this pressable is responder.
*/
blockNativeResponder?: ?boolean,

/**
* Called after the element loses focus.
*/
Expand Down Expand Up @@ -231,6 +237,7 @@ function Pressable({
'aria-multiselectable': ariaMultiselectable, // Win32
'aria-required': ariaRequired, // Win32
'aria-selected': ariaSelected,
blockNativeResponder,
cancelable,
children,
delayHoverIn,
Expand Down Expand Up @@ -348,6 +355,7 @@ function Pressable({
onPressOut(event);
}
},
blockNativeResponder,
// [Windows
onKeyDown,
onKeyUp,
Expand All @@ -356,6 +364,7 @@ function Pressable({
[
android_disableSound,
android_rippleConfig,
blockNativeResponder,
cancelable,
delayHoverIn,
delayHoverOut,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,8 @@ const TextInput: component(
}
autoComplete={
Platform.OS === 'android'
? // $FlowFixMe
? // $FlowFixMe[invalid-computed-prop]
// $FlowFixMe[prop-missing]
autoCompleteWebToAutoCompleteAndroidMap[autoComplete] ??
autoComplete
: undefined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import type {
MouseEvent,
} from '../Types/CoreEventTypes';

import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
import SoundManager from '../Components/Sound/SoundManager';
import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
import UIManager from '../ReactNative/UIManager';
import {type RectOrSize, normalizeRect} from '../StyleSheet/Rect';
import {type PointerEvent} from '../Types/CoreEventTypes';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function useMergeRefs<Instance>(
return undefined;
} else {
if (typeof ref === 'function') {
// $FlowIssue[incompatible-type] - Flow does not understand ref cleanup.
// $FlowFixMe[incompatible-type] - Flow does not understand ref cleanup.
const cleanup: void | (() => void) = ref(current);
return typeof cleanup === 'function'
? cleanup
Expand Down
Loading
Loading