Refactor/extract withGlobalDefaults

src/SweetAlert.js

@@ -60,13 +60,4 @@ SweetAlert.noop = () => { }
 
 SweetAlert.version = version
 
-SweetAlert.default = SweetAlert
-
-/**
- * Set default params if `window._swalDefaults` is an object
- */
-if (typeof window !== 'undefined' && typeof window._swalDefaults === 'object') {
- SweetAlert.setDefaults(window._swalDefaults)
-}
-
 export default SweetAlert

src/extensions.js

@@ -1 +1,2 @@
 export * from './extensions/withNoNewKeyword'
+export * from './extensions/withGlobalDefaults'

src/extensions/withGlobalDefaults.js

@@ -0,0 +1,41 @@
+import { warnOnce } from '../utils/utils'
+import {showWarningsForParams} from '../utils/params'
+
+const deprecationWarning = `\
+"setDefaults" & "resetDefaults" methods are deprecated in favor of "mixin" method and will be removed in the next major release. \
+For new projects, use "mixin". For past projects already using "setDefaults", support will be provided through an additional package.`
+let defaults = {}
+
+export function withGlobalDefaults (ParentSwal) {
+ class SwalWithGlobalDefaults extends ParentSwal {
+ _main (params) {
+ return super._main(Object.assign({}, defaults, params))
+ }
+
+ static setDefaults (params) {
+ warnOnce(deprecationWarning)
+ if (!params || typeof params !== 'object') {
+ throw new TypeError('SweetAlert2: The argument for setDefaults() is required and has to be a object')
+ }
+ showWarningsForParams(params)
+ // assign valid params from `params` to `defaults`
+ Object.keys(params).forEach(param => {
+ if (ParentSwal.isValidParameter(param)) {
+ defaults[param] = params[param]
+ }
+ })
+ }
+
+ static resetDefaults () {
+ warnOnce(deprecationWarning)
+ defaults = {}
+ }
+ }
+
+ // Set default params if `window._swalDefaults` is an object
+ if (typeof window !== 'undefined' && typeof window._swalDefaults === 'object') {
+ SwalWithGlobalDefaults.setDefaults(window._swalDefaults)
+ }
+
+ return SwalWithGlobalDefaults
+}

src/globalState.js

@@ -1,5 +1 @@
-import defaultParams from './utils/params.js'
-
-export default {
- popupParams: Object.assign({}, defaultParams)
-}
+export default {}

src/instanceMethods/_main.js

@@ -1,4 +1,4 @@
-import {showWarningsForParams} from '../utils/params'
+import defaultParams, {showWarningsForParams} from '../utils/params'
 import * as dom from '../utils/dom/index'
 import { swalClasses } from '../utils/classes'
 import { formatInputOptions, error, callIfFunction, isThenable } from '../utils/utils'
@@ -9,7 +9,7 @@ import { openPopup } from '../utils/openPopup'
 export function _main (userParams) {
  showWarningsForParams(userParams)
 
- const params = this.params = Object.assign({}, globalState.popupParams, userParams)
+ const params = this.params = Object.assign({}, defaultParams, userParams)
  setParameters(params)
  Object.freeze(params)
 

src/staticMethods.js

@@ -4,7 +4,6 @@ export * from './staticMethods/close'
 export * from './staticMethods/dom'
 export * from './staticMethods/mixin'
 export * from './staticMethods/queue'
-export * from './staticMethods/set-reset-defaults'
 export * from './staticMethods/showLoading'
 export * from './staticMethods/fire'
 export {

src/sweetalert2.js

@@ -1,4 +1,7 @@
 import SweetAlert from './SweetAlert'
-import { withNoNewKeyword } from './extensions'
+import { withGlobalDefaults, withNoNewKeyword } from './extensions'
 
-export default withNoNewKeyword(SweetAlert)
+const Swal = withNoNewKeyword(withGlobalDefaults(SweetAlert))
+Swal.default = Swal
+
+export default Swal