@energy8platform/shell 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@energy8platform/shell",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Energy8 branded game shell — one logic core, pluggable html/pixi renderers behind a stable contract.",
   "type": "module",
   "main": "./dist/index.cjs.js",

package/src/core/version.ts

@@ -1,3 +1,3 @@
 // AUTO-GENERATED by scripts/gen-version.mjs — do not edit. Mirrors package.json "version".
 /** The @energy8platform/shell package version, stamped into the game-info footer. */
-export const PACKAGE_VERSION = '0.2.0';
+export const PACKAGE_VERSION = '0.2.1';

package/src/ui/html/HtmlRenderer.ts

@@ -167,7 +167,7 @@ export class HtmlRenderer implements ShellRenderer {
         return { root };
       }
       case 'modal': {
-        const root = buildModal(req.opts);
+        const root = buildModal(this.host, req.opts);
         return { root, onKey: req.opts.onKey };
       }
     }

package/src/ui/html/components/GameInfo.ts

@@ -18,7 +18,7 @@ export interface GameInfoModal {
 export function openGameInfoModal(host: ShellHost): GameInfoModal {
   const { root, body, scroll } = createOverlay({
     title: host.t('Game info'),
-    onClose: () => root.remove(),
+    onClose: () => host.actions.closeOverlay(),
     onBack: () => { root.remove(); host.actions.openSettings(); },
   });
   root.dataset.ge = 'info-modal';

package/src/ui/html/components/Modal.ts

@@ -1,17 +1,21 @@
 import type { ModalOptions } from '@/core/types';
+import type { ShellHost } from '@/core/renderer';
 import { contrastText } from '@/core/colors';
 import { createCardModal } from '../primitives';
 
 /** Build a generic, externally-triggered modal (title + body text + optional action buttons),
  *  on the shared card-modal chrome. Each action runs its `on` then closes; the ✕ (if
- *  `availableClose`) and the actions are the only ways to dismiss. See GameShell.openModal. */
-export function buildModal(opts: ModalOptions): HTMLElement {
+ *  `availableClose`) and the actions are the only ways to dismiss. See GameShell.openModal.
+ *  Dismissals route through host.actions.closeOverlay() so the controller clears its overlay handle
+ *  (a bare root.remove() leaves the handle stale → keydowns keep routing to a torn-down layer). */
+export function buildModal(host: ShellHost, opts: ModalOptions): HTMLElement {
+  const close = () => host.actions.closeOverlay();
   const ui = createCardModal({
     ge: 'modal',
     title: opts.title,
     closable: opts.availableClose,
     blur: opts.blurLevel,
-    onClose: () => ui.root.remove(),
+    onClose: close,
   });
 
   const text = document.createElement('p');
@@ -27,7 +31,7 @@ export function buildModal(opts: ModalOptions): HTMLElement {
       btn.textContent = a.title;
       if (a.color) { btn.style.background = a.color; btn.style.color = contrastText(a.color); }
       else btn.classList.add('ge-modal-btn--ghost');
-      btn.addEventListener('click', () => { a.on?.(); ui.root.remove(); });
+      btn.addEventListener('click', () => { a.on?.(); close(); });
       actions.appendChild(btn);
     }
     ui.card.appendChild(actions);

package/src/ui/html/components/Settings.ts

@@ -3,7 +3,7 @@ import { createOverlay } from '../primitives';
 import { icon } from '../icons';
 
 export function openSettingsModal(host: ShellHost): HTMLElement {
-  const { root, body } = createOverlay({ title: host.t('Settings'), onClose: () => root.remove() });
+  const { root, body } = createOverlay({ title: host.t('Settings'), onClose: () => host.actions.closeOverlay() });
   root.dataset.ge = 'settings-modal';
 
   // Sound on/off — backed by the shell's shared `soundOn` state so this toggle and the Shift+M

package/src/ui/pixi/PixiRenderer.ts

@@ -340,7 +340,10 @@ export class PixiRenderer implements ShellRenderer {
       get screenH() { return self.app.screen.height; },
       render: () => self.renderBar(),
       pushLayer: (node) => self.pushLayer(node),
-      closeLayer: () => self.closeLayer(),
+      // Route component-initiated closes through the controller (not straight to self.closeLayer) so
+      // it clears its OverlayHandle. Otherwise the handle goes stale: hasOpenLayer() stays true and
+      // keydowns keep routing to onKey on a destroyed overlay → write to a torn-down ScrollBox.
+      closeLayer: () => host.actions.closeOverlay(),
       fitModals: () => self.fitModals(),
       fmt: (n) => host.formatCurrency(n),
       fmtWin: (n) => host.formatCurrency(n, true),

package/src/ui/pixi/primitives/scroll.ts

@@ -82,6 +82,9 @@ export class ScrollBox extends Container {
   }
 
   private setScroll(y: number): void {
+    // Ignore late scrolls after teardown: a queued keydown (or resize) can route here once the modal
+    // has been destroyed, and writing to a torn-down content Container throws (use-after-destroy).
+    if (this.destroyed || !this.content || this.content.destroyed) return;
     this.scrollY = Math.max(0, Math.min(this.maxScroll, y)) || 0; // || 0 converts -0 to 0
     this.content.y = this.scrollY === 0 ? 0 : -this.scrollY;
   }