Changeset 278815 in webkit

Timestamp:

Jun 12, 2021, 2:45:31 PM (4 years ago)

Author:

Wenson Hsieh

Message:

Number pad button is missing its image when tapping on <input type=tel> in watchOS 8
​https://bugs.webkit.org/show_bug.cgi?id=226955

Reviewed by Darin Adler.

Source/WebKit:

After some recent PepperUICore changes, the Quickboard button for presenting the number pad when focusing a
telephone input on watchOS 8 is missing its icon image. To fix this, stop using deprecated SPI for creating
the list tray button, and instead use +[PUICQuickboardListTrayButton buttonWithType:] and -setAction: to
create and set up the button.

• Platform/spi/watchos/PepperUICoreSPI.h:
• UIProcess/ios/forms/WKTextInputListViewController.mm:

(-[WKTextInputListViewController additionalTrayButtons]):

Source/WTF:

Add compile-time flags to guard the presence of PUICQuickboardController and PUICButtonTypePill.

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/spi/watchos/PepperUICoreSPI.h (modified) (1 diff)
• WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-06-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Number pad button is missing its image when tapping on <input type=tel> in watchOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=226955
+
+        Reviewed by Darin Adler.
+
+        Add compile-time flags to guard the presence of `PUICQuickboardController` and `PUICButtonTypePill`.
+
+        * wtf/PlatformHave.h:
+
 2021-06-11  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -946 +946 @@
 #endif
 
+#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 80000
+#define HAVE_QUICKBOARD_CONTROLLER 1
+#define HAVE_PUIC_BUTTON_TYPE_PILL 1
+#endif
+
 #if PLATFORM(COCOA)
 #define HAVE_CORE_GRAPHICS_ADOBE_RGB_1998_COLOR_SPACE 1

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Number pad button is missing its image when tapping on <input type=tel> in watchOS 8
+        https://bugs.webkit.org/show_bug.cgi?id=226955
+
+        Reviewed by Darin Adler.
+
+        After some recent PepperUICore changes, the Quickboard button for presenting the number pad when focusing a
+        telephone input on watchOS 8 is missing its icon image. To fix this, stop using deprecated SPI for creating
+        the list tray button, and instead use `+[PUICQuickboardListTrayButton buttonWithType:]` and `-setAction:` to
+        create and set up the button.
+
+        * Platform/spi/watchos/PepperUICoreSPI.h:
+        * UIProcess/ios/forms/WKTextInputListViewController.mm:
+        (-[WKTextInputListViewController additionalTrayButtons]):
+
 2021-06-12  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebKit/Platform/spi/watchos/PepperUICoreSPI.h

@@ -139 +139 @@
 @end
 
+typedef NS_ENUM(NSUInteger, PUICQuickboardAction) {
+    PUICQuickboardActionAddNumber = 7,
+};
+
+#if HAVE(PUIC_BUTTON_TYPE_PILL)
+extern UIButtonType const PUICButtonTypePill;
+#endif
+
 @interface PUICQuickboardListTrayButton : PUICButton
 - (instancetype)initWithFrame:(CGRect)frame tintColor:(nullable UIColor *)tintColor defaultHeight:(CGFloat)defaultHeight;
+@property (nonatomic) PUICQuickboardAction action;
 @end
 

trunk/Source/WebKit/UIProcess/ios/forms/WKTextInputListViewController.mm

@@ -65 +65 @@
         return @[ ];
 
-    UIImage *numberPadButtonIcon = [PUICResources imageNamed:@"QuickboardAddPhoneNumber" inBundle:[NSBundle bundleWithIdentifier:@"com.apple.PepperUICore"] shouldCache:YES];
-
+#if HAVE(PUIC_BUTTON_TYPE_PILL)
+    auto numberPadButton = retainPtr([PUICQuickboardListTrayButton buttonWithType:PUICButtonTypePill]);
+#else
     ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     auto numberPadButton = adoptNS([[PUICQuickboardListTrayButton alloc] initWithFrame:CGRectZero tintColor:nil defaultHeight:self.specs.defaultButtonHeight]);
     ALLOW_DEPRECATED_DECLARATIONS_END
-    [numberPadButton setImage:numberPadButtonIcon forState:UIControlStateNormal];
+#endif
+    [numberPadButton setAction:PUICQuickboardActionAddNumber];
     [numberPadButton addTarget:self action:@selector(presentNumberPadViewController) forControlEvents:UIControlEventTouchUpInside];
     return @[ numberPadButton.get() ];