Changeset 262271 in webkit

Timestamp:

May 28, 2020 4:06:48 PM (4 years ago)

Author:

Jonathan Bedard

Message:

watchOS: Upstream WKTextInputListViewController
​https://bugs.webkit.org/show_bug.cgi?id=212495
<rdar://problem/63733949>

Reviewed by Wenson Hsieh.

• UIProcess/ios/forms/WKTextInputListViewController.h: Moved from WebKitAdditions.
• UIProcess/ios/forms/WKTextInputListViewController.mm: Ditto.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKTextInputListViewController.h (modified) (2 diffs)
• UIProcess/ios/forms/WKTextInputListViewController.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-28  Jonathan Bedard  <jbedard@apple.com>
+
+        watchOS: Upstream WKTextInputListViewController
+        https://bugs.webkit.org/show_bug.cgi?id=212495
+        <rdar://problem/63733949>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/forms/WKTextInputListViewController.h: Moved from WebKitAdditions.
+        * UIProcess/ios/forms/WKTextInputListViewController.mm: Ditto.
+
 2020-05-28  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #pragma once
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKTextInputListViewControllerAdditions.h>
-#endif
+#if PLATFORM(WATCHOS)
+
+#import "WKQuickboardListViewController.h"
+
+typedef NS_ENUM(NSInteger, WKNumberPadInputMode) {
+    WKNumberPadInputModeNone,
+    WKNumberPadInputModeNumbersAndSymbols,
+    WKNumberPadInputModeTelephone,
+    WKNumberPadInputModeNumbersOnly
+};
+
+@class WKTextInputListViewController;
+
+@protocol WKTextInputListViewControllerDelegate <WKQuickboardViewControllerDelegate>
+
+- (WKNumberPadInputMode)numericInputModeForListViewController:(WKTextInputListViewController *)controller;
+- (NSString *)textContentTypeForListViewController:(WKTextInputListViewController *)controller;
+- (NSArray<UITextSuggestion *> *)textSuggestionsForListViewController:(WKTextInputListViewController *)controller;
+- (void)listViewController:(WKTextInputListViewController *)controller didSelectTextSuggestion:(UITextSuggestion *)suggestion;
+- (BOOL)allowsDictationInputForListViewController:(PUICQuickboardViewController *)controller;
+
+@end
+
+@interface WKTextInputListViewController : WKQuickboardListViewController
+
+- (instancetype)initWithDelegate:(id <WKTextInputListViewControllerDelegate>)delegate NS_DESIGNATED_INITIALIZER;
+- (void)reloadTextSuggestions;
+
+@property (nonatomic, weak) id <WKTextInputListViewControllerDelegate> delegate;
+
+@end
+
+@interface WKTextInputListViewController (Testing)
+
+- (void)enterText:(NSString *)text;
+
+@end
+
+#endif // PLATFORM(WATCHOS)

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #import "WKTextInputListViewController.h"
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKTextInputListViewControllerAdditions.mm>
+#if PLATFORM(WATCHOS)
+
+#import "WKNumberPadViewController.h"
+#import <PepperUICore/PUICQuickboardArouetViewController.h>
+#import <PepperUICore/PUICQuickboardListViewControllerSubclass.h>
+#import <PepperUICore/PUICQuickboardListViewSpecs.h>
+#import <PepperUICore/PUICResources.h>
+#import <PepperUICore/PUICTableView.h>
+#import <PepperUICore/PUICTableViewCell.h>
+#import <wtf/RetainPtr.h>
+
+#if HAVE(QUICKBOARD_COLLECTION_VIEWS)
+#import <PepperUICore/PUICQuickboardListCollectionViewItemCell.h>
 #endif
