@ionic/core 7.3.4-dev.11694542086.1f624b36 → 7.3.4-dev.11694548895.1578981b

package/components/input-shims.js

@@ -4,6 +4,7 @@
 import { g as getScrollElement, c as scrollByPoint, a as findClosestIonContent } from './index8.js';
 import { a as addEventListener, b as removeEventListener, r as raf, c as componentOnReady } from './helpers.js';
 import { a as KeyboardResize, K as Keyboard } from './keyboard.js';
+import { w as win } from './index5.js';
 
 const cloneMap = new WeakMap();
 const relocateInput = (componentEl, inputEl, shouldRelocate, inputRelativeY = 0, disabledClonedInput = false) => {
@@ -150,11 +151,10 @@ const enableInputBlurring = () => {
 };
 
 const SCROLL_ASSIST_SPEED = 0.3;
-const getScrollData = (componentEl, contentEl, keyboardHeight) => {
+const getScrollData = (componentEl, contentEl, keyboardHeight, platformHeight) => {
   var _a;
   const itemEl = (_a = componentEl.closest('ion-item,[ion-item]')) !== null && _a !== void 0 ? _a : componentEl;
-  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, componentEl.ownerDocument.defaultView.innerHeight // TODO(FW-2832): type
-  );
+  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, platformHeight);
 };
 const calcScrollData = (inputRect, contentRect, keyboardHeight, platformHeight) => {
   // compute input's Y values relative to the body
@@ -254,67 +254,19 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
    */
   const addScrollPadding = enableScrollPadding && (keyboardResize === undefined || keyboardResize.mode === KeyboardResize.None);
   /**
-   * This tracks whether or not the keyboard has been
-   * presented for a single focused text field. Note
-   * that it does not track if the keyboard is open
-   * in general such as if the keyboard is open for
-   * a different focused text field.
-   */
-  let hasKeyboardBeenPresentedForTextField = false;
-  /**
-   * Scroll assist is run when a text field
-   * is focused. However, it may need to
-   * re-run when the keyboard size changes
-   * such that the text field is now hidden
-   * underneath the keyboard.
-   * This function re-runs scroll assist
-   * when that happens.
+   * When adding scroll padding we need to know
+   * how much of the viewport the keyboard obscures.
+   * We do this by subtracting the keyboard height
+   * from the platform height.
    *
-   * One limitation of this is on a web browser
-   * where native keyboard APIs do not have cross-browser
-   * support. `ionKeyboardDidShow` relies on the Visual Viewport API.
-   * This means that if the keyboard changes but does not change
-   * geometry, then scroll assist will not re-run even if
-   * the user has scrolled the text field under the keyboard.
-   * This should not be a problem when running in Cordova/Capacitor
-   * because `ionKeyboardDidShow` uses the native events
-   * which fire every time the keyboard changes.
-   */
-  const keyboardShow = (ev) => {
-    /**
-     * If the keyboard has not yet been presented
-     * for this text field then the text field has just
-     * received focus. In that case, the focusin listener
-     * will run scroll assist.
-     */
-    if (hasKeyboardBeenPresentedForTextField === false) {
-      hasKeyboardBeenPresentedForTextField = true;
-      return;
-    }
-    /**
-     * Otherwise, the keyboard has already been presented
-     * for the focused text field.
-     * This means that the keyboard likely changed
-     * geometry, and we need to re-run scroll assist.
-     * This can happen when the user rotates their device
-     * or when they switch keyboards.
-     *
-     * Make sure we pass in the computed keyboard height
-     * rather than the estimated keyboard height.
-     *
-     * Since the keyboard is already open then we do not
-     * need to wait for the webview to resize, so we pass
-     * "waitForResize: false".
-     */
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, ev.detail.keyboardHeight, addScrollPadding, disableClonedInput, false);
-  };
-  /**
-   * Reset the internal state when the text field loses focus.
+   * If we compute this value when switching between
+   * inputs then the webview may already be resized.
+   * At this point, `win.innerHeight` has already accounted
+   * for the keyboard meaning we would then subtract
+   * the keyboard height again. This will result in the input
+   * being scrolled more than it needs to.
    */
