@venite/components 0.16.35 → 0.16.37

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

@@ -1,20 +1,22 @@
-import { r as registerInstance, c as createEvent, h, H as Host, a as getElement } from './index-67fab020.js';
-import { c as config, g as getIonMode } from './ionic-global-6ad8a48f.js';
-import { g as getTimeGivenProgression } from './cubic-bezier-89113939.js';
-import { G as GESTURE_CONTROLLER } from './gesture-controller-5bf8565e.js';
-import { i as isEndSide, a as assert, c as clamp } from './helpers-8c93393b.js';
-import { m as menuController } from './index-5d6128a2.js';
-import './hardware-back-button-b3b61715.js';
-import './animation-7a1025d0.js';
+import { r as registerInstance, c as createEvent, h, H as Host, d as getElement } from './index-034add74.js';
+import { c as config, g as getIonMode } from './ionic-global-24253941.js';
+import { g as getTimeGivenProgression } from './cubic-bezier-4c0db14f.js';
+import { G as GESTURE_CONTROLLER } from './gesture-controller-7be18351.js';
+import { k as isEndSide, i as inheritAriaAttributes, l as assert, a as clamp } from './helpers-af86adf0.js';
+import { m as menuController } from './index-7a608887.js';
+import { g as getOverlay } from './overlays-59377e10.js';
+import './hardware-back-button-fa04d6e9.js';
+import './animation-fa1c28fc.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)';
 const iosEasingReverse = 'cubic-bezier(1, 0, 0.68, 0.28)';
 const mdEasingReverse = 'cubic-bezier(0.4, 0, 0.6, 1)';
