@ionic/core 7.3.4-dev.11694608913.1bc64f72 → 7.3.4-dev.11694700050.1d868b6b

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
@@ -253,6 +253,109 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
    * Resize info is available on Capacitor 4+
    */
   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;
+  /**
+   * 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.
+   *
+   * 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.
+   */
+  let platformHeight = win !== undefined ? win.innerHeight : 0;
+  /**
+   * 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.
+   *
+   * 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 is not a problem when running in Cordova/Capacitor
+   * because `ionKeyboardDidShow` uses the native events
+   * which fire every time the keyboard changes.
+   */
+  const keyboardShow = (ev) => {
+    const { keyboardHeight } = ev.detail;
+    /**
+     * 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;
+      /**
+       * The platform height is the innerHeight of the window
+       * because the webview has not resize yet.
+       */
+      platformHeight = win !== undefined ? win.innerHeight : 0;
+      return;
+    }
+    /**
+     * platformHeight is recomputed every time the keyboard shows
+     * to account for any device rotations (i.e. rotating from portrait
+     * to landscape). This ensures we are using an accurate platform height.
+     *
+     * If we are using the Native keyboard resize behavior and
+     * the keyboard was already shown then the webview has already resized.
+     * In order to compute the correct platform height (before the keyboard was shown)
+     * we need to add the keyboard height to window.innerHeight.
+     */
+    if (keyboardResize !== undefined && keyboardResize.mode === KeyboardResize.Native) {
+      platformHeight = win !== undefined ? win.innerHeight + keyboardHeight : 0;
+      /**
+       * Otherwise the webview does not resize and we can use window.innerHeight
+       * as we normally would.
+       */
+    }
+    else {
+      platformHeight = win !== undefined ? win.innerHeight : 0;
+    }
+    /**
+     * 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, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight, false);
+  };
+  /**
+   * Reset the internal state when the text field loses focus.
+   */
+  const focusOut = () => {
+    hasKeyboardBeenPresentedForTextField = false;
+    win === null || win === void 0 ? void 0 : win.removeEventListener('ionKeyboardDidShow', keyboardShow);
+    componentEl.removeEventListener('focusout', focusOut, true);
+  };
   /**
    * When the input is about to receive
    * focus, we need to move it to prevent
@@ -269,11 +372,15 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
       inputEl.removeAttribute(SKIP_SCROLL_ASSIST);
       return;
     }
-    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput);
+    jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
+    win === null || win === void 0 ? void 0 : win.addEventListener('ionKeyboardDidShow', keyboardShow);
+    componentEl.addEventListener('focusout', focusOut, true);
   };
   componentEl.addEventListener('focusin', focusIn, true);
   return () => {
     componentEl.removeEventListener('focusin', focusIn, true);
+    win === null || win === void 0 ? void 0 : win.removeEventListener('ionKeyboardDidShow', keyboardShow);
+    componentEl.removeEventListener('focusout', focusOut, true);
   };
 };
 /**
@@ -292,11 +399,11 @@ const setManualFocus = (el) => {
   el.setAttribute(SKIP_SCROLL_ASSIST, 'true');
   el.focus();
 };
-const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false) => {
+const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHeight, enableScrollPadding, disableClonedInput = false, platformHeight = 0, waitForResize = true) => {
   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
@@ -383,7 +490,7 @@ const jsSetFocus = async (componentEl, inputEl, contentEl, footerEl, keyboardHei
        * bandwidth to become available.
        */
       const totalScrollAmount = scrollEl.scrollHeight - scrollEl.clientHeight;
-      if (scrollData.scrollAmount > totalScrollAmount - scrollEl.scrollTop) {
+      if (waitForResize && 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/components/ion-datetime-button.js

@@ -52,9 +52,6 @@ const DatetimeButton = /*@__PURE__*/ proxyCustomElement(class DatetimeButton ext
        * to today's date and time if no value is set.
        */
       const parsedDatetimes = parseDate(parsedValues.length > 0 ? parsedValues : [getToday()]);
-      if (!parsedDatetimes) {
-        return;
-      }
       /**
        * If developers incorrectly use multiple="true"
        * with non "date" datetimes, then just select