-  const focusOut = () => {
-    hasKeyboardBeenPresentedForTextField = false;
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-  };
+  const platformHeight = win !== undefined ? win.innerHeight : 0;
   /**
    * When the input is about to receive
    * focus, we need to move it to prevent
@@ -331,23 +283,11 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
       inputEl.removeAttribute(SKIP_SCROLL_ASSIST);
       return;
     }
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput);
-    /**
-     * Listen for any changes to the keyboard
-     * dimensions in case we need to re-run scroll assist.
-     */
-    window.addEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.addEventListener('focusout', focusOut, true);
+    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
   };
   componentEl.addEventListener('focusin', focusIn, true);
-  /**
-   * Scroll assist is being destroyed for this
-   * text field instance, so remove any remaining listeners.
-   */
   return () => {
     componentEl.removeEventListener('focusin', focusIn, true);
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.removeEventListener('focusout', focusOut, true);
   };
 };
 /**
@@ -366,11 +306,11 @@ const setManualFocus = (el) => {
   el.setAttribute(SKIP_SCROLL_ASSIST, 'true');
   el.focus();
 };
-const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, waitForResize = true) => {
+const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, platformHeight = 0) => {
   if (!contentEl && !footerEl) {
     return;
   }
-  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight);
+  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight, platformHeight);
   if (contentEl && Math.abs(scrollData.scrollAmount) < 4) {
     // the text input is in a safe position that doesn't
     // require it to be scrolled into view, just set focus now
@@ -457,7 +397,7 @@ const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHei
        * bandwidth to become available.
        */
       const totalScrollAmount = scrollEl.scrollHeight - scrollEl.clientHeight;
-      if (waitForResize && scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
+      if (scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
         /**
          * On iOS devices, the system will show a "Passwords" bar above the keyboard
          * after the initial keyboard is shown. This prevents the webview from resizing

package/dist/cjs/{input-shims-d8e322aa.js → input-shims-93284c80.js}

@@ -6,9 +6,9 @@
 const index = require('./index-10873539.js');
 const helpers = require('./helpers-ea4ccbcb.js');
 const keyboard = require('./keyboard-fd7db491.js');
+const index$1 = require('./index-306a7476.js');
 require('./index-cc7dfb7c.js');
 require('./capacitor-2ffba62a.js');
-require('./index-306a7476.js');
 
 const cloneMap = new WeakMap();
 const relocateInput = (componentEl, inputEl, shouldRelocate, inputRelativeY = 0, disabledClonedInput = false) => {
@@ -155,11 +155,10 @@ const enableInputBlurring = () => {
 };
 
 const SCROLL_ASSIST_SPEED = 0.3;
-const getScrollData = (componentEl, contentEl, keyboardHeight) => {
+const getScrollData = (componentEl, contentEl, keyboardHeight, platformHeight) => {
   var _a;
   const itemEl = (_a = componentEl.closest('ion-item,[ion-item]')) !== null && _a !== void 0 ? _a : componentEl;
-  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, componentEl.ownerDocument.defaultView.innerHeight // TODO(FW-2832): type
-  );
+  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, platformHeight);
 };
 const calcScrollData = (inputRect, contentRect, keyboardHeight, platformHeight) => {
   // compute input's Y values relative to the body
@@ -259,67 +258,19 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
    */
   const addScrollPadding = enableScrollPadding && (keyboardResize === undefined || keyboardResize.mode === keyboard.KeyboardResize.None);
   /**
-   * This tracks whether or not the keyboard has been
-   * presented for a single focused text field. Note
-   * that it does not track if the keyboard is open
-   * in general such as if the keyboard is open for
-   * a different focused text field.
-   */
-  let hasKeyboardBeenPresentedForTextField = false;
-  /**
-   * Scroll assist is run when a text field
-   * is focused. However, it may need to
-   * re-run when the keyboard size changes
-   * such that the text field is now hidden
-   * underneath the keyboard.
-   * This function re-runs scroll assist
-   * when that happens.
+   * When adding scroll padding we need to know
+   * how much of the viewport the keyboard obscures.
+   * We do this by subtracting the keyboard height
+   * from the platform height.
    *
-   * One limitation of this is on a web browser
-   * where native keyboard APIs do not have cross-browser
-   * support. `ionKeyboardDidShow` relies on the Visual Viewport API.
-   * This means that if the keyboard changes but does not change
-   * geometry, then scroll assist will not re-run even if
-   * the user has scrolled the text field under the keyboard.
-   * This should not be a problem when running in Cordova/Capacitor
-   * because `ionKeyboardDidShow` uses the native events
-   * which fire every time the keyboard changes.
-   */
-  const keyboardShow = (ev) => {
-    /**
-     * If the keyboard has not yet been presented
-     * for this text field then the text field has just
-     * received focus. In that case, the focusin listener
-     * will run scroll assist.
-     */
-    if (hasKeyboardBeenPresentedForTextField === false) {
-      hasKeyboardBeenPresentedForTextField = true;
-      return;
-    }
-    /**
-     * Otherwise, the keyboard has already been presented
-     * for the focused text field.
-     * This means that the keyboard likely changed
-     * geometry, and we need to re-run scroll assist.
-     * This can happen when the user rotates their device
-     * or when they switch keyboards.
-     *
-     * Make sure we pass in the computed keyboard height
-     * rather than the estimated keyboard height.
-     *
-     * Since the keyboard is already open then we do not
-     * need to wait for the webview to resize, so we pass
-     * "waitForResize: false".
-     */
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, ev.detail.keyboardHeight, addScrollPadding, disableClonedInput, false);
-  };
-  /**
-   * Reset the internal state when the text field loses focus.
+   * If we compute this value when switching between
+   * inputs then the webview may already be resized.
+   * At this point, `win.innerHeight` has already accounted
+   * for the keyboard meaning we would then subtract
+   * the keyboard height again. This will result in the input
+   * being scrolled more than it needs to.
    */
-  const focusOut = () => {
-    hasKeyboardBeenPresentedForTextField = false;
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-  };
+  const platformHeight = index$1.win !== undefined ? index$1.win.innerHeight : 0;
   /**
    * When the input is about to receive
    * focus, we need to move it to prevent
@@ -336,23 +287,11 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
       inputEl.removeAttribute(SKIP_SCROLL_ASSIST);
       return;
     }
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput);
-    /**
-     * Listen for any changes to the keyboard
-     * dimensions in case we need to re-run scroll assist.
-     */
-    window.addEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.addEventListener('focusout', focusOut, true);
+    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
   };
   componentEl.addEventListener('focusin', focusIn, true);
