apply the save shortcut only for the top open modal

2026-06-08 15:57:37 +03:00
parent aa7be1edd1
commit f58a65e4be
12 changed files with 38 additions and 16 deletions
@@ -421,7 +421,11 @@ function recordUpsertModal(collection, rawRecord, modalSettings) {
                        inert: () => data.isLoading || data.isSaving,
                        onmount: (el) => {
                            el._quickSaveHandler = (e) => {
-                                if ((e.ctrlKey || e.metaKey) && e.code == "KeyS") {
+                                if (
+                                    (e.ctrlKey || e.metaKey)
+                                    && e.code == "KeyS"
+                                    && app.modals.getTop() === el?.closest(".modal")
+                                ) {
                                    e.preventDefault();
                                    save(false);
                                }
@@ -430,7 +434,7 @@ function recordUpsertModal(collection, rawRecord, modalSettings) {
                        },
                        onunmount: (el) => {
                            if (el?._quickSaveHandler) {
-                                window.removeEventListener("keydown", el?._quickSaveHandler);
+                                window.removeEventListener("keydown", el._quickSaveHandler);
                            }
                        },
                    },