sweetalert2 11.3.2 → 11.3.6

package/src/utils/getTemplateParams.js

@@ -8,6 +8,7 @@ export const getTemplateParams = (params) => {
   if (!template) {
     return {}
   }
+  /** @type {DocumentFragment} */
   const templateContent = template.content
 
   showWarningsForElements(templateContent)
@@ -23,23 +24,28 @@ export const getTemplateParams = (params) => {
   return result
 }
 
+/**
+ * @param {DocumentFragment} templateContent
+ */
 const getSwalParams = (templateContent) => {
   const result = {}
   toArray(templateContent.querySelectorAll('swal-param')).forEach((param) => {
     showWarningsForAttributes(param, ['name', 'value'])
     const paramName = param.getAttribute('name')
-    let value = param.getAttribute('value')
+    const value = param.getAttribute('value')
     if (typeof defaultParams[paramName] === 'boolean' && value === 'false') {
-      value = false
+      result[paramName] = false
     }
     if (typeof defaultParams[paramName] === 'object') {
-      value = JSON.parse(value)
+      result[paramName] = JSON.parse(value)
     }
-    result[paramName] = value
   })
   return result
 }
 
+/**
+ * @param {DocumentFragment} templateContent
+ */
 const getSwalButtons = (templateContent) => {
   const result = {}
   toArray(templateContent.querySelectorAll('swal-button')).forEach((button) => {
@@ -57,8 +63,12 @@ const getSwalButtons = (templateContent) => {
   return result
 }
 
+/**
+ * @param {DocumentFragment} templateContent
+ */
 const getSwalImage = (templateContent) => {
   const result = {}
+  /** @type {HTMLElement} */
   const image = templateContent.querySelector('swal-image')
   if (image) {
     showWarningsForAttributes(image, ['src', 'width', 'height', 'alt'])
@@ -78,8 +88,12 @@ const getSwalImage = (templateContent) => {
   return result
 }
 
+/**
+ * @param {DocumentFragment} templateContent
+ */
 const getSwalIcon = (templateContent) => {
   const result = {}
+  /** @type {HTMLElement} */
   const icon = templateContent.querySelector('swal-icon')
   if (icon) {
     showWarningsForAttributes(icon, ['type', 'color'])
@@ -94,8 +108,12 @@ const getSwalIcon = (templateContent) => {
   return result
 }
 
+/**
+ * @param {DocumentFragment} templateContent
+ */
 const getSwalInput = (templateContent) => {
   const result = {}
+  /** @type {HTMLElement} */
   const input = templateContent.querySelector('swal-input')
   if (input) {
     showWarningsForAttributes(input, ['type', 'label', 'placeholder', 'value'])
@@ -123,10 +141,15 @@ const getSwalInput = (templateContent) => {
   return result
 }
 
+/**
+ * @param {DocumentFragment} templateContent
+ * @param {string[]} paramNames
+ */
 const getSwalStringParams = (templateContent, paramNames) => {
   const result = {}
   for (const i in paramNames) {
     const paramName = paramNames[i]
+    /** @type {HTMLElement} */
     const tag = templateContent.querySelector(paramName)
     if (tag) {
       showWarningsForAttributes(tag, [])
@@ -136,7 +159,10 @@ const getSwalStringParams = (templateContent, paramNames) => {
   return result
 }
 
-const showWarningsForElements = (template) => {
+/**
+ * @param {DocumentFragment} templateContent
+ */
+const showWarningsForElements = (templateContent) => {
   const allowedElements = swalStringParams.concat([
     'swal-param',
     'swal-button',
@@ -145,7 +171,7 @@ const showWarningsForElements = (template) => {
     'swal-input',
     'swal-input-option',
   ])
-  toArray(template.children).forEach((el) => {
+  toArray(templateContent.children).forEach((el) => {
     const tagName = el.tagName.toLowerCase()
     if (allowedElements.indexOf(tagName) === -1) {
       warn(`Unrecognized element <${tagName}>`)
@@ -153,6 +179,10 @@ const showWarningsForElements = (template) => {
   })
 }
 
+/**
+ * @param {HTMLElement} el
+ * @param {string[]} allowedAttributes
+ */
 const showWarningsForAttributes = (el, allowedAttributes) => {
   toArray(el.attributes).forEach((attribute) => {
     if (allowedAttributes.indexOf(attribute.name) === -1) {

package/src/utils/iosFix.js

@@ -12,13 +12,19 @@ export const iOSfix = () => {
     document.body.style.top = `${offset * -1}px`
     dom.addClass(document.body, swalClasses.iosfix)
     lockBodyScroll()
-    addBottomPaddingForTallPopups() // #1948
+    addBottomPaddingForTallPopups()
   }
 }
 
+/**
+ * https://github.com/sweetalert2/sweetalert2/issues/1948
+ */
 const addBottomPaddingForTallPopups = () => {
-  const safari = !navigator.userAgent.match(/(CriOS|FxiOS|EdgiOS|YaBrowser|UCBrowser)/i)
-  if (safari) {
+  const ua = navigator.userAgent
+  const iOS = !!ua.match(/iPad/i) || !!ua.match(/iPhone/i)
+  const webkit = !!ua.match(/WebKit/i)
+  const iOSSafari = iOS && webkit && !ua.match(/CriOS/i)
+  if (iOSSafari) {
     const bottomPanelHeight = 44
     if (dom.getPopup().scrollHeight > window.innerHeight - bottomPanelHeight) {
       dom.getContainer().style.paddingBottom = `${bottomPanelHeight}px`
@@ -43,7 +49,7 @@ const lockBodyScroll = () => { // #1246
 const shouldPreventTouchMove = (event) => {
   const target = event.target
   const container = dom.getContainer()
-  if (isStylys(event) || isZoom(event)) {
+  if (isStylus(event) || isZoom(event)) {
     return false
   }
   if (target === container) {
@@ -63,7 +69,13 @@ const shouldPreventTouchMove = (event) => {
   return false
 }
 
-const isStylys = (event) => { // #1786
+/**
+ * https://github.com/sweetalert2/sweetalert2/issues/1786
+ *
+ * @param {*} event
+ * @returns {boolean}
+ */
+const isStylus = (event) => {
   return event.touches && event.touches.length && event.touches[0].touchType === 'stylus'
 }
 

package/src/utils/isNodeEnv.js

@@ -1,2 +1,6 @@
-// Detect Node env
+/**
+ * Detect Node env
+ *
+ * @returns {boolean}
+ */
 export const isNodeEnv = () => typeof window === 'undefined' || typeof document === 'undefined'

package/src/utils/openPopup.js

@@ -79,7 +79,7 @@ const fixScrollContainer = (container, scrollbarPadding, initialBodyOverflow) =>
 
 const addClasses = (container, popup, params) => {
   dom.addClass(container, params.showClass.backdrop)
-  // the workaround with setting/unsetting opacity is needed for #2019 and 2059
+  // this workaround with opacity is needed for https://github.com/sweetalert2/sweetalert2/issues/2059
   popup.style.setProperty('opacity', '0', 'important')
   dom.show(popup, 'grid')
   setTimeout(() => {

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;