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

package/README.md

@@ -19,5 +19,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.1
+cordova plugin add @moodlehq/cordova-plugin-ionic-keyboard@2.2.0-moodle.2
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlehq/cordova-plugin-ionic-keyboard",
-  "version": "2.2.0-moodle.1",
+  "version": "2.2.0-moodle.2",
   "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.1">
+<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">
     <name>cordova-plugin-ionic-keyboard</name>
     <description>Ionic Keyboard Plugin</description>
     <license>Apache 2.0</license>

package/src/ios/CDVIonicKeyboard.m

@@ -189,9 +189,7 @@ NSString* UITraitsClassString;
 
 - (void)setKeyboardHeight:(int)height delay:(NSTimeInterval)delay
 {
-    if (self.keyboardResizes != ResizeNone) {
-        [self setPaddingBottom: height delay:delay];
-    }
+    [self setPaddingBottom: height delay:delay];
 }
 
 - (void)setPaddingBottom:(int)paddingBottom delay:(NSTimeInterval)delay
@@ -247,6 +245,9 @@ NSString* UITraitsClassString;
             break;
         }
         default:
+            NSString *js = [NSString stringWithFormat:@"Keyboard.fireOnResize(%d, %d, null);",
+                            _paddingBottom, (int)(f.size.height - wf.origin.y)];
+            [self.commandDelegate evalJs:js];
             break;
     }
     [self resetScrollView];

package/www/ios/keyboard.js

@@ -58,6 +58,9 @@ Keyboard.fireOnShowing = function (height) {
 };
 
 Keyboard.fireOnResize = function (height, screenHeight, ele) {
+    // Update the CSS variable with the height of the keyboard.
+    document.documentElement.style.setProperty('--keyboard-height', `${height}px`);
+
     if (!ele) {
         return;
     }
@@ -66,9 +69,6 @@ Keyboard.fireOnResize = function (height, screenHeight, ele) {
     } else {
         ele.style.height = (screenHeight - height) + 'px';
     }
-
-    // Update the CSS variable with the height of keyboard.
-    document.documentElement.style.setProperty('--keyboard-height', height > 0 ? `${height}px` : null);
 };
 
 Keyboard.hideFormAccessoryBar = function (hide, success) {