Fix dismiss trigger issues (#1822)

mdbootstrap · Jul 25, 2023 · f818e0b · f818e0b
1 parent 69e6ec6
commit f818e0b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 38 deletions.
diff --git a/src/js/autoinit/index.js b/src/js/autoinit/index.js
@@ -1,4 +1,5 @@
 import SelectorEngine from "../dom/selector-engine";
+import { enableDismissTrigger } from "../util/component-functions";
 import jqueryInit from "./jqueryInit";
 import {
   dropdownCallback,
@@ -25,6 +26,7 @@ const defaultInitSelectors = {
     name: "Alert",
     selector: "[data-te-alert-init]",
     isToggler: false,
+    dismissMethod: "close",
   },
   animation: {
     name: "Animate",
@@ -95,6 +97,7 @@ const defaultInitSelectors = {
     name: "Toast",
     selector: "[data-te-toast-init]",
     isToggler: false,
+    dismissMethod: "hide",
   },
   datatable: {
     name: "Datatable",
@@ -131,6 +134,7 @@ const defaultInitSelectors = {
   modal: {
     name: "Modal",
     selector: "[data-te-toggle='modal']",
+    dismissMethod: "hide",
     isToggler: true,
     callback: modalCallback,
   },
@@ -143,6 +147,7 @@ const defaultInitSelectors = {
   offcanvas: {
     name: "Offcanvas",
     selector: "[data-te-offcanvas-toggle]",
+    dismissMethod: "hide",
     isToggler: true,
     callback: offcanvasCallback,
   },
@@ -183,6 +188,10 @@ const initComponent = (component) => {
 
   jqueryInit(component);
 
+  if (thisComponent?.dismissMethod) {
+    enableDismissTrigger(component, thisComponent.dismissMethod);
+  }
+
   if (thisComponent?.advanced) {
     thisComponent?.advanced(component, thisComponent?.selector);
     return;

diff --git a/src/js/components/alert.js b/src/js/components/alert.js
@@ -13,7 +13,6 @@ import { typeCheckConfig, isVisible } from "../util/index";
 import EventHandler from "../dom/event-handler";
 import BaseComponent from "../base-component";
 import Manipulator from "../dom/manipulator";
-import { enableDismissTrigger } from "../util/component-functions";
 
 /*
 ------------------------------------------------------------------------
@@ -66,8 +65,6 @@ class Alert extends BaseComponent {
     this._element = element;
     this._config = this._getConfig(config);
     this._classes = this._getClasses(classes);
-    this._didInit = false;
-    this._init();
   }
 
   // Getters
@@ -163,14 +160,6 @@ class Alert extends BaseComponent {
   }
 
   // Private
-  _init() {
-    if (this._didInit) {
-      return;
-    }
-    enableDismissTrigger(Alert, "close");
-    this._didInit = true;
-  }
-
   _getConfig(config) {
     config = {
       ...Default,

diff --git a/src/js/components/modal.js b/src/js/components/modal.js
@@ -17,7 +17,6 @@ import ScrollBarHelper from "../util/scrollbar";
 import BaseComponent from "../base-component";
 import Backdrop from "../util/backdrop";
 import FocusTrap from "../util/focusTrap";
-import { enableDismissTrigger } from "../util/component-functions";
 
 /*
 ------------------------------------------------------------------------
@@ -89,8 +88,6 @@ class Modal extends BaseComponent {
     this._ignoreBackdropClick = false;
     this._isTransitioning = false;
     this._scrollBar = new ScrollBarHelper();
-    this._didInit = false;
-    this._init();
   }
 
   // Getters
@@ -195,16 +192,6 @@ class Modal extends BaseComponent {
   }
 
   // Private
-  _init() {
-    if (this._didInit) {
-      return;
-    }
-
-    enableDismissTrigger(Modal);
-
-    this._didInit = true;
-  }
-
   _initializeBackDrop() {
     return new Backdrop({
       isVisible: Boolean(this._config.backdrop), // 'static' option will be translated to true, and booleans will keep their value

diff --git a/src/js/components/offcanvas.js b/src/js/components/offcanvas.js
@@ -17,7 +17,6 @@ import SelectorEngine from "../dom/selector-engine";
 import Manipulator from "../dom/manipulator";
 import Backdrop from "../util/backdrop";
 import FocusTrap from "../util/focusTrap";
-import { enableDismissTrigger } from "../util/component-functions";
 
 /*
 ------------------------------------------------------------------------
@@ -177,7 +176,6 @@ class Offcanvas extends BaseComponent {
       )
     );
 
-    enableDismissTrigger(Offcanvas);
     this._didInit = true;
   }
 

diff --git a/src/js/components/toast.js b/src/js/components/toast.js
@@ -13,7 +13,6 @@ import { reflow, typeCheckConfig } from "../util/index";
 import EventHandler from "../dom/event-handler";
 import Manipulator from "../dom/manipulator";
 import BaseComponent from "../base-component";
-import { enableDismissTrigger } from "../util/component-functions";
 
 /*
 ------------------------------------------------------------------------
@@ -78,8 +77,6 @@ class Toast extends BaseComponent {
     this._hasMouseInteraction = false;
     this._hasKeyboardInteraction = false;
     this._setListeners();
-    this._didInit = false;
-    this._init();
   }
 
   // Getters
@@ -168,15 +165,6 @@ class Toast extends BaseComponent {
   }
 
   // Private
-  _init() {
-    if (this._didInit) {
-      return;
-    }
-
-    enableDismissTrigger(Toast);
-    this._didInit = true;
-  }
-
   _getConfig(config) {
     config = {
       ...Default,