[webkit-changes] [WebKit/WebKit] bf5cf8: [Writing Tools] Two Writing Tools context menu ite...

[Richard Robinson]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: bf5cf82f2df5bbd2afd6e7cdc56f6da24b2b21fb
      https://github.com/WebKit/WebKit/commit/bf5cf82f2df5bbd2afd6e7cdc56f6da24b2b21fb
  Author: Richard Robinson <richard_robinson2 at apple.com>
  Date:   2024-07-05 (Fri, 05 Jul 2024)

  Changed paths:
    M Source/WebCore/PAL/pal/spi/mac/NSMenuSPI.h
    M Source/WebCore/loader/EmptyClients.cpp
    M Source/WebCore/page/ContextMenuClient.h
    M Source/WebCore/page/ContextMenuController.cpp
    M Source/WebCore/page/writing-tools/WritingToolsTypes.h
    M Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
    M Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm
    M Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.h
    M Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.mm
    M Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
    M Source/WebKit/UIProcess/PageClient.h
    M Source/WebKit/UIProcess/WebPageProxy.h
    M Source/WebKit/UIProcess/WebPageProxy.messages.in
    M Source/WebKit/UIProcess/mac/PageClientImplMac.h
    M Source/WebKit/UIProcess/mac/PageClientImplMac.mm
    M Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
    M Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
    M Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
    M Source/WebKit/UIProcess/mac/WebViewImpl.h
    M Source/WebKit/UIProcess/mac/WebViewImpl.mm
    M Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.h
    M Source/WebKit/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.h
    M Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h
    M Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm

  Log Message:
  -----------
  [Writing Tools] Two Writing Tools context menu items show up; menu item shows up even in non-text cases; panel appears in wrong location with one of the items; menu item is in wrong location
https://bugs.webkit.org/show_bug.cgi?id=276241
rdar://127608508

Reviewed by Wenson Hsieh, Aditya Keerthi and Tim Horton.

* Implement the `providesWritingToolsContextMenu` property so that AppKit does not inject their own
Writing Tools context menu item.

* Move the Writing Tools context menu item to be just above the 'Spelling & Grammar' item.

* Use `standardWritingToolsMenuItem` to implement the new Writing Tools context menu item UX so that
it includes each tool as a sub-menu item.

* Maintain compatibility in cases where these methods are not currently implemented by keeping the
old implementation around temporarily.

* Source/WebCore/PAL/pal/spi/mac/NSMenuSPI.h:
* Source/WebCore/page/ContextMenuController.cpp:
(WebCore::ContextMenuController::populate):
* Source/WebCore/page/writing-tools/WritingToolsTypes.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView writingToolsBehavior]):
* Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm:
(-[WKWebView providesWritingToolsContextMenu]):
* Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.h:
* Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.mm:
(WebKit::convertToPlatformRequestedTool):
(WebKit::convertToWebRequestedTool):
* Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::writingToolsBehavior const):
* Source/WebKit/UIProcess/PageClient.h:
(WebKit::PageClient::writingToolsContextMenuItemSelected):
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/mac/PageClientImplMac.h:
* Source/WebKit/UIProcess/mac/PageClientImplMac.mm:
(WebKit::PageClientImpl::writingToolsContextMenuItemSelected):
* Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h:
* Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:
(-[WKMenuTarget showWritingTools:]):
(WebKit::WebContextMenuProxyMac::writingToolsContextMenuItemSelected):
(WebKit::WebContextMenuProxyMac::getContextMenuItem):
* Source/WebKit/UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::writingToolsContextMenuItemSelected):
* Source/WebKit/UIProcess/mac/WebViewImpl.mm:
(WebKit::WebViewImpl::canHandleContextMenuWritingTools const):

Canonical link: https://commits.webkit.org/280705@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications