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 9/25",
"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 9/25",
"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 9/25",
"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.73.0-nightly-20230920-630cf3b21",
"baseVersion": "0.73.0-nightly-20230925-2de964cfd",
"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.217",
"react": "18.0.0",
"react-native": "0.73.0-nightly-20230920-630cf3b21"
"react-native": "0.73.0-nightly-20230925-2de964cfd"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.217",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.73.0-nightly-20230920-630cf3b21",
"react-native": "0.73.0-nightly-20230925-2de964cfd",
"react-native-platform-override": "^1.9.15",
"typescript": "^4.9.5"
},
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 @@ -146,4 +146,4 @@ untyped-import
untyped-type-import

[version]
^0.216.1
^0.217.0
16 changes: 8 additions & 8 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.73.0-nightly-20230920-630cf3b21",
"baseVersion": "0.73.0-nightly-20230925-2de964cfd",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "df2115e026fe77aef6f344f7523b09dd83be5626"
"baseHash": "fd2609719419d6fd262c1e7f993eb566ad2444f6"
},
{
"type": "derived",
Expand Down Expand Up @@ -101,7 +101,7 @@
"type": "derived",
"file": "src/Libraries/Components/ScrollView/ScrollView.win32.js",
"baseFile": "packages/react-native/Libraries/Components/ScrollView/ScrollView.js",
"baseHash": "1254528d4082b82fe26d147676b812940bff63ac"
"baseHash": "87a276aff215fedb38d7ced5d9aef61224ebe0c2"
},
{
"type": "platform",
Expand All @@ -119,7 +119,7 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "b3075e093f75337144dc7e54194d9d01d4a82aa1"
"baseHash": "4e2811777a14ba8f87dc0a36ca11fcf390bd8def"
},
{
"type": "patch",
Expand Down Expand Up @@ -183,7 +183,7 @@
"type": "patch",
"file": "src/Libraries/Components/View/View.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/View.js",
"baseHash": "f6813acaf2043e39f0d57fa9f667c5bbb5202daa"
"baseHash": "f25ca9bd8f25d1dd05d98d40946a41b19fac87f1"
},
{
"type": "derived",
Expand Down Expand Up @@ -241,7 +241,7 @@
"type": "derived",
"file": "src/Libraries/Image/Image.win32.js",
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
"baseHash": "69dca1ad9864b7f2468e8f6026203cb98332c690",
"baseHash": "ead4aaa048a5ae0186d3f8ade054b970a2115a3a",
"issue": 4320
},
{
Expand Down Expand Up @@ -423,13 +423,13 @@
"type": "patch",
"file": "src/Libraries/StyleSheet/StyleSheet.win32.js",
"baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js",
"baseHash": "e28351df47b41e47fce71a2a5850f70bd337b78f"
"baseHash": "e73098e3a22f8f74328e0a9f387839bb03322bb6"
},
{
"type": "derived",
"file": "src/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "f56a969c163de4f20bcdefaa42792f31c3497888"
"baseHash": "02a8ebee89958ab16c6014c2fe1d5b6253113918"
},
{
"type": "derived",
Expand Down
26 changes: 13 additions & 13 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^29.6.3",
"@react-native-community/cli": "12.0.0-alpha.12",
"@react-native-community/cli-platform-android": "12.0.0-alpha.12",
"@react-native-community/cli-platform-ios": "12.0.0-alpha.12",
"@react-native-community/cli": "12.0.0-alpha.15",
"@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.73.0-nightly-20230622-0201e51bb",
"@react-native/codegen": "0.73.0-nightly-20230918-1ac3dab6e",
"@react-native/community-cli-plugin": "^0.73.0",
"@react-native/gradle-plugin": "0.73.0-nightly-20230918-1ac3dab6e",
"@react-native/js-polyfills": "0.73.0-nightly-20230622-0201e51bb",
"@react-native/assets-registry": "0.73.0-nightly-20230925-2de964cfd",
"@react-native/codegen": "0.73.0-nightly-20230925-2de964cfd",
"@react-native/community-cli-plugin": "0.73.0-nightly-20230925-2de964cfd",
"@react-native/gradle-plugin": "0.73.0-nightly-20230925-2de964cfd",
"@react-native/js-polyfills": "0.73.0-nightly-20230925-2de964cfd",
"@react-native/metro-config": "^0.73.0",
"@react-native/normalize-colors": "0.73.0-nightly-20230622-0201e51bb",
"@react-native/virtualized-lists": "0.73.0-nightly-20230912-0e5ea2890",
"@react-native/normalize-colors": "0.73.0-nightly-20230925-2de964cfd",
"@react-native/virtualized-lists": "0.73.0-nightly-20230925-2de964cfd",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -58,7 +58,7 @@
"promise": "^8.3.0",
"react-clone-referenced-element": "^1.0.1",
"react-devtools-core": "^4.27.7",
"react-refresh": "^0.4.0",
"react-refresh": "^0.14.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
"scheduler": "0.24.0-canary-efb381bbf-20230505",
Expand All @@ -85,13 +85,13 @@
"just-scripts": "^1.3.3",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.73.0-nightly-20230920-630cf3b21",
"react-native": "0.73.0-nightly-20230925-2de964cfd",
"react-native-platform-override": "^1.9.15",
"typescript": "^4.9.5"
},
"peerDependencies": {
"react": "18.2.0",
"react-native": "0.73.0-nightly-20230920-630cf3b21"
"react-native": "0.73.0-nightly-20230925-2de964cfd"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1665,6 +1665,7 @@ class ScrollView extends React.Component<Props, State> {
// $FlowFixMe[underconstrained-implicit-instantiation]
const style = flattenStyle(this.props.style);
const childLayoutProps = ['alignItems', 'justifyContent'].filter(
// $FlowFixMe[incompatible-use]
prop => style && style[prop] !== undefined,
);
invariant(
Expand Down Expand Up @@ -1837,6 +1838,7 @@ class ScrollView extends React.Component<Props, State> {
// Note: we should split props.style on the inner and outer props
// however, the ScrollView still needs the baseStyle to be scrollable
// $FlowFixMe[underconstrained-implicit-instantiation]
// $FlowFixMe[incompatible-call]
const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
return React.cloneElement(
refreshControl,
Expand Down Expand Up @@ -1924,6 +1926,7 @@ function Wrapper(props, ref: (mixed => mixed) | {current: mixed, ...}) {
return <ScrollView {...props} scrollViewRef={ref} />;
}
Wrapper.displayName = 'ScrollView';
// $FlowFixMe[incompatible-call]
const ForwardedScrollView = React.forwardRef(Wrapper);

// $FlowFixMe[prop-missing] Add static context to ForwardedScrollView
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1777,6 +1777,7 @@ const autoCompleteWebToTextContentTypeMap = {
const ExportedForwardRef: React.AbstractComponent<
React.ElementConfig<typeof InternalTextInput>,
TextInputInstance,
// $FlowFixMe[incompatible-call]
> = React.forwardRef(function TextInput(
{
allowFontScaling = true,
Expand All @@ -1799,8 +1800,13 @@ const ExportedForwardRef: React.AbstractComponent<
let style = flattenStyle(restProps.style);

if (style?.verticalAlign != null) {
// $FlowFixMe[prop-missing]
// $FlowFixMe[cannot-write]
style.textAlignVertical =
// $FlowFixMe[invalid-computed-prop]
verticalAlignToTextAlignVerticalMap[style.verticalAlign];
// $FlowFixMe[prop-missing]
// $FlowFixMe[cannot-write]
delete style.verticalAlign;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ const View: React.AbstractComponent<
// $FlowFixMe[underconstrained-implicit-instantiation]
let style = flattenStyle(otherProps.style);

// $FlowFixMe[sketchy-null-mixed]
const newPointerEvents = style?.pointerEvents || pointerEvents;
const collapsableOverride =
ReactNativeFeatureFlags.shouldForceUnflattenForElevation()
Expand Down Expand Up @@ -252,6 +253,7 @@ const View: React.AbstractComponent<
}
nativeID={id ?? nativeID}
style={style}
// $FlowFixMe[incompatible-type]
pointerEvents={newPointerEvents}
ref={forwardedRef}
onKeyDown={_keyDown}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
const objectFit =
// $FlowFixMe[prop-missing]
style && style.objectFit
? convertObjectFitToResizeMode(style.objectFit)
? // $FlowFixMe[incompatible-call]
convertObjectFitToResizeMode(style.objectFit)
: null;
const resizeMode =
// $FlowFixMe[prop-missing]
Expand Down Expand Up @@ -210,12 +211,13 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
{analyticTag => {
return (
<ImageViewNativeComponent
{...restProps}
accessibilityState={_accessibilityState}
{...restProps}
accessible={props.alt !== undefined ? true : props.accessible}
accessibilityLabel={accessibilityLabel}
accessibilityLabel={accessibilityLabel ?? props.alt}
ref={forwardedRef}
style={style}
// $FlowFixMe[incompatible-type]
resizeMode={resizeMode}
tintColor={tintColor}
source={sources}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ module.exports = {
/**
* Creates a StyleSheet style reference from the given object.
*/
// $FlowFixMe[unsupported-variance-annotation]
create<+S: ____Styles_Internal>(obj: S): $ReadOnly<S> {
// TODO: This should return S as the return type. But first,
// we need to codemod all the callsites that are typing this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,18 +233,28 @@ const Text: React.AbstractComponent<
style = flattenStyle(style);

if (typeof style?.fontWeight === 'number') {
// $FlowFixMe[prop-missing]
// $FlowFixMe[cannot-write]
style.fontWeight = style?.fontWeight.toString();
}

let _selectable = restProps.selectable;
if (style?.userSelect != null) {
// $FlowFixMe[invalid-computed-prop]
_selectable = userSelectToSelectableMap[style.userSelect];
// $FlowFixMe[prop-missing]
// $FlowFixMe[cannot-write]
delete style.userSelect;
}

if (style?.verticalAlign != null) {
// $FlowFixMe[prop-missing]
// $FlowFixMe[cannot-write]
style.textAlignVertical =
// $FlowFixMe[invalid-computed-prop]
verticalAlignToTextAlignVerticalMap[style.verticalAlign];
// $FlowFixMe[prop-missing]
// $FlowFixMe[cannot-write]
delete style.verticalAlign;
}

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.73.0-nightly-20230920-630cf3b21",
"react-native": "0.73.0-nightly-20230925-2de964cfd",
"react-native-windows": "^0.0.0-canary.716",
"typescript": "^4.9.5"
},
Expand Down
2 changes: 1 addition & 1 deletion 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.73.0-nightly-20230920-630cf3b21",
"baseVersion": "0.73.0-nightly-20230925-2de964cfd",
"overrides": [
{
"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 @@ -18,7 +18,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "18.0.0",
"react-native": "0.73.0-nightly-20230920-630cf3b21",
"react-native": "0.73.0-nightly-20230925-2de964cfd",
"react-native-windows": "^0.0.0-canary.716",
"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.73.0-nightly-20230920-630cf3b21",
"react-native": "0.73.0-nightly-20230925-2de964cfd",
"react-native-platform-override": "^1.9.15",
"react-native-windows": "^0.0.0-canary.716",
"typescript": "^4.9.5"
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.73.0-nightly-20230920-630cf3b21",
"baseVersion": "0.73.0-nightly-20230925-2de964cfd",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "af476573ff9850102d77fc10617129d0d1a96315"
"baseHash": "a110b5f1bcfdf1f6fd31230a44a7f6d4dcb3a6a7"
}
]
}
2 changes: 1 addition & 1 deletion packages/@react-native/monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"eslint-plugin-redundant-undefined": "^0.4.0",
"eslint-plugin-relay": "^1.8.3",
"flow-api-translator": "0.15.0",
"flow-bin": "^0.216.1",
"flow-bin": "^0.217.0",
"glob": "^7.1.1",
"hermes-eslint": "0.15.0",
"inquirer": "^7.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ type Props = {
};

const BaseFlatListExample = React.forwardRef(
// $FlowFixMe[incompatible-call]
(
props: Props,
ref:
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/tester/overrides.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"baseVersion": "0.73.0-nightly-20230920-630cf3b21",
"baseVersion": "0.73.0-nightly-20230925-2de964cfd",
"overrides": [
{
"type": "copy",
Expand Down Expand Up @@ -131,7 +131,7 @@
"type": "copy",
"directory": "js/examples/FlatList",
"baseDirectory": "packages/rn-tester/js/examples/FlatList",
"baseHash": "b269fa4b6e0bd62df276813a6c84274d1be675d5",
"baseHash": "d2ff0b9731d3cda9476defe61d56f8ba7df3dc0c",
"issue": 4054
},
{
Expand Down
Loading