@sparkle-learning/core 0.0.27 → 0.0.30

package/dist/cjs/ion-menu-button.cjs.entry.js

@@ -2,14 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-fbf4d3bf.js');
-const ionicGlobal = require('./ionic-global-4930d319.js');
-require('./helpers-26770c32.js');
-require('./animation-05337433.js');
-require('./hardware-back-button-ca468aae.js');
-const index$1 = require('./index-7bcd36a0.js');
-const theme = require('./theme-98ccfc24.js');
-const menuToggleUtil = require('./menu-toggle-util-a8fb4c56.js');
+const index = require('./index-bae2a754.js');
+const index$2 = require('./index-8540d72e.js');
+const ionicGlobal = require('./ionic-global-878073d1.js');
+const helpers = require('./helpers-7e28976c.js');
+const index$1 = require('./index-459a5fa9.js');
+const theme = require('./theme-4252ac15.js');
+const menuToggleUtil = require('./menu-toggle-util-cb549c2c.js');
+require('./hardware-back-button-f7b5d99e.js');
+require('./animation-6132e37f.js');
 
 const menuButtonIosCss = ":host{--background:transparent;--color-focused:currentColor;--border-radius:initial;--padding-top:0;--padding-bottom:0;color:var(--color);text-align:center;text-decoration:none;text-overflow:ellipsis;text-transform:none;white-space:nowrap;font-kerning:none}.button-native{border-radius:var(--border-radius);font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;letter-spacing:inherit;text-decoration:inherit;text-indent:inherit;text-overflow:inherit;text-transform:inherit;text-align:inherit;white-space:inherit;color:inherit;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;padding-left:var(--padding-start);padding-right:var(--padding-end);padding-top:var(--padding-top);padding-bottom:var(--padding-bottom);-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:flex;position:relative;flex-flow:row nowrap;flex-shrink:0;align-items:center;justify-content:center;width:100%;height:100%;border:0;outline:none;background:var(--background);line-height:1;cursor:pointer;overflow:hidden;user-select:none;z-index:0;appearance:none}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){.button-native{padding-left:unset;padding-right:unset;-webkit-padding-start:var(--padding-start);padding-inline-start:var(--padding-start);-webkit-padding-end:var(--padding-end);padding-inline-end:var(--padding-end)}}.button-inner{display:flex;position:relative;flex-flow:row nowrap;flex-shrink:0;align-items:center;justify-content:center;width:100%;height:100%;z-index:1}ion-icon{margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;pointer-events:none}:host(.menu-button-hidden){display:none}:host(.menu-button-disabled){cursor:default;opacity:0.5;pointer-events:none}:host(.ion-focused) .button-native{color:var(--color-focused)}:host(.ion-focused) .button-native::after{background:var(--background-focused);opacity:var(--background-focused-opacity)}.button-native::after{left:0;right:0;top:0;bottom:0;position:absolute;content:\"\";opacity:0}@media (any-hover: hover){:host(:hover) .button-native{color:var(--color-hover)}:host(:hover) .button-native::after{background:var(--background-hover);opacity:var(--background-hover-opacity, 0)}}:host(.ion-color) .button-native{color:var(--ion-color-base)}:host(.in-toolbar:not(.in-toolbar-color)){color:var(--ion-toolbar-color, var(--color))}:host{--background-focused:currentColor;--background-focused-opacity:.1;--border-radius:4px;--color:var(--ion-color-primary, #3880ff);--padding-start:5px;--padding-end:5px;height:32px;font-size:31px}:host(.ion-activated){opacity:0.4}@media (any-hover: hover){:host(:hover){opacity:0.6}}";
 
