@solidrt/core 0.0.36 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidrt/core",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "license": "MIT",
   "author": "Antoine van Wel",
   "type": "module",
@@ -27,7 +27,7 @@
     "colord": "^2.9.3"
   },
   "devDependencies": {
-    "@solidrt/flux-types": "0.0.36"
+    "@solidrt/flux-types": "0.0.37"
   },
   "peerDependencies": {
     "@solidjs/signals": "2.0.0-beta.20",

package/src/index.ts

@@ -3,7 +3,8 @@ export { setFocus, getFocusedNodeId, measureText, getBoundingBox, getBoundingBox
 export type { BoundingBox } from "./core"
 export { parseColor, mixColors, brightness, createLinearGradient, createRadialGradient } from "./color"
 export type { Gradient, GradientStop } from "./color"
-export { onFrame, onLayout, onResize, onWindowFocus, onWindowBlur } from "./window"
+export { onFrame, onLayout, onResize, onWindowFocus, onWindowBlur, onBack, exit } from "./window"
+export type { BackEvent } from "./window"
 export { windowSize, safeArea, displayScale, windowFocused, keyboardHeight } from "./window"
 export { env } from "./environment"
 export type { InputDevices, SystemTheme, Orientation } from "./environment"

package/src/runtime-modules.d.ts

@@ -31,6 +31,17 @@ declare module "srt:events" {
   export function once(event: string, callback: (data: any) => void): () => void
 }
 
+// The running application's own surface (lattice), present in every build.
+declare module "srt:app" {
+  /**
+   * Leave the current app, unconditionally: back to the launcher in a dev
+   * client, quit when standalone or at the launcher root (on Android the
+   * client backgrounds instead of dying). The default action of an
+   * unprevented `back` event; prefer the @solidrt/core re-export.
+   */
+  export function exit(): void
+}
+
 // Dev-server control surface (lattice). Present only in dev/go builds; in other
 // builds `available` is false and the functions are no-ops.
 declare module "srt:dev" {
@@ -63,8 +74,13 @@ declare module "srt:apps" {
   export type InstalledApp = { id: string; name: string; version: string }
   /** Installed apps, sorted by name. */
   export function list(): InstalledApp[]
-  /** A stored version: id (manifest hash), bytes on disk, whether it is the current one. */
-  export type AppVersion = { id: string; size: number; current: boolean }
+  /**
+   * A stored version: id (manifest hash), bytes on disk, whether it is the
+   * current one, and the SolidRT (CLI) release that built it per its
+   * manifest ("unknown" from an in-repo CLI or when the manifest predates
+   * the field).
+   */
+  export type AppVersion = { id: string; size: number; current: boolean; solidrtVersion: string }
   /** One file in a listing: a relative path and its size in bytes. */
   export type AppFile = { path: string; size: number }
   /**

package/src/types.d.ts

@@ -198,8 +198,18 @@ export interface WheelEvent extends PointerEvent {
   deltaY: number
 }
 
+// Key events use the W3C UI Events vocabulary: `key` is the logical,
+// layout-dependent value ("a", "!", "Enter", "ArrowLeft"); `code` is the
+// physical, layout-independent key position ("KeyA", "Digit1", "NumpadEnter").
+// Printable characters for text entry arrive via onTextInput, not here.
 export interface KeyEvent {
   key: string
+  code: string
+  repeat: boolean
+  shiftKey: boolean
+  ctrlKey: boolean
+  altKey: boolean
+  metaKey: boolean
 }
 
 export interface TextEvent {

package/src/window.ts

@@ -2,9 +2,19 @@ import { createSignal, onCleanup, onSettled, flush } from "@solidjs/signals"
 import { requestFrame } from "flux:rendertree"
 import { renderFrame } from "srt:render"
 import { on, once } from "srt:events"
+import { exit } from "srt:app"
 import { getEventHandler, getFocusedNodeId, setFocus } from "./core"
 import { scanForOrphans } from "./renderer"
 
+/**
+ * Leaves the current app, unconditionally: back to the launcher in a dev
+ * client, quitting when standalone or at the launcher itself (on Android the
+ * client backgrounds instead of dying). The default action of an unprevented
+ * `back` event; call it directly to exit programmatically, e.g. after
+ * intercepting back for an unsaved-changes dialog.
+ */
+export { exit }
+
 // ------ Pointer routing -----------------
 
 // Hit path frozen at pointerDown, pointerId -> targets. While a pointer has an
@@ -179,6 +189,30 @@ export function onWindowBlur(fn: () => void) {
   return unsubscribe
 }
 
+// ------ Back ----------------
+
+export type BackEvent = { preventDefault: () => void }
+
+// App handlers for the window-level back event, run in registration order.
+// Kept in a local registry (not per-handler bus subscriptions) so the default
+// action runs exactly once, after every handler has had its say.
+let backHandlers = new Set<(e: BackEvent) => void>()
+
+/**
+ * Calls `fn` on the user's back intent (Android back button/gesture, the
+ * desktop dev chord). Call `e.preventDefault()` when back means in-app
+ * navigation right now (close a modal, previous screen); unprevented, the
+ * default action runs: exit(). Apps without a handler exit on back
+ * everywhere, which is the correct zero-effort default.
+ * Returns a cleanup function; also auto-cleans within a reactive scope.
+ */
+export function onBack(fn: (e: BackEvent) => void) {
+  backHandlers.add(fn)
+  let cleanup = () => backHandlers.delete(fn)
+  onCleanup(cleanup)
+  return cleanup
+}
+
 // ------ Window ----------------
 
 export function attachWindow(_nodeId: number) {
@@ -191,6 +225,7 @@ export function attachWindow(_nodeId: number) {
   let unsubWheel: () => void = null!
   let unsubKeyDown: () => void = null!
   let unsubKeyUp: () => void = null!
+  let unsubBack: () => void = null!
   let unsubTextInput: () => void = null!
   let unsubKeyboardVisibility: () => void = null!
   let unsubRefreshRate: () => void = null!
@@ -304,6 +339,18 @@ export function attachWindow(_nodeId: number) {
       }
     })
 
+    unsubBack = on("back", () => {
+      let prevented = false
+      let e: BackEvent = {
+        preventDefault: () => {
+          prevented = true
+        },
+      }
+      // Copy first: a handler may unregister (itself or others) mid-dispatch.
+      for (let fn of [...backHandlers]) fn(e)
+      if (!prevented) exit()
+    })
+
     unsubTextInput = on("textInput", (e: any) => {
       let id = getFocusedNodeId()
       if (id != null) {
@@ -339,6 +386,7 @@ export function attachWindow(_nodeId: number) {
     if (unsubWheel) unsubWheel()
     if (unsubKeyDown) unsubKeyDown()
     if (unsubKeyUp) unsubKeyUp()
+    if (unsubBack) unsubBack()
     if (unsubTextInput) unsubTextInput()
     if (unsubKeyboardVisibility) unsubKeyboardVisibility()
     if (unsubRefreshRate) unsubRefreshRate()