sweetalert2 11.3.6 → 11.3.7

package/src/buttons-handlers.js

@@ -34,7 +34,9 @@ export const handleCancelButtonClick = (instance, dismissWith) => {
 const handleConfirmOrDenyWithInput = (instance, type /* 'confirm' | 'deny' */) => {
   const innerParams = privateProps.innerParams.get(instance)
   if (!innerParams.input) {
-    return error(`The "input" parameter is needed to be set when using returnInputValueOn${capitalizeFirstLetter(type)}`)
+    return error(
+      `The "input" parameter is needed to be set when using returnInputValueOn${capitalizeFirstLetter(type)}`
+    )
   }
   const inputValue = getInputValue(instance, innerParams)
   if (innerParams.inputValidator) {
@@ -52,22 +54,20 @@ const handleConfirmOrDenyWithInput = (instance, type /* 'confirm' | 'deny' */) =
 const handleInputValidator = (instance, inputValue, type /* 'confirm' | 'deny' */) => {
   const innerParams = privateProps.innerParams.get(instance)
   instance.disableInput()
-  const validationPromise = Promise.resolve().then(() => asPromise(
-    innerParams.inputValidator(inputValue, innerParams.validationMessage))
+  const validationPromise = Promise.resolve().then(() =>
+    asPromise(innerParams.inputValidator(inputValue, innerParams.validationMessage))
   )
-  validationPromise.then(
-    (validationMessage) => {
-      instance.enableButtons()
-      instance.enableInput()
-      if (validationMessage) {
-        instance.showValidationMessage(validationMessage)
-      } else if (type === 'deny') {
-        deny(instance, inputValue)
-      } else {
-        confirm(instance, inputValue)
-      }
+  validationPromise.then((validationMessage) => {
+    instance.enableButtons()
+    instance.enableInput()
+    if (validationMessage) {
+      instance.showValidationMessage(validationMessage)
+    } else if (type === 'deny') {
+      deny(instance, inputValue)
+    } else {
+      confirm(instance, inputValue)
     }
-  )
+  })
 }
 
 const deny = (instance, value) => {
@@ -79,18 +79,18 @@ const deny = (instance, value) => {
 
   if (innerParams.preDeny) {
     privateProps.awaitingPromise.set(instance || this, true) // Flagging the instance as awaiting a promise so it's own promise's reject/resolve methods doesn't get destroyed until the result from this preDeny's promise is received
-    const preDenyPromise = Promise.resolve().then(() => asPromise(
-      innerParams.preDeny(value, innerParams.validationMessage))
+    const preDenyPromise = Promise.resolve().then(() =>
+      asPromise(innerParams.preDeny(value, innerParams.validationMessage))
     )
-    preDenyPromise.then(
-      (preDenyValue) => {
+    preDenyPromise
+      .then((preDenyValue) => {
         if (preDenyValue === false) {
           instance.hideLoading()
         } else {
           instance.closePopup({ isDenied: true, value: typeof preDenyValue === 'undefined' ? value : preDenyValue })
         }
-      }
-    ).catch((error) => rejectWith(instance || this, error))
+      })
+      .catch((error) => rejectWith(instance || this, error))
   } else {
     instance.closePopup({ isDenied: true, value })
   }
@@ -114,18 +114,18 @@ const confirm = (instance, value) => {
   if (innerParams.preConfirm) {
     instance.resetValidationMessage()
     privateProps.awaitingPromise.set(instance || this, true) // Flagging the instance as awaiting a promise so it's own promise's reject/resolve methods doesn't get destroyed until the result from this preConfirm's promise is received
-    const preConfirmPromise = Promise.resolve().then(() => asPromise(
-      innerParams.preConfirm(value, innerParams.validationMessage))
+    const preConfirmPromise = Promise.resolve().then(() =>
+      asPromise(innerParams.preConfirm(value, innerParams.validationMessage))
     )
-    preConfirmPromise.then(
-      (preConfirmValue) => {
+    preConfirmPromise
+      .then((preConfirmValue) => {
         if (isVisible(getValidationMessage()) || preConfirmValue === false) {
           instance.hideLoading()
         } else {
           succeedWith(instance, typeof preConfirmValue === 'undefined' ? value : preConfirmValue)
         }
-      }
-    ).catch((error) => rejectWith(instance || this, error))
+      })
+      .catch((error) => rejectWith(instance || this, error))
   } else {
     succeedWith(instance, value)
   }

package/src/globalState.js

@@ -15,7 +15,7 @@ const focusPreviousActiveElement = () => {
 
 // Restore previous active (focused) element
 export const restoreActiveElement = (returnFocus) => {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     if (!returnFocus) {
       return resolve()
     }

package/src/instanceMethods/_destroy.js

@@ -2,7 +2,7 @@ import globalState from '../globalState.js'
 import privateProps from '../privateProps.js'
 import privateMethods from '../privateMethods.js'
 
-export function _destroy () {
+export function _destroy() {
   const domCache = privateProps.domCache.get(this)
   const innerParams = privateProps.innerParams.get(this)
 

package/src/instanceMethods/close.js

@@ -11,12 +11,14 @@ import privateMethods from '../privateMethods.js'
  * Instance method to close sweetAlert
  */
 
-function removePopupAndResetState (instance, container, returnFocus, didClose) {
+function removePopupAndResetState(instance, container, returnFocus, didClose) {
   if (dom.isToast()) {
     triggerDidCloseAndDispose(instance, didClose)
   } else {
     restoreActiveElement(returnFocus).then(() => triggerDidCloseAndDispose(instance, didClose))
-    globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, { capture: globalState.keydownListenerCapture })
+    globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, {
+      capture: globalState.keydownListenerCapture,
+    })
     globalState.keydownHandlerAdded = false
   }
 
@@ -40,19 +42,14 @@ function removePopupAndResetState (instance, container, returnFocus, didClose) {
   removeBodyClasses()
 }
 
-function removeBodyClasses () {
+function removeBodyClasses() {
   dom.removeClass(
     [document.documentElement, document.body],
-    [
-      swalClasses.shown,
-      swalClasses['height-auto'],
-      swalClasses['no-backdrop'],
-      swalClasses['toast-shown'],
-    ]
+    [swalClasses.shown, swalClasses['height-auto'], swalClasses['no-backdrop'], swalClasses['toast-shown']]
   )
 }
 
-export function close (resolveValue) {
+export function close(resolveValue) {
   resolveValue = prepareResolveValue(resolveValue)
 
   const swalPromiseResolve = privateMethods.swalPromiseResolve.get(this)
@@ -71,7 +68,7 @@ export function close (resolveValue) {
   }
 }
 
-export function isAwaitingPromise () {
+export function isAwaitingPromise() {
   return !!privateProps.awaitingPromise.get(this)
 }
 
@@ -99,7 +96,7 @@ const triggerClosePopup = (instance) => {
   return true
 }
 
-export function rejectPromise (error) {
+export function rejectPromise(error) {
   const rejectPromise = privateMethods.swalPromiseReject.get(this)
   handleAwaitingPromise(this)
   if (rejectPromise) {
@@ -128,11 +125,14 @@ const prepareResolveValue = (resolveValue) => {
     }
   }
 
-  return Object.assign({
-    isConfirmed: false,
-    isDenied: false,
-    isDismissed: false,
-  }, resolveValue)
+  return Object.assign(
+    {
+      isConfirmed: false,
+      isDenied: false,
+      isDismissed: false,
+    },
+    resolveValue
+  )
 }
 
 const handlePopupAnimation = (instance, popup, innerParams) => {
@@ -153,7 +153,13 @@ const handlePopupAnimation = (instance, popup, innerParams) => {
 }
 
 const animatePopup = (instance, popup, container, returnFocus, didClose) => {
-  globalState.swalCloseEventFinishedCallback = removePopupAndResetState.bind(null, instance, container, returnFocus, didClose)
+  globalState.swalCloseEventFinishedCallback = removePopupAndResetState.bind(
+    null,
+    instance,
+    container,
+    returnFocus,
+    didClose
+  )
   popup.addEventListener(dom.animationEndEvent, function (e) {
     if (e.target === popup) {
       globalState.swalCloseEventFinishedCallback()
@@ -171,8 +177,4 @@ const triggerDidCloseAndDispose = (instance, didClose) => {
   })
 }
 
-export {
-  close as closePopup,
-  close as closeModal,
-  close as closeToast
-}
+export { close as closePopup, close as closeModal, close as closeToast }

package/src/instanceMethods/enable-disable-elements.js

@@ -1,13 +1,13 @@
 import privateProps from '../privateProps.js'
 
-function setButtonsDisabled (instance, buttons, disabled) {
+function setButtonsDisabled(instance, buttons, disabled) {
   const domCache = privateProps.domCache.get(instance)
-  buttons.forEach(button => {
+  buttons.forEach((button) => {
     domCache[button].disabled = disabled
   })
 }
 
-function setInputDisabled (input, disabled) {
+function setInputDisabled(input, disabled) {
   if (!input) {
     return false
   }
@@ -22,18 +22,18 @@ function setInputDisabled (input, disabled) {
   }
 }
 
-export function enableButtons () {
+export function enableButtons() {
   setButtonsDisabled(this, ['confirmButton', 'denyButton', 'cancelButton'], false)
 }
 
-export function disableButtons () {
+export function disableButtons() {
   setButtonsDisabled(this, ['confirmButton', 'denyButton', 'cancelButton'], true)
 }
 
-export function enableInput () {
+export function enableInput() {
   return setInputDisabled(this.getInput(), false)
 }
 
-export function disableInput () {
+export function disableInput() {
   return setInputDisabled(this.getInput(), true)
 }

package/src/instanceMethods/getInput.js

@@ -5,7 +5,7 @@ import privateProps from '../privateProps.js'
  * Gets the input DOM node, this method works with input parameter.
  * @returns {HTMLElement | null}
  */
-export function getInput (instance) {
+export function getInput(instance) {
   const innerParams = privateProps.innerParams.get(instance || this)
   const domCache = privateProps.domCache.get(instance || this)
   if (!domCache) {

package/src/instanceMethods/hideLoading.js

@@ -5,7 +5,7 @@ import privateProps from '../privateProps.js'
 /**
  * Hides loader and shows back the button which was hidden by .showLoading()
  */
-function hideLoading () {
+function hideLoading() {
   // do nothing if popup is closed
   const innerParams = privateProps.innerParams.get(this)
   if (!innerParams) {
@@ -37,7 +37,4 @@ const showRelatedButton = (domCache) => {
   }
 }
 
-export {
-  hideLoading,
-  hideLoading as disableLoading
-}
+export { hideLoading, hideLoading as disableLoading }

package/src/instanceMethods/progress-steps.js

@@ -1,6 +1,6 @@
 import privateProps from '../privateProps.js'
 
-export function getProgressSteps () {
+export function getProgressSteps() {
   const domCache = privateProps.domCache.get(this)
   return domCache.progressSteps
 }

package/src/instanceMethods/update.js

@@ -6,24 +6,17 @@ import { isUpdatableParameter } from '../../src/utils/params.js'
 /**
  * Updates popup parameters.
  */
-export function update (params) {
+export function update(params) {
   const popup = dom.getPopup()
   const innerParams = privateProps.innerParams.get(this)
 
   if (!popup || dom.hasClass(popup, innerParams.hideClass.popup)) {
-    return warn(`You're trying to update the closed or closing popup, that won't work. Use the update() method in preConfirm parameter or show a new popup.`)
+    return warn(
+      `You're trying to update the closed or closing popup, that won't work. Use the update() method in preConfirm parameter or show a new popup.`
+    )
   }
 
-  const validUpdatableParams = {}
-
-  // assign valid params from `params` to `defaults`
-  Object.keys(params).forEach(param => {
-    if (isUpdatableParameter(param)) {
-      validUpdatableParams[param] = params[param]
-    } else {
-      warn(`Invalid parameter to update: "${param}". Updatable params are listed here: https://github.com/sweetalert2/sweetalert2/blob/master/src/utils/params.js\n\nIf you think this parameter should be updatable, request it here: https://github.com/sweetalert2/sweetalert2/issues/new?template=02_feature_request.md`)
-    }
-  })
+  const validUpdatableParams = filterValidParams(params)
 
   const updatedParams = Object.assign({}, innerParams, validUpdatableParams)
 
@@ -34,7 +27,21 @@ export function update (params) {
     params: {
       value: Object.assign({}, this.params, params),
       writable: false,
-      enumerable: true
+      enumerable: true,
+    },
+  })
+}
+
+const filterValidParams = (params) => {
+  const validUpdatableParams = {}
+  Object.keys(params).forEach((param) => {
+    if (isUpdatableParameter(param)) {
+      validUpdatableParams[param] = params[param]
+    } else {
+      warn(
+        `Invalid parameter to update: "${param}". Updatable params are listed here: https://github.com/sweetalert2/sweetalert2/blob/master/src/utils/params.js\n\nIf you think this parameter should be updatable, request it here: https://github.com/sweetalert2/sweetalert2/issues/new?template=02_feature_request.md`
+      )
     }
   })
+  return validUpdatableParams
 }

package/src/instanceMethods/validation-message.js

@@ -3,7 +3,7 @@ import { swalClasses } from '../utils/classes.js'
 import privateProps from '../privateProps.js'
 
 // Show block with validation message
-export function showValidationMessage (error) {
+export function showValidationMessage(error) {
   const domCache = privateProps.domCache.get(this)
   const params = privateProps.innerParams.get(this)
   dom.setInnerHtml(domCache.validationMessage, error)
@@ -23,7 +23,7 @@ export function showValidationMessage (error) {
 }
 
 // Hide block with validation message
-export function resetValidationMessage () {
+export function resetValidationMessage() {
   const domCache = privateProps.domCache.get(this)
   if (domCache.validationMessage) {
     dom.hide(domCache.validationMessage)

package/src/keydown-handler.js

@@ -6,7 +6,9 @@ import privateProps from './privateProps.js'
 
 export const addKeydownHandler = (instance, globalState, innerParams, dismissWith) => {
   if (globalState.keydownTarget && globalState.keydownHandlerAdded) {
-    globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, { capture: globalState.keydownListenerCapture })
+    globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, {
+      capture: globalState.keydownListenerCapture,
+    })
     globalState.keydownHandlerAdded = false
   }
 
@@ -14,7 +16,9 @@ export const addKeydownHandler = (instance, globalState, innerParams, dismissWit
     globalState.keydownHandler = (e) => keydownHandler(instance, e, dismissWith)
     globalState.keydownTarget = innerParams.keydownListenerCapture ? window : dom.getPopup()
     globalState.keydownListenerCapture = innerParams.keydownListenerCapture
-    globalState.keydownTarget.addEventListener('keydown', globalState.keydownHandler, { capture: globalState.keydownListenerCapture })
+    globalState.keydownTarget.addEventListener('keydown', globalState.keydownHandler, {
+      capture: globalState.keydownListenerCapture,
+    })
     globalState.keydownHandlerAdded = true
   }
 }
@@ -41,13 +45,9 @@ export const setFocus = (innerParams, index, increment) => {
   dom.getPopup().focus()
 }
 
-const arrowKeysNextButton = [
-  'ArrowRight', 'ArrowDown',
-]
+const arrowKeysNextButton = ['ArrowRight', 'ArrowDown']
 
-const arrowKeysPreviousButton = [
-  'ArrowLeft', 'ArrowUp',
-]
+const arrowKeysPreviousButton = ['ArrowLeft', 'ArrowUp']
 
 const keydownHandler = (instance, e, dismissWith) => {
   const innerParams = privateProps.innerParams.get(instance)
@@ -63,24 +63,27 @@ const keydownHandler = (instance, e, dismissWith) => {
   // ENTER
   if (e.key === 'Enter') {
     handleEnter(instance, e, innerParams)
+  }
 
   // TAB
-  } else if (e.key === 'Tab') {
+  else if (e.key === 'Tab') {
     handleTab(e, innerParams)
+  }
 
   // ARROWS - switch focus between buttons
-  } else if ([...arrowKeysNextButton, ...arrowKeysPreviousButton].includes(e.key)) {
+  else if ([...arrowKeysNextButton, ...arrowKeysPreviousButton].includes(e.key)) {
     handleArrows(e.key)
+  }
 
   // ESC
-  } else if (e.key === 'Escape') {
+  else if (e.key === 'Escape') {
     handleEsc(e, innerParams, dismissWith)
   }
 }
 
 const handleEnter = (instance, e, innerParams) => {
-  // #720 #721
-  if (e.isComposing) {
+  // #2386 #720 #721
+  if (!callIfFunction(innerParams.allowEnterKey) || e.isComposing) {
     return
   }
 
@@ -106,13 +109,16 @@ const handleTab = (e, innerParams) => {
     }
   }
 
+  // Cycle to the next button
   if (!e.shiftKey) {
-    // Cycle to the next button
     setFocus(innerParams, btnIndex, 1)
-  } else {
-    // Cycle to the prev button
+  }
+
+  // Cycle to the prev button
+  else {
     setFocus(innerParams, btnIndex, -1)
   }
+
   e.stopPropagation()
   e.preventDefault()
 }

package/src/popup-click-handler.js

@@ -34,10 +34,12 @@ const handleToastClick = (instance, domCache, dismissWith) => {
  * @returns {boolean}
  */
 const isAnyButtonShown = (innerParams) => {
-  return innerParams.showConfirmButton ||
+  return (
+    innerParams.showConfirmButton ||
     innerParams.showDenyButton ||
     innerParams.showCancelButton ||
     innerParams.showCloseButton
+  )
 }
 
 let ignoreOutsideClick = false

package/src/privateMethods.js

@@ -10,5 +10,5 @@
 
 export default {
   swalPromiseResolve: new WeakMap(),
-  swalPromiseReject: new WeakMap()
+  swalPromiseReject: new WeakMap(),
 }

package/src/privateProps.js

@@ -12,5 +12,5 @@ export default {
   awaitingPromise: new WeakMap(),
   promise: new WeakMap(),
   innerParams: new WeakMap(),
-  domCache: new WeakMap()
+  domCache: new WeakMap(),
 }

package/src/staticMethods/argsToParams.js

@@ -8,7 +8,7 @@ export const argsToParams = (args) => {
   if (typeof args[0] === 'object' && !isElement(args[0])) {
     Object.assign(params, args[0])
   } else {
-    ['title', 'html', 'icon'].forEach((name, index) => {
+    ;['title', 'html', 'icon'].forEach((name, index) => {
       const arg = args[index]
       if (typeof arg === 'string' || isElement(arg)) {
         params[name] = arg

package/src/staticMethods/bindClickHandler.js

@@ -1,7 +1,7 @@
 let bodyClickListenerAdded = false
 const clickHandlers = {}
 
-export function bindClickHandler (attr = 'data-swal-template') {
+export function bindClickHandler(attr = 'data-swal-template') {
   clickHandlers[attr] = this
 
   if (!bodyClickListenerAdded) {

package/src/staticMethods/dom.js

@@ -19,7 +19,7 @@ export {
   getTimerProgressBar,
   getFocusableElements,
   getValidationMessage,
-  isLoading
+  isLoading,
 } from '../utils/dom/index.js'
 
 /*

package/src/staticMethods/fire.js

@@ -1,4 +1,4 @@
-export function fire (...args) {
-  const Swal = this
+export function fire(...args) {
+  const Swal = this // eslint-disable-line @typescript-eslint/no-this-alias
   return new Swal(...args)
 }

package/src/staticMethods/mixin.js

@@ -16,9 +16,9 @@
  *
  * @param mixinParams
  */
-export function mixin (mixinParams) {
+export function mixin(mixinParams) {
   class MixinSwal extends this {
-    _main (params, priorityMixinParams) {
+    _main(params, priorityMixinParams) {
       return super._main(params, Object.assign({}, mixinParams, priorityMixinParams))
     }
   }

package/src/staticMethods/showLoading.js

@@ -43,7 +43,4 @@ const replaceButton = (popup, buttonToReplace) => {
   dom.addClass([popup, actions], swalClasses.loading)
 }
 
-export {
-  showLoading,
-  showLoading as enableLoading
-}
+export { showLoading, showLoading as enableLoading }

package/src/staticMethods.js

@@ -5,8 +5,4 @@ export * from './staticMethods/mixin.js'
 export * from './staticMethods/showLoading.js'
 export * from './staticMethods/timer.js'
 export * from './staticMethods/bindClickHandler.js'
-export {
-  isValidParameter,
-  isUpdatableParameter,
-  isDeprecatedParameter
-} from './utils/params.js'
+export { isValidParameter, isUpdatableParameter, isDeprecatedParameter } from './utils/params.js'

package/src/utils/DismissReason.js

@@ -3,5 +3,5 @@ export const DismissReason = Object.freeze({
   backdrop: 'backdrop',
   close: 'close',
   esc: 'esc',
-  timer: 'timer'
+  timer: 'timer',
 })

package/src/utils/Timer.js

@@ -1,5 +1,5 @@
 export default class Timer {
-  constructor (callback, delay) {
+  constructor(callback, delay) {
     this.callback = callback
     this.remaining = delay
     this.running = false
@@ -7,7 +7,7 @@ export default class Timer {
     this.start()
   }
 
-  start () {
+  start() {
     if (!this.running) {
       this.running = true
       this.started = new Date()
@@ -16,7 +16,7 @@ export default class Timer {
     return this.remaining
   }
 
-  stop () {
+  stop() {
     if (this.running) {
       this.running = false
       clearTimeout(this.id)
@@ -25,7 +25,7 @@ export default class Timer {
     return this.remaining
   }
 
-  increase (n) {
+  increase(n) {
     const running = this.running
     if (running) {
       this.stop()
@@ -37,7 +37,7 @@ export default class Timer {
     return this.remaining
   }
 
-  getTimerLeft () {
+  getTimerLeft() {
     if (this.running) {
       this.stop()
       this.start()
@@ -45,7 +45,7 @@ export default class Timer {
     return this.remaining
   }
 
-  isRunning () {
+  isRunning() {
     return this.running
   }
 }

package/src/utils/aria.js

@@ -8,7 +8,7 @@ import { toArray } from './utils.js'
 
 export const setAriaHidden = () => {
   const bodyChildren = toArray(document.body.children)
-  bodyChildren.forEach(el => {
+  bodyChildren.forEach((el) => {
     if (el === getContainer() || el.contains(getContainer())) {
       return
     }
@@ -22,7 +22,7 @@ export const setAriaHidden = () => {
 
 export const unsetAriaHidden = () => {
   const bodyChildren = toArray(document.body.children)
-  bodyChildren.forEach(el => {
+  bodyChildren.forEach((el) => {
     if (el.hasAttribute('data-previous-aria-hidden')) {
       el.setAttribute('aria-hidden', el.getAttribute('data-previous-aria-hidden'))
       el.removeAttribute('data-previous-aria-hidden')

package/src/utils/classes.js

@@ -80,10 +80,4 @@ export const swalClasses = prefix([
   'icon-error',
 ])
 
-export const iconTypes = prefix([
-  'success',
-  'warning',
-  'info',
-  'question',
-  'error'
-])
+export const iconTypes = prefix(['success', 'warning', 'info', 'question', 'error'])

package/src/utils/defaultInputValidators.js

@@ -9,5 +9,5 @@ export default {
     return /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-z]{2,63}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)$/.test(string)
       ? Promise.resolve()
       : Promise.resolve(validationMessage || 'Invalid URL')
-  }
+  },
 }