@pod-os/elements 0.6.1-bea440b.0 → 0.7.1-2196a40.0

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

@@ -1,15 +1,17 @@
-import { r as registerInstance, c as createEvent, h, H as Host, a as getElement } from './index-e4deec27.js';
-import { c as config, g as getIonMode } from './ionic-global-2e28f7c7.js';
-import { g as getTimeGivenProgression } from './cubic-bezier-108b8579.js';
-import { G as GESTURE_CONTROLLER } from './gesture-controller-8f35af24.js';
-import { m as isEndSide, i as inheritAriaAttributes, n as assert, c as clamp } from './helpers-44e3bd9f.js';
-import { m as menuController } from './index-97199683.js';
-import './hardware-back-button-bb4c578a.js';
-import './animation-fe6ed422.js';
+import { r as registerInstance, d as createEvent, h, H as Host, c as getElement } from './index-cb938ffb.js';
+import { c as config, g as getIonMode } from './ionic-global-6cd57191.js';
+import { g as getTimeGivenProgression } from './cubic-bezier-538b6253.js';
+import { G as GESTURE_CONTROLLER } from './gesture-controller-c466ff14.js';
+import { l as isEndSide, i as inheritAriaAttributes, n as assert, b as clamp } from './helpers-aeff219b.js';
+import { m as menuController } from './index-2be9a18b.js';
+import { g as getOverlay } from './overlays-0c7f05e1.js';
+import './hardware-back-button-242191a7.js';
+import './animation-801a007a.js';
+import './index-0dbaca1a.js';
 
-const menuIosCss = ":host{--width:304px;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--background:var(--ion-background-color, #fff);left:0;right:0;top:0;bottom:0;display:none;position:absolute;contain:strict}:host(.show-menu){display:block}.menu-inner{left:0;right:auto;top:0;bottom:0;transform:translate3d(-9999px,  0,  0);display:flex;position:absolute;flex-direction:column;justify-content:space-between;width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);background:var(--background);contain:strict}[dir=rtl] .menu-inner,:host-context([dir=rtl]) .menu-inner{left:unset;right:unset;left:auto;right:0}[dir=rtl] .menu-inner,:host-context([dir=rtl]) .menu-inner{transform:translate3d(calc(-1 * -9999px),  0,  0)}:host(.menu-side-start) .menu-inner{--ion-safe-area-right:0px;right:auto;left:0}:host(.menu-side-end) .menu-inner{--ion-safe-area-left:0px;right:0;left:auto;}ion-backdrop{display:none;opacity:0.01;z-index:-1}@media (max-width: 340px){.menu-inner{--width:264px}}:host(.menu-type-reveal){z-index:0}:host(.menu-type-reveal.show-menu) .menu-inner{transform:translate3d(0,  0,  0)}:host(.menu-type-overlay){z-index:1000}:host(.menu-type-overlay) .show-backdrop{display:block;cursor:pointer}:host(.menu-pane-visible){width:var(--width);min-width:var(--min-width);max-width:var(--max-width)}:host(.menu-pane-visible) .menu-inner{left:0;right:0;width:auto;transform:none !important;box-shadow:none !important}:host(.menu-pane-visible) ion-backdrop{display:hidden !important;}:host(.menu-type-push){z-index:1000}:host(.menu-type-push) .show-backdrop{display:block}";
+const menuIosCss = ":host{--width:304px;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--background:var(--ion-background-color, #fff);left:0;right:0;top:0;bottom:0;display:none;position:absolute;contain:strict}:host(.show-menu){display:block}.menu-inner{left:0;right:auto;top:0;bottom:0;transform:translateX(-9999px);display:flex;position:absolute;flex-direction:column;justify-content:space-between;width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);background:var(--background);contain:strict}[dir=rtl] .menu-inner,:host-context([dir=rtl]) .menu-inner{left:unset;right:unset;left:auto;right:0}:host(.menu-side-start) .menu-inner{--ion-safe-area-right:0px;right:auto;left:0}:host(.menu-side-end) .menu-inner{--ion-safe-area-left:0px;right:0;left:auto;}ion-backdrop{display:none;opacity:0.01;z-index:-1}@media (max-width: 340px){.menu-inner{--width:264px}}:host(.menu-type-reveal){z-index:0}:host(.menu-type-reveal.show-menu) .menu-inner{transform:translate3d(0,  0,  0)}:host(.menu-type-overlay){z-index:1000}:host(.menu-type-overlay) .show-backdrop{display:block;cursor:pointer}:host(.menu-pane-visible){width:var(--width);min-width:var(--min-width);max-width:var(--max-width)}:host(.menu-pane-visible) .menu-inner{left:0;right:0;width:auto;transform:none !important;box-shadow:none !important}:host(.menu-pane-visible) ion-backdrop{display:hidden !important;}:host(.menu-type-push){z-index:1000}:host(.menu-type-push) .show-backdrop{display:block}";
 