-  /**
-   * Scroll assist is being destroyed for this
-   * text field instance, so remove any remaining listeners.
-   */
   return () => {
     componentEl.removeEventListener('focusin', focusIn, true);
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.removeEventListener('focusout', focusOut, true);
   };
 };
 /**
@@ -371,11 +310,11 @@ const setManualFocus = (el) => {
   el.setAttribute(SKIP_SCROLL_ASSIST, 'true');
   el.focus();
 };
-const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, waitForResize = true) => {
+const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, platformHeight = 0) => {
   if (!contentEl && !footerEl) {
     return;
   }
-  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight);
+  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight, platformHeight);
   if (contentEl && Math.abs(scrollData.scrollAmount) < 4) {
     // the text input is in a safe position that doesn't
     // require it to be scrolled into view, just set focus now
@@ -462,7 +401,7 @@ const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHei
        * bandwidth to become available.
        */
       const totalScrollAmount = scrollEl.scrollHeight - scrollEl.clientHeight;
-      if (waitForResize && scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
+      if (scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
         /**
          * On iOS devices, the system will show a "Passwords" bar above the keyboard
          * after the initial keyboard is shown. This prevents the webview from resizing

package/dist/cjs/ion-app_8.cjs.entry.js

@@ -42,7 +42,7 @@ const App = class {
            * platforms proceed into this block.
            */
           const platform = ionicGlobal.isPlatform(window, 'ios') ? 'ios' : 'android';
-          Promise.resolve().then(function () { return require('./input-shims-d8e322aa.js'); }).then((module) => module.startInputShims(ionicGlobal.config, platform));
+          Promise.resolve().then(function () { return require('./input-shims-93284c80.js'); }).then((module) => module.startInputShims(ionicGlobal.config, platform));
         }
         const hardwareBackButtonModule = await Promise.resolve().then(function () { return require('./hardware-back-button-b67c8e75.js'); });
         if (ionicGlobal.config.getBoolean('hardwareBackButton', isHybrid)) {

package/dist/collection/utils/input-shims/hacks/scroll-assist.js

@@ -1,6 +1,7 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
+import { win } from "../../browser/index";
 import { getScrollElement, scrollByPoint } from "../../content";
 import { raf } from "../../helpers";
 import { KeyboardResize } from "../../native/keyboard";
@@ -21,67 +22,19 @@ export const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, ke
    */
   const addScrollPadding = enableScrollPadding && (keyboardResize === undefined || keyboardResize.mode === KeyboardResize.None);
   /**
-   * This tracks whether or not the keyboard has been
-   * presented for a single focused text field. Note
-   * that it does not track if the keyboard is open
-   * in general such as if the keyboard is open for
-   * a different focused text field.
-   */
-  let hasKeyboardBeenPresentedForTextField = false;
-  /**
-   * Scroll assist is run when a text field
-   * is focused. However, it may need to
-   * re-run when the keyboard size changes
-   * such that the text field is now hidden
-   * underneath the keyboard.
-   * This function re-runs scroll assist
-   * when that happens.
+   * When adding scroll padding we need to know
+   * how much of the viewport the keyboard obscures.
+   * We do this by subtracting the keyboard height
+   * from the platform height.
    *
-   * One limitation of this is on a web browser
-   * where native keyboard APIs do not have cross-browser
-   * support. `ionKeyboardDidShow` relies on the Visual Viewport API.
-   * This means that if the keyboard changes but does not change
-   * geometry, then scroll assist will not re-run even if
-   * the user has scrolled the text field under the keyboard.
-   * This should not be a problem when running in Cordova/Capacitor
-   * because `ionKeyboardDidShow` uses the native events
-   * which fire every time the keyboard changes.
-   */
-  const keyboardShow = (ev) => {
-    /**
-     * If the keyboard has not yet been presented
-     * for this text field then the text field has just
-     * received focus. In that case, the focusin listener
-     * will run scroll assist.
-     */
-    if (hasKeyboardBeenPresentedForTextField === false) {
-      hasKeyboardBeenPresentedForTextField = true;
-      return;
-    }
-    /**
-     * Otherwise, the keyboard has already been presented
-     * for the focused text field.
-     * This means that the keyboard likely changed
-     * geometry, and we need to re-run scroll assist.
-     * This can happen when the user rotates their device
-     * or when they switch keyboards.
-     *
-     * Make sure we pass in the computed keyboard height
-     * rather than the estimated keyboard height.
-     *
-     * Since the keyboard is already open then we do not
-     * need to wait for the webview to resize, so we pass
-     * "waitForResize: false".
-     */
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, ev.detail.keyboardHeight, addScrollPadding, disableClonedInput, false);
-  };
-  /**
-   * Reset the internal state when the text field loses focus.
+   * If we compute this value when switching between
+   * inputs then the webview may already be resized.
+   * At this point, `win.innerHeight` has already accounted
+   * for the keyboard meaning we would then subtract
+   * the keyboard height again. This will result in the input
+   * being scrolled more than it needs to.
    */
-  const focusOut = () => {
-    hasKeyboardBeenPresentedForTextField = false;
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-  };
+  const platformHeight = win !== undefined ? win.innerHeight : 0;
   /**
    * When the input is about to receive
    * focus, we need to move it to prevent
@@ -98,23 +51,11 @@ export const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, ke
       inputEl.removeAttribute(SKIP_SCROLL_ASSIST);
       return;
     }
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput);
-    /**
-     * Listen for any changes to the keyboard
-     * dimensions in case we need to re-run scroll assist.
-     */
-    window.addEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.addEventListener('focusout', focusOut, true);
+    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
   };
   componentEl.addEventListener('focusin', focusIn, true);