@@ -18,6 +19,7 @@ const menuButtonMdCss = ":host{--background:transparent;--color-focused:currentC
 const MenuButton = class {
   constructor(hostRef) {
     index.registerInstance(this, hostRef);
+    this.inheritedAttributes = {};
     this.visible = false;
     /**
      * If `true`, the user cannot interact with the menu button.
@@ -35,6 +37,9 @@ const MenuButton = class {
       return index$1.menuController.toggle(this.menu);
     };
   }
+  componentWillLoad() {
+    this.inheritedAttributes = helpers.inheritAttributes(this.el, ['aria-label']);
+  }
   componentDidLoad() {
     this.visibilityChanged();
   }
@@ -42,13 +47,14 @@ const MenuButton = class {
     this.visible = await menuToggleUtil.updateVisibility(this.menu);
   }
   render() {
-    const { color, disabled } = this;
+    const { color, disabled, inheritedAttributes } = this;
     const mode = ionicGlobal.getIonMode(this);
-    const menuIcon = ionicGlobal.config.get('menuIcon', mode === 'ios' ? 'menu-outline' : 'menu-sharp');
+    const menuIcon = ionicGlobal.config.get('menuIcon', mode === 'ios' ? index$2.menuOutline : index$2.menuSharp);
     const hidden = this.autoHide && !this.visible;
     const attrs = {
       type: this.type
     };
+    const ariaLabel = inheritedAttributes['aria-label'] || 'menu';
     return (index.h(index.Host, { onClick: this.onClick, "aria-disabled": disabled ? 'true' : null, "aria-hidden": hidden ? 'true' : null, class: theme.createColorClasses(color, {
         [mode]: true,
         'button': true,
@@ -58,7 +64,7 @@ const MenuButton = class {
         'in-toolbar-color': theme.hostContext('ion-toolbar[color]', this.el),
         'ion-activatable': true,
         'ion-focusable': true
-      }) }, index.h("button", Object.assign({}, attrs, { disabled: disabled, class: "button-native", part: "native", "aria-label": "menu" }), index.h("span", { class: "button-inner" }, index.h("slot", null, index.h("ion-icon", { part: "icon", icon: menuIcon, mode: mode, lazy: false, "aria-hidden": "true" }))), mode === 'md' && index.h("ion-ripple-effect", { type: "unbounded" }))));
+      }) }, index.h("button", Object.assign({}, attrs, { disabled: disabled, class: "button-native", part: "native", "aria-label": ariaLabel }), index.h("span", { class: "button-inner" }, index.h("slot", null, index.h("ion-icon", { part: "icon", icon: menuIcon, mode: mode, lazy: false, "aria-hidden": "true" }))), mode === 'md' && index.h("ion-ripple-effect", { type: "unbounded" }))));
   }
   get el() { return index.getElement(this); }
 };

package/dist/cjs/ion-menu-toggle.cjs.entry.js

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-fbf4d3bf.js');
-const ionicGlobal = require('./ionic-global-4930d319.js');
-require('./helpers-26770c32.js');
-require('./animation-05337433.js');
-require('./hardware-back-button-ca468aae.js');
-const index$1 = require('./index-7bcd36a0.js');
-const menuToggleUtil = require('./menu-toggle-util-a8fb4c56.js');
+const index = require('./index-bae2a754.js');
+const ionicGlobal = require('./ionic-global-878073d1.js');
+const index$1 = require('./index-459a5fa9.js');
+const menuToggleUtil = require('./menu-toggle-util-cb549c2c.js');
+require('./hardware-back-button-f7b5d99e.js');
+require('./helpers-7e28976c.js');
+require('./animation-6132e37f.js');
 
 const menuToggleCss = ":host(.menu-toggle-hidden){display:none}";
 

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

@@ -2,14 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-fbf4d3bf.js');
-const ionicGlobal = require('./ionic-global-4930d319.js');
-const helpers = require('./helpers-26770c32.js');
-require('./animation-05337433.js');
-const cubicBezier = require('./cubic-bezier-24e309bf.js');
-const gestureController = require('./gesture-controller-e824cfb3.js');
-require('./hardware-back-button-ca468aae.js');
-const index$1 = require('./index-7bcd36a0.js');
+const index = require('./index-bae2a754.js');
+const ionicGlobal = require('./ionic-global-878073d1.js');
+const cubicBezier = require('./cubic-bezier-293f4663.js');
+const gestureController = require('./gesture-controller-07c31f70.js');
+const helpers = require('./helpers-7e28976c.js');
+const index$1 = require('./index-459a5fa9.js');
+const overlays = require('./overlays-0a748609.js');
+require('./hardware-back-button-f7b5d99e.js');
+require('./animation-6132e37f.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}";
 
@@ -19,6 +20,7 @@ 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) {
     index.registerInstance(this, hostRef);
@@ -31,6 +33,21 @@ const Menu = class {
     this.blocker = gestureController.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 = overlays.getOverlay(document);
+      if (lastOverlay && !lastOverlay.contains(this.el)) {
+        return;
+      }
+      this.trapKeyboardFocus(ev, document);
+    };
     this.isPaneVisible = false;
     this.isEndSide = false;
     /**
@@ -80,30 +97,24 @@ 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 = ionicGlobal.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
+      : 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');
@@ -111,7 +122,7 @@ AFTER:
     this.sideChanged();
     // register this menu with the app's menu controller
     index$1.menuController._register(this);
-    this.gesture = (await Promise.resolve().then(function () { return require('./index-6eff209d.js'); })).createGesture({
+    this.gesture = (await Promise.resolve().then(function () { return require('./index-43642662.js'); })).createGesture({
       el: document,
       gestureName: 'menu-swipe',
       gesturePriority: 30,
@@ -125,6 +136,9 @@ AFTER:
     });
     this.updateState();
   }
+  componentWillLoad() {
+    this.inheritedAttributes = helpers.inheritAttributes(this.el, ['aria-label']);
+  }
   async componentDidLoad() {
     this.ionMenuChange.emit({ disabled: this.disabled, open: this._isOpen });
     this.updateState();
@@ -158,6 +172,11 @@ AFTER:
       }
     }
   }
+  onKeydown(ev) {
+    if (ev.key === 'Escape') {
+      this.close();
+    }
+  }
   /**
    * Returns `true` is the menu is open.
    */
@@ -201,6 +220,62 @@ AFTER:
   setOpen(shouldOpen, animated = true) {
     return index$1.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) {
@@ -345,6 +420,15 @@ AFTER:
     // 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);
     }
@@ -369,18 +453,44 @@ 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();
+      // focus menu content for screen readers
+      if (this.menuInnerEl) {
+        this.focusFirstDescendant();
+      }
+      // setup 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);
@@ -390,6 +500,8 @@ AFTER:
       }
       // emit close event
       this.ionDidClose.emit();
+      // undo focus trapping so multiple menus don't collide
+      document.removeEventListener('focus', this.handleFocus, true);
     }
   }
   updateState() {
@@ -415,9 +527,9 @@ AFTER:
     this.afterAnimation(false);
   }
   render() {
-    const { isEndSide, type, disabled, isPaneVisible } = this;
+    const { isEndSide, type, disabled, isPaneVisible, inheritedAttributes } = this;
     const mode = ionicGlobal.getIonMode(this);
-    return (index.h(index.Host, { role: "navigation", class: {
+    return (index.h(index.Host, { role: "navigation", "aria-label": inheritedAttributes['aria-label'] || 'menu', class: {
         [mode]: true,
         [`menu-type-${type}`]: true,
         'menu-enabled': !disabled,