Changeset 280690 in webkit

Timestamp:

Aug 5, 2021 9:03:34 AM (12 months ago)

Author:

Wenson Hsieh

Message:

[macOS Monterey] Translate popover becomes detached from webpage after scrolling
​https://bugs.webkit.org/show_bug.cgi?id=228807
rdar://81540115

Reviewed by Sam Weinig.

Close the context menu translation popover in WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly
(along with all other content-relative UI) to prevent the popover from being detached from its translated text
upon scrolling or zooming.

• UIProcess/Cocoa/WebViewImpl.h:
• UIProcess/Cocoa/WebViewImpl.mm:

(WebKit::WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly):
(WebKit::WebViewImpl::handleContextMenuTranslation):

Save a weak pointer to the current translation popover when we're about to present it, and use it to force the
popover to -close when dismissing content-relative child windows. Also take this opportunity to remove some
staging declarations on LTUITranslationViewController that have long since landed in the macOS 12 SDK.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebViewImpl.h (modified) (2 diffs)
• UIProcess/Cocoa/WebViewImpl.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-05  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS Monterey] Translate popover becomes detached from webpage after scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=228807
+        rdar://81540115
+
+        Reviewed by Sam Weinig.
+
+        Close the context menu translation popover in `WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly`
+        (along with all other content-relative UI) to prevent the popover from being detached from its translated text
+        upon scrolling or zooming.
+
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly):
+        (WebKit::WebViewImpl::handleContextMenuTranslation):
+
+        Save a weak pointer to the current translation popover when we're about to present it, and use it to force the
+        popover to `-close` when dismissing content-relative child windows. Also take this opportunity to remove some
+        staging declarations on LTUITranslationViewController that have long since landed in the macOS 12 SDK.
+
 2021-08-05  Michael Catanzaro  <mcatanzaro@gnome.org>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h

@@ -53 +53 @@
 OBJC_CLASS NSImmediateActionGestureRecognizer;
 OBJC_CLASS NSMenu;
+OBJC_CLASS NSPopover;
 OBJC_CLASS NSTextInputContext;
 OBJC_CLASS NSView;
@@ -908 +909 @@
     RetainPtr<VKImageAnalyzer> m_imageAnalyzer;
 #endif
+
+#if HAVE(TRANSLATION_UI_SERVICES) && ENABLE(CONTEXT_MENUS)
+    WeakObjCPtr<NSPopover> m_lastContextMenuTranslationPopover;
+#endif
 };
     

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

@@ -151 +151 @@
 #import <TranslationUIServices/LTUITranslationViewController.h>
 
-@interface LTUITranslationViewController (Staging_77660675)
-@property (nonatomic, copy) void(^replacementHandler)(NSAttributedString *);
-@end
-
 SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TranslationUIServices)
 SOFT_LINK_CLASS_OPTIONAL(TranslationUIServices, LTUITranslationViewController)
@@ -3721 +3717 @@
 
     m_pageClient->dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeTextIgnored);
+
+#if HAVE(TRANSLATION_UI_SERVICES) && ENABLE(CONTEXT_MENUS)
+    [std::exchange(m_lastContextMenuTranslationPopover, nil) close];
+#endif
 }
 
@@ -5780 +5780 @@
     auto translationViewController = adoptNS([allocLTUITranslationViewControllerInstance() init]);
     [translationViewController setText:adoptNS([[NSAttributedString alloc] initWithString:info.text]).get()];
-    if (info.mode == WebCore::TranslationContextMenuMode::Editable && [translationViewController respondsToSelector:@selector(setReplacementHandler:)]) {
+    if (info.mode == WebCore::TranslationContextMenuMode::Editable) {
         [translationViewController setIsSourceEditable:YES];
         [translationViewController setReplacementHandler:[this, weakThis = makeWeakPtr(*this)](NSAttributedString *string) {
@@ -5806 +5806 @@
         preferredEdge = aim > highlight ? NSRectEdgeMaxX : NSRectEdgeMinX;
 
+    m_lastContextMenuTranslationPopover = popover.get();
     [popover showRelativeToRect:info.selectionBoundsInRootView ofView:view.get() preferredEdge:preferredEdge];
 }