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

Integration 04/13/24 (1b152f6ec) #13226

Merged
merged 13 commits into from
May 14, 2024
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": "0413 integration",
"packageName": "@office-iss/react-native-win32",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "0413 integration",
"packageName": "@react-native-windows/automation-channel",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "0413 integration",
"packageName": "@rnw-scripts/eslint-config",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "0413 integration",
"packageName": "react-native-windows",
"email": "email not defined",
"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.75.0-nightly-20240406-a05466c5b",
"baseVersion": "0.75.0-nightly-20240413-1b152f6ec",
"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": "3ca30c3da9875e8f01acfdb575658d9996243185"
"baseHash": "c40d0a03a89b9017cbb08a0449d5a0c32cadc5f2"
}
]
}
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.245",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240406-a05466c5b"
"react-native": "0.75.0-nightly-20240413-1b152f6ec"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.245",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-nightly-20240406-a05466c5b",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native-platform-override": "^1.9.32",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ const Components: Array<RNTesterModuleInfo> = [
category: 'Basic',
module: require('../examples/Performance/PerformanceComparisonExample'),
},
/*
{
key: 'OSSLibraryExample',
module: require('../examples/OSSLibraryExample/OSSLibraryExample'),
},
*/
];

const APIs: Array<RNTesterModuleInfo> = ([
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 @@ -154,4 +154,4 @@ untyped-import
untyped-type-import

[version]
^0.232.0
^0.233.0
4 changes: 2 additions & 2 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-win/rntypes/**"
],
"baseVersion": "0.75.0-nightly-20240406-a05466c5b",
"baseVersion": "0.75.0-nightly-20240413-1b152f6ec",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "47a3426b7d1053a171e1ee1c56120e0e2f1ce887"
"baseHash": "207887dce4d232e4ded4dbeefe4188766b24144a"
},
{
"type": "derived",
Expand Down
21 changes: 11 additions & 10 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": "14.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "14.0.0-alpha.2",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/codegen": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/community-cli-plugin": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/gradle-plugin": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/js-polyfills": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/normalize-colors": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/virtualized-lists": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/assets-registry": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/codegen": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/community-cli-plugin": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/gradle-plugin": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/js-polyfills": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/normalize-colors": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/virtualized-lists": "0.75.0-nightly-20240413-1b152f6ec",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -61,6 +61,7 @@
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
"scheduler": "0.24.0-canary-efb381bbf-20230505",
"semver": "^7.1.3",
"stacktrace-parser": "^0.1.10",
"whatwg-fetch": "^3.0.0",
"ws": "^6.2.2",
Expand All @@ -69,7 +70,7 @@
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
"@react-native/metro-config": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/metro-config": "0.75.0-nightly-20240413-1b152f6ec",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.15",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.19",
Expand All @@ -85,14 +86,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.2.0",
"react-native": "0.75.0-nightly-20240406-a05466c5b",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native-platform-override": "^1.9.32",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "18.2.0",
"react-native": "0.75.0-nightly-20240406-a05466c5b"
"react-native": "0.75.0-nightly-20240413-1b152f6ec"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "18.2.0",
"react-native": "0.75.0-nightly-20240406-a05466c5b",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native-windows": "^0.0.0-canary.815",
"typescript": "5.0.4"
},
Expand Down
4 changes: 2 additions & 2 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.75.0-nightly-20240406-a05466c5b",
"baseVersion": "0.75.0-nightly-20240413-1b152f6ec",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -78,7 +78,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.windows.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "3ca30c3da9875e8f01acfdb575658d9996243185"
"baseHash": "c40d0a03a89b9017cbb08a0449d5a0c32cadc5f2"
}
]
}
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 @@ -18,7 +18,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.75.0-nightly-20240406-a05466c5b",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native-windows": "^0.0.0-canary.815",
"react-native-xaml": "^0.0.78"
},
Expand All @@ -31,7 +31,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-nightly-20240406-a05466c5b",
"react-native": "0.75.0-nightly-20240413-1b152f6ec",
"react-native-platform-override": "^1.9.32",
"react-native-windows": "^0.0.0-canary.815",
"typescript": "5.0.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ const pickerRef = React.createRef<Picker<string>>();
const viewWindowsRef = React.createRef<ViewWindows>();
const textInputRef = React.createRef<TextInput>();
const textInputRef2 = React.createRef<any>();
const touchableHighlightRef = React.createRef<TouchableHighlight>();
const touchableOpacityRef = React.createRef<TouchableOpacity>();
const touchableHighlightRef = React.createRef<React.ElementRef<typeof TouchableHighlight>>();
const touchableOpacityRef = React.createRef<React.ElementRef<typeof TouchableOpacity>>();
const touchableWithoutFeedbackRef = React.createRef<TouchableWithoutFeedback>();

class KeyboardFocusExample extends React.Component<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,12 @@ const Components: Array<RNTesterModuleInfo> = [
category: 'Basic',
module: require('../examples/Performance/PerformanceComparisonExample'),
},
/*
{
key: 'OSSLibraryExample',
module: require('../examples/OSSLibraryExample/OSSLibraryExample'),
},
*/
];

const APIs: Array<RNTesterModuleInfo> = ([
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/overrides.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"baseVersion": "0.75.0-nightly-20240406-a05466c5b",
"baseVersion": "0.75.0-nightly-20240413-1b152f6ec",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "112ec4f4055c0dce5eeb9070ac0b06371fcd5478"
"baseHash": "81f7183581b4f3efc83807acf9d13acf11cbbc6e"
}
]
}
6 changes: 3 additions & 3 deletions packages/@react-native/monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"@definitelytyped/dtslint": "^0.0.127",
"@jest/create-cache-key-function": "^29.6.3",
"@pkgjs/parseargs": "^0.11.0",
"@react-native/metro-babel-transformer": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/metro-config": "0.75.0-nightly-20240406-a05466c5b",
"@react-native/metro-babel-transformer": "0.75.0-nightly-20240413-1b152f6ec",
"@react-native/metro-config": "0.75.0-nightly-20240413-1b152f6ec",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^7.1.1",
Expand All @@ -83,7 +83,7 @@
"eslint-plugin-redundant-undefined": "^0.4.0",
"eslint-plugin-relay": "^1.8.3",
"flow-api-translator": "0.20.1",
"flow-bin": "^0.232.0",
"flow-bin": "^0.233.0",
"glob": "^7.1.1",
"hermes-eslint": "0.20.0",
"hermes-transform": "0.20.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import type {RNTesterModule} from '../../types/RNTesterTypes';

