Changeset 260759 in webkit

Timestamp:

Apr 27, 2020 9:08:21 AM (4 years ago)

Author:

dbates@webkit.org

Message:

Caret may be placed in the wrong spot for text input context that is a form control
​https://bugs.webkit.org/show_bug.cgi?id=210939
<rdar://problem/61943089>

Reviewed by Darin Adler.

Source/WebCore:

Add a helper function that returns the closest editable position inside an element
for a given point (if any).

• editing/Editing.cpp:

(WebCore::closestEditablePositionInElementForAbsolutePoint): Added.

• editing/Editing.h:

Source/WebKit:

Find the closest editable position in the element for the point using the
newly introduced closestEditablePositionInElementForAbsolutePoint().

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::focusTextInputContextAndPlaceCaret):

Tools:

Add a test.

• TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editing.cpp (modified) (2 diffs)
• Source/WebCore/editing/Editing.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-27  Daniel Bates  <dabates@apple.com>
+
+        Caret may be placed in the wrong spot for text input context that is a form control
+        https://bugs.webkit.org/show_bug.cgi?id=210939
+        <rdar://problem/61943089>
+
+        Reviewed by Darin Adler.
+
+        Add a helper function that returns the closest editable position inside an element
+        for a given point (if any).
+
+        * editing/Editing.cpp:
+        (WebCore::closestEditablePositionInElementForAbsolutePoint): Added.
+        * editing/Editing.h:
+
 2020-04-27  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WebCore/editing/Editing.cpp

@@ -51 +51 @@
 #include "RenderElement.h"
 #include "RenderTableCell.h"
+#include "RenderTextControlSingleLine.h"
 #include "ShadowRoot.h"
 #include "Text.h"
+#include "TextControlInnerElements.h"
 #include "TextIterator.h"
 #include "VisibleUnits.h"
@@ -560 +562 @@
     ASSERT(!node.parentNode()->isShadowRoot());
     return positionInParentAfterNode(&node);
+}
+
+VisiblePosition closestEditablePositionInElementForAbsolutePoint(const Element& element, const IntPoint& point)
+{
+    if (!element.isConnected() || !element.document().frame())
+        return { };
+
+    Ref<const Element> protectedElement { element };
+    auto frame = makeRef(*element.document().frame());
+
+    element.document().updateLayoutIgnorePendingStylesheets();
+
+    RenderObject* renderer = element.renderer();
+    // Look at the inner element of a form control, not the control itself, as it is the editable part.
+    if (is<HTMLTextFormControlElement>(element)) {
+        auto& formControlElement = downcast<HTMLTextFormControlElement>(element);
+        if (!formControlElement.isInnerTextElementEditable())
+            return { };
+        if (auto innerTextElement = formControlElement.innerTextElement())
+            renderer = innerTextElement->renderer();
+    }
+    if (!renderer)
+        return { };
+    auto absoluteBoundingBox = renderer->absoluteBoundingBoxRect();
+    auto constrainedPoint = point.constrainedBetween(absoluteBoundingBox.minXMinYCorner(), absoluteBoundingBox.maxXMaxYCorner());
+    auto visiblePosition = frame->visiblePositionForPoint(constrainedPoint);
+    return isEditablePosition(visiblePosition.deepEquivalent()) ? visiblePosition : VisiblePosition { };
 }
 

trunk/Source/WebCore/editing/Editing.h

@@ -157 +157 @@
 VisiblePosition visiblePositionForIndexUsingCharacterIterator(Node&, int index); // FIXME: Why do we need this version?
 
