[iOS] File picker dialog remains after opening a new tab in 3rd-party browsers

pxlcoder · robert-jenner · commit ef2e9b1c7fdb · 2024-05-15T10:52:41.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=265602 rdar://119001046 Reviewed by Abrar Rahman Protyasha. The file upload panel does not dismiss itself after a new tab is opened, and can end up displayed over a site that's unrelated to the one requesting the upload. The panel itself is a modal view controller that is presented from an appropriate view controller containing the `WKWebView`. Safari has explicit logic to dismiss presented modal view controllers on tab switch, but it is not reasonable to expect other clients to guarantee this behavior. Fix by dismissing all pickers if the `WKWebView` is removed from the hierarchy. * LayoutTests/fast/forms/ios/file-upload-panel-dismiss-when-view-removed-from-window-expected.txt: Added. * LayoutTests/fast/forms/ios/file-upload-panel-dismiss-when-view-removed-from-window.html: Added. * Source/WebKit/UIProcess/Cocoa/WKContactPicker.h: * Source/WebKit/UIProcess/Cocoa/WKContactPicker.mm: (-[WKContactPicker dismiss]): Add a new hook to dismiss the contact picker. * Source/WebKit/UIProcess/ios/WKContentView.mm: (-[WKContentView willMoveToWindow:]): If the content view has moved to a `nil` window, it has been removed from the view hierarchy, and presented pickers should be dismissed. * Source/WebKit/UIProcess/ios/WKContentViewInteraction.h: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView cleanUpInteraction]): Factor out logic into `-[WKContentView dismissPickers]`. (-[WKContentView dismissPickers]): Dismiss all pickers that the content view is aware of. Originally-landed-as: 272448.703@safari-7618-branch (a3524e3). rdar://128089287 Canonical link: https://commits.webkit.org/278816@main
diff --git a/LayoutTests/fast/forms/ios/file-upload-panel-dismiss-when-view-removed-from-window-expected.txt b/LayoutTests/fast/forms/ios/file-upload-panel-dismiss-when-view-removed-from-window-expected.txt
@@ -0,0 +1,14 @@
+Test that the file upload panel is dismissed when its presenting view is removed from the window on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Present file picker
+PASS areArraysEqual(typeIdentifiers, ['public.plain-text']) is true
+
+Remove view from window
+PASS areArraysEqual(typeIdentifiers, []) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/forms/ios/file-upload-panel-dismiss-when-view-removed-from-window.html b/LayoutTests/fast/forms/ios/file-upload-panel-dismiss-when-view-removed-from-window.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true shouldHandleRunOpenPanel=false shouldPresentPopovers=false ] -->
+<html>
+<head>
+<meta name="viewport" content="width=device-width">
+<script src="../../../resources/js-test.js"></script>
+<script src="../../../resources/ui-helper.js"></script>
+</head>
+<body>
+<input id="fileInput" type="file" accept=".txt">
+<script>
+description("Test that the file upload panel is dismissed when its presenting view is removed from the window on iOS.");
+jsTestIsAsync = true;
+
+addEventListener("load", async () => {
+    debug("Present file picker");
+    await UIHelper.activateElement(fileInput);
+    typeIdentifiers = await UIHelper.filePickerAcceptedTypeIdentifiers();
+    shouldBeTrue("areArraysEqual(typeIdentifiers, ['public.plain-text'])");
+
+    debug("\nRemove view from window");
+    await UIHelper.removeViewFromWindow();
+    typeIdentifiers = await UIHelper.filePickerAcceptedTypeIdentifiers();
+    shouldBeTrue("areArraysEqual(typeIdentifiers, [])");
+
+    finishJSTest();
+});
+</script>
+</body>
+</html>
diff --git a/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h b/Source/WebKit/UIProcess/Cocoa/WKContactPicker.h
@@ -44,6 +44,8 @@ struct ContactsRequestData;
 
 - (void)presentWithRequestData:(const WebCore::ContactsRequestData&)requestData completionHandler:(WTF::CompletionHandler<void(std::optional<Vector<WebCore::ContactInfo>>&&)>&&)completionHandler;
 
+- (void)dismiss;
+
 @property (nonatomic, weak) id<WKContactPickerDelegate> delegate;
 
 @end
diff --git a/Source/WebKit/UIProcess/Cocoa/WKContactPicker.mm b/Source/WebKit/UIProcess/Cocoa/WKContactPicker.mm
@@ -179,6 +179,11 @@ - (void)presentWithRequestData:(const WebCore::ContactsRequestData&)requestData
 #endif
 }
 
+- (void)dismiss
+{
+    [self dismissWithContacts:nil];
+}
+
 #pragma mark - Completion
 
 #if HAVE(CNCONTACTPICKERVIEWCONTROLLER)
diff --git a/Source/WebKit/UIProcess/ios/WKContentView.mm b/Source/WebKit/UIProcess/ios/WKContentView.mm
@@ -522,6 +522,9 @@ - (void)willMoveToWindow:(UIWindow *)newWindow
 
         [self _updateForScreen:newWindow.screen];
     }
+
+    if (window && !newWindow)
+        [self dismissPickers];
 }
 
 - (void)didMoveToWindow
diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
@@ -681,6 +681,8 @@ struct ImageAnalysisContextMenuActionData {
 - (void)cleanUpInteraction;
 - (void)cleanUpInteractionPreviewContainers;
 
+- (void)dismissPickers;
+
 - (void)scrollViewWillStartPanOrPinchGesture;
 
 - (void)buildMenuForWebViewWithBuilder:(id <UIMenuBuilder>)builder;
diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
@@ -1561,19 +1561,7 @@ - (void)cleanUpInteraction
     [self _unregisterPreview];
 #endif
 
-    if (_fileUploadPanel) {
-        [_fileUploadPanel setDelegate:nil];
-        [_fileUploadPanel dismiss];
-        _fileUploadPanel = nil;
-    }
-
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-    if (_shareSheet) {
-        [_shareSheet setDelegate:nil];
-        [_shareSheet dismiss];
-        _shareSheet = nil;
-    }
-#endif
+    [self dismissPickers];
 
     [self stopDeferringInputViewUpdatesForAllSources];
     _focusedElementInformation = { };
@@ -9099,6 +9087,31 @@ - (void)contactPickerDidDismiss:(WKContactPicker *)contactPicker
 }
 #endif
 
+- (void)dismissPickers
+{
+    if (_fileUploadPanel) {
+        [_fileUploadPanel setDelegate:nil];
+        [_fileUploadPanel dismiss];
+        _fileUploadPanel = nil;
+    }
+
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+    if (_shareSheet) {
+        [_shareSheet setDelegate:nil];
+        [_shareSheet dismiss];
+        _shareSheet = nil;
+    }
+#endif
+
+#if HAVE(CONTACTSUI)
+    if (_contactPicker) {
+        [_contactPicker setDelegate:nil];
+        [_contactPicker dismiss];
+        _contactPicker = nil;
+    }
+#endif
+}
+
 - (NSString *)inputLabelText
 {
     if (!_focusedElementInformation.label.isEmpty())

Original file line number	Diff line number	Diff line change
`@@ -522,6 +522,9 @@ - (void)willMoveToWindow:(UIWindow *)newWindow`
`522`	`522`
`523`	`523`	`[self _updateForScreen:newWindow.screen];`
`524`	`524`	`}`
	`525`	`+`
	`526`	`+ if (window && !newWindow)`
	`527`	`+ [self dismissPickers];`
`525`	`528`	`}`
`526`	`529`
`527`	`530`	`- (void)didMoveToWindow`