change 'onclick' method to config property

twbs · Apr 11, 2021 · 522dfef · 522dfef
1 parent 05ca443
commit 522dfef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/js/src/util/backdrop.js b/js/src/util/backdrop.js
@@ -11,13 +11,15 @@ import { emulateTransitionEnd, execute, getTransitionDurationFromElement, reflow
 const Default = {
   isVisible: true, // if false, we use the backdrop helper without adding any element to the dom
   isAnimated: false,
-  rootElement: document.body // give the choice to place backdrop under different elements
+  rootElement: document.body, // give the choice to place backdrop under different elements
+  clickCallback: null
 }
 
 const DefaultType = {
   isVisible: 'boolean',
   isAnimated: 'boolean',
-  rootElement: 'element'
+  rootElement: 'element',
+  clickCallback: '(function|null)'
 }
 const NAME = 'backdrop'
 const CLASS_NAME_BACKDROP = 'modal-backdrop'
@@ -33,10 +35,6 @@ class Backdrop {
     this._element = null
   }
 
-  onClick(callback) {
-    this._clickCallback = callback
-  }
-
   show(callback) {
     if (!this._config.isVisible) {
       execute(callback)
@@ -103,7 +101,7 @@ class Backdrop {
     this._config.rootElement.appendChild(this._getElement())
 
     EventHandler.on(this._getElement(), EVENT_MOUSEDOWN, () => {
-      execute(this._clickCallback)
+      execute(this._config.clickCallback)
     })
 
     this._isAppended = true

diff --git a/js/tests/unit/util/backdrop.spec.js b/js/tests/unit/util/backdrop.spec.js
@@ -164,9 +164,9 @@ describe('Backdrop', () => {
 
       const instance = new Backdrop({
         isVisible: true,
-        isAnimated: false
+        isAnimated: false,
+        clickCallback: () => spy()
       })
-      instance.onClick(() => spy())
       const endTest = () => {
         setTimeout(() => {
           expect(spy).toHaveBeenCalled()