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.

Sign up for GitHub

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

Jump to bottom

Fix action sheet callback invoked more than once on iPad #33099

Closed
wants to merge 2 commits into from
Closed

Fix action sheet callback invoked more than once on iPad #33099

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80f53d0
Fix action sheet callback invoked more than once on iPad
janicduplessis Feb 13, 2022
5ee17ea
Update RCTActionSheetManager.mm
janicduplessis Feb 14, 2022
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
8 changes: 7 additions & 1 deletion React/CoreModules/RCTActionSheetManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ - (void)presentViewController:(UIViewController *)alertController

NSInteger index = 0;
bool isCancelButtonIndex = false;
// The handler for a button might get called more than once when tapping outside
// the action sheet on iPad. RCTResponseSenderBlock can only be called once so
// keep track of callback invocation here.
__block bool callbackInvoked = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is never set to true? the condition in L146 will always pass. am i missing something obvious?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh you're right, my bad I removed it to test before / after and forgot to put it back -_-

for (NSString *option in buttons) {
UIAlertActionStyle style = UIAlertActionStyleDefault;
if ([destructiveButtonIndices containsObject:@(index)]) {
Expand All @@ -139,7 +143,9 @@ - (void)presentViewController:(UIViewController *)alertController
UIAlertAction *actionButton = [UIAlertAction actionWithTitle:option
style:style
handler:^(__unused UIAlertAction *action) {
callback(@[ @(localIndex) ]);
if (!callbackInvoked) {
callback(@[ @(localIndex) ]);
}
}];
if (isCancelButtonIndex) {
[actionButton setValue:cancelButtonTintColor forKey:@"titleTextColor"];
Expand Down