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 01/02 #12688

Merged
merged 23 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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": "Integration 01/02",
"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": "Integration 01/02",
"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": "prerelease",
"comment": "Integration up to 01/02/24",
"packageName": "@react-native-windows/codegen",
"email": "email not defined",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integration 01/02",
"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.74.0-nightly-20231201-c30f2b620",
"baseVersion": "0.74.0-nightly-20240102-05ec058ac",
"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.227",
"react": "18.0.0",
"react-native": "0.74.0-nightly-20231201-c30f2b620"
"react-native": "0.74.0-nightly-20240102-05ec058ac"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.227",
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-20231201-c30f2b620",
"react-native": "0.74.0-nightly-20240102-05ec058ac",
"react-native-platform-override": "^1.9.17",
"typescript": "^4.9.5"
},
Expand Down
5 changes: 4 additions & 1 deletion packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
; Checked-in build output
<PROJECT_ROOT>/packages/debugger-frontend/dist/

; Generated build output
<PROJECT_ROOT>/packages/.*/dist

[untyped]
.*/node_modules/@react-native-community/cli/.*/.*
; Should work out how to do this properly
Expand Down Expand Up @@ -148,4 +151,4 @@ untyped-import
untyped-type-import

[version]
^0.223.0
^0.225.1
12 changes: 6 additions & 6 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/rntypes/**"
],
"baseVersion": "0.74.0-nightly-20231201-c30f2b620",
"baseVersion": "0.74.0-nightly-20240102-05ec058ac",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "172a4663d9243a77e3b35a2d8a5e403fd62062cf"
"baseHash": "9c6c26c42702bd360f25551690594d246946173b"
},
{
"type": "derived",
"file": "src/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "6c91f268c2189f9db74bead7fef1ed262c77586e"
"baseHash": "e9b8155ec5aa3957ac571272fd8ddc304a97786a"
},
{
"type": "platform",
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": "f6742637eda13080bd175a45eb0edbc83fa260c5"
"baseHash": "0119ddc412dcbacf1074b1d6b13628667578a270"
},
{
"type": "patch",
Expand Down Expand Up @@ -252,7 +252,7 @@
"type": "derived",
"file": "src/Libraries/Image/Image.win32.js",
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
"baseHash": "ba2c259fd454ed0c0f73b82f6390fef8045320ab",
"baseHash": "751390bc6d7b721b5101138b682973410216c720",
"issue": 4320
},
{
Expand Down Expand Up @@ -440,7 +440,7 @@
"type": "derived",
"file": "src/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "02a8ebee89958ab16c6014c2fe1d5b6253113918"
"baseHash": "057cf316c2f379cbc97cf1bad76c31e94888246d"
},
{
"type": "derived",
Expand Down
25 changes: 12 additions & 13 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,23 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^29.6.3",
"@react-native-community/cli": "12.0.0",
"@react-native-community/cli-platform-android": "12.0.0",
"@react-native-community/cli-platform-ios": "12.0.0",
"@react-native-community/cli": "13.0.0",
"@react-native-community/cli-platform-android": "13.0.0",
"@react-native-community/cli-platform-ios": "13.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/codegen": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/community-cli-plugin": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/gradle-plugin": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/js-polyfills": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/assets-registry": "0.74.0-nightly-20240102-05ec058ac",
"@react-native/codegen": "0.74.0-nightly-20240102-05ec058ac",
"@react-native/community-cli-plugin": "0.74.0-nightly-20240102-05ec058ac",
"@react-native/gradle-plugin": "0.74.0-nightly-20240102-05ec058ac",
"@react-native/js-polyfills": "0.74.0-nightly-20240102-05ec058ac",
"@react-native/metro-config": "^0.73.0",
"@react-native/normalize-colors": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/virtualized-lists": "0.74.0-nightly-20231201-c30f2b620",
"@react-native/normalize-colors": "0.74.0-nightly-20240102-05ec058ac",
"@react-native/virtualized-lists": "0.74.0-nightly-20240102-05ec058ac",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
"art": "^0.10.0",
"base64-js": "^1.5.1",
"deprecated-react-native-prop-types": "^5.0.0",
"event-target-shim": "^5.0.1",
"flow-enums-runtime": "^0.0.6",
"invariant": "^2.2.4",
Expand Down Expand Up @@ -85,13 +84,13 @@
"just-scripts": "^1.3.3",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.74.0-nightly-20231201-c30f2b620",
"react-native": "0.74.0-nightly-20240102-05ec058ac",
"react-native-platform-override": "^1.9.17",
"typescript": "^4.9.5"
},
"peerDependencies": {
"react": "18.2.0",
"react-native": "0.74.0-nightly-20231201-c30f2b620"
"react-native": "0.74.0-nightly-20240102-05ec058ac"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1568,16 +1568,20 @@ function InternalTextInput(props: Props): React.Node {
};
}

// $FlowFixMe[underconstrained-implicit-instantiation]
let style = flattenStyle(props.style);
const style = flattenStyle<TextStyleProp>(props.style);

if (Platform.OS === 'ios') {
const RCTTextInputView =
props.multiline === true
? RCTMultilineTextInputView
: RCTSinglelineTextInputView;

style = props.multiline === true ? [styles.multilineInput, style] : style;
const useMultilineDefaultStyle =
props.multiline === true &&
(style == null ||
(style.padding == null &&
style.paddingVertical == null &&
style.paddingTop == null));

const useOnChangeSync =
(props.unstable_onChangeSync || props.unstable_onChangeTextSync) &&
Expand Down Expand Up @@ -1608,7 +1612,10 @@ function InternalTextInput(props: Props): React.Node {
onSelectionChange={_onSelectionChange}
onSelectionChangeShouldSetResponder={emptyFunctionThatReturnsTrue}
selection={selection}
style={style}
style={StyleSheet.compose(
useMultilineDefaultStyle ? styles.multilineDefault : null,
style,
)}
text={text}
/>
);
Expand Down Expand Up @@ -1882,13 +1889,6 @@ const ExportedForwardRef: React.AbstractComponent<

ExportedForwardRef.displayName = 'TextInput';

/**
* Switch to `deprecated-react-native-prop-types` for compatibility with future
* releases. This is deprecated and will be removed in the future.
*/
ExportedForwardRef.propTypes =
require('deprecated-react-native-prop-types').TextInputPropTypes;

