Skip to content

fix(share_plus): only configure popover presentation on iPad #3965

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

Open
m1roxx wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −10
Open

fix(share_plus): only configure popover presentation on iPad #3965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions packages/share_plus/share_plus/ios/share_plus/Sources/share_plus/FPPSharePlusPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,22 +415,24 @@ + (void)share:(NSArray *)shareItems
[activityViewController setValue:subject forKey:@"subject"];
}

activityViewController.popoverPresentationController.sourceView =
controller.view;

// Check if this is actually an iPad
BOOL isIpad = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad);

// Before Xcode 26 hasPopoverPresentationController is true for iPads and false for iPhones.
// Since Xcode 26 it is true for both iPads and iPhones, so we only configure popover on iPad.
// Before Xcode 26, popoverPresentationController was non-nil only on iPad.
// Since Xcode 26 it is non-nil on iPhone as well, where it is a private
// _UIActivityViewControllerPresentationController rather than a real
// UIPopoverPresentationController. Configuring it on iPhone pushes
// UIActivityViewController onto the anchored presentation path, so restrict
// every popover configuration to iPad.
UIPopoverPresentationController *popover =
activityViewController.popoverPresentationController;
BOOL hasPopoverPresentationController = (popover != NULL);

CGRect sourceRect = origin;
if (isIpad && hasPopoverPresentationController) {
if (isIpad && popover != nil) {
popover.sourceView = controller.view;

// Flutter sends sharePositionOrigin in global (window) coordinates.
// Convert to the source view's coordinate space for sourceRect.
CGRect sourceRect = origin;
if (controller.view.window && !CGRectIsEmpty(origin)) {
sourceRect = [controller.view convertRect:origin fromView:nil];
}
Expand All @@ -442,8 +444,6 @@ + (void)share:(NSArray *)shareItems
CGRectGetMidY(bounds) - 1.0, 2.0, 2.0);
}
popover.sourceRect = sourceRect;
} else if (!CGRectIsEmpty(origin)) {
activityViewController.popoverPresentationController.sourceRect = origin;
}

activityViewController.completionWithItemsHandler =
Expand Down
Loading