Skip to content

Commit 60cc461

Browse files
committed
Touch events blocked after dismissModal on iOS + dismissModal animation options not respected #8279
1 parent 0ab840a commit 60cc461

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

ios/RNNComponentOptions.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
99
self.name = [TextParser parse:dict key:@"name"];
1010
self.componentId = [TextParser parse:dict key:@"componentId"];
1111
self.alignment = [TextParser parse:dict key:@"alignment"];
12-
self.waitForRender = [Bool withValue:[[BoolParser parse:dict key:@"waitForRender"] withDefault:[RNNUtils getDefaultWaitForRender]]];
12+
self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
1313

1414
return self;
1515
}

ios/RNNScreenTransition.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
1111
self.content = [[RNNEnterExitAnimation alloc] initWithDict:dict[@"content"]];
1212
self.bottomTabs = [[ElementTransitionOptions alloc] initWithDict:dict[@"bottomTabs"]];
1313
self.enable = [BoolParser parse:dict key:@"enabled"];
14-
self.waitForRender = [Bool withValue: [[BoolParser parse:dict key:@"waitForRender"] withDefault: [RNNUtils getDefaultWaitForRender]]];
14+
self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
1515
self.duration = [TimeIntervalParser parse:dict key:@"duration"];
1616
self.sharedElementTransitions = [OptionsArrayParser parse:dict
1717
key:@"sharedElementTransitions"

ios/TransitionOptions.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
1515
self.translationY = [[TransitionDetailsOptions alloc] initWithDict:dict[@"translationY"]];
1616
self.rotationX = [[TransitionDetailsOptions alloc] initWithDict:dict[@"rotationX"]];
1717
self.rotationY = [[TransitionDetailsOptions alloc] initWithDict:dict[@"rotationY"]];
18-
19-
self.waitForRender = [Bool withValue:[[BoolParser parse:dict key:@"waitForRender"] withDefault:[RNNUtils getDefaultWaitForRender]]];
18+
19+
self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
2020
self.enable = [BoolParser parse:dict key:@"enabled"];
2121

2222
return self;

0 commit comments

Comments
 (0)