@sparkle-learning/core 0.0.33 → 0.0.36

package/dist/cjs/{menu-toggle-util-cb549c2c.js → menu-toggle-util-7a01448c.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const index = require('./index-459a5fa9.js');
+const index = require('./index-15ea05f5.js');
 
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
@@ -8,7 +8,7 @@ const index = require('./index-459a5fa9.js');
 // Given a menu, return whether or not the menu toggle should be visible
 const updateVisibility = async (menu) => {
   const menuEl = await index.menuController.get(menu);
-  return !!(menuEl && await menuEl.isActive());
+  return !!(menuEl && (await menuEl.isActive()));
 };
 
 exports.updateVisibility = updateVisibility;

package/dist/cjs/{overlays-0a748609.js → overlays-32df265a.js}

@@ -1,8 +1,8 @@
 'use strict';
 
-const ionicGlobal = require('./ionic-global-878073d1.js');
-const hardwareBackButton = require('./hardware-back-button-f7b5d99e.js');
-const helpers = require('./helpers-7e28976c.js');
+const ionicGlobal = require('./ionic-global-2cde9d3a.js');
+const hardwareBackButton = require('./hardware-back-button-92d97ff8.js');
+const helpers = require('./helpers-c2496722.js');
 
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
@@ -19,7 +19,7 @@ const createController = (tagName) => {
     },
     async getTop() {
       return getOverlay(document, tagName);
-    }
+    },
   };
 };
 const alertController = /*@__PURE__*/ createController('ion-alert');