// $FlowFixMe[prop-missing]
ExportedForwardRef.State = {
currentlyFocusedInput: TextInputState.currentlyFocusedInput,
Expand All @@ -1908,7 +1908,7 @@ export type TextInputComponentStatics = $ReadOnly<{|
|}>;

const styles = StyleSheet.create({
multilineInput: {
multilineDefault: {
// This default top inset makes RCTMultilineTextInputView seem as close as possible
// to single-line RCTSinglelineTextInputView defaults, using the system defaults
// of font size 17 and a height of 31 points.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,6 @@ Image.queryCache = queryCache;
// $FlowFixMe[incompatible-use] This property isn't writable but we're actually defining it here for the first time.
Image.resolveAssetSource = resolveAssetSource;

/**
* Switch to `deprecated-react-native-prop-types` for compatibility with future
* releases. This is deprecated and will be removed in the future.
*/
Image.propTypes = require('deprecated-react-native-prop-types').ImagePropTypes;

const styles = StyleSheet.create({
base: {
overflow: 'hidden',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,6 @@ const Text: React.AbstractComponent<

Text.displayName = 'Text';

/**
* Switch to `deprecated-react-native-prop-types` for compatibility with future
* releases. This is deprecated and will be removed in the future.
*/
Text.propTypes = require('deprecated-react-native-prop-types').TextPropTypes;

/**
* Returns false until the first time `newValue` is true, after which this will
* always return true. This is necessary to lazily initialize `Pressability` so
Expand Down
41 changes: 0 additions & 41 deletions packages/@office-iss/react-native-win32/src/index.win32.js
Original file line number Diff line number Diff line change
Expand Up @@ -385,47 +385,6 @@ module.exports = {
'LogBox is enabled by default so there is no need to call unstable_enableLogBox() anymore. This is a no op and will be removed in the next version.',
);
},
// Deprecated Prop Types
get ColorPropType(): $FlowFixMe {
console.error(
'ColorPropType will be removed from React Native, along with all ' +
'other PropTypes. We recommend that you migrate away from PropTypes ' +
'and switch to a type system like TypeScript. If you need to ' +
'continue using ColorPropType, migrate to the ' +
"'deprecated-react-native-prop-types' package.",
);
return require('deprecated-react-native-prop-types').ColorPropType;
},
get EdgeInsetsPropType(): $FlowFixMe {
console.error(
'EdgeInsetsPropType will be removed from React Native, along with all ' +
'other PropTypes. We recommend that you migrate away from PropTypes ' +
'and switch to a type system like TypeScript. If you need to ' +
'continue using EdgeInsetsPropType, migrate to the ' +
"'deprecated-react-native-prop-types' package.",
);
return require('deprecated-react-native-prop-types').EdgeInsetsPropType;
},
get PointPropType(): $FlowFixMe {
console.error(
'PointPropType will be removed from React Native, along with all ' +
'other PropTypes. We recommend that you migrate away from PropTypes ' +
'and switch to a type system like TypeScript. If you need to ' +
'continue using PointPropType, migrate to the ' +
"'deprecated-react-native-prop-types' package.",
);
return require('deprecated-react-native-prop-types').PointPropType;
},
get ViewPropTypes(): $FlowFixMe {
console.error(
'ViewPropTypes will be removed from React Native, along with all ' +
'other PropTypes. We recommend that you migrate away from PropTypes ' +
'and switch to a type system like TypeScript. If you need to ' +
'continue using ViewPropTypes, migrate to the ' +
"'deprecated-react-native-prop-types' package.",
);
return require('deprecated-react-native-prop-types').ViewPropTypes;
},
// Win32 Types (Typescript components exported as flow any)
get ColorGradientWin32(): ColorGradientWin32 {
return require('./Libraries/StyleSheet/PlatformColorValueTypesWin32')
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.4.1",
"react": "18.2.0",
"react-native": "0.74.0-nightly-20231201-c30f2b620",
"react-native": "0.74.0-nightly-20240102-05ec058ac",
"react-native-windows": "^0.0.0-canary.765",
"typescript": "^4.9.5"
},
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.74.0-nightly-20231201-c30f2b620",
"baseVersion": "0.74.0-nightly-20240102-05ec058ac",
"overrides": [
{
"type": "derived",
Expand Down Expand Up @@ -45,7 +45,7 @@
"type": "patch",
"file": "src/js/examples/View/ViewExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/View/ViewExample.js",
"baseHash": "4904becf311eeeb2b3a324f7efb5c82531e50969"
"baseHash": "30d55506dc740a7b6dcd1cd5fc26a43f3eb8f384"
},
{
"type": "copy",
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 @@ -18,7 +18,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.74.0-nightly-20231201-c30f2b620",
"react-native": "0.74.0-nightly-20240102-05ec058ac",
"react-native-windows": "^0.0.0-canary.765",
"react-native-xaml": "^0.0.50"
},
Expand All @@ -31,7 +31,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.74.0-nightly-20231201-c30f2b620",
"react-native": "0.74.0-nightly-20240102-05ec058ac",
"react-native-platform-override": "^1.9.17",
"react-native-windows": "^0.0.0-canary.765",
"typescript": "^4.9.5"
Expand Down
Loading
Loading