Changeset 219113 in webkit

Timestamp:

Jul 3, 2017, 9:33:21 PM (8 years ago)

Author:

Wenson Hsieh

Message:

[iOS DnD] [WK2] Callout bar should reappear after dragging ends for a text selection
​https://bugs.webkit.org/show_bug.cgi?id=174116
<rdar://problem/33017845>

Reviewed by Ryosuke Niwa.

-willStartScrollingOverflow -didEndScrollingOverflow are helper methods on both the UIWKTextInteractionAssistant
and UIWebSelectionAssistant that handle hiding selection and callout bar UI during overflow scrolling and making
it reappear after scrolling ends. However, these hooks do not contain logic specific to scrolling, and simply
tell the inner UIWebSelectionView to either show or hide and are safe to invoke outside of the context of
scrolling.

This patch invokes these hooks when beginning a drag on a selection, and when a dragging ends, if it called
-willStartScrollingOverflow to begin with. We should rename these in the future to be something along the lines
of -hideSelectionViewAndControls and -showSelectionViewAndControls, respectively, and adopt these new names in
WebKit. We also move logic to hide the callout out of -itemsForBeginningSession: and into
-willAnimateLiftWithAnimator:, when the lift actually begins.

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

(-[WKContentView cleanUpDragSourceSessionState]):
(-[WKContentView _restoreCalloutBarIfNeeded]):
(-[WKContentView dragInteraction:itemsForBeginningSession:]):
(-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
(-[WKContentView dragInteraction:session:didEndWithOperation:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-03  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS DnD] [WK2] Callout bar should reappear after dragging ends for a text selection
+        https://bugs.webkit.org/show_bug.cgi?id=174116
+        <rdar://problem/33017845>
+
+        Reviewed by Ryosuke Niwa.
+
+        -willStartScrollingOverflow -didEndScrollingOverflow are helper methods on both the UIWKTextInteractionAssistant
+        and UIWebSelectionAssistant that handle hiding selection and callout bar UI during overflow scrolling and making
+        it reappear after scrolling ends. However, these hooks do not contain logic specific to scrolling, and simply
+        tell the inner UIWebSelectionView to either show or hide and are safe to invoke outside of the context of
+        scrolling.
+
+        This patch invokes these hooks when beginning a drag on a selection, and when a dragging ends, if it called
+        -willStartScrollingOverflow to begin with. We should rename these in the future to be something along the lines
+        of -hideSelectionViewAndControls and -showSelectionViewAndControls, respectively, and adopt these new names in
+        WebKit. We also move logic to hide the callout out of -itemsForBeginningSession: and into
+        -willAnimateLiftWithAnimator:, when the lift actually begins.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView cleanUpDragSourceSessionState]):
+        (-[WKContentView _restoreCalloutBarIfNeeded]):
+        (-[WKContentView dragInteraction:itemsForBeginningSession:]):
+        (-[WKContentView dragInteraction:willAnimateLiftWithAnimator:session:]):
+        (-[WKContentView dragInteraction:session:didEndWithOperation:]):
+
 2017-07-03  Matt Rajca  <mrajca@apple.com>
 

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

@@ -126 +126 @@
     BOOL isPerformingOperation { NO };
     BOOL isAnimatingConcludeEditDrag { NO };
+    BOOL shouldRestoreCalloutBar { NO };
     RetainPtr<id <UIDragSession>> dragSession;
     RetainPtr<id <UIDropSession>> dropSession;

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

@@ -4377 +4377 @@
     }
 
+    [self _restoreCalloutBarIfNeeded];
     [_dataInteractionState.caretView remove];
     [_dataInteractionState.visibleContentViewSnapshot removeFromSuperview];
@@ -4507 +4508 @@
 }
 
+- (void)_restoreCalloutBarIfNeeded
+{
+    if (!_dataInteractionState.shouldRestoreCalloutBar)
+        return;
+
+    // FIXME: This SPI should be renamed in UIKit to reflect a more general purpose of revealing hidden interaction assistant controls.
+    [_webSelectionAssistant didEndScrollingOverflow];
+    [_textSelectionAssistant didEndScrollingOverflow];
+    _dataInteractionState.shouldRestoreCalloutBar = NO;
+}
+
 #pragma mark - UIDragInteractionDelegate
 
@@ -4552 +4564 @@
         return @[ ];
     }
-
-    [UICalloutBar fadeSharedCalloutBar];
 
     // Give internal clients such as Mail one final chance to augment the contents of each UIItemProvider before sending the drag items off to UIKit.
@@ -4601 +4611 @@
 - (void)dragInteraction:(UIDragInteraction *)interaction willAnimateLiftWithAnimator:(id <UIDragAnimating>)animator session:(id <UIDragSession>)session
 {
+    if (!_dataInteractionState.shouldRestoreCalloutBar && (_dataInteractionState.sourceAction & DragSourceActionSelection)) {
+        // FIXME: This SPI should be renamed in UIKit to reflect a more general purpose of hiding interaction assistant controls.
+        [_webSelectionAssistant willStartScrollingOverflow];
+        [_textSelectionAssistant willStartScrollingOverflow];
+        _dataInteractionState.shouldRestoreCalloutBar = YES;
+    }
+
     auto adjustedOrigin = _dataInteractionState.adjustedOrigin;
     RetainPtr<WKContentView> protectedSelf(self);
@@ -4632 +4649 @@
 {
     RELEASE_LOG(DragAndDrop, "Drag session ended: %p (with operation: %tu, performing operation: %d, began dragging: %d)", session, operation, _dataInteractionState.isPerformingOperation, _dataInteractionState.didBeginDragging);
+
+    [self _restoreCalloutBarIfNeeded];
+
     id <WKUIDelegatePrivate> uiDelegate = self.webViewUIDelegate;
     if ([uiDelegate respondsToSelector:@selector(_webView:dataInteraction:session:didEndWithOperation:)])