@@ -28,7 +28,6 @@ const modalController = /*@__PURE__*/ createController('ion-modal');
 const popoverController = /*@__PURE__*/ createController('ion-popover');
 const toastController = /*@__PURE__*/ createController('ion-toast');
 const prepareOverlay = (el) => {
-  /* tslint:disable-next-line */
   if (typeof document !== 'undefined') {
     connectListeners(document);
   }
@@ -39,7 +38,6 @@ const prepareOverlay = (el) => {
   }
 };
 const createOverlay = (tagName, opts) => {
-  /* tslint:disable-next-line */
   if (typeof window !== 'undefined' && typeof window.customElements !== 'undefined') {
     return window.customElements.whenDefined(tagName).then(() => {
       const element = document.createElement(tagName);
@@ -51,19 +49,18 @@ const createOverlay = (tagName, opts) => {
       Object.assign(element, Object.assign(Object.assign({}, opts), { hasController: true }));
       // append the overlay element to the document body
       getAppRoot(document).appendChild(element);
-      return new Promise(resolve => helpers.componentOnReady(element, resolve));
+      return new Promise((resolve) => helpers.componentOnReady(element, resolve));
     });
   }
   return Promise.resolve();
 };
 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 innerFocusableQueryString = 'input:not([type=hidden]), textarea, button, select';
 const focusFirstDescendant = (ref, overlay) => {
   let firstInput = ref.querySelector(focusableQueryString);
-  const shadowRoot = firstInput && firstInput.shadowRoot;
+  const shadowRoot = firstInput === null || firstInput === void 0 ? void 0 : firstInput.shadowRoot;
   if (shadowRoot) {
     // If there are no inner focusable elements, just focus the host element.
-    firstInput = shadowRoot.querySelector(innerFocusableQueryString) || firstInput;
+    firstInput = shadowRoot.querySelector(focusableQueryString) || firstInput;
   }
   if (firstInput) {
     helpers.focusElement(firstInput);
@@ -77,10 +74,10 @@ const isOverlayHidden = (overlay) => overlay.classList.contains('overlay-hidden'
 const focusLastDescendant = (ref, overlay) => {
   const inputs = Array.from(ref.querySelectorAll(focusableQueryString));
   let lastInput = inputs.length > 0 ? inputs[inputs.length - 1] : null;
-  const shadowRoot = lastInput && lastInput.shadowRoot;
+  const shadowRoot = lastInput === null || lastInput === void 0 ? void 0 : lastInput.shadowRoot;
   if (shadowRoot) {
     // If there are no inner focusable elements, just focus the host element.
-    lastInput = shadowRoot.querySelector(innerFocusableQueryString) || lastInput;
+    lastInput = shadowRoot.querySelector(focusableQueryString) || lastInput;
   }
   if (lastInput) {
     lastInput.focus();
@@ -249,19 +246,19 @@ const connectListeners = (doc) => {
       trapKeyboardFocus(ev, doc);
     }, true);
     // handle back-button click
-    doc.addEventListener('ionBackButton', ev => {
+    doc.addEventListener('ionBackButton', (ev) => {
       const lastOverlay = getOverlay(doc);
-      if (lastOverlay && lastOverlay.backdropDismiss) {
+      if (lastOverlay === null || lastOverlay === void 0 ? void 0 : lastOverlay.backdropDismiss) {
         ev.detail.register(hardwareBackButton.OVERLAY_BACK_BUTTON_PRIORITY, () => {
           return lastOverlay.dismiss(undefined, BACKDROP);
         });
       }
     });
     // handle ESC to close overlay
-    doc.addEventListener('keyup', ev => {
+    doc.addEventListener('keyup', (ev) => {
       if (ev.key === 'Escape') {
         const lastOverlay = getOverlay(doc);
-        if (lastOverlay && lastOverlay.backdropDismiss) {
+        if (lastOverlay === null || lastOverlay === void 0 ? void 0 : lastOverlay.backdropDismiss) {
           lastOverlay.dismiss(undefined, BACKDROP);
         }
       }
@@ -279,8 +276,7 @@ const getOverlays = (doc, selector) => {
   if (selector === undefined) {
     selector = 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-picker,ion-popover,ion-toast';
   }
-  return Array.from(doc.querySelectorAll(selector))
-    .filter(c => c.overlayIndex > 0);
+  return Array.from(doc.querySelectorAll(selector)).filter((c) => c.overlayIndex > 0);
 };
 /**
  * Returns an overlay element
@@ -290,10 +286,8 @@ const getOverlays = (doc, selector) => {
  * @returns The overlay element or `undefined` if no overlay element is found.
  */
 const getOverlay = (doc, overlayTag, id) => {
-  const overlays = getOverlays(doc, overlayTag).filter(o => !isOverlayHidden(o));
-  return (id === undefined)
-    ? overlays[overlays.length - 1]
-    : overlays.find(o => o.id === id);
+  const overlays = getOverlays(doc, overlayTag).filter((o) => !isOverlayHidden(o));
+  return id === undefined ? overlays[overlays.length - 1] : overlays.find((o) => o.id === id);
 };
 /**
  * When an overlay is presented, the main
@@ -341,7 +335,7 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
   (_a = overlay.willPresentShorthand) === null || _a === void 0 ? void 0 : _a.emit();
   const mode = ionicGlobal.getIonMode(overlay);
   // get the user's animation fn if one was provided
-  const animationBuilder = (overlay.enterAnimation)
+  const animationBuilder = overlay.enterAnimation
     ? overlay.enterAnimation
     : ionicGlobal.config.get(name, mode === 'ios' ? iosEnterAnimation : mdEnterAnimation);
   const completed = await overlayAnimation(overlay, animationBuilder, overlay.el, opts);
@@ -360,7 +354,13 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
   if (overlay.el.tagName !== 'ION-TOAST') {
     focusPreviousElementOnDismiss(overlay.el);
   }
-  if (overlay.keyboardClose) {
+  /**
+   * If the focused element is already
+   * inside the overlay component then
+   * focus should not be moved from that
+   * to the overlay container.
+   */
+  if (overlay.keyboardClose && (document.activeElement === null || !overlay.el.contains(document.activeElement))) {
     overlay.el.focus();
   }
 };
@@ -379,10 +379,10 @@ const focusPreviousElementOnDismiss = async (overlayEl) => {
   if (!previousElement) {
     return;
   }
-  const shadowRoot = previousElement && previousElement.shadowRoot;
+  const shadowRoot = previousElement === null || previousElement === void 0 ? void 0 : previousElement.shadowRoot;
   if (shadowRoot) {
     // If there are no inner focusable elements, just focus the host element.
-    previousElement = shadowRoot.querySelector(innerFocusableQueryString) || previousElement;
+    previousElement = shadowRoot.querySelector(focusableQueryString) || previousElement;
   }
   await overlayEl.onDidDismiss();
   previousElement.focus();
@@ -400,7 +400,7 @@ const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnim
     overlay.willDismiss.emit({ data, role });
     (_a = overlay.willDismissShorthand) === null || _a === void 0 ? void 0 : _a.emit({ data, role });
     const mode = ionicGlobal.getIonMode(overlay);
-    const animationBuilder = (overlay.leaveAnimation)
+    const animationBuilder = overlay.leaveAnimation
       ? overlay.leaveAnimation
       : ionicGlobal.config.get(name, mode === 'ios' ? iosLeaveAnimation : mdLeaveAnimation);
     // If dismissed via gesture, no need to play leaving animation again
@@ -438,7 +438,7 @@ const overlayAnimation = async (overlay, animationBuilder, baseEl, opts) => {
   if (overlay.keyboardClose) {
     animation.beforeAddWrite(() => {
       const activeElement = baseEl.ownerDocument.activeElement;
-      if (activeElement && activeElement.matches('input,ion-input, ion-textarea')) {
+      if (activeElement === null || activeElement === void 0 ? void 0 : activeElement.matches('input,ion-input, ion-textarea')) {
         activeElement.blur();
       }
     });
@@ -450,7 +450,7 @@ const overlayAnimation = async (overlay, animationBuilder, baseEl, opts) => {
 };
 const eventMethod = (element, eventName) => {
   let resolve;
-  const promise = new Promise(r => resolve = r);
+  const promise = new Promise((r) => (resolve = r));
   onceEvent(element, eventName, (event) => {
     resolve(event.detail);
   });