Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate RN Nightly 10/31 #12541

Merged
merged 5 commits into from
Dec 19, 2023
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 10/31",
"packageName": "@office-iss/react-native-win32",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 10/31",
"packageName": "@react-native-windows/automation-channel",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 10/31",
"packageName": "react-native-windows",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
13 changes: 3 additions & 10 deletions packages/@office-iss/react-native-win32-tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,19 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.74.0-nightly-20231016-44660019e",
"baseVersion": "0.74.0-nightly-20231031-572dd76ba",
"overrides": [
{
"type": "patch",
"file": "src/js/components/ListExampleShared.win32.js",
"baseFile": "packages/rn-tester/js/components/ListExampleShared.js",
"baseHash": "7bdaba03bf529cfb9920c1be2c8af1443fc628c9"
},
{
"type": "patch",
"file": "src/js/components/RNTesterEmptyBookmarksState.win32.js",
"baseFile": "packages/rn-tester/js/components/RNTesterEmptyBookmarksState.js",
"baseHash": "a1d1c6638e815f6dd53504983813fda92f3b5478",
"issue": 6341
},
{
"type": "patch",
"file": "src/js/components/RNTesterExampleFilter.win32.js",
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
"baseHash": "76f3d045c6f4cdbd1538735c7c923da66de6974c"
"baseHash": "3d9f0be3317ac705673daed4c75ec7a49a2f7652"
},
{
"type": "platform",
Expand All @@ -42,7 +35,7 @@
"type": "copy",
"file": "src/js/RNTesterApp.win32.js",
"baseFile": "packages/rn-tester/js/RNTesterApp.android.js",
"baseHash": "d517675a1da173a7d57ac87d0ea9efc08f05b50d",
"baseHash": "27a275e7409dc4b45503492d243607a2d93d55d5",
"issue": 4586
},
{
Expand Down
4 changes: 2 additions & 2 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.223",
"react": "18.0.0",
"react-native": "0.74.0-nightly-20231016-44660019e"
"react-native": "0.74.0-nightly-20231031-572dd76ba"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.223",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.74.0-nightly-20231016-44660019e",
"react-native": "0.74.0-nightly-20231031-572dd76ba",
"react-native-platform-override": "^1.9.17",
"typescript": "^4.9.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*
* @format
* @flow
* @flow strict-local
*/

import {AppRegistry} from 'react-native';
Expand Down

This file was deleted.

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 @@ -147,4 +147,4 @@ untyped-import
untyped-type-import

[version]
^0.218.0
^0.219.4
18 changes: 9 additions & 9 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"**/__snapshots__/**",
"src/rntypes/**"
],
"baseVersion": "0.74.0-nightly-20231016-44660019e",
"baseVersion": "0.74.0-nightly-20231031-572dd76ba",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "671a34717020278b7888dafa3b4fa88375e3d29b"
"baseHash": "55a2906a48f5d54bd1daf47d2b127ce2848199e9"
},
{
"type": "derived",
Expand All @@ -35,7 +35,7 @@
"type": "derived",
"file": "src/Libraries/Animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/Libraries/Animated/NativeAnimatedHelper.js",
"baseHash": "99fc31f856815c19024407d629e4a0762df9011e",
"baseHash": "8bca307f500feef9f3a9ca1ef784d4a87f61ca43",
"issue": 11041
},
{
Expand Down Expand Up @@ -92,7 +92,7 @@
"type": "patch",
"file": "src/Libraries/Components/Pressable/Pressable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
"baseHash": "6fb2aede8cff4c47e8e965fed9ed1a9d55d33cfc",
"baseHash": "63cc0b16c930ef07a0570d1b8e4abc51a77d06dc",
"issue": 6240
},
{
Expand Down Expand Up @@ -130,7 +130,7 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "4431d2d4ea39a5ce9b9fad8ed22c7896b77ca9d2"
"baseHash": "d12fe54e9da3be0b1003a5bc18fa3c6d09728564"
},
{
"type": "patch",
Expand Down Expand Up @@ -200,7 +200,7 @@
"type": "derived",
"file": "src/Libraries/Components/View/ViewAccessibility.d.ts",
"baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.d.ts",
"baseHash": "085982a44202765d099caf13785e8b4a42628d86"
"baseHash": "eafbdb8db89b98aafd23514173360e07a942d205"
},
{
"type": "derived",
Expand All @@ -212,13 +212,13 @@
"type": "derived",
"file": "src/Libraries/Components/View/ViewPropTypes.d.ts",
"baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.d.ts",
"baseHash": "91d96e475fc55da6c6456a240edbd650c1ca4a26"
"baseHash": "8a7908f1ebfde292f2d70f6672c96c05eb7397c8"
},
{
"type": "patch",
"file": "src/Libraries/Components/View/ViewPropTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js",
"baseHash": "2bbe617e19537c49c2cbd7abad16580e386f1d65",
"baseHash": "6eecfbf0d3028d1838463a66b3acbda6f9a2c651",
"issue": 6240
},
{
Expand Down Expand Up @@ -479,7 +479,7 @@
"type": "derived",
"file": "src/Libraries/Utilities/Dimensions.win32.js",
"baseFile": "packages/react-native/Libraries/Utilities/Dimensions.js",
"baseHash": "c37d2da5361a472af0c97e7c7a3ceba573b73d73"
"baseHash": "e2c1d4379abf083b11f3e853d160068ad6b55ba0"
},
{
"type": "platform",
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,14 +30,14 @@
"@react-native-community/cli-platform-android": "12.0.0-alpha.15",
"@react-native-community/cli-platform-ios": "12.0.0-alpha.15",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.74.0-nightly-20231016-44660019e",
"@react-native/codegen": "0.74.0-nightly-20231016-44660019e",
"@react-native/community-cli-plugin": "0.74.0-nightly-20231016-44660019e",
"@react-native/gradle-plugin": "0.74.0-nightly-20231016-44660019e",
"@react-native/js-polyfills": "0.74.0-nightly-20231016-44660019e",
"@react-native/assets-registry": "0.74.0-nightly-20231031-572dd76ba",
"@react-native/codegen": "0.74.0-nightly-20231031-572dd76ba",
"@react-native/community-cli-plugin": "0.74.0-nightly-20231031-572dd76ba",
"@react-native/gradle-plugin": "0.74.0-nightly-20231031-572dd76ba",
"@react-native/js-polyfills": "0.74.0-nightly-20231031-572dd76ba",
"@react-native/metro-config": "^0.73.0",
"@react-native/normalize-colors": "0.74.0-nightly-20231016-44660019e",
"@react-native/virtualized-lists": "0.74.0-nightly-20231016-44660019e",
"@react-native/normalize-colors": "0.74.0-nightly-20231031-572dd76ba",
"@react-native/virtualized-lists": "0.74.0-nightly-20231031-572dd76ba",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -50,8 +50,8 @@
"jest-environment-node": "^29.6.3",
"jsc-android": "^250231.0.0",
"memoize-one": "^5.0.0",
"metro-runtime": "0.79.1",
"metro-source-map": "0.79.1",
"metro-runtime": "^0.80.0",
"metro-source-map": "^0.80.0",
"mkdirp": "^0.5.1",
"nullthrows": "^1.1.1",
"pretty-format": "^26.5.2",
Expand Down Expand Up @@ -85,13 +85,13 @@
"just-scripts": "^1.3.3",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.74.0-nightly-20231016-44660019e",
"react-native": "0.74.0-nightly-20231031-572dd76ba",
"react-native-platform-override": "^1.9.17",
"typescript": "^4.9.5"
},
"peerDependencies": {
"react": "18.2.0",
"react-native": "0.74.0-nightly-20231016-44660019e"
"react-native": "0.74.0-nightly-20231031-572dd76ba"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ const useSingleOpBatching =
let flushQueueTimeout = null;

const eventListenerGetValueCallbacks: {
[$FlowFixMe | number]: ((value: number) => void) | void,
[number]: (value: number) => void,
} = {};
const eventListenerAnimationFinishedCallbacks: {
[$FlowFixMe | number]: EndCallback | void,
[number]: EndCallback,
} = {};
let globalEventEmitterGetValueListener: ?EventSubscription = null;
let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
Expand Down Expand Up @@ -341,7 +341,7 @@ const API = {
function setupGlobalEventEmitterListeners() {
globalEventEmitterGetValueListener = RCTDeviceEventEmitter.addListener(
'onNativeAnimatedModuleGetValue',
function (params) {
params => {
const {tag} = params;
const callback = eventListenerGetValueCallbacks[tag];
if (!callback) {
Expand All @@ -354,14 +354,17 @@ function setupGlobalEventEmitterListeners() {
globalEventEmitterAnimationFinishedListener =
RCTDeviceEventEmitter.addListener(
'onNativeAnimatedModuleAnimationFinished',
function (params) {
const {animationId} = params;
const callback = eventListenerAnimationFinishedCallbacks[animationId];
if (!callback) {
return;
params => {
// TODO: remove Array.isArray once native changes have propagated
const animations = Array.isArray(params) ? params : [params];
for (const animation of animations) {
const {animationId} = animation;
const callback = eventListenerAnimationFinishedCallbacks[animationId];
if (callback) {
callback(animation);
delete eventListenerAnimationFinishedCallbacks[animationId];
}
}
callback(params);
delete eventListenerAnimationFinishedCallbacks[animationId];
},
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import useAndroidRippleForView, {
type RippleConfig,
} from './useAndroidRippleForView';
import * as React from 'react';
import {useImperativeHandle, useMemo, useRef, useState} from 'react';
import {useMemo, useRef, useState} from 'react';
import type {HandledKeyboardEvent} from '../../Components/View/ViewPropTypes';
import View from '../View/View';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1086,8 +1086,8 @@ const emptyFunctionThatReturnsTrue = () => true;
* return (
* <TextInput
* {...this.props} // Inherit any props passed to it; e.g., multiline, numberOfLines below
* editable = {true}
* maxLength = {40}
* editable={true}
* maxLength={40}
* />
* );
* }
Expand All @@ -1111,8 +1111,8 @@ const emptyFunctionThatReturnsTrue = () => true;
* borderBottomWidth: 1 }}
* >
* <UselessTextInput
* multiline = {true}
* numberOfLines = {4}
* multiline={true}
* numberOfLines={4}
* onChangeText={(text) => this.setState({text})}
* value={this.state.text}
* />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class TouchableWin32WithoutFeedback extends React.Component<ITouchableWin32Witho
};

private readonly _touchableGetHitSlop = (): Insets => {
return this.props.hitSlop;
return this.props.hitSlop as Insets;
};

private readonly _touchableGetHighlightDelayMS = (): number => {
Expand Down
Loading