-  /**
-   * Scroll assist is being destroyed for this
-   * text field instance, so remove any remaining listeners.
-   */
   return () => {
     componentEl.removeEventListener('focusin', focusIn, true);
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.removeEventListener('focusout', focusOut, true);
   };
 };
 /**
@@ -133,11 +74,11 @@ const setManualFocus = (el) => {
   el.setAttribute(SKIP_SCROLL_ASSIST, 'true');
   el.focus();
 };
-const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, waitForResize = true) => {
+const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, platformHeight = 0) => {
   if (!contentEl && !footerEl) {
     return;
   }
-  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight);
+  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight, platformHeight);
   if (contentEl && Math.abs(scrollData.scrollAmount) < 4) {
     // the text input is in a safe position that doesn't
     // require it to be scrolled into view, just set focus now
@@ -224,7 +165,7 @@ const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHei
        * bandwidth to become available.
        */
       const totalScrollAmount = scrollEl.scrollHeight - scrollEl.clientHeight;
-      if (waitForResize && scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
+      if (scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
         /**
          * On iOS devices, the system will show a "Passwords" bar above the keyboard
          * after the initial keyboard is shown. This prevents the webview from resizing

package/dist/collection/utils/input-shims/hacks/scroll-data.js

@@ -3,11 +3,10 @@
  */
 import { SCROLL_AMOUNT_PADDING } from "./common";
 const SCROLL_ASSIST_SPEED = 0.3;
-export const getScrollData = (componentEl, contentEl, keyboardHeight) => {
+export const getScrollData = (componentEl, contentEl, keyboardHeight, platformHeight) => {
   var _a;
   const itemEl = (_a = componentEl.closest('ion-item,[ion-item]')) !== null && _a !== void 0 ? _a : componentEl;
-  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, componentEl.ownerDocument.defaultView.innerHeight // TODO(FW-2832): type
-  );
+  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, platformHeight);
 };
 const calcScrollData = (inputRect, contentRect, keyboardHeight, platformHeight) => {
   // compute input's Y values relative to the body

package/dist/docs.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2023-09-12T18:10:21",
+  "timestamp": "2023-09-12T20:03:48",
   "compiler": {
     "name": "@stencil/core",
     "version": "4.2.1",

package/dist/esm/{input-shims-c738363e.js → input-shims-4f1b0af9.js}

@@ -4,9 +4,9 @@
 import { g as getScrollElement, c as scrollByPoint, f as findClosestIonContent } from './index-746a238e.js';
 import { a as addEventListener, b as removeEventListener, r as raf, c as componentOnReady } from './helpers-3379ba19.js';
 import { a as KeyboardResize, K as Keyboard } from './keyboard-b063f012.js';
+import { w as win } from './index-7a14ecec.js';
 import './index-595d62c9.js';
 import './capacitor-b4979570.js';
-import './index-7a14ecec.js';
 
 const cloneMap = new WeakMap();
 const relocateInput = (componentEl, inputEl, shouldRelocate, inputRelativeY = 0, disabledClonedInput = false) => {
@@ -153,11 +153,10 @@ const enableInputBlurring = () => {
 };
 
 const SCROLL_ASSIST_SPEED = 0.3;
-const getScrollData = (componentEl, contentEl, keyboardHeight) => {
+const getScrollData = (componentEl, contentEl, keyboardHeight, platformHeight) => {
   var _a;
   const itemEl = (_a = componentEl.closest('ion-item,[ion-item]')) !== null && _a !== void 0 ? _a : componentEl;
-  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, componentEl.ownerDocument.defaultView.innerHeight // TODO(FW-2832): type
-  );
+  return calcScrollData(itemEl.getBoundingClientRect(), contentEl.getBoundingClientRect(), keyboardHeight, platformHeight);
 };
 const calcScrollData = (inputRect, contentRect, keyboardHeight, platformHeight) => {
   // compute input's Y values relative to the body
@@ -257,67 +256,19 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
    */
   const addScrollPadding = enableScrollPadding && (keyboardResize === undefined || keyboardResize.mode === KeyboardResize.None);
   /**
-   * This tracks whether or not the keyboard has been
-   * presented for a single focused text field. Note
-   * that it does not track if the keyboard is open
-   * in general such as if the keyboard is open for
-   * a different focused text field.
-   */
-  let hasKeyboardBeenPresentedForTextField = false;
-  /**
-   * Scroll assist is run when a text field
-   * is focused. However, it may need to
-   * re-run when the keyboard size changes
-   * such that the text field is now hidden
-   * underneath the keyboard.
-   * This function re-runs scroll assist
-   * when that happens.
+   * When adding scroll padding we need to know
+   * how much of the viewport the keyboard obscures.
+   * We do this by subtracting the keyboard height
+   * from the platform height.
    *
-   * One limitation of this is on a web browser
-   * where native keyboard APIs do not have cross-browser
-   * support. `ionKeyboardDidShow` relies on the Visual Viewport API.
-   * This means that if the keyboard changes but does not change
-   * geometry, then scroll assist will not re-run even if
-   * the user has scrolled the text field under the keyboard.
-   * This should not be a problem when running in Cordova/Capacitor
-   * because `ionKeyboardDidShow` uses the native events
-   * which fire every time the keyboard changes.
-   */
-  const keyboardShow = (ev) => {
-    /**
-     * If the keyboard has not yet been presented
-     * for this text field then the text field has just
-     * received focus. In that case, the focusin listener
-     * will run scroll assist.
-     */
-    if (hasKeyboardBeenPresentedForTextField === false) {
-      hasKeyboardBeenPresentedForTextField = true;
-      return;
-    }
-    /**
-     * Otherwise, the keyboard has already been presented
-     * for the focused text field.
-     * This means that the keyboard likely changed
-     * geometry, and we need to re-run scroll assist.
-     * This can happen when the user rotates their device
-     * or when they switch keyboards.
-     *
-     * Make sure we pass in the computed keyboard height
-     * rather than the estimated keyboard height.
-     *
-     * Since the keyboard is already open then we do not
-     * need to wait for the webview to resize, so we pass
-     * "waitForResize: false".
-     */
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, ev.detail.keyboardHeight, addScrollPadding, disableClonedInput, false);
-  };
-  /**
-   * Reset the internal state when the text field loses focus.
+   * If we compute this value when switching between
+   * inputs then the webview may already be resized.
+   * At this point, `win.innerHeight` has already accounted
+   * for the keyboard meaning we would then subtract
+   * the keyboard height again. This will result in the input
+   * being scrolled more than it needs to.
    */
-  const focusOut = () => {
-    hasKeyboardBeenPresentedForTextField = false;
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-  };
+  const platformHeight = win !== undefined ? win.innerHeight : 0;
   /**
    * When the input is about to receive
    * focus, we need to move it to prevent
@@ -334,23 +285,11 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
       inputEl.removeAttribute(SKIP_SCROLL_ASSIST);
       return;
     }
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput);
-    /**
-     * Listen for any changes to the keyboard
-     * dimensions in case we need to re-run scroll assist.
-     */
-    window.addEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.addEventListener('focusout', focusOut, true);
+    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
   };
   componentEl.addEventListener('focusin', focusIn, true);
-  /**
-   * Scroll assist is being destroyed for this
-   * text field instance, so remove any remaining listeners.
-   */
   return () => {
     componentEl.removeEventListener('focusin', focusIn, true);
-    window.removeEventListener('ionKeyboardDidShow', keyboardShow);
-    componentEl.removeEventListener('focusout', focusOut, true);
   };
 };
 /**
@@ -369,11 +308,11 @@ const setManualFocus = (el) => {
   el.setAttribute(SKIP_SCROLL_ASSIST, 'true');
   el.focus();
 };
-const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, waitForResize = true) => {
+const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, platformHeight = 0) => {
   if (!contentEl && !footerEl) {
     return;
   }
-  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight);
+  const scrollData = getScrollData(componentEl, (contentEl || footerEl), keyboardHeight, platformHeight);
   if (contentEl && Math.abs(scrollData.scrollAmount) < 4) {
     // the text input is in a safe position that doesn't
     // require it to be scrolled into view, just set focus now
@@ -460,7 +399,7 @@ const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHei
        * bandwidth to become available.
        */
       const totalScrollAmount = scrollEl.scrollHeight - scrollEl.clientHeight;
-      if (waitForResize && scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
+      if (scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
         /**
          * On iOS devices, the system will show a "Passwords" bar above the keyboard
          * after the initial keyboard is shown. This prevents the webview from resizing

package/dist/esm/ion-app_8.entry.js

@@ -38,7 +38,7 @@ const App = class {
            * platforms proceed into this block.
            */
           const platform = isPlatform(window, 'ios') ? 'ios' : 'android';
-          import('./input-shims-c738363e.js').then((module) => module.startInputShims(config, platform));
+          import('./input-shims-4f1b0af9.js').then((module) => module.startInputShims(config, platform));
         }
         const hardwareBackButtonModule = await import('./hardware-back-button-39299f84.js');
         if (config.getBoolean('hardwareBackButton', isHybrid)) {