sweetalert2 11.26.13 → 11.26.15

package/src/SweetAlert.js

@@ -24,7 +24,7 @@ export class SweetAlert {
   /**
    * @type {Promise<SweetAlertResult>}
    */
-  #promise
+  #promise = /** @type {Promise<SweetAlertResult>} */ (Promise.resolve({ isConfirmed: false, isDenied: false, isDismissed: true }))
 
   /**
    * @param {...(SweetAlertOptions | string)} args
@@ -50,6 +50,10 @@ export class SweetAlert {
     this.#promise = this._main(currentInstance.params)
   }
 
+  /**
+   * @param {any} userParams
+   * @param {any} mixinParams
+   */
   _main(userParams, mixinParams = {}) {
     showWarningsForParams(Object.assign({}, mixinParams, userParams))
 
@@ -90,10 +94,16 @@ export class SweetAlert {
   }
 
   // `catch` cannot be the name of a module export, so we define our thenable methods here instead
+  /**
+   * @param {any} onFulfilled
+   */
   then(onFulfilled) {
     return this.#promise.then(onFulfilled)
   }
 
+  /**
+   * @param {any} onFinally
+   */
   finally(onFinally) {
     return this.#promise.finally(onFinally)
   }
@@ -103,7 +113,7 @@ export class SweetAlert {
  * @param {SweetAlert} instance
  * @param {DomCache} domCache
  * @param {SweetAlertOptions} innerParams
- * @returns {Promise}
+ * @returns {Promise<SweetAlertResult>}
  */
 const swalPromise = (instance, domCache, innerParams) => {
   return new Promise((resolve, reject) => {
@@ -177,18 +187,18 @@ const prepareParams = (userParams, mixinParams) => {
  * @returns {DomCache}
  */
 const populateDomCache = (instance) => {
-  const domCache = {
-    popup: dom.getPopup(),
-    container: dom.getContainer(),
-    actions: dom.getActions(),
-    confirmButton: dom.getConfirmButton(),
-    denyButton: dom.getDenyButton(),
-    cancelButton: dom.getCancelButton(),
-    loader: dom.getLoader(),
-    closeButton: dom.getCloseButton(),
-    validationMessage: dom.getValidationMessage(),
-    progressSteps: dom.getProgressSteps(),
-  }
+  const domCache = /** @type {DomCache} */ ({
+    popup: /** @type {HTMLElement} */ (dom.getPopup()),
+    container: /** @type {HTMLElement} */ (dom.getContainer()),
+    actions: /** @type {HTMLElement} */ (dom.getActions()),
+    confirmButton: /** @type {HTMLElement} */ (dom.getConfirmButton()),
+    denyButton: /** @type {HTMLElement} */ (dom.getDenyButton()),
+    cancelButton: /** @type {HTMLElement} */ (dom.getCancelButton()),
+    loader: /** @type {HTMLElement} */ (dom.getLoader()),
+    closeButton: /** @type {HTMLElement} */ (dom.getCloseButton()),
+    validationMessage: /** @type {HTMLElement} */ (dom.getValidationMessage()),
+    progressSteps: /** @type {HTMLElement} */ (dom.getProgressSteps()),
+  })
   privateProps.domCache.set(instance, domCache)
 
   return domCache
@@ -207,13 +217,13 @@ const setupTimer = (globalState, innerParams, dismissWith) => {
       dismissWith('timer')
       delete globalState.timeout
     }, innerParams.timer)
-    if (innerParams.timerProgressBar) {
+    if (innerParams.timerProgressBar && timerProgressBar) {
       dom.show(timerProgressBar)
       dom.applyCustomClass(timerProgressBar, innerParams, 'timerProgressBar')
       setTimeout(() => {
         if (globalState.timeout && globalState.timeout.running) {
           // timer can be already stopped or unset at this point
-          dom.animateTimerProgressBar(innerParams.timer)
+          dom.animateTimerProgressBar(/** @type {number} */ (innerParams.timer))
         }
       })
     }
@@ -327,16 +337,19 @@ Object.keys(instanceMethods).forEach((key) => {
    * @param {...(SweetAlertOptions | string | undefined)} args
    * @returns {SweetAlertResult | Promise<SweetAlertResult> | undefined}
    */
+  // @ts-ignore: Dynamic property assignment for backwards compatibility
   SweetAlert[key] = function (...args) {
+    // @ts-ignore
     if (currentInstance && currentInstance[key]) {
+      // @ts-ignore
       return currentInstance[key](...args)
     }
-    return null
+    return undefined
   }
 })
 
 SweetAlert.DismissReason = DismissReason
 
-SweetAlert.version = '11.26.13'
+SweetAlert.version = '11.26.15'
 
 export default SweetAlert

package/src/staticMethods/mixin.js

@@ -16,9 +16,15 @@
  *
  * @param {SweetAlertOptions} mixinParams
  * @returns {SweetAlert}
+ * @this {typeof import('../SweetAlert.js').SweetAlert}
  */
 export function mixin(mixinParams) {
+  // @ts-ignore: 'this' refers to the SweetAlert constructor
   class MixinSwal extends this {
+    /**
+     * @param {any} params
+     * @param {any} priorityMixinParams
+     */
     _main(params, priorityMixinParams) {
       return super._main(params, Object.assign({}, mixinParams, priorityMixinParams))
     }

package/src/utils/dom/domUtils.js

@@ -210,7 +210,7 @@ export const applyNumericalStyle = (elem, property, value) => {
     value = parseInt(value)
   }
   if (value || parseInt(`${value}`) === 0) {
-    elem.style.setProperty(property, typeof value === 'number' ? `${value}px` : value)
+    elem.style.setProperty(property, typeof value === 'number' ? `${value}px` : /** @type {string} */ (value))
   } else {
     elem.style.removeProperty(property)
   }
@@ -305,7 +305,7 @@ export const isScrollable = (elem) => Boolean(elem.scrollHeight > elem.clientHei
  * @returns {boolean}
  */
 export const selfOrParentIsScrollable = (element, stopElement) => {
-  let parent = element
+  let parent = /** @type {HTMLElement | null} */ (element)
   while (parent && parent !== stopElement) {
     if (isScrollable(parent)) {
       return true

package/src/utils/dom/init.js

@@ -52,44 +52,66 @@ const resetOldContainer = () => {
   oldContainer.remove()
   removeClass(
     [document.documentElement, document.body],
-    [swalClasses['no-backdrop'], swalClasses['toast-shown'], swalClasses['has-column']]
+    [
+      swalClasses['no-backdrop'],
+      swalClasses['toast-shown'],
+      // @ts-ignore: 'has-column' is not defined in swalClasses but may be set dynamically
+      swalClasses['has-column'],
+    ]
   )
 
   return true
 }
 
 const resetValidationMessage = () => {
-  globalState.currentInstance.resetValidationMessage()
+  if (globalState.currentInstance) {
+    globalState.currentInstance.resetValidationMessage()
+  }
 }
 
 const addInputChangeListeners = () => {
   const popup = getPopup()
+  if (!popup) {
+    return
+  }
 
   const input = getDirectChildByClass(popup, swalClasses.input)
   const file = getDirectChildByClass(popup, swalClasses.file)
-  /** @type {HTMLInputElement} */
+  /** @type {HTMLInputElement | null} */
   const range = popup.querySelector(`.${swalClasses.range} input`)
-  /** @type {HTMLOutputElement} */
+  /** @type {HTMLOutputElement | null} */
   const rangeOutput = popup.querySelector(`.${swalClasses.range} output`)
   const select = getDirectChildByClass(popup, swalClasses.select)
-  /** @type {HTMLInputElement} */
+  /** @type {HTMLInputElement | null} */
   const checkbox = popup.querySelector(`.${swalClasses.checkbox} input`)
   const textarea = getDirectChildByClass(popup, swalClasses.textarea)
 
-  input.oninput = resetValidationMessage
-  file.onchange = resetValidationMessage
-  select.onchange = resetValidationMessage
-  checkbox.onchange = resetValidationMessage
-  textarea.oninput = resetValidationMessage
-
-  range.oninput = () => {
-    resetValidationMessage()
-    rangeOutput.value = range.value
+  if (input) {
+    input.oninput = resetValidationMessage
+  }
+  if (file) {
+    file.onchange = resetValidationMessage
+  }
+  if (select) {
+    select.onchange = resetValidationMessage
+  }
+  if (checkbox) {
+    checkbox.onchange = resetValidationMessage
   }
+  if (textarea) {
+    textarea.oninput = resetValidationMessage
+  }
+
+  if (range && rangeOutput) {
+    range.oninput = () => {
+      resetValidationMessage()
+      rangeOutput.value = range.value
+    }
 
-  range.onchange = () => {
-    resetValidationMessage()
-    rangeOutput.value = range.value
+    range.onchange = () => {
+      resetValidationMessage()
+      rangeOutput.value = range.value
+    }
   }
 }
 
@@ -97,13 +119,25 @@ const addInputChangeListeners = () => {
  * @param {string | HTMLElement} target
  * @returns {HTMLElement}
  */
-const getTarget = (target) => (typeof target === 'string' ? document.querySelector(target) : target)
+const getTarget = (target) => {
+  if (typeof target === 'string') {
+    const element = document.querySelector(target)
+    if (!element) {
+      throw new Error(`Target element "${target}" not found`)
+    }
+    return /** @type {HTMLElement} */ (element)
+  }
+  return target
+}
 
 /**
  * @param {SweetAlertOptions} params
  */
 const setupAccessibility = (params) => {
   const popup = getPopup()
+  if (!popup) {
+    return
+  }
 
   popup.setAttribute('role', params.toast ? 'alert' : 'dialog')
   popup.setAttribute('aria-live', params.toast ? 'polite' : 'assertive')
@@ -145,7 +179,7 @@ export const init = (params) => {
 
   container.dataset['swal2Theme'] = params.theme
 
-  const targetElement = getTarget(params.target)
+  const targetElement = getTarget(params.target || 'body')
   targetElement.appendChild(container)
 
   if (params.topLayer) {

package/src/utils/dom/inputUtils.js

@@ -235,5 +235,5 @@ const formatInputOptions = (inputOptions) => {
  * @returns {boolean}
  */
 const isSelected = (optionValue, inputValue) => {
-  return Boolean(inputValue) && inputValue.toString() === optionValue.toString()
+  return Boolean(inputValue) && (inputValue !== null && inputValue !== undefined) && inputValue.toString() === optionValue.toString()
 }

package/src/utils/dom/parseHtmlToContainer.js

@@ -27,7 +27,7 @@ export const parseHtmlToContainer = (param, target) => {
  */
 const handleObject = (param, target) => {
   // JQuery element(s)
-  if (param.jquery) {
+  if ('jquery' in param) {
     handleJqueryElem(target, param)
   }
 
@@ -39,7 +39,7 @@ const handleObject = (param, target) => {
 
 /**
  * @param {HTMLElement} target
- * @param {object} elem
+ * @param {any} elem
  */
 const handleJqueryElem = (target, elem) => {
   target.textContent = ''

package/src/utils/dom/renderers/render.js

@@ -33,5 +33,5 @@ export const render = (instance, params) => {
   if (typeof params.didRender === 'function' && popup) {
     params.didRender(popup)
   }
-  globalState.eventEmitter.emit('didRender', popup)
+  globalState.eventEmitter?.emit('didRender', popup)
 }

package/src/utils/getTemplateParams.js

@@ -48,9 +48,15 @@ const getSwalParams = (templateContent) => {
     if (!paramName || !value) {
       return
     }
-    if (typeof defaultParams[paramName] === 'boolean') {
+    if (
+      paramName in defaultParams &&
+      typeof defaultParams[/** @type {keyof typeof defaultParams} */ (paramName)] === 'boolean'
+    ) {
       result[paramName] = value !== 'false'
-    } else if (typeof defaultParams[paramName] === 'object') {
+    } else if (
+      paramName in defaultParams &&
+      typeof defaultParams[/** @type {keyof typeof defaultParams} */ (paramName)] === 'object'
+    ) {
       result[paramName] = JSON.parse(value)
     } else {
       result[paramName] = value
@@ -97,10 +103,16 @@ const getSwalButtons = (templateContent) => {
     result[`${type}ButtonText`] = button.innerHTML
     result[`show${capitalizeFirstLetter(type)}Button`] = true
     if (button.hasAttribute('color')) {
-      result[`${type}ButtonColor`] = button.getAttribute('color')
+      const color = button.getAttribute('color')
+      if (color !== null) {
+        result[`${type}ButtonColor`] = color
+      }
     }
     if (button.hasAttribute('aria-label')) {
-      result[`${type}ButtonAriaLabel`] = button.getAttribute('aria-label')
+      const ariaLabel = button.getAttribute('aria-label')
+      if (ariaLabel !== null) {
+        result[`${type}ButtonAriaLabel`] = ariaLabel
+      }
     }
   })
   return result
@@ -158,7 +170,7 @@ const getSwalIcon = (templateContent) => {
  * @returns {object}
  */
 const getSwalInput = (templateContent) => {
-  /** @type {object} */
+  /** @type {Record<string, any>} */
   const result = {}
   /** @type {HTMLElement | null} */
   const input = templateContent.querySelector('swal-input')