-const menuMdCss = ":host{--width:304px;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--background:var(--ion-background-color, #fff);left:0;right:0;top:0;bottom:0;display:none;position:absolute;contain:strict}:host(.show-menu){display:block}.menu-inner{left:0;right:auto;top:0;bottom:0;transform:translate3d(-9999px,  0,  0);display:flex;position:absolute;flex-direction:column;justify-content:space-between;width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);background:var(--background);contain:strict}[dir=rtl] .menu-inner,:host-context([dir=rtl]) .menu-inner{left:unset;right:unset;left:auto;right:0}[dir=rtl] .menu-inner,:host-context([dir=rtl]) .menu-inner{transform:translate3d(calc(-1 * -9999px),  0,  0)}:host(.menu-side-start) .menu-inner{--ion-safe-area-right:0px;right:auto;left:0}:host(.menu-side-end) .menu-inner{--ion-safe-area-left:0px;right:0;left:auto;}ion-backdrop{display:none;opacity:0.01;z-index:-1}@media (max-width: 340px){.menu-inner{--width:264px}}:host(.menu-type-reveal){z-index:0}:host(.menu-type-reveal.show-menu) .menu-inner{transform:translate3d(0,  0,  0)}:host(.menu-type-overlay){z-index:1000}:host(.menu-type-overlay) .show-backdrop{display:block;cursor:pointer}:host(.menu-pane-visible){width:var(--width);min-width:var(--min-width);max-width:var(--max-width)}:host(.menu-pane-visible) .menu-inner{left:0;right:0;width:auto;transform:none !important;box-shadow:none !important}:host(.menu-pane-visible) ion-backdrop{display:hidden !important;}:host(.menu-type-overlay) .menu-inner{box-shadow:4px 0px 16px rgba(0, 0, 0, 0.18)}";
+const menuMdCss = ":host{--width:304px;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--background:var(--ion-background-color, #fff);left:0;right:0;top:0;bottom:0;display:none;position:absolute;contain:strict}:host(.show-menu){display:block}.menu-inner{left:0;right:auto;top:0;bottom:0;transform:translateX(-9999px);display:flex;position:absolute;flex-direction:column;justify-content:space-between;width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);background:var(--background);contain:strict}[dir=rtl] .menu-inner,:host-context([dir=rtl]) .menu-inner{left:unset;right:unset;left:auto;right:0}:host(.menu-side-start) .menu-inner{--ion-safe-area-right:0px;right:auto;left:0}:host(.menu-side-end) .menu-inner{--ion-safe-area-left:0px;right:0;left:auto;}ion-backdrop{display:none;opacity:0.01;z-index:-1}@media (max-width: 340px){.menu-inner{--width:264px}}:host(.menu-type-reveal){z-index:0}:host(.menu-type-reveal.show-menu) .menu-inner{transform:translate3d(0,  0,  0)}:host(.menu-type-overlay){z-index:1000}:host(.menu-type-overlay) .show-backdrop{display:block;cursor:pointer}:host(.menu-pane-visible){width:var(--width);min-width:var(--min-width);max-width:var(--max-width)}:host(.menu-pane-visible) .menu-inner{left:0;right:0;width:auto;transform:none !important;box-shadow:none !important}:host(.menu-pane-visible) ion-backdrop{display:hidden !important;}:host(.menu-type-overlay) .menu-inner{box-shadow:4px 0px 16px rgba(0, 0, 0, 0.18)}";
 
 const iosEasing = 'cubic-bezier(0.32,0.72,0,1)';
 const mdEasing = 'cubic-bezier(0.0,0.0,0.2,1)';
