Et2Nextmatch: Fix action keyboard shortcuts

- keyboard events were swallowed by the datagrid

Author: nathangray

api/js/etemplate/Et2Nextmatch/Et2Nextmatch.ts

@@ -661,6 +661,7 @@ export class Et2Nextmatch extends Et2Widget(LitElement) implements et2_IInput
 		this.addEventListener("et2-column-selection-apply", this._handleColumnSelectionApply as EventListener);
 		this.addEventListener("contextmenu", this._handleContextMenu as EventListener, true);
 		this.addEventListener("dblclick", this._handleDoubleClick as EventListener, true);
+		this.addEventListener("keydown", this._handleActionShortcut as EventListener, true);
 		this.addEventListener("keydown", this._handleKeydown as EventListener);
 		this.addEventListener("pointerdown", this._handlePointerDown as EventListener);
 		this.addEventListener("pointermove", this._handlePointerMove as EventListener);
@@ -699,6 +700,7 @@ export class Et2Nextmatch extends Et2Widget(LitElement) implements et2_IInput
 		this.removeEventListener("et2-column-selection-apply", this._handleColumnSelectionApply as EventListener);
 		this.removeEventListener("contextmenu", this._handleContextMenu as EventListener, true);
 		this.removeEventListener("dblclick", this._handleDoubleClick as EventListener, true);
+		this.removeEventListener("keydown", this._handleActionShortcut as EventListener, true);
 		this.removeEventListener("keydown", this._handleKeydown as EventListener);
 		this.removeEventListener("pointerdown", this._handlePointerDown as EventListener);
 		this.removeEventListener("pointermove", this._handlePointerMove as EventListener);
@@ -2927,6 +2929,19 @@ export class Et2Nextmatch extends Et2Widget(LitElement) implements et2_IInput
 		}
 	};
 
+	/**
+	 * Let nextmatch action shortcuts run before the datagrid handles navigation
+	 * keys and stops their propagation.
+	 */
+	private _handleActionShortcut = (event : KeyboardEvent) =>
+	{
+		if(this._actionController.handleShortcut(event))
+		{
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	};
+
 	/**
 	 * Forward pointerdown to the action controller for long-press/drag setup.
 	 */

api/js/etemplate/Et2Nextmatch/Et2NextmatchActionController.ts

@@ -288,6 +288,31 @@ export class Et2NextmatchActionController
 		return {ids: [...this.selectedRowIds], all: this.allSelected};
 	}
 
+	/**
+	 * Execute an action shortcut originating in this nextmatch.
+	 *
+	 * This is called while the event is being captured by Et2Nextmatch.  The
+	 * datagrid consumes some keys (notably Ctrl+A) for its own navigation, so
+	 * waiting for the document-level key manager would make those action
+	 * shortcuts unreachable.
+	 */
+	handleShortcut(event : KeyboardEvent) : boolean
+	{
+		const keyCode = event.keyCode;
+		if(!keyCode)
+		{
+			return false;
+		}
+		return !!this.objectManager?.executeActionImplementation?.({
+			keyEvent: {
+				keyCode,
+				shift: event.shiftKey,
+				ctrl: event.ctrlKey || event.metaKey,
+				alt: event.altKey
+			}
+		}, "popup", EGW_AO_EXEC_SELECTED);
+	}
+
 	/**
 	 * Return the pending submit payload produced by the last submit action.
 	 *

api/js/etemplate/Et2Nextmatch/test/Et2Nextmatch.actions.test.ts

@@ -370,6 +370,38 @@ describe("Et2Nextmatch action setup", () =>
 		}
 	});
 
+	/**
+	 * Contract under test:
+	 * - A shortcut declared by a nextmatch action is executed before datagrid key handling.
+	 *
+	 * Setup strategy:
+	 * - Provide a Delete action and an action-object manager spy to the controller.
+	 *
+	 * Pass criteria:
+	 * - Delete is forwarded with its matching shortcut data; an unmatched Ctrl+A is ignored.
+	 */
+	it("forwards matching action shortcuts to the action object manager", () =>
+	{
+		const controller : any = new Et2NextmatchActionController({} as any);
+		const execute = sinon.stub().callsFake((context) => context.keyEvent.keyCode === 46);
+		controller.actionManager = {
+			children: [{
+				id: "delete",
+				shortcut: {keyCode: 46, shift: false, ctrl: false, alt: false}
+			}]
+		};
+		controller.objectManager = {executeActionImplementation: execute};
+
+		const deleteEvent = new KeyboardEvent("keydown", {key: "Delete"});
+		Object.defineProperty(deleteEvent, "keyCode", {value: 46});
+		assert.isTrue(controller.handleShortcut(deleteEvent), "Delete shortcut should be handled");
+		assert.isTrue(execute.calledOnce, "matching shortcut should execute through the action manager");
+		assert.deepInclude(execute.firstCall.args[0].keyEvent, {keyCode: 46, ctrl: false}, "shortcut data should preserve key and modifiers");
+		const selectAllEvent = new KeyboardEvent("keydown", {key: "a", ctrlKey: true});
+		Object.defineProperty(selectAllEvent, "keyCode", {value: 65});
+		assert.isFalse(controller.handleShortcut(selectAllEvent), "unmatched shortcut should remain available to other handlers");
+	});
+
 	/**
 	 * Contract under test:
 	 * - Selecting a popup action executes the configured handler with the selected row object.