chore: extract input logic to inputUtils.js (#1681)

sweetalert2 · Jul 20, 2019 · 976e42c · 976e42c
1 parent 10b6790
commit 976e42c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/instanceMethods/_main.js b/src/instanceMethods/_main.js
@@ -2,13 +2,13 @@ import defaultParams, { showWarningsForParams } from '../utils/params.js'
 import * as dom from '../utils/dom/index.js'
 import { swalClasses } from '../utils/classes.js'
 import Timer from '../utils/Timer.js'
-import { callIfFunction, isPromise } from '../utils/utils.js'
+import { callIfFunction } from '../utils/utils.js'
 import setParameters from '../utils/setParameters.js'
 import globalState from '../globalState.js'
 import { openPopup } from '../utils/openPopup.js'
 import privateProps from '../privateProps.js'
 import privateMethods from '../privateMethods.js'
-import { handleInputOptions, handleInputValue } from '../utils/dom/inputUtils.js'
+import { handleInputOptionsAndValue } from '../utils/dom/inputUtils.js'
 import { handleConfirmButtonClick, handleCancelButtonClick } from './buttons-handlers.js'
 import { addKeydownHandler, setFocus } from './keydown-handler.js'
 import { handlePopupClick } from './popup-click-handler.js'
@@ -93,12 +93,7 @@ const swalPromise = (instance, domCache, innerParams) => {
       dom.removeClass(document.body, swalClasses['toast-column'])
     }
 
-    // inputOptions, inputValue
-    if (innerParams.input === 'select' || innerParams.input === 'radio') {
-      handleInputOptions(instance, innerParams)
-    } else if (['text', 'email', 'number', 'tel', 'textarea'].includes(innerParams.input) && isPromise(innerParams.inputValue)) {
-      handleInputValue(instance, innerParams)
-    }
+    handleInputOptionsAndValue(instance, innerParams)
 
     openPopup(innerParams)
 

diff --git a/src/utils/dom/inputUtils.js b/src/utils/dom/inputUtils.js
@@ -4,7 +4,15 @@ import { getChildByClass } from './domUtils.js'
 import { error, isPromise } from '../utils.js'
 import { showLoading } from '../../staticMethods/showLoading.js'
 
-export const handleInputOptions = (instance, params) => {
+export const handleInputOptionsAndValue = (instance, params) => {
+  if (params.input === 'select' || params.input === 'radio') {
+    handleInputOptions(instance, params)
+  } else if (['text', 'email', 'number', 'tel', 'textarea'].includes(params.input) && isPromise(params.inputValue)) {
+    handleInputValue(instance, params)
+  }
+}
+
+const handleInputOptions = (instance, params) => {
   const content = dom.getContent()
   const processInputOptions = (inputOptions) => populateInputOptions[params.input](content, formatInputOptions(inputOptions), params)
   if (isPromise(params.inputOptions)) {
@@ -20,7 +28,7 @@ export const handleInputOptions = (instance, params) => {
   }
 }
 
-export const handleInputValue = (instance, params) => {
+const handleInputValue = (instance, params) => {
   const input = instance.getInput()
   dom.hide(input)
   params.inputValue.then((inputValue) => {

diff --git a/src/utils/dom/renderers/renderInput.js b/src/utils/dom/renderers/renderInput.js
@@ -41,7 +41,7 @@ const showInput = (params) => {
   // input autofocus
   setTimeout(() => {
     dom.focusInput(input)
-  }, 0)
+  })
 }
 
 const removeAttributes = (input) => {