Changeset 270007 in webkit

Timestamp:

Nov 18, 2020 7:16:53 PM (3 years ago)

Author:

Megan Gardner

Message:

Menu Bar support for app highlights in book.
​https://bugs.webkit.org/show_bug.cgi?id=219117

Reviewed by Wenson Hsieh.

Add menu stubs in iOS to support highlights for books in modern webkit.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView setUpInteraction]):
(-[WKContentView canPerformAction:withSender:]):
(-[WKContentView setupAppHighlightMenus]):
(-[WKContentView createHighlightInCurrentGroupWithRange:]):
(-[WKContentView createHighlightInNewGroupWithRange:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-18  Megan Gardner  <megan_gardner@apple.com>
+
+        Menu Bar support for app highlights in book.
+        https://bugs.webkit.org/show_bug.cgi?id=219117
+
+        Reviewed by Wenson Hsieh.
+
+        Add menu stubs in iOS to support highlights for books in modern webkit. 
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setUpInteraction]):
+        (-[WKContentView canPerformAction:withSender:]):
+        (-[WKContentView setupAppHighlightMenus]):
+        (-[WKContentView createHighlightInCurrentGroupWithRange:]):
+        (-[WKContentView createHighlightInNewGroupWithRange:]):
+
 2020-11-18  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -838 +838 @@
 #endif
 
+#if ENABLE(APP_HIGHLIGHTS)
+    [self setupAppHighlightMenus];
+#endif
+
     _twoFingerSingleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerSingleTapGestureRecognized:)]);
     [_twoFingerSingleTapGestureRecognizer setAllowableMovement:60];
@@ -3326 +3330 @@
         || action == @selector(_transpose))
         return editorState.isContentEditable;
+
+#if ENABLE(APP_HIGHLIGHTS)
+    if (action == @selector(createHighlightInCurrentGroupWithRange:) || action == @selector(createHighlightInNewGroupWithRange:))
+        return editorState.selectionIsRange && !editorState.isContentEditable;
+#endif
 
     return [_webView canPerformAction:action withSender:sender];
@@ -8595 +8604 @@
 #endif
 
+#if ENABLE(APP_HIGHLIGHTS)
+- (void)setupAppHighlightMenus
+{
+    if (_page->preferences().appHighlightsEnabled()) {
+        auto addHighlightCurrentGroupItem = adoptNS([[UIMenuItem alloc] initWithTitle:WebCore::contextMenuItemTagAddHighlightToCurrentGroup() action:@selector(createHighlightInCurrentGroupWithRange:)]);
+        auto addHighlightNewGroupItem = adoptNS([[UIMenuItem alloc] initWithTitle:WebCore::contextMenuItemTagAddHighlightToNewGroup() action:@selector(createHighlightInNewGroupWithRange:)]);
+        [[UIMenuController sharedMenuController] setMenuItems:@[ addHighlightCurrentGroupItem.get(), addHighlightNewGroupItem.get() ]];
+    }
+}
+
+- (void)createHighlightInCurrentGroupWithRange:(id)sender
+{
+    // FIXME: Add Highlight logic.
+}
+
+- (void)createHighlightInNewGroupWithRange:(id)sender
+{
+    // FIXME: Add Highlight logic.
+}
+
+#endif
+
 - (void)setContinuousSpellCheckingEnabled:(BOOL)enabled
 {