Changeset 286552 in webkit

Timestamp:

Dec 6, 2021, 11:00:25 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] Allow WKWebView clients to override undoManager
​https://bugs.webkit.org/show_bug.cgi?id=233297
<rdar://problem/85526549>

Patch by Matt Gilligan <​matthew_gilligan@apple.com> on 2021-12-06
Reviewed by Wenson Hsieh.

Source/WebKit:

Move WKContentView's undoManager up the responder chain to WKWebView so web view
subclasses can customize the undo manager used when WKContentView is first responder.

Test: KeyboardInputTests.OverrideUndoManager

• UIProcess/API/ios/WKWebViewIOS.mm:

(-[WKWebView undoManager]):
Return the undo manager provided by _contentView when it is current.

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

(-[WKContentView undoManagerForWebView]):
Provide the view's undo manager via this property so that -undoManager will look up the
responder chain to WKWebView.

(-[WKContentView undoManager]): Deleted.

Tools:

• TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:

(-[CustomUndoManagerWebView undoManager]):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentView.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentView.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-06  Matt Gilligan  <matthew_gilligan@apple.com>
+
+        [iOS] Allow WKWebView clients to override undoManager
+        https://bugs.webkit.org/show_bug.cgi?id=233297
+        <rdar://problem/85526549>
+
+        Reviewed by Wenson Hsieh.
+
+        Move WKContentView's undoManager up the responder chain to WKWebView so web view
+        subclasses can customize the undo manager used when WKContentView is first responder.
+
+        Test: KeyboardInputTests.OverrideUndoManager
+
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView undoManager]):
+        Return the undo manager provided by _contentView when it is current.
+
+        * UIProcess/ios/WKContentView.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView undoManagerForWebView]):
+        Provide the view's undo manager via this property so that -undoManager will look up the
+        responder chain to WKWebView.
+
+        (-[WKContentView undoManager]): Deleted.
+
 2021-12-06  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm

@@ -319 +319 @@
 }
 
+- (NSUndoManager *)undoManager
+{
+    if (self._currentContentView == _contentView)
+        return [_contentView undoManagerForWebView];
+
+    return [super undoManager];
+}
+
 FOR_EACH_WKCONTENTVIEW_ACTION(FORWARD_ACTION_TO_WKCONTENTVIEW)
 

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

@@ -72 +72 @@
 @property (nonatomic) BOOL sizeChangedSinceLastVisibleContentRectUpdate;
 @property (nonatomic, readonly) UIInterfaceOrientation interfaceOrientation;
+@property (nonatomic, readonly) NSUndoManager *undoManagerForWebView;
 
 - (instancetype)initWithFrame:(CGRect)frame processPool:(NakedRef<WebKit::WebProcessPool>)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;

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

@@ -563 +563 @@
 }
 
-- (NSUndoManager *)undoManager
+- (NSUndoManager *)undoManagerForWebView
 {
     if (self.focusedElementInformation.shouldSynthesizeKeyEventsForEditing && self.hasHiddenContentEditable) {

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-06  Matt Gilligan  <matthew_gilligan@apple.com>
+
+        [iOS] Allow WKWebView clients to override undoManager
+        https://bugs.webkit.org/show_bug.cgi?id=233297
+        <rdar://problem/85526549>
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
+        (-[CustomUndoManagerWebView undoManager]):
+        (TestWebKitAPI::TEST):
+
 2021-12-06  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm

@@ -43 +43 @@
 
 @interface WKContentView ()
+@property (nonatomic, readonly) NSUndoManager *undoManagerForWebView;
 - (BOOL)_shouldSimulateKeyboardInputOnTextInsertion;
 @end
@@ -184 +185 @@
 {
     return _customInputAccessoryView.get();
+}
+
+@end
+
+@interface CustomUndoManagerWebView : TestWKWebView
+@property (nonatomic, strong) NSUndoManager *customUndoManager;
+@end
+
+@implementation CustomUndoManagerWebView
+
+- (NSUndoManager *)undoManager
+{
+    return _customUndoManager ?: super.undoManager;
 }
 
@@ -802 +816 @@
 }
 
+TEST(KeyboardInputTests, OverrideUndoManager)
+{
+    auto webView = adoptNS([[CustomUndoManagerWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
+    auto contentView = [webView wkContentView];
+    EXPECT_EQ(contentView.undoManager, contentView.undoManagerForWebView);
+
+    auto undoManager = adoptNS([[NSUndoManager alloc] init]);
+    [webView setCustomUndoManager:undoManager.get()];
+    EXPECT_EQ(contentView.undoManager, undoManager);
+}
+
 } // namespace TestWebKitAPI