Changeset 259840 in webkit

Timestamp:

Apr 9, 2020, 4:58:49 PM (6 years ago)

Author:

Megan Gardner

Message:

Popovers are dismissed immediately when they try and bring up the keyboard.
​https://bugs.webkit.org/show_bug.cgi?id=210230
<rdar://problem/60385504>

Reviewed by Darin Adler.

When popovers use keyboards we dismiss them because the
web view loses firstResponder. We already have ways of
retaining focus when we lose first responde, so extend that
code to cover the case where a keyboard comes up in a popover.

We are also callling controlBeginEditing twice on refocusing a
popover due to behaviour with touch and syntheticClick, so
keep up from presenting the popover twice, and allow for the focus
count to be correclty incremented and decremented.

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView preserveFocus]):
(-[WKContentView releaseFocus]):

• UIProcess/ios/forms/WKFormInputControl.mm:

(-[WKDateTimePopover popoverWasDismissed:]):
(-[WKDateTimePopover controlBeginEditing]):
(-[WKDateTimePopover controlEndEditing]):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-09  Megan Gardner  <megan_gardner@apple.com>
+
+        Popovers are dismissed immediately when they try and bring up the keyboard.
+        https://bugs.webkit.org/show_bug.cgi?id=210230
+        <rdar://problem/60385504>
+
+        Reviewed by Darin Adler.
+
+        When popovers use keyboards we dismiss them because the
+        web view loses firstResponder. We already have ways of 
+        retaining focus when we lose first responde, so extend that
+        code to cover the case where a keyboard comes up in a popover.
+
+        We are also callling controlBeginEditing twice on refocusing a
+        popover due to behaviour with touch and syntheticClick, so 
+        keep up from presenting the popover twice, and allow for the focus
+        count to be correclty incremented and decremented.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView preserveFocus]):
+        (-[WKContentView releaseFocus]):
+        * UIProcess/ios/forms/WKFormInputControl.mm:
+        (-[WKDateTimePopover popoverWasDismissed:]):
+        (-[WKDateTimePopover controlBeginEditing]):
+        (-[WKDateTimePopover controlEndEditing]):
+
 2020-04-09  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -531 +531 @@
 - (void)generateSyntheticEditingCommand:(WebKit::SyntheticEditingCommandType)command;
 
+- (void)preserveFocus;
+- (void)releaseFocus;
+
 // UIWebFormAccessoryDelegate protocol
 - (void)accessoryDone;

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

@@ -6659 +6659 @@
 }
 
+- (void)preserveFocus
+{
+    [_webView _incrementFocusPreservationCount];
+}
+
+- (void)releaseFocus
+{
+    [_webView _decrementFocusPreservationCount];
+}
+
 - (void)_preserveFocusWithToken:(id <NSCopying, NSSecureCoding>)token destructively:(BOOL)destructively
 {

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

@@ -51 +51 @@
     RetainPtr<WKDateTimePopoverViewController> _viewController;
     WKContentView *_view;
+    BOOL _presenting;
+    BOOL _preservingFocus;
 }
 - (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode;
@@ -335 +337 @@
 }
 
+- (void)popoverWasDismissed:(WKRotatingPopover *)popover
+{
+    [super popoverWasDismissed:popover];
+    
+    if (popover == self) {
+        if (_preservingFocus) {
+            [_view releaseFocus];
+            _preservingFocus = NO;
+        }
+    }
+}
+
 - (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode
 {
@@ -378 +392 @@
 - (void)controlBeginEditing
 {
-    [self presentPopoverAnimated:NO];
-    [_viewController.get().innerControl controlBeginEditing];
+    if (!_presenting) {
+        _presenting = YES;
+        [self presentPopoverAnimated:NO];
+        [_viewController.get().innerControl controlBeginEditing];
+        
+        if (_view.focusedElementInformation.elementType == InputType::Time || _view.focusedElementInformation.elementType == InputType::DateTimeLocal) {
+            _preservingFocus = YES;
+            [_view preserveFocus];
+        }
+    }
 }
 
 - (void)controlEndEditing
 {
+    _presenting = NO;
     [self dismissPopoverAnimated:NO];
     [_viewController.get().innerControl controlEndEditing];