Merge pull request #1112 from swanson/swanson/invoke-action-pass-element

Pass invoking element as event data
basecamp · Dec 14, 2023 · ca59588 · ca59588
2 parents bceee69 + e64d0d7
commit ca59588
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/trix/controllers/editor_controller.js b/src/trix/controllers/editor_controller.js
@@ -374,8 +374,8 @@ export default class EditorController extends Controller {
     }
   }
 
-  toolbarDidInvokeAction(actionName) {
-    return this.invokeAction(actionName)
+  toolbarDidInvokeAction(actionName, invokingElement) {
+    return this.invokeAction(actionName, invokingElement)
   }
 
   toolbarDidToggleAttribute(attributeName) {
@@ -448,9 +448,9 @@ export default class EditorController extends Controller {
     }
   }
 
-  invokeAction(actionName) {
+  invokeAction(actionName, invokingElement) {
     if (this.actionIsExternal(actionName)) {
-      return this.notifyEditorElement("action-invoke", { actionName })
+      return this.notifyEditorElement("action-invoke", { actionName, invokingElement })
     } else {
       return this.actions[actionName]?.perform?.call(this)
     }

diff --git a/src/trix/controllers/toolbar_controller.js b/src/trix/controllers/toolbar_controller.js
@@ -64,7 +64,7 @@ export default class ToolbarController extends BasicObject {
     if (this.getDialog(actionName)) {
       return this.toggleDialog(actionName)
     } else {
-      return this.delegate?.toolbarDidInvokeAction(actionName)
+      return this.delegate?.toolbarDidInvokeAction(actionName, element)
     }
   }