Changeset 245993 in webkit

Timestamp:

May 31, 2019, 4:13:39 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

[iOS] Reveal the focused element when it's immediately above software keyboard
​https://bugs.webkit.org/show_bug.cgi?id=198412

Reviewed by Wenson Hsieh.

Source/WebKit:

When _zoomToRevealFocusedElement is called with forceScroll set to NO (happens when input type is none or drawing
or when the platform is iPad), we don't force scrolling to reveal the focused element when it's entirely visible.

This can be misleading in cases where there is more content right beneath it relevant for editing operations.
Zoom & scroll to reveal the focused element when the said element is within 50px of the software keyboard.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):

LayoutTests:

Added a regression test. Note that this test always passes on non-iPad platforms either
before or after this patch as _zoomToRevealFocusedElement forces scrolling in that case.

• fast/scrolling/ios/reveal-focused-element-right-above-keyboard-on-ipad-expected.txt: Added.
• fast/scrolling/ios/reveal-focused-element-right-above-keyboard-on-ipad.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/ios/reveal-focused-element-right-above-keyboard-on-ipad-expected.txt (added)
• LayoutTests/fast/scrolling/ios/reveal-focused-element-right-above-keyboard-on-ipad.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [iOS] Reveal the focused element when it's immediately above software keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=198412
+
+        Reviewed by Wenson Hsieh.
+
+        Added a regression test. Note that this test always passes on non-iPad platforms either
+        before or after this patch as _zoomToRevealFocusedElement forces scrolling in that case.
+
+        * fast/scrolling/ios/reveal-focused-element-right-above-keyboard-on-ipad-expected.txt: Added.
+        * fast/scrolling/ios/reveal-focused-element-right-above-keyboard-on-ipad.html: Added.
+
 2019-05-31  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [iOS] Reveal the focused element when it's immediately above software keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=198412
+
+        Reviewed by Wenson Hsieh.
+
+        When _zoomToRevealFocusedElement is called with forceScroll set to NO (happens when input type is none or drawing
+        or when the platform is iPad), we don't force scrolling to reveal the focused element when it's entirely visible.
+
+        This can be misleading in cases where there is more content right beneath it relevant for editing operations.
+        Zoom & scroll to reveal the focused element when the said element is within 50px of the software keyboard.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
+
 2019-05-31  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -2328 +2328 @@
 
     CGFloat visibleOffsetFromTop = 0;
+    CGFloat minimumDistanceFromKeyboardToTriggerScroll = 0;
     if (!CGRectIsEmpty(intersectionBetweenScrollViewAndFormAssistant)) {
         CGFloat heightVisibleAboveFormAssistant = CGRectGetMinY(intersectionBetweenScrollViewAndFormAssistant) - CGRectGetMinY(visibleScrollViewBoundsInWebViewCoordinates);
         CGFloat heightVisibleBelowFormAssistant = CGRectGetMaxY(visibleScrollViewBoundsInWebViewCoordinates) - CGRectGetMaxY(intersectionBetweenScrollViewAndFormAssistant);
 
-        if (heightVisibleAboveFormAssistant >= minimumHeightToShowContentAboveKeyboard || heightVisibleBelowFormAssistant < heightVisibleAboveFormAssistant)
+        if (heightVisibleAboveFormAssistant >= minimumHeightToShowContentAboveKeyboard || heightVisibleBelowFormAssistant < heightVisibleAboveFormAssistant) {
             visibleSize.height = heightVisibleAboveFormAssistant;
-        else {
+            minimumDistanceFromKeyboardToTriggerScroll = 50;
+        } else {
             visibleSize.height = heightVisibleBelowFormAssistant;
             visibleOffsetFromTop = CGRectGetMaxY(intersectionBetweenScrollViewAndFormAssistant) - CGRectGetMinY(visibleScrollViewBoundsInWebViewCoordinates);
@@ -2373 +2375 @@
         currentlyVisibleRegionInWebViewCoordinates.origin.y += visibleOffsetFromTop;
         currentlyVisibleRegionInWebViewCoordinates.size = visibleSize;
+        currentlyVisibleRegionInWebViewCoordinates.size.height -= minimumDistanceFromKeyboardToTriggerScroll;
 
         // Don't bother scrolling if the entire node is already visible, whether or not we got a selectionRect.