Skip to content

Commit 880a5d7

Browse files
authored
fix(iOS): change default sheet detent to large (#2470)
## Description This PR ensures the default sheet detent is 'large' as stated in types. The value is not being updated in `updateProps` since it's always 'large' and `setSheetAllowedDetents` is not triggered until we intentionally use a different value. Changing the order in the typedef ensures `RNSScreenDetentTypeLarge` gets picked up as the default value. Fixes #2347 ## Test code and steps to reproduce - Use `StackPresentation` screen in the Example app ## Checklist - [x] Ensured that CI passes
1 parent c67e2b2 commit 880a5d7

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

Example/yarn.lock

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3186,7 +3186,7 @@ __metadata:
31863186
chalk: "npm:^4.1.2"
31873187
execa: "npm:^5.0.0"
31883188
fast-glob: "npm:^3.3.2"
3189-
fast-xml-parser: "npm:^4.2.4"
3189+
fast-xml-parser: "npm:^4.4.1"
31903190
logkitty: "npm:^0.7.1"
31913191
checksum: 10c0/43139f26a179a1e27e37a8e54d7c96d696b2ad3b289027dab7ee4660068ef88099814e5be082e464f022ccdc910640ac30a82959e8b981b15f43a52abc47cb20
31923192
languageName: node
@@ -3200,7 +3200,7 @@ __metadata:
32003200
chalk: "npm:^4.1.2"
32013201
execa: "npm:^5.0.0"
32023202
fast-glob: "npm:^3.3.2"
3203-
fast-xml-parser: "npm:^4.2.4"
3203+
fast-xml-parser: "npm:^4.4.1"
32043204
ora: "npm:^5.4.1"
32053205
checksum: 10c0/54623f26e47293fe277c8924e8cafafda76a624916e3975da380705a2532d4a98113298e604d2698998e096090f3662481e2bb38d616afeafe50417aa92d4833
32063206
languageName: node
@@ -3367,6 +3367,7 @@ __metadata:
33673367
jscodeshift: "npm:^0.14.0"
33683368
mkdirp: "npm:^0.5.1"
33693369
nullthrows: "npm:^1.1.1"
3370+
yargs: "npm:^17.6.2"
33703371
peerDependencies:
33713372
"@babel/preset-env": ^7.1.6
33723373
checksum: 10c0/4f806b77037758040894f88b4db78c6c1600e9e5cbfa7e87a5e369a9b33f10594840d800486ec23e4f93ff0a6ef168d391c85f7ed7e6fab8f6bccb65e1a636d3
@@ -3386,7 +3387,6 @@ __metadata:
33863387
metro-config: "npm:^0.81.0"
33873388
metro-core: "npm:^0.81.0"
33883389
node-fetch: "npm:^2.2.0"
3389-
querystring: "npm:^0.2.1"
33903390
readline: "npm:^1.3.0"
33913391
peerDependencies:
33923392
"@react-native-community/cli-server-api": "*"
@@ -6475,14 +6475,14 @@ __metadata:
64756475
languageName: node
64766476
linkType: hard
64776477

6478-
"fast-xml-parser@npm:^4.2.4":
6479-
version: 4.3.6
6480-
resolution: "fast-xml-parser@npm:4.3.6"
6478+
"fast-xml-parser@npm:^4.4.1":
6479+
version: 4.5.0
6480+
resolution: "fast-xml-parser@npm:4.5.0"
64816481
dependencies:
64826482
strnum: "npm:^1.0.5"
64836483
bin:
64846484
fxparser: src/cli/cli.js
6485-
checksum: 10c0/9ebe2ac142c6978cae423c39c2a9b561edb76be584317d578768ed4a006a61fc0e83abf8c6fe31029139c4ad15ea1f2e7b6720ba9e6eda0e5266d7f2770fb079
6485+
checksum: 10c0/71d206c9e137f5c26af88d27dde0108068a5d074401901d643c500c36e95dfd828333a98bda020846c41f5b9b364e2b0e9be5b19b0bdcab5cf31559c07b80a95
64866486
languageName: node
64876487
linkType: hard
64886488

@@ -10534,13 +10534,6 @@ __metadata:
1053410534
languageName: node
1053510535
linkType: hard
1053610536

10537-
"querystring@npm:^0.2.1":
10538-
version: 0.2.1
10539-
resolution: "querystring@npm:0.2.1"
10540-
checksum: 10c0/6841b32bec4f16ffe7f5b5e4373b47ad451f079cde3a7f45e63e550f0ecfd8f8189ef81fb50079413b3fc1c59b06146e4c98192cb74ed7981aca72090466cd94
10541-
languageName: node
10542-
linkType: hard
10543-
1054410537
"queue-microtask@npm:^1.2.2":
1054510538
version: 1.2.3
1054610539
resolution: "queue-microtask@npm:1.2.3"

ios/RNSEnums.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
6060
};
6161

6262
typedef NS_ENUM(NSInteger, RNSScreenDetentType) {
63-
RNSScreenDetentTypeMedium,
6463
RNSScreenDetentTypeLarge,
64+
RNSScreenDetentTypeMedium,
6565
RNSScreenDetentTypeAll,
6666
};
6767

ios/RNSScreen.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1619,7 +1619,7 @@ @implementation RCTConvert (RNSScreen)
16191619
@"medium" : @(RNSScreenDetentTypeMedium),
16201620
@"all" : @(RNSScreenDetentTypeAll),
16211621
}),
1622-
RNSScreenDetentTypeAll,
1622+
RNSScreenDetentTypeLarge,
16231623
integerValue)
16241624

16251625
+ (UIInterfaceOrientationMask)UIInterfaceOrientationMask:(id)json

0 commit comments

Comments
 (0)