+
+static const CGFloat textSuggestionButtonHeight = 44;
+static const CGFloat textSuggestionLabelHorizontalMargin = 9;
+static NSString *textSuggestionCellReuseIdentifier = @"WebKitQuickboardTextSuggestionCell";
+
+@implementation WKTextInputListViewController {
+    RetainPtr<WKNumberPadViewController> _numberPadViewController;
+}
+
+@dynamic delegate;
+
+- (instancetype)initWithDelegate:(id <WKTextInputListViewControllerDelegate>)delegate
+{
+    if (!(self = [super initWithDelegate:delegate]))
+        return nil;
+
+    self.textContentType = [self.delegate textContentTypeForListViewController:self];
+    return self;
+}
+
+- (void)willPresentArouetViewController:(PUICQuickboardArouetViewController *)quickboard
+{
+    NSString *initialText = [self.delegate initialValueForViewController:self];
+    if (initialText.length)
+        [quickboard setInputText:initialText selectionRange:NSMakeRange(initialText.length, 0)];
+
+    quickboard.minTextLengthForEnablingAccept = 0;
+}
+
+- (NSArray *)additionalTrayButtons
+{
+    if ([self.delegate numericInputModeForListViewController:self] == WKNumberPadInputModeNone)
+        return @[ ];
+
+    UIImage *numberPadButtonIcon = [PUICResources imageNamed:@"QuickboardAddPhoneNumber" inBundle:[NSBundle bundleWithIdentifier:@"com.apple.PepperUICore"] shouldCache:YES];
+
+    auto numberPadButton = adoptNS([[PUICQuickboardListTrayButton alloc] initWithFrame:CGRectZero tintColor:nil defaultHeight:self.specs.defaultButtonHeight]);
+    [numberPadButton setImage:numberPadButtonIcon forState:UIControlStateNormal];
+    [numberPadButton addTarget:self action:@selector(presentNumberPadViewController) forControlEvents:UIControlEventTouchUpInside];
+    return @[ numberPadButton.get() ];
+}
+
+- (void)presentNumberPadViewController
+{
+    if (_numberPadViewController)
+        return;
+
+    WKNumberPadInputMode mode = [self.delegate numericInputModeForListViewController:self];
+    if (mode == WKNumberPadInputModeNone) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+
+    NSString *initialText = [self.delegate initialValueForViewController:self];
+    _numberPadViewController = adoptNS([[WKNumberPadViewController alloc] initWithDelegate:self.delegate initialText:initialText inputMode:mode]);
+    [self presentViewController:_numberPadViewController.get() animated:YES completion:nil];
+}
+
+- (void)reloadTextSuggestions
+{
+    [self reloadListItems];
+}
+
+- (void)enterText:(NSString *)text
+{
+    [self.delegate quickboard:self textEntered:[[[NSAttributedString alloc] initWithString:text] autorelease]];
+}
+
+#pragma mark - Quickboard subclassing
+
+- (BOOL)supportsDictationInput
+{
+    return [self.delegate allowsDictationInputForListViewController:self];
+}
+
+- (void)didSelectListItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    [self _didSelectListItem:indexPath.row];
+}
+
+// FIXME: This method can be removed when <rdar://problem/57807445> lands in a build.
+- (void)didSelectListItem:(NSInteger)itemNumber
+{
+    [self _didSelectListItem:itemNumber];
+}
+
+- (void)_didSelectListItem:(NSInteger)itemNumber
+{
+    NSArray<UITextSuggestion *> *textSuggestions = [self.delegate textSuggestionsForListViewController:self];
+    if (textSuggestions.count <= static_cast<NSUInteger>(itemNumber)) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+
+    [self.delegate listViewController:self didSelectTextSuggestion:[textSuggestions objectAtIndex:itemNumber]];
+}
+
+- (NSInteger)numberOfListItems
+{
+    return [self.delegate textSuggestionsForListViewController:self].count;
+}
+
+- (CGFloat)heightForListItem:(NSInteger)itemNumber width:(CGFloat)width
+{
+    return textSuggestionButtonHeight;
+}
+
+// FIXME: This method can be removed when <rdar://problem/57807445> lands in a build.
+- (PUICQuickboardListItemCell *)cellForListItem:(NSInteger)itemNumber
+{
+    NSArray<UITextSuggestion *> *textSuggestions = [self.delegate textSuggestionsForListViewController:self];
+    if (textSuggestions.count <= static_cast<NSUInteger>(itemNumber)) {
+        ASSERT_NOT_REACHED();
+        return nil;
+    }
+
+    UITextSuggestion *textSuggestion = [textSuggestions objectAtIndex:itemNumber];
+    auto reusableCell = retainPtr([self.listView dequeueReusableCellWithIdentifier:textSuggestionCellReuseIdentifier]);
+    if (!reusableCell) {
+        reusableCell = adoptNS([[WKQuickboardListItemCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:textSuggestionCellReuseIdentifier]);
+        [reusableCell itemLabel].numberOfLines = 1;
+        [reusableCell itemLabel].lineBreakMode = NSLineBreakByTruncatingTail;
+        [reusableCell itemLabel].allowsDefaultTighteningForTruncation = YES;
+    }
+
+    CGFloat viewWidth = CGRectGetWidth(self.listView.bounds);
+    [reusableCell configureForText:textSuggestion.displayText width:viewWidth];
+
+    // The default behavior of -configureForText:width: causes the text label to run off the end of the cell.
+    // Adjust for this by shrinking the label width to actually fit the bounds of the cell.
+    [reusableCell itemLabel].frame = UIRectInset([reusableCell contentView].bounds, 0, textSuggestionLabelHorizontalMargin, 0, textSuggestionLabelHorizontalMargin);
+    return reusableCell.autorelease();
+}
+
+- (NSString *)listItemCellReuseIdentifier
+{
+    return textSuggestionCellReuseIdentifier;
+}
+
+#if HAVE(QUICKBOARD_COLLECTION_VIEWS)
+
+- (Class)listItemCellClass
+{
+    return [WKQuickboardListCollectionViewItemCell class];
+}
+
+- (PUICQuickboardListCollectionViewItemCell *)itemCellForListItem:(NSInteger)itemNumber forIndexPath:(NSIndexPath *)indexPath
+{
+    NSArray<UITextSuggestion *> *textSuggestions = [self.delegate textSuggestionsForListViewController:self];
+    if (textSuggestions.count <= static_cast<NSUInteger>(itemNumber)) {
+        ASSERT_NOT_REACHED();
+        return nil;
+    }
+
+    UITextSuggestion *textSuggestion = [textSuggestions objectAtIndex:itemNumber];
+    auto reusableCell = retainPtr([self.collectionView dequeueReusableCellWithReuseIdentifier:textSuggestionCellReuseIdentifier forIndexPath:indexPath]);
+
+    [reusableCell bodyLabel].numberOfLines = 1;
+    [reusableCell bodyLabel].lineBreakMode = NSLineBreakByTruncatingTail;
+    [reusableCell bodyLabel].allowsDefaultTighteningForTruncation = YES;
+    [reusableCell setText:textSuggestion.displayText];
+
+    // The default behavior of -configureForText:width: causes the text label to run off the end of the cell.
+    // Adjust for this by shrinking the label width to actually fit the bounds of the cell.
+    [reusableCell bodyLabel].frame = UIRectInset([reusableCell contentView].bounds, 0, textSuggestionLabelHorizontalMargin, 0, textSuggestionLabelHorizontalMargin);
+    return reusableCell.autorelease();
+}
+
+#endif // HAVE(QUICKBOARD_COLLECTION_VIEWS)
+
+- (BOOL)supportsArouetInput
+{
+    return [self.delegate numericInputModeForListViewController:self] == WKNumberPadInputModeNone;
+}
+
+@end
+
+#endif // PLATFORM(WATCHOS)