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 0.83.0-nightly-20250917-18cb4edfa",
"packageName": "@office-iss/react-native-win32",
"email": "66076509+vineethkuttan@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 0.83.0-nightly-20250917-18cb4edfa",
"packageName": "@react-native-windows/automation-channel",
"email": "66076509+vineethkuttan@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 0.83.0-nightly-20250917-18cb4edfa",
"packageName": "react-native-windows",
"email": "66076509+vineethkuttan@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.82.0-nightly-20250902-9731e8ebc",
"baseVersion": "0.83.0-nightly-20250917-18cb4edfa",
"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": "8cd219abae140e98f9578432954fc9ef62421308"
"baseHash": "aeb0275507e7c508cdf7c2ceec49f9e95ef4e1ec"
}
]
}
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 @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.305",
"react": "19.1.1",
"react-native": "0.82.0-nightly-20250902-9731e8ebc"
"react-native": "0.83.0-nightly-20250917-18cb4edfa"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.305",
Expand All @@ -30,11 +30,11 @@
"@types/node": "^22.14.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.82.0-nightly-20250902-9731e8ebc",
"react-native": "0.83.0-nightly-20250917-18cb4edfa",
"react-native-platform-override": "0.0.0-canary.1019",
"typescript": "5.0.4"
},
"engines": {
"node": ">= 22"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,16 @@ const APIs: Array<RNTesterModuleInfo> = ([
category: 'Basic',
module: require('../examples/TurboModule/TurboCxxModuleExample'),
},
// Basic check to detect the availability of the modern Performance API.
...(typeof performance.getEntries === 'function'
? [
{
key: 'PerformanceApiExample',
category: 'Basic',
module: require('../examples/Performance/PerformanceApiExample'),
},
]
: []),
...RNTesterListFbInternal.APIs,
]: Array<?RNTesterModuleInfo>).filter(Boolean);

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.280.0
^0.281.0
10 changes: 5 additions & 5 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.82.0-nightly-20250902-9731e8ebc",
"baseVersion": "0.83.0-nightly-20250917-18cb4edfa",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "c8bd25d4aa75328a2484c5c7b0b768c188a50b52"
"baseHash": "8a6739338afdae4cbcfad614e33e66ae2948f497"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "88aa62f2d86a810631bcbc871f45c28c53fceec7"
"baseHash": "02a8ea6efd164de036681159f18135cc3393cb21"
},
{
"type": "platform",
Expand Down Expand Up @@ -394,7 +394,7 @@
"type": "patch",
"file": "src-win/Libraries/Renderer/shims/ReactNativeTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js",
"baseHash": "9e91759d01c9a6d459c5781b357533f4ac8727a7",
"baseHash": "333afc05f5a42a5321196f5f7a14d14c8fd5dd0f",
"issue": 0
},
{
Expand Down Expand Up @@ -431,7 +431,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
"baseHash": "259a625b5f7cf3a70ecd4af6388d82d47f446e50",
"baseHash": "56a99244e10bd1833a3d048f2476c4500f59202d",
"issue": 7074
},
{
Expand Down
24 changes: 12 additions & 12 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.82.0-nightly-20250902-9731e8ebc",
"@react-native/codegen": "0.82.0-nightly-20250902-9731e8ebc",
"@react-native/community-cli-plugin": "0.82.0-nightly-20250902-9731e8ebc",
"@react-native/gradle-plugin": "0.82.0-nightly-20250902-9731e8ebc",
"@react-native/js-polyfills": "0.82.0-nightly-20250902-9731e8ebc",
"@react-native/normalize-colors": "0.82.0-nightly-20250902-9731e8ebc",
"@react-native/virtualized-lists": "0.82.0-nightly-20250902-9731e8ebc",
"@react-native/assets-registry": "0.83.0-nightly-20250917-18cb4edfa",
"@react-native/codegen": "0.83.0-nightly-20250917-18cb4edfa",
"@react-native/community-cli-plugin": "0.83.0-nightly-20250917-18cb4edfa",
"@react-native/gradle-plugin": "0.83.0-nightly-20250917-18cb4edfa",
"@react-native/js-polyfills": "0.83.0-nightly-20250917-18cb4edfa",
"@react-native/normalize-colors": "0.83.0-nightly-20250917-18cb4edfa",
"@react-native/virtualized-lists": "0.83.0-nightly-20250917-18cb4edfa",
"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.82.0-nightly-20250902-9731e8ebc",
"@react-native/metro-config": "0.83.0-nightly-20250917-18cb4edfa",
"@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 @@ -83,19 +83,19 @@
"@types/prop-types": "15.7.1",
"@types/react": "^19.0.0",
"eslint": "^8.19.0",
"flow-bin": "^0.280.0",
"flow-bin": "^0.281.0",
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.1.1",
"react-native": "0.82.0-nightly-20250902-9731e8ebc",
"react-native": "0.83.0-nightly-20250917-18cb4edfa",
"react-native-platform-override": "0.0.0-canary.1019",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^19.1.1",
"react": "^19.1.1",
"react-native": "0.82.0-nightly-20250902-9731e8ebc"
"react-native": "0.83.0-nightly-20250917-18cb4edfa"
},
"beachball": {
"defaultNpmTag": "canary",
Expand All @@ -112,4 +112,4 @@
"engines": {
"node": ">= 22"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -646,9 +646,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
const {onBlur, onFocus, ...eventHandlers} = usePressability(config);
const eventPhase = Object.freeze({Capturing: 1, Bubbling: 3});
const _keyDown = (event: KeyEvent) => {
if (props.keyDownEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of props.keyDownEvents) {
const keyDownEvents = props.keyDownEvents;
if (keyDownEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyDownEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -665,9 +665,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
};

const _keyUp = (event: KeyEvent) => {
if (props.keyUpEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of props.keyUpEvents) {
const keyUpEvents = props.keyUpEvents;
if (keyUpEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyUpEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -684,9 +684,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
};

const _keyDownCapture = (event: KeyEvent) => {
if (props.keyDownEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of props.keyDownEvents) {
const keyDownEvents = props.keyDownEvents;
if (keyDownEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyDownEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -703,9 +703,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
};

const _keyUpCapture = (event: KeyEvent) => {
if (props.keyUpEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of props.keyUpEvents) {
const keyUpEvents = props.keyUpEvents;
if (keyUpEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyUpEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ const View: component(
: undefined;

const _keyDown = (event: KeyEvent) => {
if (otherProps.keyDownEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of otherProps.keyDownEvents) {
const keyDownEvents = otherProps.keyDownEvents;
if (keyDownEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyDownEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -131,9 +131,9 @@ const View: component(
};

const _keyUp = (event: KeyEvent) => {
if (otherProps.keyUpEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of otherProps.keyUpEvents) {
const keyUpEvents = otherProps.keyUpEvents;
if (keyUpEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyUpEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -150,9 +150,9 @@ const View: component(
};

const _keyDownCapture = (event: KeyEvent) => {
if (otherProps.keyDownEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of otherProps.keyDownEvents) {
const keyDownEvents = otherProps.keyDownEvents;
if (keyDownEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyDownEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -169,9 +169,9 @@ const View: component(
};

const _keyUpCapture = (event: KeyEvent) => {
if (otherProps.keyUpEvents && event.isPropagationStopped() !== true) {
// $FlowFixMe - keyDownEvents was already checked to not be undefined
for (const el of otherProps.keyUpEvents) {
const keyUpEvents = otherProps.keyUpEvents;
if (keyUpEvents != null && event.isPropagationStopped() !== true) {
for (const el of keyUpEvents) {
if (
event.nativeEvent.code === el.code &&
event.nativeEvent.ctrlKey === Boolean(el.ctrlKey) &&
Expand All @@ -188,11 +188,13 @@ const View: component(
};

// [Windows
// $FlowFixMe - children typing
const childrenWithImportantForAccessibility = children => {
const childrenWithImportantForAccessibility = (
children: React.Node,
): React.Node => {
return React.Children.map(children, child => {
if (React.isValidElement(child)) {
// $FlowFixMe[incompatible-use]
// $FlowFixMe[prop-missing]
if (child.props.children) {
// $FlowFixMe[incompatible-call] - React.Children.map types child as mixed
// $FlowFixMe[incompatible-type]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -603,9 +603,9 @@ export default class Pressability {
this._isKeyDown
) {
const {onPressOut, onPress} = this._config;
// $FlowFixMe: PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
// $FlowFixMe[incompatible-type] PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
onPressOut && onPressOut(event);
// $FlowFixMe: PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
// $FlowFixMe[incompatible-type] PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
onPress && onPress(event);
}
// Native windows app clears the key pressed state when another key press interrupts the current
Expand All @@ -623,7 +623,7 @@ export default class Pressability {
) {
const {onPressIn} = this._config;
this._isKeyDown = true;
// $FlowFixMe: PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
// $FlowFixMe[incompatible-type] PressEvents don't mesh with keyboarding APIs. Keep legacy behavior of passing KeyEvents instead
onPressIn && onPressIn(event);
}
},
Expand Down Expand Up @@ -788,8 +788,8 @@ export default class Pressability {
}

// [Win32]
// $FlowFixMe - button typing
_isDefaultPressButton(button): boolean {
// $FlowFixMe[unclear-type] - button typing
_isDefaultPressButton(button: any): boolean {
return !button; // Treat 0 or undefined as default press
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,22 @@ const UIManagerJS: UIManagerJSInterface = {
for (const propName of Object.getOwnPropertyNames(
Object.getPrototypeOf(NativeUIManager),
)) {
// $FlowFixMe
// $FlowFixMe[incompatible-type]
UIManagerJS[propName] = NativeUIManager[propName];
}
// Windows]

/* $FlowFixMe(>=0.123.0 site=react_native_fb) This comment suppresses an error
/* $FlowFixMe[cannot-write] (>=0.123.0 site=react_native_fb) This comment suppresses an error
* found when Flow v0.123.0 was deployed. To see the error, delete this comment
* and run Flow. */
//const UIManagerJS = {
// ...NativeUIManager,
// $FlowFixMe
// $FlowFixMe[cannot-write]
UIManagerJS.getConstants = getConstants;
// },
// $FlowFixMe
// $FlowFixMe[cannot-write]
UIManagerJS.getViewManagerConfig = getViewManagerConfig;
// $FlowFixMe
// $FlowFixMe[cannot-write]
UIManagerJS.hasViewManagerConfig = (viewManagerName: string) =>
getViewManagerConfig(viewManagerName) != null;

Expand All @@ -130,7 +130,7 @@ UIManagerJS.hasViewManagerConfig = (viewManagerName: string) =>
// getViewManagerConfig is implemented on the JSI object, so we don't
// need to hook this unless we are running in webdebugger
if (!global.nativeCallSyncHook)
// $FlowFixMe
// $FlowFixMe[prop-missing]
NativeUIManager.getViewManagerConfig = UIManagerJS.getViewManagerConfig;

function lazifyViewManagerConfig(viewName: string) {
Expand Down Expand Up @@ -199,7 +199,7 @@ if (!global.nativeCallSyncHook) {
`Accessing view manager configs directly off UIManager via UIManager['${viewManagerName}'] ` +
`is no longer supported. Use UIManager.getViewManagerConfig('${viewManagerName}') instead.`,
);
// $FlowFixMe
// $FlowFixMe[incompatible-return]
return UIManagerJS.getViewManagerConfig(viewManagerName);
},
});
Expand Down
Loading
Loading