+WEBCORE_EXPORT VisiblePosition closestEditablePositionInElementForAbsolutePoint(const Element&, const IntPoint&);
+
 // -------------------------------------------------------------------------
 // HTMLElement

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-27  Daniel Bates  <dabates@apple.com>
+
+        Caret may be placed in the wrong spot for text input context that is a form control
+        https://bugs.webkit.org/show_bug.cgi?id=210939
+        <rdar://problem/61943089>
+
+        Reviewed by Darin Adler.
+
+        Find the closest editable position in the element for the point using the
+        newly introduced closestEditablePositionInElementForAbsolutePoint().
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::focusTextInputContextAndPlaceCaret):
+
 2020-04-27  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -100 +100 @@
 #import <WebCore/HTMLSummaryElement.h>
 #import <WebCore/HTMLTextAreaElement.h>
-#import <WebCore/HTMLTextFormControlElement.h>
 #import <WebCore/HistoryItem.h>
 #import <WebCore/HitTestResult.h>
@@ -4351 +4350 @@
     }
 
+    // FIXME: Do not focus an element if it moved or the caret point is outside its bounds
+    // because we only want to do so if the caret can be placed.
     UserGestureIndicator gestureIndicator { ProcessingUserGesture, &target->document() };
     SetForScope<bool> userIsInteractingChange { m_userIsInteracting, true };
@@ -4360 +4361 @@
         return;
     }
-    // The function visiblePositionInFocusedNodeForPoint constrains the point to be inside
-    // the bounds of the target element.
-    auto position = visiblePositionInFocusedNodeForPoint(targetFrame, point, true /* isInteractingWithFocusedElement */);
+
+    ASSERT(targetFrame->view());
+    auto position = closestEditablePositionInElementForAbsolutePoint(*target, targetFrame->view()->rootViewToContents(point));
+    if (position.isNull()) {
+        completionHandler(false);
+        return;
+    }
     targetFrame->selection().setSelectedRange(Range::create(*targetFrame->document(), position, position).ptr(), position.affinity(), WebCore::FrameSelection::ShouldCloseTyping::Yes, UserTriggered);
     completionHandler(true);

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-27  Daniel Bates  <dabates@apple.com>
+
+        Caret may be placed in the wrong spot for text input context that is a form control
+        https://bugs.webkit.org/show_bug.cgi?id=210939
+        <rdar://problem/61943089>
+
+        Reviewed by Darin Adler.
+
+        Add a test.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm:
+        (TestWebKitAPI::TEST):
+
 2020-04-27  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RequestTextInputContext.mm

@@ -465 +465 @@
 }
 
+TEST(RequestTextInputContext, FocusFieldWithPaddingAndPlaceCaretAtEnd)
+{
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+    constexpr char exampleText[] = "hello world";
+    constexpr size_t exampleTextLength = sizeof(exampleText) - 1;
+    [webView synchronouslyLoadHTMLString:applyStyle([NSString stringWithFormat:@"<input type='text' value='%s' style='width: 100px; height: 50px; padding: 20px'>", exampleText])];
+    NSArray<_WKTextInputContext *> *contexts = [webView synchronouslyRequestTextInputContextsInRect:[webView bounds]];
+    EXPECT_EQ(1UL, contexts.count);
+    RetainPtr<_WKTextInputContext> inputElement = contexts[0];
+
+    CGRect boundingRect = [inputElement boundingRect];
+    CGPoint endPosition = CGPointMake(boundingRect.origin.x + boundingRect.size.width, boundingRect.origin.y);
+    EXPECT_EQ((UIResponder<UITextInput> *)[webView textInputContentView], [webView synchronouslyFocusTextInputContext:inputElement.get() placeCaretAt:endPosition]);
+    EXPECT_WK_STREQ("INPUT", [webView stringByEvaluatingJavaScript:@"document.activeElement.tagName"]);
+    EXPECT_EQ(static_cast<int>(exampleTextLength), [[webView objectByEvaluatingJavaScript:@"document.activeElement.selectionStart"] intValue]);
+    EXPECT_EQ(static_cast<int>(exampleTextLength), [[webView objectByEvaluatingJavaScript:@"document.activeElement.selectionEnd"] intValue]);
+}
+
 TEST(RequestTextInputContext, FocusFieldAndPlaceCaretOutsideField)
 {