Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 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 3/22/23",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate 3/22/23",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 3/22/23",
"packageName": "react-native-windows",
"email": "[email protected]",
"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.0.0-20230308-2111-d41e95fb1",
"baseVersion": "0.0.0-20230321-2153-7b86e3aae",
"overrides": [
{
"type": "patch",
Expand All @@ -24,7 +24,7 @@
"type": "patch",
"file": "src/js/components/RNTesterExampleFilter.win32.js",
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
"baseHash": "91b349ecb666e3c44c14fecc5d8ac2a5fdba4ae6"
"baseHash": "76f3d045c6f4cdbd1538735c7c923da66de6974c"
},
{
"type": "platform",
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.188",
"react": "18.0.0",
"react-native": "0.0.0-20230308-2111-d41e95fb1"
"react-native": "0.0.0-20230321-2153-7b86e3aae"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.188",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^14.14.22",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-20230308-2111-d41e95fb1",
"react-native": "0.0.0-20230321-2153-7b86e3aae",
"react-native-platform-override": "^1.9.4",
"typescript": "^4.9.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@ class RNTesterExampleFilter<T> extends React.Component<Props<T>, State> {
keyboardShouldPersistTaps="handled"
keyboardDismissMode="interactive">
{this.props.render({filteredSections})}
{/**
* This is a fake list item. It is needed to provide the ScrollView some bottom padding.
* The height of this item is basically ScreenHeight - the height of (Header + bottom navbar)
* */}
<View style={{height: 350}} />
</ScrollView>
);
} else {
Expand Down
9 changes: 5 additions & 4 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

; Flow doesn't support platforms
.*/packages/react-native/Libraries/Utilities/LoadingView.js
; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder
.*/react-native-win32/src/.*

Expand All @@ -81,6 +83,7 @@
[libs]
interface.js
flow/
flow-typed/

[options]
enums=true
Expand All @@ -100,7 +103,7 @@ munge_underscores=true
module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.win32.js'
module.name_mapper='^@office-iss/react-native-win32$' -> '<PROJECT_ROOT>/index.win32.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>/\1'
module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>\/1'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand All @@ -109,8 +112,6 @@ suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FlowFixMeEmpty

experimental.array_literal_providers=true
inference_mode=experimental.lti

sharedmemory.hash_table_pow=21

Expand All @@ -134,4 +135,4 @@ untyped-import
untyped-type-import

[version]
^0.201.0
^0.202.0
Loading