Skip to content

Commit

Permalink
Integrate RN Nightly 10/31 (#14152)
Browse files Browse the repository at this point in the history
* Integrate 10/31

* Change files

* remove usage of react::MountingCoordinator::Shared

* resolve EventBeat and CoreFeatures changes

* apply feedback and fix typos

* fix snapshot and test

* fix override

* fix formatting and snapshot

* update text e2e tests

* fix linting and snapshots

* fix linting
  • Loading branch information
Yajur-Grover authored Dec 5, 2024
1 parent 0917e00 commit 40c1c59
Show file tree
Hide file tree
Showing 70 changed files with 1,267 additions and 502 deletions.
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": "yajurgrover24@gmail.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": "yajurgrover24@gmail.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": "yajurgrover24@gmail.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.77.0-nightly-20241020-e7a3f479f",
"baseVersion": "0.77.0-nightly-20241031-3a01a0c9c",
"overrides": [
{
"type": "patch",
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.273",
"react": "18.0.0",
"react-native": "0.77.0-nightly-20241020-e7a3f479f"
"react-native": "0.77.0-nightly-20241031-3a01a0c9c"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.273",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native": "0.77.0-nightly-20241031-3a01a0c9c",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
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 @@ -160,4 +160,4 @@ untyped-import
untyped-type-import

[version]
^0.250.0
^0.251.1
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.77.0-nightly-20241020-e7a3f479f",
"baseVersion": "0.77.0-nightly-20241031-3a01a0c9c",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "d824685eb9983c3aecb6d8207eeb0312f3d5a743"
"baseHash": "16d33187350d986e6c2fd343ff06f8f1c6f64ebf"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "2c80856075b7979d9119fb5e2b4b66b43456c068"
"baseHash": "5f0532348ca7440731478ef5b119a3a569529a7f"
},
{
"type": "platform",
Expand Down Expand Up @@ -304,7 +304,7 @@
"type": "patch",
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js",
"baseHash": "9e394821ea51994288aa4626d0fdff7aae1aa0a1",
"baseHash": "c4a8a3591ffb65360237708c9fb919408835cb76",
"issue": 7952
},
{
Expand Down Expand Up @@ -414,7 +414,7 @@
"type": "patch",
"file": "src-win/Libraries/StyleSheet/StyleSheet.win32.js",
"baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js",
"baseHash": "acf84f21e80cce08afd0a56a2f79690641c7228e"
"baseHash": "46f00f057f504c71fa0feb5695307e3e3806211b"
},
{
"type": "derived",
Expand Down
18 changes: 9 additions & 9 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": "15.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/codegen": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/community-cli-plugin": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/gradle-plugin": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/js-polyfills": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/normalize-colors": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/virtualized-lists": "0.77.0-nightly-20241020-e7a3f479f",
"@react-native/assets-registry": "0.77.0-nightly-20241031-3a01a0c9c",
"@react-native/codegen": "0.77.0-nightly-20241031-3a01a0c9c",
"@react-native/community-cli-plugin": "0.77.0-nightly-20241031-3a01a0c9c",
"@react-native/gradle-plugin": "0.77.0-nightly-20241031-3a01a0c9c",
"@react-native/js-polyfills": "0.77.0-nightly-20241031-3a01a0c9c",
"@react-native/normalize-colors": "0.77.0-nightly-20241031-3a01a0c9c",
"@react-native/virtualized-lists": "0.77.0-nightly-20241031-3a01a0c9c",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -90,14 +90,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native": "0.77.0-nightly-20241031-3a01a0c9c",
"react-native-platform-override": "^1.9.49",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241020-e7a3f479f"
"react-native": "0.77.0-nightly-20241031-3a01a0c9c"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,7 @@ function InternalTextInput(props: Props): React.Node {
mostRecentEventCount,
selection,
text,
// $FlowFixMe[incompatible-call]
viewCommands,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
import requireNativeComponent from '../../ReactNative/requireNativeComponent';
import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
import type {TextInputNativeCommands} from './TextInputNativeCommands';

// $FlowFixMe[incompatible-type-arg]
type NativeType = HostComponent<mixed>;

type NativeCommands = TextInputNativeCommands<NativeType>;
Expand All @@ -17,6 +19,7 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
});

const WindowsTextInputComponent: NativeType =
// $FlowFixMe[incompatible-call]
requireNativeComponent<mixed>('RCTTextInput');

export default WindowsTextInputComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import warnOnce from '../../Utilities/warnOnce';
* Basic View component with additional Win32 specific functionality
*/

// $FlowFixMe[prop-missing]
const ViewWin32: React.AbstractComponent<
ViewProps,
React.ElementRef<typeof View>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type Props = $ReadOnly<{
level: LogLevel,
}>;

const LogBoxInspectorHeaderSafeArea: React.AbstractComponent<ViewProps> =
const LogBoxInspectorHeaderSafeArea: React.ComponentType<ViewProps> =
Platform.OS === 'android' ? View : SafeAreaView;

export default function LogBoxInspectorHeader(props: Props): React.Node {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,13 @@ if (hairlineWidth === 0) {
hairlineWidth = 1 / PixelRatio.get();
}

const absoluteFill = {
const absoluteFill: {
+bottom: 0,
+left: 0,
+position: 'absolute',
+right: 0,
+top: 0,
} = {
position: 'absolute',
left: 0,
right: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ module.exports = {
get processColor(): processColor {
return require('./Libraries/StyleSheet/processColor').default;
},
get requireNativeComponent(): <T>(
get requireNativeComponent(): <T: {...}>(
uiViewClassName: string,
) => HostComponent<T> {
return require('./Libraries/ReactNative/requireNativeComponent').default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native": "0.77.0-nightly-20241031-3a01a0c9c",
"react-native-windows": "^0.0.0-canary.898",
"typescript": "5.0.4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-native-windows/tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.77.0-nightly-20241020-e7a3f479f",
"baseVersion": "0.77.0-nightly-20241031-3a01a0c9c",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -64,7 +64,7 @@
"type": "derived",
"file": "src/js/examples/Text/TextExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/Text/TextExample.android.js",
"baseHash": "a424cc0287a78d55f78de8c19cbde0f4ba56d28e"
"baseHash": "4a4b00574c473a730168785dc0ec9dfa3f89f5e5"
},
{
"type": "patch",
Expand All @@ -77,7 +77,7 @@
"type": "derived",
"file": "src/js/examples/Touchable/TouchableExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/Touchable/TouchableExample.js",
"baseHash": "19ff0caab9ea1a766b7c72566c4b08e7aaf338c1"
"baseHash": "fdc30510eb983f28aaf6beba11b9e52c06493ff5"
},
{
"type": "patch",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native": "0.77.0-nightly-20241031-3a01a0c9c",
"react-native-windows": "^0.0.0-canary.898",
"react-native-xaml": "^0.0.78"
},
Expand All @@ -32,7 +32,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.77.0-nightly-20241020-e7a3f479f",
"react-native": "0.77.0-nightly-20241031-3a01a0c9c",
"react-native-platform-override": "^1.9.49",
"react-native-windows": "^0.0.0-canary.898",
"typescript": "5.0.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -895,13 +895,66 @@ function CustomFontsExample(props: {}): React.Node {

function LineHeightExample(props: {}): React.Node {
return (
<View testID={'text-line-height'}>
<Text style={[{lineHeight: 35}, styles.wrappedText]}>
<>
<Text
style={[
{
fontSize: 16,
lineHeight: 35,
borderColor: 'black',
borderWidth: 1,
marginBottom: 5,
},
styles.wrappedText,
]}
testID={'line-height-greater-than-font-size'}>
Holisticly formulate inexpensive ideas before best-of-breed benefits.{' '}
<Text style={{fontSize: 20}}>Continually</Text> expedite magnetic
potentialities rather than client-focused interfaces.
</Text>
</View>
<Text
style={[
{
fontSize: 16,
lineHeight: 8,
borderColor: 'black',
borderWidth: 1,
marginBottom: 5,
},
styles.wrappedText,
]}
testID="line-height-less-than-font-size">
Holisticly formulate inexpensive ideas before best-of-breed benefits.{' '}
<Text style={{fontSize: 20}}>Continually</Text> expedite magnetic
potentialities rather than client-focused interfaces.
</Text>
<Text
style={[
{
fontSize: 24,
lineHeight: 8,
borderColor: 'black',
borderWidth: 1,
},
styles.wrappedText,
]}
testID="line-height-single-line-less-than-font-size">
Holisticly formulate
</Text>
<Text
style={[
{
fontSize: 16,
lineHeight: 20,
borderColor: 'black',
borderWidth: 1,
},
styles.wrappedText,
]}
testID="line-height-single-line-greater-than-font-size">
Holisticly formulate
</Text>
</>
);
}

Expand Down
Loading

0 comments on commit 40c1c59

Please sign in to comment.