@@ -29,7 +31,20 @@ const Menu = class {
     this.isAnimating = false;
     this._isOpen = false;
     this.inheritedAttributes = {};
-    this.handleFocus = (ev) => this.trapKeyboardFocus(ev, document);
+    this.handleFocus = (ev) => {
+      /**
+       * Overlays have their own focus trapping listener
+       * so we do not want the two listeners to conflict
+       * with each other. If the top-most overlay that is
+       * open does not contain this ion-menu, then ion-menu's
+       * focus trapping should not run.
+       */
+      const lastOverlay = getOverlay(document);
+      if (lastOverlay && !lastOverlay.contains(this.el)) {
+        return;
+      }
+      this.trapKeyboardFocus(ev, document);
+    };
     this.isPaneVisible = false;
     this.isEndSide = false;
     /**
@@ -69,7 +84,7 @@ const Menu = class {
     this.updateState();
     this.ionMenuChange.emit({
       disabled: this.disabled,
-      open: this._isOpen
+      open: this._isOpen,
     });
   }
   sideChanged() {
@@ -79,30 +94,22 @@ const Menu = class {
     this.updateState();
   }
   async connectedCallback() {
+    // TODO: connectedCallback is fired in CE build
+    // before WC is defined. This needs to be fixed in Stencil.
+    if (typeof customElements !== 'undefined') {
+      await customElements.whenDefined('ion-menu');
+    }
     if (this.type === undefined) {
       this.type = config.get('menuType', 'overlay');
     }
-    const el = this.el;
-    const parent = el.parentNode;
-    if (this.contentId === undefined) {
-      console.warn(`[DEPRECATED][ion-menu] Using the [main] attribute is deprecated, please use the "contentId" property instead:
-BEFORE:
-  <ion-menu>...</ion-menu>
-  <div main>...</div>
-
-AFTER:
-  <ion-menu contentId="main-content"></ion-menu>
-  <div id="main-content">...</div>
-`);
-    }
-    const content = this.contentId !== undefined
-      ? document.getElementById(this.contentId)
-      : parent && parent.querySelector && parent.querySelector('[main]');
-    if (!content || !content.tagName) {
-      // requires content element
+    const content = this.contentId !== undefined ? document.getElementById(this.contentId) : null;
+    if (content === null) {
       console.error('Menu: must have a "content" element to listen for drag events on.');
       return;
     }
+    if (this.el.contains(content)) {
+      console.error(`Menu: "contentId" should refer to the main view's ion-content, not the ion-content inside of the ion-menu.`);
+    }
     this.contentEl = content;
     // add menu's content classes
     content.classList.add('menu-content');
@@ -110,17 +117,17 @@ AFTER:
     this.sideChanged();
     // register this menu with the app's menu controller
     menuController._register(this);
-    this.gesture = (await import('./index-3a1bd803.js')).createGesture({
+    this.gesture = (await import('./index-d39eb62b.js')).createGesture({
       el: document,
       gestureName: 'menu-swipe',
       gesturePriority: 30,
       threshold: 10,
       blurOnStart: true,
-      canStart: ev => this.canStart(ev),
+      canStart: (ev) => this.canStart(ev),
       onWillStart: () => this.onWillStart(),
       onStart: () => this.onStart(),
-      onMove: ev => this.onMove(ev),
-      onEnd: ev => this.onEnd(ev),
+      onMove: (ev) => this.onMove(ev),
+      onEnd: (ev) => this.onEnd(ev),
     });
     this.updateState();
   }
@@ -150,9 +157,7 @@ AFTER:
   }
   onBackdropClick(ev) {
     if (this._isOpen && this.lastOnEnd < ev.timeStamp - 100) {
-      const shouldClose = (ev.composedPath)
-        ? !ev.composedPath().includes(this.menuInnerEl)
-        : false;
+      const shouldClose = ev.composedPath ? !ev.composedPath().includes(this.menuInnerEl) : false;
       if (shouldClose) {
         ev.preventDefault();
         ev.stopPropagation();
@@ -301,8 +306,8 @@ AFTER:
     const easing = mode === 'ios' ? iosEasing : mdEasing;
     const easingReverse = mode === 'ios' ? iosEasingReverse : mdEasingReverse;
     const ani = this.animation
-      .direction((isReversed) ? 'reverse' : 'normal')
-      .easing((isReversed) ? easingReverse : easing)
+      .direction(isReversed ? 'reverse' : 'normal')
+      .easing(isReversed ? easingReverse : easing)
       .onFinish(() => {
       if (ani.getDirection() === 'reverse') {
         ani.direction('normal');
@@ -329,7 +334,6 @@ AFTER:
     }
     if (this._isOpen) {
       return true;
-      // TODO error
     }
     else if (menuController._getOpenSync()) {
       return false;
@@ -346,7 +350,7 @@ AFTER:
       return;
     }
     // the cloned animation should not use an easing curve during seek
-    this.animation.progressStart(true, (this._isOpen) ? 1 : 0);
+    this.animation.progressStart(true, this._isOpen ? 1 : 0);
   }
   onMove(detail) {
     if (!this.isAnimating || !this.animation) {
@@ -355,7 +359,7 @@ AFTER:
     }
     const delta = computeDelta(detail.deltaX, this._isOpen, this.isEndSide);
     const stepValue = delta / this.width;
-    this.animation.progressStep((this._isOpen) ? 1 - stepValue : stepValue);
+    this.animation.progressStep(this._isOpen ? 1 - stepValue : stepValue);
   }
   onEnd(detail) {
     if (!this.isAnimating || !this.animation) {
@@ -372,22 +376,25 @@ AFTER:
     const shouldCompleteRight = velocity >= 0 && (velocity > 0.2 || detail.deltaX > z);
     const shouldCompleteLeft = velocity <= 0 && (velocity < -0.2 || detail.deltaX < -z);
     const shouldComplete = isOpen
-      ? isEndSide ? shouldCompleteRight : shouldCompleteLeft
-      : isEndSide ? shouldCompleteLeft : shouldCompleteRight;
+      ? isEndSide
+        ? shouldCompleteRight
+        : shouldCompleteLeft
+      : isEndSide
+        ? shouldCompleteLeft
+        : shouldCompleteRight;
     let shouldOpen = !isOpen && shouldComplete;
     if (isOpen && !shouldComplete) {
       shouldOpen = true;
     }
     this.lastOnEnd = detail.currentTime;
     // Account for rounding errors in JS
-    let newStepValue = (shouldComplete) ? 0.001 : -0.001;
+    let newStepValue = shouldComplete ? 0.001 : -0.001;
     /**
-     * TODO: stepValue can sometimes return a negative
+     * stepValue can sometimes return a negative
      * value, but you can't have a negative time value
      * for the cubic bezier curve (at least with web animations)
-     * Not sure if the negative step value is an error or not
      */
-    const adjustedStepValue = (stepValue < 0) ? 0.01 : stepValue;
+    const adjustedStepValue = stepValue < 0 ? 0.01 : stepValue;
     /**
      * Animation will be reversed here, so need to
      * reverse the easing curve as well
@@ -396,12 +403,13 @@ AFTER:
      * to the new easing curve, as `stepValue` is going to be given
      * in terms of a linear curve.
      */
-    newStepValue += getTimeGivenProgression([0, 0], [0.4, 0], [0.6, 1], [1, 1], clamp(0, adjustedStepValue, 0.9999))[0] || 0;
-    const playTo = (this._isOpen) ? !shouldComplete : shouldComplete;
+    newStepValue +=
+      getTimeGivenProgression([0, 0], [0.4, 0], [0.6, 1], [1, 1], clamp(0, adjustedStepValue, 0.9999))[0] || 0;
+    const playTo = this._isOpen ? !shouldComplete : shouldComplete;
     this.animation
       .easing('cubic-bezier(0.4, 0.0, 0.6, 1)')
       .onFinish(() => this.afterAnimation(shouldOpen), { oneTimeCallback: true })
-      .progressEnd((playTo) ? 1 : 0, (this._isOpen) ? 1 - newStepValue : newStepValue, 300);
+      .progressEnd(playTo ? 1 : 0, this._isOpen ? 1 - newStepValue : newStepValue, 300);
   }
   beforeAnimation(shouldOpen) {
     assert(!this.isAnimating, '_before() should not be called while animating');
@@ -430,6 +438,7 @@ AFTER:
     }
   }
   afterAnimation(isOpen) {
+    var _a;
     assert(this.isAnimating, '_before() should be called while animating');
     // keep opening/closing the menu disabled for a touch more yet
     // only add listeners/css if it's enabled and isOpen
@@ -456,11 +465,16 @@ AFTER:
       }
       // emit open event
       this.ionDidOpen.emit();
