Changeset 198046 in webkit

Timestamp:

Mar 11, 2016, 2:13:42 PM (9 years ago)

Author:

mitz@apple.com

Message:

[iOS] Allow clients to specify text suggestions to be used for a form input session
​https://bugs.webkit.org/show_bug.cgi?id=155343

Patch by Chelsea Pugh <​cpugh@apple.com> on 2016-03-11
Reviewed by Dan Bernstein.

• UIProcess/API/Cocoa/_WKFormInputSession.h:
• UIProcess/API/Cocoa/_WKInputDelegate.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKFormInputSession suggestions]): Add a getter for suggestions.
(-[WKFormInputSession setSuggestions:]): Add a setter, which calls setSuggestions with our suggestions on the input delegate.
(-[WKContentView insertTextSuggestion:]): Call _webView:insertTextSuggestion:inInputSession: on our input delegate so clients know
a text suggestion was tapped.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKFormInputSession.h (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKInputDelegate.h (modified) (2 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-03-11  Chelsea Pugh  <cpugh@apple.com>
+
+        [iOS] Allow clients to specify text suggestions to be used for a form input session
+        https://bugs.webkit.org/show_bug.cgi?id=155343
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/Cocoa/_WKFormInputSession.h:
+        * UIProcess/API/Cocoa/_WKInputDelegate.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKFormInputSession suggestions]): Add a getter for suggestions.
+        (-[WKFormInputSession setSuggestions:]): Add a setter, which calls setSuggestions with our suggestions on the input delegate.
+        (-[WKContentView insertTextSuggestion:]): Call _webView:insertTextSuggestion:inInputSession: on our input delegate so clients know 
+        a text suggestion was tapped.
+
 2016-03-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h

@@ -31 +31 @@
 #import <WebKit/_WKFocusedElementInfo.h>
 
+@class UITextSuggestion;
+
 @protocol _WKFormInputSession <NSObject>
 
@@ -40 +42 @@
 @property (nonatomic, copy) NSString *accessoryViewCustomButtonTitle;
 @property (nonatomic, strong) UIView *customInputView WK_AVAILABLE(NA, WK_IOS_TBA);
+@property (nonatomic, copy) NSArray<UITextSuggestion *> *suggestions WK_AVAILABLE(NA, WK_IOS_TBA);
 #endif
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h

@@ -30 +30 @@
 #import <Foundation/Foundation.h>
 
+@class UITextSuggestion;
 @class WKWebView;
 @protocol _WKFocusedElementInfo;
@@ -46 +47 @@
 - (BOOL)_webView:(WKWebView *)webView hasSuggestionsForCurrentStringInInputSession:(id <_WKFormInputSession>)inputSession;
 - (NSArray *)_webView:(WKWebView *)webView suggestionsForString:(NSString *)string inInputSession:(id <_WKFormInputSession>)inputSession;
+- (void)_webView:(WKWebView *)webView insertTextSuggestion:(UITextSuggestion *)suggestion inInputSession:(id <_WKFormInputSession>)inputSession WK_AVAILABLE(NA, WK_IOS_TBA);
 #endif
 

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

@@ -261 +261 @@
     RetainPtr<WKFocusedElementInfo> _focusedElementInfo;
     RetainPtr<UIView> _customInputView;
+    RetainPtr<NSArray<UITextSuggestion *>> _suggestions;
 }
 
@@ -317 +318 @@
     _customInputView = customInputView;
     [_contentView reloadInputViews];
+}
+
+- (NSArray<UITextSuggestion *> *)suggestions
+{
+    return _suggestions.get();
+}
+
+- (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions
+{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+    id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
+    _suggestions = adoptNS([suggestions copy]);
+    // FIXME 25102224: Remove this dispatch_after once race condition causing keyboard suggestions to overwrite
+    // the suggestions being set is resolved
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
+        [suggestionDelegate setSuggestions:suggestions];
+    });
+#endif
 }
 
@@ -2604 +2623 @@
     [self.inputDelegate selectionDidChange:self];
 }
+    
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion
+{
+    id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
+    if ([inputDelegate respondsToSelector:@selector(_webView:insertTextSuggestion:inInputSession:)])
+        [inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()];
+}
+#endif
 
 - (NSString *)textInRange:(UITextRange *)range