Skip to content
Closed
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
Expand Up @@ -5,13 +5,13 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.81.0-nightly-20250709-6892dde36",
"baseVersion": "0.82.0-nightly-20250819-25104de5c",
"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"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250819-25104de5c",
"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,15 @@ const Components: Array<RNTesterModuleInfo> = [
category: 'Basic',
module: require('../examples/Performance/PerformanceComparisonExample'),
},
<<<<<<< Upstream
=======
/*
{
key: 'OSSLibraryExample',
module: require('../examples/OSSLibraryExample/OSSLibraryExample'),
},
*/
>>>>>>> Override
...RNTesterListFbInternal.Components,
];

Expand Down Expand Up @@ -374,14 +376,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
9 changes: 5 additions & 4 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,8 @@ module.system.haste.module_ref_prefix=m#

react.runtime=automatic

suppress_type=$FlowIssue
experimental.error_code_migration=new
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FlowFixMeEmpty

ban_spread_key_props=true

Expand All @@ -180,4 +177,8 @@ untyped-import
untyped-type-import

[version]
<<<<<<< Upstream
^0.279.0
=======
^0.274.2
>>>>>>> Override
38 changes: 19 additions & 19 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-20250819-25104de5c",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "a5a50b87e779ba343919454cb5f7c1e77c2db982"
"baseHash": "85187f6c2ae01185505e2dc8d14587e9e887e519"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "c5d0dfd40d0fb7c197790b1f23f4f8b9ca835047"
"baseHash": "88aa62f2d86a810631bcbc871f45c28c53fceec7"
},
{
"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": "b77b87e32a86265a3c8c29ebbbee46558596aec8"
},
{
"type": "copy",
Expand All @@ -60,7 +60,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/Button.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Button.js",
"baseHash": "5b293a6dbfdf16309c7cbfe71d61f143fa9fa2a2"
"baseHash": "26d3afc77f82939021f848eb8185b3b441fb3c7d"
},
{
"type": "platform",
Expand All @@ -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": "ed5d48ce62056182bf81dfa2d22d511d611d5201"
},
{
"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 @@ -218,7 +218,7 @@
"type": "patch",
"file": "src-win/Libraries/Core/Devtools/loadBundleFromServer.win32.js",
"baseFile": "packages/react-native/Libraries/Core/Devtools/loadBundleFromServer.js",
"baseHash": "ac08c96a4bebd677597a40ea1525a2d5d1ee8742",
"baseHash": "5177ecc736e9bebd4e798dcc2c6dd19c38b0a937",
"issue": 12704
},
{
Expand Down Expand Up @@ -309,7 +309,7 @@
"type": "derived",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
"baseHash": "987653809d7838bb80d3a975abc9f0fd3bc13d93"
"baseHash": "ccbfc8413dc7bd26eb7bc9726b273f1cf23b1c70"
},
{
"type": "derived",
Expand All @@ -335,7 +335,7 @@
"type": "copy",
"file": "src-win/Libraries/Network/RCTNetworking.win32.js",
"baseFile": "packages/react-native/Libraries/Network/RCTNetworking.ios.js",
"baseHash": "975cb78ed40d162be73144bafcaee9bcd057bd44",
"baseHash": "1c7dcc3e3cf7339c3450e7722b7b0a355266a001",
"issue": 4318
},
{
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 @@ -425,13 +425,13 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "fb6f5390b49eb22085ac1618becde3a5208ba167"
"baseHash": "14367e55fca8889783f7dea94ec2c09205960c3c"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
"baseHash": "4af82705ca22b281344c1e7f0c7b06b6fc3264c5",
"baseHash": "259a625b5f7cf3a70ecd4af6388d82d47f446e50",
"issue": 7074
},
{
Expand Down Expand Up @@ -478,26 +478,26 @@
"type": "derived",
"file": "src-win/Libraries/Utilities/Platform.win32.js",
"baseFile": "packages/react-native/Libraries/Utilities/Platform.android.js",
"baseHash": "d3c78d9d5e43a65ec67505b84a1f25f1647530c8"
"baseHash": "6497ec623691b34885e226e4d05bc55ba582a135"
},
{
"type": "patch",
"file": "src-win/Libraries/Utilities/PlatformTypes.js",
"baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
"baseHash": "c2f607691db07cf1d43c42d048e8513b5515757b",
"baseHash": "f4859039e2bf991ff60d38308c25456ec752191f",
"issue": 14686
},
{
"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": "c3fdc3d1e9879c6fe03a1a5caad7b02b386ddcde",
"issue": 11041
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"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-20250819-25104de5c",
"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 @@ -420,13 +420,13 @@ 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);
return deviceEventName == null
? {remove(): void {}}
: // $FlowFixMe[incompatible-call]
: // $FlowFixMe[incompatible-type]
RCTDeviceEventEmitter.addListener(deviceEventName, handler);
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ const Button: component(
touchSoundDisabled={touchSoundDisabled}
// $FlowFixMe[incompatible-exact]
// $FlowFixMe[prop-missing]
// $FlowFixMe[incompatible-type-arg]
// $FlowFixMe[incompatible-type]
ref={ref}>
<View style={buttonStyles}>
<Text style={textStyles} disabled={disabled}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ type PressableBaseProps = $ReadOnly<{
onPressOut?: ?(event: GestureResponderEvent) => mixed,

/**
<<<<<<< Upstream
* Whether to prevent any other native components from becoming responder
* while this pressable is responder.
*/
blockNativeResponder?: ?boolean,
=======
* Called after the element loses focus.
*/
onBlur?: ?(event: BlurEvent) => mixed,
Expand Down Expand Up @@ -161,6 +167,7 @@ type PressableBaseProps = $ReadOnly<{
* Called in the tunneling phase after a key up event is detected.
*/
onKeyUpCapture?: ?(event: KeyEvent) => void,
>>>>>>> Override

/**
* Either view styles or a function that receives a boolean reflecting whether
Expand Down Expand Up @@ -231,6 +238,7 @@ function Pressable({
'aria-multiselectable': ariaMultiselectable, // Win32
'aria-required': ariaRequired, // Win32
'aria-selected': ariaSelected,
blockNativeResponder,
cancelable,
children,
delayHoverIn,
Expand Down Expand Up @@ -290,7 +298,7 @@ function Pressable({
};

const accessibilityLiveRegion =
ariaLive === 'off' ? 'none' : ariaLive ?? props.accessibilityLiveRegion;
ariaLive === 'off' ? 'none' : (ariaLive ?? props.accessibilityLiveRegion);

const accessibilityLabel = ariaLabel ?? props.accessibilityLabel;
const restPropsWithDefaults: React.ElementConfig<typeof View> = {
Expand Down Expand Up @@ -348,14 +356,19 @@ function Pressable({
onPressOut(event);
}
},
<<<<<<< Upstream
blockNativeResponder,
=======
// [Windows
onKeyDown,
onKeyUp,
// Windows]
>>>>>>> Override
}),
[
android_disableSound,
android_rippleConfig,
blockNativeResponder,
cancelable,
delayHoverIn,
delayHoverOut,
Expand Down
Loading