-      // focus menu content for screen readers
-      if (this.menuInnerEl) {
-        this.focusFirstDescendant();
+      /**
+       * Move focus to the menu to prepare focus trapping, as long as
+       * it isn't already focused. Use the host element instead of the
+       * first descendant to avoid the scroll position jumping around.
+       */
+      const focusedMenu = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.closest('ion-menu');
+      if (focusedMenu !== this.el) {
+        this.el.focus();
       }
-      // setup focus trapping
+      // start focus trapping
       document.addEventListener('focus', this.handleFocus, true);
     }
     else {
@@ -523,8 +537,8 @@ AFTER:
         'menu-enabled': !disabled,
         'menu-side-end': isEndSide,
         'menu-side-start': !isEndSide,
-        'menu-pane-visible': isPaneVisible
-      } }, h("div", { class: "menu-inner", part: "container", ref: el => this.menuInnerEl = el }, h("slot", null)), h("ion-backdrop", { ref: el => this.backdropEl = el, class: "menu-backdrop", tappable: false, stopPropagation: false, part: "backdrop" })));
+        'menu-pane-visible': isPaneVisible,
+      } }, h("div", { class: "menu-inner", part: "container", ref: (el) => (this.menuInnerEl = el) }, h("slot", null)), h("ion-backdrop", { ref: (el) => (this.backdropEl = el), class: "menu-backdrop", tappable: false, stopPropagation: false, part: "backdrop" })));
   }
   get el() { return getElement(this); }
   static get watchers() { return {