@sparkle-learning/core 0.0.33 → 0.0.36

package/dist/esm/{menu-toggle-util-06adade3.js → menu-toggle-util-bace8ae6.js}

@@ -1,4 +1,4 @@
-import { m as menuController } from './index-fa5e93c5.js';
+import { m as menuController } from './index-cded2d87.js';
 
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
@@ -6,7 +6,7 @@ import { m as menuController } from './index-fa5e93c5.js';
 // Given a menu, return whether or not the menu toggle should be visible
 const updateVisibility = async (menu) => {
   const menuEl = await menuController.get(menu);
-  return !!(menuEl && await menuEl.isActive());
+  return !!(menuEl && (await menuEl.isActive()));
 };
 
 export { updateVisibility as u };

package/dist/esm/{overlays-5c777f10.js → overlays-3b4dca92.js}

@@ -1,6 +1,6 @@
-import { g as getIonMode, c as config } from './ionic-global-0939c477.js';
-import { OVERLAY_BACK_BUTTON_PRIORITY } from './hardware-back-button-b6ccf74a.js';
-import { c as componentOnReady, f as focusElement, a as addEventListener, r as removeEventListener, g as getElementRoot } from './helpers-9d0930de.js';
+import { g as getIonMode, c as config } from './ionic-global-4903e23e.js';
+import { OVERLAY_BACK_BUTTON_PRIORITY } from './hardware-back-button-fa04d6e9.js';
+import { c as componentOnReady, f as focusElement, a as addEventListener, r as removeEventListener, g as getElementRoot } from './helpers-bf0e23d6.js';
 
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
@@ -17,7 +17,7 @@ const createController = (tagName) => {
     },
     async getTop() {
       return getOverlay(document, tagName);
-    }
+    },
   };
 };
 const alertController = /*@__PURE__*/ createController('ion-alert');
@@ -26,7 +26,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);
   }
@@ -37,7 +36,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);
@@ -49,19 +47,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 => componentOnReady(element, resolve));
+      return new Promise((resolve) => 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) {
     focusElement(firstInput);
@@ -75,10 +72,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();
@@ -247,19 +244,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(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);
         }
       }
@@ -277,8 +274,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
@@ -288,10 +284,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
@@ -339,7 +333,7 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
   (_a = overlay.willPresentShorthand) === null || _a === void 0 ? void 0 : _a.emit();
   const mode = getIonMode(overlay);
   // get the user's animation fn if one was provided
-  const animationBuilder = (overlay.enterAnimation)
+  const animationBuilder = overlay.enterAnimation
     ? overlay.enterAnimation
     : config.get(name, mode === 'ios' ? iosEnterAnimation : mdEnterAnimation);
   const completed = await overlayAnimation(overlay, animationBuilder, overlay.el, opts);
@@ -358,7 +352,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();
   }
 };
@@ -377,10 +377,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();
@@ -398,7 +398,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 = getIonMode(overlay);
-    const animationBuilder = (overlay.leaveAnimation)
+    const animationBuilder = overlay.leaveAnimation
       ? overlay.leaveAnimation
       : config.get(name, mode === 'ios' ? iosLeaveAnimation : mdLeaveAnimation);
     // If dismissed via gesture, no need to play leaving animation again
@@ -436,7 +436,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();
       }
     });
@@ -448,7 +448,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);
   });
@@ -488,4 +488,4 @@ const safeCall = (handler, arg) => {
 };
 const BACKDROP = 'backdrop';
 
-export { BACKDROP as B, present as a, activeAnimations as b, popoverController as c, dismiss as d, eventMethod as e, actionSheetController as f, getOverlay as g, alertController as h, isCancel as i, focusFirstDescendant as j, modalController as m, prepareOverlay as p, safeCall as s, toastController as t };
+export { BACKDROP as B, alertController as a, present as b, activeAnimations as c, dismiss as d, eventMethod as e, popoverController as f, getOverlay as g, actionSheetController as h, isCancel as i, focusFirstDescendant as j, modalController as m, prepareOverlay as p, safeCall as s, toastController as t };