Changeset 278330 in webkit

Timestamp:

Jun 1, 2021, 3:36:13 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Adopt Reveal for phone numbers
​https://bugs.webkit.org/show_bug.cgi?id=226383
rdar://78482517
Source/WebCore/PAL:

Patch by Dana Estra <​destra@apple.com> on 2021-06-01
Reviewed by Tim Horton.

Add declaration for RVItem method initWithURL.

• pal/spi/cocoa/RevealSPI.h:

Source/WebKit:

Patch by Dana Estra <​destra@apple.com> on 2021-06-01
Reviewed by Tim Horton.

Manually tested by selecting text containing phone numbers in Safari and viewing dropdown menu.

Switch to Reveal framework to show a dropdown menu for telephone numbers with more options.

• Platform/mac/MenuUtilities.mm:

(-[WKEmptyPresenterHighlightDelegate revealContext:rectsForItem:]):
(WebKit::menuForTelephoneNumber):

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/RevealSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/mac/MenuUtilities.mm (modified) (3 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-06-01  Dana Estra  <destra@apple.com>
+
+        Adopt Reveal for phone numbers
+        https://bugs.webkit.org/show_bug.cgi?id=226383
+        rdar://78482517
+        
+        Reviewed by Tim Horton.
+        
+        Add declaration for RVItem method initWithURL.
+
+        * pal/spi/cocoa/RevealSPI.h:
+
 2021-05-30  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h

@@ -50 +50 @@
 - (instancetype)initWithText:(NSString *)text selectedRange:(NSRange)selectedRange NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithDDResult:(DDScannerResult *)result NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithURL:(NSURL *)url rangeInContext:(NSRange)rangeInContext;
 @property (readonly, nonatomic) NSRange highlightRange;
 @end

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-01  Dana Estra  <destra@apple.com>
+
+        Adopt Reveal for phone numbers
+        https://bugs.webkit.org/show_bug.cgi?id=226383
+        rdar://78482517
+
+        Reviewed by Tim Horton.
+
+        Manually tested by selecting text containing phone numbers in Safari and viewing dropdown menu.
+        
+        Switch to Reveal framework to show a dropdown menu for telephone numbers with more options.
+
+        * Platform/mac/MenuUtilities.mm:
+        (-[WKEmptyPresenterHighlightDelegate revealContext:rectsForItem:]):
+        (WebKit::menuForTelephoneNumber):
+
 2021-06-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Platform/mac/MenuUtilities.mm

@@ -26 +26 @@
 #import "config.h"
 #import "MenuUtilities.h"
+#import <pal/cocoa/RevealSoftLink.h>
 
 #if PLATFORM(MAC)
@@ -40 +41 @@
 SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
 #endif
+
+@interface WKEmptyPresenterHighlightDelegate : NSObject <RVPresenterHighlightDelegate>
+@end
+
+@implementation WKEmptyPresenterHighlightDelegate
+
+- (NSArray <NSValue *> *)revealContext:(RVPresentingContext *)context rectsForItem:(RVItem *)item
+{
+    return @[ ];
+}
+
+@end
 
 namespace WebKit {
@@ -95 +108 @@
 RetainPtr<NSMenu> menuForTelephoneNumber(const String& telephoneNumber)
 {
-    if (!DataDetectorsLibrary())
+    if (!PAL::isRevealFrameworkAvailable() || !PAL::isRevealCoreFrameworkAvailable())
         return nil;
 
     RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
-    NSMutableArray *faceTimeItems = [NSMutableArray array];
-    NSMenuItem *dialItem = nil;
-
-    RetainPtr<DDActionContext> actionContext = adoptNS([allocDDActionContextInstance() init]);
-    [actionContext setAllowedActionUTIs:@[ @"com.apple.dial", @"com.apple.facetime", @"com.apple.facetimeaudio" ]];
-
-    NSArray *proposedMenuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:actionContext.get()];
-    for (NSMenuItem *item in proposedMenuItems) {
-        auto action = actionForMenuItem(item);
-        if ([action.actionUTI hasPrefix:@"com.apple.dial"])
-            dialItem = item;
-        else if ([action.actionUTI hasPrefix:@"com.apple.facetime"])
-            [faceTimeItems addObject:item];
-    }
-
-    if (dialItem)
-        [menu addItem:dialItem];
-
-    if (faceTimeItems.count) {
-        if ([menu numberOfItems])
-            [menu addItem:[NSMenuItem separatorItem]];
-        for (NSMenuItem *item in faceTimeItems)
-            [menu addItem:item];
-    }
+    auto viewForPresenter = adoptNS([[NSView alloc] init]);
+    auto urlComponents = adoptNS([[NSURLComponents alloc] init]);
+    [urlComponents setScheme:@"tel"];
+    [urlComponents setPath:telephoneNumber];
+    auto item = adoptNS([PAL::allocRVItemInstance() initWithURL:[urlComponents URL] rangeInContext:NSMakeRange(0, telephoneNumber.length())]);
+    auto presenter = adoptNS([PAL::allocRVPresenterInstance() init]);
+    auto delegate = adoptNS([[WKEmptyPresenterHighlightDelegate alloc] init]);
+    auto context = adoptNS([PAL::allocRVPresentingContextInstance() initWithPointerLocationInView:NSZeroPoint inView:viewForPresenter.get() highlightDelegate:delegate.get()]);
+    NSArray *proposedMenuItems = [presenter menuItemsForItem:item.get() documentContext:nil presentingContext:context.get() options:nil];
+    
+    [menu setItemArray:proposedMenuItems];
 
     return menu;