+const focusableQueryString = '[tabindex]:not([tabindex^="-"]), input:not([type=hidden]):not([tabindex^="-"]), textarea:not([tabindex^="-"]), button:not([tabindex^="-"]), select:not([tabindex^="-"]), .ion-focusable:not([tabindex^="-"])';
 const Menu = class {
   constructor(hostRef) {
     registerInstance(this, hostRef);
@@ -27,6 +29,21 @@ const Menu = class {
     this.blocker = GESTURE_CONTROLLER.createBlocker({ disableScroll: true });
     this.isAnimating = false;
     this._isOpen = false;
+    this.inheritedAttributes = {};
+    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;
     /**
@@ -66,7 +83,7 @@ const Menu = class {
     this.updateState();
     this.ionMenuChange.emit({
       disabled: this.disabled,
-      open: this._isOpen
+      open: this._isOpen,
     });
   }
   sideChanged() {
@@ -76,30 +93,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');
@@ -107,20 +116,23 @@ AFTER:
     this.sideChanged();
     // register this menu with the app's menu controller
     menuController._register(this);
-    this.gesture = (await import('./index-82044e24.js')).createGesture({
+    this.gesture = (await import('./index-21661af2.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();
   }
+  componentWillLoad() {
+    this.inheritedAttributes = inheritAriaAttributes(this.el);
+  }
   async componentDidLoad() {
     this.ionMenuChange.emit({ disabled: this.disabled, open: this._isOpen });
     this.updateState();
@@ -144,9 +156,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();
@@ -154,6 +164,11 @@ AFTER:
       }
     }
   }
+  onKeydown(ev) {
+    if (ev.key === 'Escape') {
+      this.close();
+    }
+  }
   /**
    * Returns `true` is the menu is open.
    */
@@ -197,6 +212,62 @@ AFTER:
   setOpen(shouldOpen, animated = true) {
     return menuController._setOpen(this, shouldOpen, animated);
   }
+  focusFirstDescendant() {
+    const { el } = this;
+    const firstInput = el.querySelector(focusableQueryString);
+    if (firstInput) {
+      firstInput.focus();
+    }
+    else {
+      el.focus();
+    }
+  }
+  focusLastDescendant() {
+    const { el } = this;
+    const inputs = Array.from(el.querySelectorAll(focusableQueryString));
+    const lastInput = inputs.length > 0 ? inputs[inputs.length - 1] : null;
+    if (lastInput) {
+      lastInput.focus();
+    }
+    else {
+      el.focus();
+    }
+  }
+  trapKeyboardFocus(ev, doc) {
+    const target = ev.target;
+    if (!target) {
+      return;
+    }
+    /**
+     * If the target is inside the menu contents, let the browser
+     * focus as normal and keep a log of the last focused element.
+     */
+    if (this.el.contains(target)) {
+      this.lastFocus = target;
+    }
+    else {
+      /**
+       * Otherwise, we are about to have focus go out of the menu.
+       * Wrap the focus to either the first or last element.
+       */
+      /**
+       * Once we call `focusFirstDescendant`, another focus event
+       * will fire, which will cause `lastFocus` to be updated
+       * before we can run the code after that. We cache the value
+       * here to avoid that.
+       */
+      this.focusFirstDescendant();
+      /**
+       * If the cached last focused element is the same as the now-
+       * active element, that means the user was on the first element
+       * already and pressed Shift + Tab, so we need to wrap to the
+       * last descendant.
+       */
+      if (this.lastFocus === doc.activeElement) {
+        this.focusLastDescendant();
+      }
+    }
+  }
   async _setOpen(shouldOpen, animated = true) {
     // If the menu is disabled or it is currently being animated, let's do nothing
     if (!this._isActive() || this.isAnimating || shouldOpen === this._isOpen) {
@@ -234,8 +305,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');
@@ -279,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) {
@@ -288,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) {
@@ -305,22 +376,26 @@ 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
      * 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
@@ -329,18 +404,28 @@ 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');
     // this places the menu into the correct location before it animates in
     // this css class doesn't actually kick off any animations
     this.el.classList.add(SHOW_MENU);
+    /**
+     * We add a tabindex here so that focus trapping
+     * still works even if the menu does not have
+     * any focusable elements slotted inside. The
+     * focus trapping utility will fallback to focusing
+     * the menu so focus does not leave when the menu
+     * is open.
+     */
+    this.el.setAttribute('tabindex', '0');
     if (this.backdropEl) {
       this.backdropEl.classList.add(SHOW_BACKDROP);
     }
@@ -354,6 +439,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
@@ -365,18 +451,49 @@ AFTER:
       this.blocker.unblock();
     }
     if (isOpen) {
-      // add css class
+      // add css class and hide content behind menu from screen readers
       if (this.contentEl) {
         this.contentEl.classList.add(MENU_CONTENT_OPEN);
+        /**
+         * When the menu is open and overlaying the main
+         * content, the main content should not be announced
+         * by the screenreader as the menu is the main
+         * focus. This is useful with screenreaders that have
+         * "read from top" gestures that read the entire
+         * page from top to bottom when activated.
+         */
+        this.contentEl.setAttribute('aria-hidden', 'true');
       }
       // emit open event
       this.ionDidOpen.emit();
+      /**
+       * 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();
+      }
+      // start focus trapping
+      document.addEventListener('focus', this.handleFocus, true);
     }
     else {
-      // remove css classes
+      // remove css classes and unhide content from screen readers
       this.el.classList.remove(SHOW_MENU);
+      /**
+       * Remove tabindex from the menu component
+       * so that is cannot be tabbed to.
+       */
+      this.el.removeAttribute('tabindex');
       if (this.contentEl) {
         this.contentEl.classList.remove(MENU_CONTENT_OPEN);
+        /**
+         * Remove aria-hidden so screen readers
+         * can announce the main content again
+         * now that the menu is not the main focus.
+         */
+        this.contentEl.removeAttribute('aria-hidden');
       }
       if (this.backdropEl) {
         this.backdropEl.classList.remove(SHOW_BACKDROP);
@@ -386,6 +503,8 @@ AFTER:
       }
       // emit close event
       this.ionDidClose.emit();
+      // undo focus trapping so multiple menus don't collide
+      document.removeEventListener('focus', this.handleFocus, true);
     }
   }
   updateState() {
@@ -411,16 +530,16 @@ AFTER:
     this.afterAnimation(false);
   }
   render() {
-    const { isEndSide, type, disabled, isPaneVisible } = this;
+    const { isEndSide, type, disabled, isPaneVisible, inheritedAttributes } = this;
     const mode = getIonMode(this);
-    return (h(Host, { role: "navigation", class: {
+    return (h(Host, { role: "navigation", "aria-label": inheritedAttributes['aria-label'] || 'menu', class: {
         [mode]: true,
         [`menu-type-${type}`]: true,
         '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 {