1.9.10

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue-nonograms-solid",
-  "version": "1.9.8",
+  "version": "1.9.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vue-nonograms-solid",
-      "version": "1.9.8",
+      "version": "1.9.10",
       "dependencies": {
         "fireworks-js": "^2.10.8",
         "flag-icons": "^7.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-nonograms-solid",
-  "version": "1.9.8",
+  "version": "1.9.10",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/App.vue

@@ -28,6 +28,21 @@ const appVersion = __APP_VERSION__;
 let displayModeMedia = null;
 let prefersColorSchemeMedia = null;
 
+const onKeyDownGlobal = (e) => {
+  if (e.key !== 'Escape') return;
+  if (showSimulation.value) {
+    showSimulation.value = false;
+    return;
+  }
+  if (showCustomModal.value) {
+    showCustomModal.value = false;
+    return;
+  }
+  if (store.isGameWon) {
+    store.closeWinModal();
+  }
+};
+
 const installLabel = computed(() => {
   return isCoarsePointer.value ? t('pwa.installMobile') : t('pwa.installDesktop');
 });
@@ -114,6 +129,7 @@ onMounted(() => {
     } else if (displayModeMedia?.addListener) {
       displayModeMedia.addListener(updateStandalone);
     }
+    window.addEventListener('keydown', onKeyDownGlobal);
   }
 });
 
@@ -131,6 +147,7 @@ onUnmounted(() => {
   } else if (displayModeMedia?.removeListener) {
     displayModeMedia.removeListener(updateStandalone);
   }
+  window.removeEventListener('keydown', onKeyDownGlobal);
 });
 </script>
 
@@ -279,4 +296,4 @@ onUnmounted(() => {
   border-top: 1px solid var(--panel-border);
   z-index: 90;
 }
-</style>
+</style>

src/components/SimulationView.vue

@@ -1,6 +1,6 @@
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { generateRandomGrid, calculateHints } from '@/utils/puzzleUtils';
 import { solvePuzzle } from '@/utils/solver';
 import { useI18n } from '@/composables/useI18n';
@@ -21,6 +21,22 @@ const simulationSpeed = ref(1); // 1 = Normal, 2 = Fast (less render updates)
 
 let stopRequested = false;
 
+const onKeyDown = (e) => {
+    if (e.key === 'Escape') {
+        e.stopImmediatePropagation?.();
+        e.preventDefault?.();
+        emit('close');
+    }
+};
+
+onMounted(() => {
+    window.addEventListener('keydown', onKeyDown);
+});
+
+onUnmounted(() => {
+    window.removeEventListener('keydown', onKeyDown);
+});
+
 const displayStatus = computed(() => {
     if (!currentStatus.value) return t('simulation.status.ready');
     return currentStatus.value;

src/components/WinModal.vue

@@ -28,6 +28,8 @@ const handleClose = () => {
 
 const handleKeyDown = (e) => {
   if (e.key === 'Escape') {
+    e.stopImmediatePropagation?.();
+    e.preventDefault?.();
     handleClose();
   }
 };