sweetalert2 11.3.0 → 11.3.4

package/src/utils/utils.js

@@ -16,27 +16,28 @@ export const uniqueArray = (arr) => {
 
 /**
  * Capitalize the first letter of a string
- * @param str
+ * @param {string} str
+ * @returns {string}
  */
 export const capitalizeFirstLetter = (str) => str.charAt(0).toUpperCase() + str.slice(1)
 
 /**
- * Convert NodeList to Array
- * @param nodeList
+ * @param {NodeList | HTMLCollection | NamedNodeMap} nodeList
+ * @returns {array}
  */
 export const toArray = (nodeList) => Array.prototype.slice.call(nodeList)
 
 /**
- * Standardise console warnings
- * @param message
+ * Standardize console warnings
+ * @param {string | array} message
  */
 export const warn = (message) => {
   console.warn(`${consolePrefix} ${typeof message === 'object' ? message.join(' ') : message}`)
 }
 
 /**
- * Standardise console errors
- * @param message
+ * Standardize console errors
+ * @param {string} message
  */
 export const error = (message) => {
   console.error(`${consolePrefix} ${message}`)
@@ -51,7 +52,7 @@ const previousWarnOnceMessages = []
 
 /**
  * Show a console warning, but only if it hasn't already been shown
- * @param message
+ * @param {string} message
  */
 export const warnOnce = (message) => {
   if (!previousWarnOnceMessages.includes(message)) {

package/src/variables.scss

@@ -70,7 +70,7 @@ $swal2-html-container-word-wrap: break-word !default;
 $swal2-html-container-word-break: break-word !default;
 
 // INPUT
-$swal2-input-margin: 1em 2em 0 !default;
+$swal2-input-margin: 1em 2em 3px !default;
 $swal2-input-width: auto !default;
 $swal2-input-height: 2.625em !default;
 $swal2-input-padding: 0 .75em !default;

package/sweetalert2.d.ts

@@ -580,14 +580,14 @@ declare module 'sweetalert2' {
     padding?: number | string;
 
     /**
-     * Popup color for title, content and footer (CSS `color` property).
+     * Color for title, content and footer (CSS `color` property).  The default color is `#545454`.
      *
      * @default undefined
      */
     color?: string;
 
     /**
-     * Popup background (CSS `background` property).
+     * Popup background (CSS `background` property). The default background is `#fff`.
      *
      * @default undefined
      */

package/src/instanceMethods/_main.js

@@ -1,168 +0,0 @@
-import defaultParams, { showWarningsForParams } from '../utils/params.js'
-import * as dom from '../utils/dom/index.js'
-import Timer from '../utils/Timer.js'
-import { callIfFunction } from '../utils/utils.js'
-import setParameters from '../utils/setParameters.js'
-import { getTemplateParams } from '../utils/getTemplateParams.js'
-import globalState from '../globalState.js'
-import { openPopup } from '../utils/openPopup.js'
-import privateProps from '../privateProps.js'
-import privateMethods from '../privateMethods.js'
-import { handleInputOptionsAndValue } from '../utils/dom/inputUtils.js'
-import { handleConfirmButtonClick, handleDenyButtonClick, handleCancelButtonClick } from './buttons-handlers.js'
-import { addKeydownHandler, setFocus } from './keydown-handler.js'
-import { handlePopupClick } from './popup-click-handler.js'
-import { DismissReason } from '../utils/DismissReason.js'
-import { unsetAriaHidden } from '../utils/aria.js'
-
-export function _main (userParams, mixinParams = {}) {
-  showWarningsForParams(Object.assign({}, mixinParams, userParams))
-
-  if (globalState.currentInstance) {
-    globalState.currentInstance._destroy()
-    if (dom.isModal()) {
-      unsetAriaHidden()
-    }
-  }
-  globalState.currentInstance = this
-
-  const innerParams = prepareParams(userParams, mixinParams)
-  setParameters(innerParams)
-  Object.freeze(innerParams)
-
-  // clear the previous timer
-  if (globalState.timeout) {
-    globalState.timeout.stop()
-    delete globalState.timeout
-  }
-
-  // clear the restore focus timeout
-  clearTimeout(globalState.restoreFocusTimeout)
-
-  const domCache = populateDomCache(this)
-
-  dom.render(this, innerParams)
-
-  privateProps.innerParams.set(this, innerParams)
-
-  return swalPromise(this, domCache, innerParams)
-}
-
-const prepareParams = (userParams, mixinParams) => {
-  const templateParams = getTemplateParams(userParams)
-  const params = Object.assign({}, defaultParams, mixinParams, templateParams, userParams) // precedence is described in #2131
-  params.showClass = Object.assign({}, defaultParams.showClass, params.showClass)
-  params.hideClass = Object.assign({}, defaultParams.hideClass, params.hideClass)
-  return params
-}
-
-const swalPromise = (instance, domCache, innerParams) => {
-  return new Promise((resolve, reject) => {
-    // functions to handle all closings/dismissals
-    const dismissWith = (dismiss) => {
-      instance.closePopup({ isDismissed: true, dismiss })
-    }
-
-    privateMethods.swalPromiseResolve.set(instance, resolve)
-    privateMethods.swalPromiseReject.set(instance, reject)
-
-    domCache.confirmButton.onclick = () => handleConfirmButtonClick(instance)
-    domCache.denyButton.onclick = () => handleDenyButtonClick(instance)
-    domCache.cancelButton.onclick = () => handleCancelButtonClick(instance, dismissWith)
-
-    domCache.closeButton.onclick = () => dismissWith(DismissReason.close)
-
-    handlePopupClick(instance, domCache, dismissWith)
-
-    addKeydownHandler(instance, globalState, innerParams, dismissWith)
-
-    handleInputOptionsAndValue(instance, innerParams)
-
-    openPopup(innerParams)
-
-    setupTimer(globalState, innerParams, dismissWith)
-
-    initFocus(domCache, innerParams)
-
-    // Scroll container to top on open (#1247, #1946)
-    setTimeout(() => {
-      domCache.container.scrollTop = 0
-    })
-  })
-}
-
-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()
-  }
-  privateProps.domCache.set(instance, domCache)
-
-  return domCache
-}
-
-const setupTimer = (globalState, innerParams, dismissWith) => {
-  const timerProgressBar = dom.getTimerProgressBar()
-  dom.hide(timerProgressBar)
-  if (innerParams.timer) {
-    globalState.timeout = new Timer(() => {
-      dismissWith('timer')
-      delete globalState.timeout
-    }, innerParams.timer)
-    if (innerParams.timerProgressBar) {
-      dom.show(timerProgressBar)
-      setTimeout(() => {
-        if (globalState.timeout && globalState.timeout.running) { // timer can be already stopped or unset at this point
-          dom.animateTimerProgressBar(innerParams.timer)
-        }
-      })
-    }
-  }
-}
-
-const initFocus = (domCache, innerParams) => {
-  if (innerParams.toast) {
-    return
-  }
-
-  if (!callIfFunction(innerParams.allowEnterKey)) {
-    return blurActiveElement()
-  }
-
-  if (!focusButton(domCache, innerParams)) {
-    setFocus(innerParams, -1, 1)
-  }
-}
-
-const focusButton = (domCache, innerParams) => {
-  if (innerParams.focusDeny && dom.isVisible(domCache.denyButton)) {
-    domCache.denyButton.focus()
-    return true
-  }
-
-  if (innerParams.focusCancel && dom.isVisible(domCache.cancelButton)) {
-    domCache.cancelButton.focus()
-    return true
-  }
-
-  if (innerParams.focusConfirm && dom.isVisible(domCache.confirmButton)) {
-    domCache.confirmButton.focus()
-    return true
-  }
-
-  return false
-}
-
-const blurActiveElement = () => {
-  if (document.activeElement && typeof document.activeElement.blur === 'function') {
-    document.activeElement.blur()
-  }
-}