Merge pull request #358 from XpressAI/fahreza/propagation-bugfix

🐛 Prevent Event Propagation to Other Widgets
XpressAI · Oct 7, 2024 · dc4b639 · dc4b639
2 parents 46c8ba1 + 4e70839
commit dc4b639
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/commands/CustomActionEvent.tsx b/src/commands/CustomActionEvent.tsx
@@ -10,23 +10,25 @@ interface CustomActionEventOptions {
 
 export class CustomActionEvent extends Action {
     constructor(options: CustomActionEventOptions) {
-
         super({
             type: InputType.KEY_DOWN,
             fire: (event: ActionEvent<React.KeyboardEvent>) => {
                 const app = options.app;
                 // @ts-ignore
-                if(app.shell._tracker._activeWidget && options.getWidgetId() === app.shell._tracker._activeWidget.id){
+                if (app.shell._tracker._activeWidget && options.getWidgetId() === app.shell._tracker._activeWidget.id) {
                     const keyCode = event.event.key;
                     const ctrlKey = event.event.ctrlKey;
 
                     const executeIf = (condition, command) => {
-                        if(condition){
-                            // @ts-ignore
-                            event.event.stopImmediatePropagation();
-                            app.commands.execute(command)
+                        if (condition) {
+                            event.event.preventDefault();
+                            event.event.stopPropagation();
+                            if (event.event.nativeEvent) {
+                                event.event.nativeEvent.stopImmediatePropagation();
+                            }
+                            app.commands.execute(command);
                         }
-                    }
+                    };
 
                     executeIf(ctrlKey && keyCode === 'z', commandIDs.undo);
                     executeIf(ctrlKey && keyCode === 'y', commandIDs.redo);