@moodlehq/cordova-plugin-ionic-keyboard 2.2.0-moodle.2 → 2.2.0-moodle.4

package/README.md

@@ -11,6 +11,7 @@ We created this fork because we needed to include the following modifications in
 | [#883](https://github.com/ionic-team/cordova-plugin-ionic-keyboard/pull/181) | Fix ion-footer hidden behind keyboard on iOS |
 | - | Port Android implementation from Capacitor plugin |
 | - | Set a CSS variable with the height of the keyboard on iOS |
+| - | Update code for Cordova iOS 8 |
 
 You can see all the changes here: [master...moodlemobile:master](https://github.com/ionic-team/cordova-plugin-ionic-keyboard/compare/master...moodlemobile:master)
 
@@ -19,5 +20,5 @@ You can see all the changes here: [master...moodlemobile:master](https://github.
 You can install this package using the [original installation instructions](https://github.com/ionic-team/cordova-plugin-ionic-keyboard#installation), but installing this package instead:
 
 ```sh
-cordova plugin add @moodlehq/cordova-plugin-ionic-keyboard@2.2.0-moodle.2
+cordova plugin add @moodlehq/cordova-plugin-ionic-keyboard@2.2.0-moodle.4
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlehq/cordova-plugin-ionic-keyboard",
-  "version": "2.2.0-moodle.2",
+  "version": "2.2.0-moodle.4",
   "description": "Moodle's fork of Ionic Keyboard Plugin",
   "scripts": {
     "release": "standard-version -a",

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" id="@moodlehq/cordova-plugin-ionic-keyboard" version="2.2.0-moodle.2">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" id="@moodlehq/cordova-plugin-ionic-keyboard" version="2.2.0-moodle.4">
     <name>cordova-plugin-ionic-keyboard</name>
     <description>Ionic Keyboard Plugin</description>
     <license>Apache 2.0</license>

package/src/ios/CDVIonicKeyboard.m

@@ -18,8 +18,10 @@
  */
 
 #import "CDVIonicKeyboard.h"
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <Cordova/CDVAvailability.h>
-#import <Cordova/NSDictionary+CordovaPreferences.h>
+#import <Cordova/CDVSettingsDictionary.h>
 #import <objc/runtime.h>
 
 typedef enum : NSUInteger {
@@ -66,7 +68,7 @@ NSString* UITraitsClassString;
     WKClassString = [@[@"WK", @"Content", @"View"] componentsJoinedByString:@""];
     UITraitsClassString = [@[@"UI", @"Text", @"Input", @"Traits"] componentsJoinedByString:@""];
 
-    NSDictionary *settings = self.commandDelegate.settings;
+    id settings = self.commandDelegate.settings;
 
     self.disableScroll = ![settings cordovaBoolSettingForKey:@"ScrollEnabled" defaultValue:NO];
 
@@ -129,9 +131,26 @@ NSString* UITraitsClassString;
 
 #pragma mark Keyboard events
 
+- (UIScrollView *)webViewScrollView
+{
+    SEL scrollViewSelector = NSSelectorFromString(@"scrollView");
+    if (![self.webView respondsToSelector:scrollViewSelector]) {
+        return nil;
+    }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    return [self.webView performSelector:scrollViewSelector];
+#pragma clang diagnostic pop
+}
+
 - (void)resetScrollView
 {
-    UIScrollView *scrollView = [self.webView scrollView];
+    UIScrollView *scrollView = [self webViewScrollView];
+    if (scrollView == nil) {
+        return;
+    }
+
     [scrollView setContentInset:UIEdgeInsetsZero];
 }
 
@@ -210,6 +229,62 @@ NSString* UITraitsClassString;
     }
 }
 
+- (CGRect)getAvailableBounds
+{
+    UIView *webView = self.webView;
+    // Preferred path: use the Cordova view hierarchy for the current plugin instance.
+    if (webView.superview != nil) {
+        return webView.superview.bounds;
+    }
+
+    if (self.viewController != nil && self.viewController.view != nil) {
+        return self.viewController.view.bounds;
+    }
+
+    UIWindow *window = webView.window ?: self.viewController.view.window;
+    if (window != nil) {
+        return window.bounds;
+    }
+
+    // Fallback path for early lifecycle and scene transitions where view.window can be temporarily nil.
+    if (@available(iOS 13.0, *)) {
+        for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
+            if (![scene isKindOfClass:[UIWindowScene class]]) {
+                continue;
+            }
+
+            UIWindowScene *windowScene = (UIWindowScene *) scene;
+            // Prefer scenes that are visible to the user. Inactive can happen during transitions.
+            if (windowScene.activationState != UISceneActivationStateForegroundActive &&
+                windowScene.activationState != UISceneActivationStateForegroundInactive) {
+                continue;
+            }
+
+            NSArray<UIWindow *> *sceneWindows = windowScene.windows;
+            for (UIWindow *sceneWindow in sceneWindows) {
+                if (sceneWindow.isKeyWindow) {
+                    return sceneWindow.bounds;
+                }
+            }
+
+            UIWindow *firstWindow = sceneWindows.firstObject;
+            if (firstWindow != nil) {
+                return firstWindow.bounds;
+            }
+        }
+    }
+
+    id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
+    if ([appDelegate respondsToSelector:@selector(window)]) {
+        UIWindow *delegateWindow = appDelegate.window;
+        if (delegateWindow != nil) {
+            return delegateWindow.bounds;
+        }
+    }
+
+    return [UIScreen mainScreen].bounds;
+}
+
 - (void)_updateFrame
 {
     CGSize statusBarSize = [[UIApplication sharedApplication] statusBarFrame].size;
@@ -221,34 +296,38 @@ NSString* UITraitsClassString;
         _paddingBottom = _paddingBottom + 20;
     }
     NSLog(@"CDVIonicKeyboard: updating frame");
-    // NOTE: to handle split screen correctly, the application's window bounds must be used as opposed to the screen's bounds.
-    CGRect f = [[[[UIApplication sharedApplication] delegate] window] bounds];
+    CGRect f = [self getAvailableBounds];
     CGRect wf = self.webView.frame;
+    int availableHeight = MAX(0, (int)(f.size.height - wf.origin.y));
     switch (self.keyboardResizes) {
         case ResizeBody:
         {
             NSString *js = [NSString stringWithFormat:@"Keyboard.fireOnResize(%d, %d, document.body);",
-                            _paddingBottom, (int)(f.size.height - wf.origin.y)];
+                            _paddingBottom, availableHeight];
             [self.commandDelegate evalJs:js];
             break;
         }
         case ResizeIonic:
         {
             NSString *js = [NSString stringWithFormat:@"Keyboard.fireOnResize(%d, %d, document.querySelector('ion-app'));",
-                            _paddingBottom, (int)(f.size.height - wf.origin.y)];
+                            _paddingBottom, availableHeight];
             [self.commandDelegate evalJs:js];
             break;
         }
         case ResizeNative:
         {
-            [self.webView setFrame:CGRectMake(wf.origin.x, wf.origin.y, f.size.width - wf.origin.x, f.size.height - wf.origin.y - self.paddingBottom)];
+            CGFloat width = MAX(0.f, f.size.width - wf.origin.x);
+            CGFloat height = MAX(0.f, f.size.height - wf.origin.y - self.paddingBottom);
+            [self.webView setFrame:CGRectMake(wf.origin.x, wf.origin.y, width, height)];
             break;
         }
         default:
+        {
             NSString *js = [NSString stringWithFormat:@"Keyboard.fireOnResize(%d, %d, null);",
-                            _paddingBottom, (int)(f.size.height - wf.origin.y)];
+                            _paddingBottom, availableHeight];
             [self.commandDelegate evalJs:js];
             break;
+        }
     }
     [self resetScrollView];
 }
@@ -329,13 +408,20 @@ static IMP WKOriginalImp;
     if (disableScroll == _disableScroll) {
         return;
     }
+
+    UIScrollView *scrollView = [self webViewScrollView];
+    if (scrollView == nil) {
+        _disableScroll = disableScroll;
+        return;
+    }
+
     if (disableScroll) {
-        self.webView.scrollView.scrollEnabled = NO;
-        self.webView.scrollView.delegate = self;
+        scrollView.scrollEnabled = NO;
+        scrollView.delegate = self;
     }
     else {
-        self.webView.scrollView.scrollEnabled = YES;
-        self.webView.scrollView.delegate = nil;
+        scrollView.scrollEnabled = YES;
+        scrollView.delegate = nil;
     }
     _disableScroll = disableScroll;
 }