import ColorStylesExample from './ColorStylesExample';
import CombineExample from './CombineExample';
import ComposeAnimationsWithEasingExample from './ComposeAnimationsWithEasingExample';
import ComposingExample from './ComposingExample';
import ContinuousInteractionsExample from './ContinuousInteractionsExample';
Expand Down Expand Up @@ -43,5 +44,6 @@ export default ({
TransformBounceExample,
LoopingExample,
ContinuousInteractionsExample,
CombineExample,
],
}: RNTesterModule);
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow strict-local
* @format
*/

import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
import type {Numeric} from 'react-native/Libraries/Animated/AnimatedImplementation';

import RNTesterButton from '../../components/RNTesterButton';
import * as React from 'react';
import {Animated, StyleSheet, Text, TextInput, View} from 'react-native';
export default ({
title: 'Combine Example',
name: 'Combine View',
description:
'Change the opacity of the view by combining different Animated.Values.',
render: () => <CombineExample />,
}: RNTesterModuleExample);

const CombineExample = () => {
const [aValue, setAValue] = React.useState('0.4');
const [bValue, setBValue] = React.useState('0.5');
const a = new Animated.Value(parseFloat(aValue));
const b = new Animated.Value(parseFloat(bValue));
const add = Animated.add(a, b);
const subtract = Animated.subtract(b, a);
const mult = Animated.multiply(a, b);
const divide =
parseFloat(aValue) !== 0 ? Animated.divide(b, a) : new Animated.Value(1);
const mod = Animated.modulo(a, parseFloat(bValue));
const [animation, setAnimation] = React.useState<Numeric>(add);

return (
<View>
<TextInput
style={styles.input}
value={aValue}
onChangeText={text => setAValue(text)}
placeholder="Enter value for a"
keyboardType="numeric"
/>
<TextInput
style={styles.input}
value={bValue}
onChangeText={text => setBValue(text)}
placeholder="Enter value for b"
keyboardType="numeric"
/>
<Animated.View style={[styles.content, {opacity: animation}]}>
<Text>Change Opacity</Text>
</Animated.View>
<RNTesterButton onPress={() => setAnimation(add)}>Add</RNTesterButton>
<RNTesterButton onPress={() => setAnimation(subtract)}>
Subtract
</RNTesterButton>
<RNTesterButton onPress={() => setAnimation(mult)}>
Multiply
</RNTesterButton>
<RNTesterButton onPress={() => setAnimation(divide)}>
Divide
</RNTesterButton>
<RNTesterButton onPress={() => setAnimation(mod)}>Modulo</RNTesterButton>
</View>
);
};

const styles = StyleSheet.create({
content: {
backgroundColor: 'deepskyblue',
borderWidth: 1,
borderColor: 'dodgerblue',
padding: 20,
margin: 20,
borderRadius: 10,
alignItems: 'center',
},
input: {
height: 40,
borderColor: 'gray',
borderWidth: 1,
paddingLeft: 10,
margin: 10,
borderRadius: 5,
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

import type {Node} from 'react';

import React, {useRef, useState} from 'react';
import {RNTesterThemeContext} from '../../components/RNTesterTheme';
import React, {useContext, useRef, useState} from 'react';
import {
Button,
DrawerLayoutAndroid,
Expand All @@ -22,6 +23,7 @@ import {
} from 'react-native';

const Drawer = () => {
const theme = useContext(RNTesterThemeContext);
const drawer = useRef<null | React$ElementRef<any>>(null);
const [drawerPosition, setDrawerPosition] = useState('left');
const changeDrawerPosition = () => {
Expand Down Expand Up @@ -52,7 +54,9 @@ const Drawer = () => {
drawerPosition={drawerPosition}
renderNavigationView={navigationView}>
<View style={styles.container}>
<Text style={styles.paragraph}>Drawer on the {drawerPosition}!</Text>
<Text style={[{color: theme.LabelColor}, styles.paragraph]}>
Drawer on the {drawerPosition}!
</Text>
<Button
title="Change Drawer Position"
onPress={() => changeDrawerPosition()}
Expand Down
Loading