[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - ios/CollaboraOnlineWebViewKeyboardManager

[Tor Lillqvist (via logerrit)]

 ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m |   70 ++++++++--
 1 file changed, 58 insertions(+), 12 deletions(-)

New commits:
commit 01b2241c17d5bd08f0c52d85de591308361ac652
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Aug 28 18:09:17 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Sep 2 19:37:02 2020 +0200

    Update CollaboraOnlineWebViewKeyboardManager
    
    Update to latest commit, d7f8383603aa156611d901f5f073666ab45d5e6a.
    
    Change-Id: I24c2bf8fed7d692ba8ea747f3384c8e154f7c8af
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101556
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101952

diff --git a/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m b/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
index 0e7d3208f..561b726d6 100644
--- a/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
+++ b/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
@@ -16,6 +16,7 @@
 
 @interface _COWVKMKeyInputControl : UITextView<UITextViewDelegate> {
     WKWebView *webView;
+    BOOL lastWasNewline;
 }
 
 - (instancetype)initForWebView:(nonnull WKWebView *)webView;
@@ -28,6 +29,7 @@
     self = [super init];
 
     self->webView = webView;
+    self->lastWasNewline = NO;
     self.delegate = self;
 
     return self;
@@ -70,8 +72,10 @@
 }
 
 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text {
-    NSLog(@"COKbdMgr: shouldChangeTextInRange({%lu, %lu}, '%@')", (unsigned long)range.location, (unsigned long)range.length, text);
-    NSLog(@"self.text is now length %lu '%@'", self.text.length, self.text);
+    NSLog(@"COKbdMgr: shouldChange({%lu, %lu}, '%@'), self.text:%lu:'%@' selectedRange:{%lu, %lu}",
+          (unsigned long)range.location, (unsigned long)range.length,
+          text, self.text.length, self.text,
+          (unsigned long)self.selectedRange.location, (unsigned long)self.selectedRange.length);
 
     NSMutableString *quotedText = [NSMutableString string];
 
@@ -95,9 +99,23 @@
 
     [self postMessage:message];
 
+    self->lastWasNewline = (range.length == 0 && [text isEqualToString:@"\n"]);
+
     return YES;
 }
 
+- (void)textViewDidChange:(UITextView *)textView {
+    NSLog(@"COKbdMgr: didChange: self.text is now:%lu:'%@'", self.text.length, self.text);
+
+    // Hack to match the logic in loleaflet's manipulation of the _textArea.value in TextInput.js.
+    // Probably means that the local testbed here (COKbdMgrTest's test.html) doesn't necessarily
+    // handle adding newlines properly. Oh well.
+    if (self->lastWasNewline) {
+        self.text = @"";
+        NSLog(@"          Made self.text empty to match TextInput.js");
+    }
+}
+
 - (BOOL)canBecomeFirstResponder {
     return YES;
 }
@@ -109,6 +127,7 @@
 @interface CollaboraOnlineWebViewKeyboardManager () <WKScriptMessageHandler> {
     WKWebView *webView;
     _COWVKMKeyInputControl *control;
+    BOOL lastCommandIsHide;
 }
 
 @end
@@ -146,6 +165,11 @@
                                                  name:UIKeyboardDidHideNotification
                                                object:nil];
 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardDidShow:)
+                                                 name:UIKeyboardDidShowNotification
+                                               object:nil];
+
     return self;
 }
 
@@ -188,53 +212,75 @@
         control.text = text;
         control.selectedRange = NSMakeRange(location, 0);
 
+        lastCommandIsHide = NO;
+
         [self->webView addSubview:control];
-        // NSLog(@"COKbdMgr: added _COWVKMKeyInputControl to webView");
+        NSLog(@"COKbdMgr: Added _COWVKMKeyInputControl to webView");
         [control becomeFirstResponder];
     }
 }
 
 - (void)hideKeyboard {
-    if (control != nil) {
-        [control removeFromSuperview];
-        // NSLog(@"COKbdMgr: removed _COWVKMKeyInputControl from webView");
-        control = nil;
-    }
+    // At least for spreadsheet documents, loleaflet calls us to hide the keyboard like crazy even
+    // if it immediately then calls us to show it again. That used to mess things up very badly. Try
+    // to make some sense out of it by not trusting a hide request until we see that it hasn't been
+    // folllowed by a display request within 100 ms.
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 100000000ll), dispatch_get_main_queue(), ^{
+            if (!lastCommandIsHide) {
+                NSLog(@"COKbdMgr: Ignoring hide command that was quickly followed by a display command");
+                return;
+            }
+            if (control != nil) {
+                [control removeFromSuperview];
+                NSLog(@"COKbdMgr: Removed _COWVKMKeyInputControl from webView");
+                control = nil;
+            }
+        });
 }
 
 - (void)userContentController:(nonnull WKUserContentController *)userContentController
       didReceiveScriptMessage:(nonnull WKScriptMessage *)message {
     if (![message.name isEqualToString:@"CollaboraOnlineWebViewKeyboardManager"]) {
-        NSLog(@"Received unrecognized script message name: %@ %@", message.name, message.body);
+        NSLog(@"COKbdMgr: Received unrecognized script message name: %@ %@", message.name, message.body);
         return;
     }
 
     if ([message.body isKindOfClass:[NSDictionary class]]) {
         NSString *stringCommand = message.body[@"command"];
+        lastCommandIsHide = NO;
         if ([stringCommand isEqualToString:@"display"]) {
             NSString *type = message.body[@"type"];
             NSString *text = message.body[@"text"];
             NSNumber *location = message.body[@"location"];
+            NSLog(@"COKbdMgr: command=display type=%@ text=%@ location=%@", type, text, location);
             [self displayKeyboardOfType:type withText:text at:(location != nil ? [location unsignedIntegerValue] : UINT_MAX)];
         } else if ([stringCommand isEqualToString:@"hide"]) {
+            lastCommandIsHide = YES;
+            NSLog(@"COKbdMgr: command=hide");
             [self hideKeyboard];
         } else if (stringCommand == nil) {
-            NSLog(@"No 'command' in %@", message.body);
+            NSLog(@"COKbdMgr: No 'command' in %@", message.body);
         } else {
-            NSLog(@"Received unrecognized command:%@", stringCommand);
+            NSLog(@"COKbdMgr: Received unrecognized command:%@", stringCommand);
         }
     } else {
-        NSLog(@"Received unrecognized message body of type %@: %@, should be a dictionary (JS object)", [message.body class], message.body);
+        NSLog(@"COKbdMgr: Received unrecognized message body of type %@: %@, should be a dictionary (JS object)", [message.body class], message.body);
     }
 }
 
 - (void)keyboardDidHide:(NSNotification *)notification {
+    NSLog(@"COKbdMgr: didHide");
     if (control != nil) {
         [control removeFromSuperview];
+        NSLog(@"COKbdMgr: Removed _COWVKMKeyInputControl from webView");
         control = nil;
     }
 }
 
+- (void)keyboardDidShow:(NSNotification *)notification {
+    NSLog(@"COKbdMgr: didShow");
+}
+
 @end
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab: