Allow passing an alert class in alert.show

flarum · May 16, 2020 · 2432b4d · 2432b4d
1 parent 5f345da
commit 2432b4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/js/src/common/components/AlertManager.js b/js/src/common/components/AlertManager.js
@@ -14,7 +14,9 @@ export default class AlertManager extends Component {
     return (
       <div className="AlertManager">
         {Object.entries(this.state.activeAlerts).map(([key, state]) => (
-          <div className="AlertManager-alert">{Alert.component({ ...state.attrs, ondismiss: this.state.dismiss.bind(this.state, key) })}</div>
+          <div className="AlertManager-alert">
+            {state.alertClass.component({ ...state.attrs, ondismiss: this.state.dismiss.bind(this.state, key) })}
+          </div>
         ))}
       </div>
     );

diff --git a/js/src/common/states/AlertManagerState.js b/js/src/common/states/AlertManagerState.js
@@ -1,3 +1,4 @@
+import Alert from '../components/Alert';
 import AlertState from './AlertState';
 
 export default class AlertManagerState {
@@ -8,8 +9,8 @@ export default class AlertManagerState {
   /**
    * Show an Alert in the alerts area.
    */
-  show(attrs, key = AlertManagerState.genAlertId()) {
-    const state = new AlertState(attrs);
+  show(attrs, alertClass = Alert, key = AlertManagerState.genAlertId()) {
+    const state = new AlertState(attrs, alertClass);
 
     this.activeAlerts[key] = state;
     m.redraw();

diff --git a/js/src/common/states/AlertState.js b/js/src/common/states/AlertState.js
@@ -1,5 +1,8 @@
+import Alert from '../components/Alert';
+
 export default class AlertState {
-  constructor(attrs = {}) {
+  constructor(attrs = {}, alertClass = Alert) {
     this.attrs = attrs;
+    this.alertClass = alertClass;
   }
 }