@signal9/era-ui 1.26.0 → 1.26.1

package/dist/os/launcher.svelte

@@ -3,34 +3,39 @@
 	import * as Command from '../ui/command';
 	import Search from '@lucide/svelte/icons/search';
 	import { cn } from '../utils/index.js';
+	import { keys, isTextEntryFocused, type KeyBindingMap } from '../utils/hotkeys.js';
 	import { getWindowManager } from './wm.svelte.js';
 	import { LAYER } from './layers.js';
 
 	let {
 		open = $bindable(false),
-		hotkey = true
+		hotkey
 	}: {
 		open?: boolean;
-		/** Register Ctrl/Cmd+K to toggle and Escape to close (default true). */
-		hotkey?: boolean;
+		/** Global binding(s) that toggle the launcher (tinykeys grammar, e.g.
+		 *  `'$mod+k'`). No default — the taskbar button is the base affordance.
+		 *  Escape always closes while open. */
+		hotkey?: string | string[];
 	} = $props();
 
 	const wm = getWindowManager();
 	const apps = $derived(Object.values(wm.apps));
 	let query = $state('');
 
-	$effect(() => {
-		if (!hotkey) return;
-		const onKey = (e: KeyboardEvent) => {
-			if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'k') {
+	// One central binding map through the shared hotkeys engine ($mod
+	// normalization, exact-modifier matching, text-entry guard) instead of a
+	// hand-rolled listener. An empty map (no hotkey, closed) attaches nothing.
+	const bindings = $derived.by((): KeyBindingMap => {
+		const map: KeyBindingMap = {};
+		for (const b of hotkey ? (Array.isArray(hotkey) ? hotkey : [hotkey]) : []) {
+			map[b] = (e) => {
+				if (isTextEntryFocused() && !open) return;
 				e.preventDefault();
 				open = !open;
-			} else if (e.key === 'Escape' && open) {
-				open = false;
-			}
-		};
-		window.addEventListener('keydown', onKey);
-		return () => window.removeEventListener('keydown', onKey);
+			};
+		}
+		if (open) map['Escape'] = () => (open = false);
+		return map;
 	});
 
 	// Reset the query each time it opens so it's fresh.
@@ -44,6 +49,8 @@
 	}
 </script>
 
+<svelte:window use:keys={bindings} />
+
 {#if open}
 	<div
 		class={cn(

package/dist/os/launcher.svelte.d.ts

@@ -1,7 +1,9 @@
 type $$ComponentProps = {
     open?: boolean;
-    /** Register Ctrl/Cmd+K to toggle and Escape to close (default true). */
-    hotkey?: boolean;
+    /** Global binding(s) that toggle the launcher (tinykeys grammar, e.g.
+     *  `'$mod+k'`). No default — the taskbar button is the base affordance.
+     *  Escape always closes while open. */
+    hotkey?: string | string[];
 };
 declare const Launcher: import("svelte").Component<$$ComponentProps, {}, "open">;
 type Launcher = ReturnType<typeof Launcher>;

package/dist/os/wm.svelte.d.ts

@@ -126,7 +126,9 @@ export declare class WindowManager {
      *  singleton — from any workspace; it is brought to the active one). */
     open(appId: string, overrides?: Partial<Pick<AppWindow, 'title' | 'pos' | 'size' | 'resizable' | 'workspaceId'>>): string | null;
     close(id: string): void;
-    /** Bring a window to the front (and un-minimize it if needed). */
+    /** Make a window the frontmost VISIBLE one: switch to its workspace,
+     *  un-minimize it, and bring it to the front. Focus means reveal at every
+     *  level — never a silent off-screen z bump. */
     focus(id: string): void;
     minimize(id: string): void;
     /** Taskbar behaviour: focus if not focused, else minimize; restore if minimized. */

package/dist/os/wm.svelte.js

@@ -77,7 +77,11 @@ export class WindowManager {
         if (app.singleton) {
             const existing = this.windows.find((w) => w.appId === appId);
             if (existing) {
-                existing.workspaceId = overrides?.workspaceId ?? this.activeWorkspaceId;
+                // Reveal, don't relocate: restore() → focus() switches to the
+                // workspace the window already lives on, the way every virtual
+                // desktop behaves. An explicit override still moves it.
+                if (overrides?.workspaceId)
+                    existing.workspaceId = overrides.workspaceId;
                 this.restore(existing.id);
                 return existing.id;
             }
@@ -108,11 +112,15 @@ export class WindowManager {
     close(id) {
         this.windows = this.windows.filter((w) => w.id !== id);
     }
-    /** Bring a window to the front (and un-minimize it if needed). */
+    /** Make a window the frontmost VISIBLE one: switch to its workspace,
+     *  un-minimize it, and bring it to the front. Focus means reveal at every
+     *  level — never a silent off-screen z bump. */
     focus(id) {
         const w = this.#find(id);
         if (!w)
             return;
+        if (w.workspaceId !== this.activeWorkspaceId)
+            this.switchWorkspace(w.workspaceId);
         if (w.state === 'minimized')
             w.state = 'normal';
         if (w.z <= this.#z)

package/dist/styles/themes.css

@@ -56,7 +56,7 @@
 	--color-destructive-fg: oklch(0.96 0 0);
 	--color-success: oklch(0.65 0.17 145);
 	--color-success-fg: oklch(0.96 0 0);
---color-warning: oklch(0.8 0.16 85);
+	--color-warning: oklch(0.8 0.16 85);
 	--color-warning-fg: oklch(0.162 0 0);
 }
 
@@ -95,7 +95,7 @@
 		--color-destructive-fg: oklch(0.98 0 0);
 		--color-success: oklch(0.5 0.17 145);
 		--color-success-fg: oklch(0.98 0 0);
---color-warning: oklch(0.72 0.15 85);
+		--color-warning: oklch(0.72 0.15 85);
 		--color-warning-fg: oklch(0.162 0 0);
 	}
 }
@@ -131,7 +131,7 @@
 	--color-destructive-fg: oklch(0.98 0 0);
 	--color-success: oklch(0.5 0.17 145);
 	--color-success-fg: oklch(0.98 0 0);
---color-warning: oklch(0.72 0.15 85);
+	--color-warning: oklch(0.72 0.15 85);
 	--color-warning-fg: oklch(0.162 0 0);
 }
 
@@ -175,7 +175,7 @@
 	--color-destructive-fg: oklch(0.96 0.016 90);
 	--color-success: oklch(0.7 0.125 184);
 	--color-success-fg: oklch(0.19 0.014 50);
---color-warning: oklch(0.78 0.14 82);
+	--color-warning: oklch(0.78 0.14 82);
 	--color-warning-fg: oklch(0.19 0.014 50);
 }
 
@@ -218,7 +218,7 @@
 		--color-destructive-fg: oklch(0.98 0.012 78);
 		--color-success: oklch(0.5 0.13 158);
 		--color-success-fg: oklch(0.98 0.012 78);
---color-warning: oklch(0.7 0.13 80);
+		--color-warning: oklch(0.7 0.13 80);
 		--color-warning-fg: oklch(0.19 0.014 50);
 	}
 }
@@ -253,7 +253,7 @@
 	--color-destructive-fg: oklch(0.98 0.012 78);
 	--color-success: oklch(0.5 0.13 158);
 	--color-success-fg: oklch(0.98 0.012 78);
---color-warning: oklch(0.7 0.13 80);
+	--color-warning: oklch(0.7 0.13 80);
 	--color-warning-fg: oklch(0.19 0.014 50);
 }
 
@@ -291,7 +291,7 @@
 	--color-destructive-fg: var(--color-12);
 	--color-success: oklch(0.71 0.09 164);
 	--color-success-fg: var(--color-1);
---color-warning: oklch(0.78 0.1 85);
+	--color-warning: oklch(0.78 0.1 85);
 	--color-warning-fg: var(--color-1);
 }
 
@@ -329,7 +329,7 @@
 		--color-destructive-fg: oklch(0.98 0.008 80);
 		--color-success: oklch(0.54 0.11 164);
 		--color-success-fg: oklch(0.98 0.008 80);
---color-warning: oklch(0.68 0.1 82);
+		--color-warning: oklch(0.68 0.1 82);
 		--color-warning-fg: oklch(0.2 0.012 60);
 	}
 }
@@ -364,6 +364,6 @@
 	--color-destructive-fg: oklch(0.98 0.008 80);
 	--color-success: oklch(0.54 0.11 164);
 	--color-success-fg: oklch(0.98 0.008 80);
---color-warning: oklch(0.68 0.1 82);
+	--color-warning: oklch(0.68 0.1 82);
 	--color-warning-fg: oklch(0.2 0.012 60);
 }

package/dist/ui/button/index.d.ts

@@ -2,7 +2,7 @@ import Button from './button.svelte';
 export { Button };
 export { buttonVariants } from './variants.js';
 export interface ButtonVariants {
-    tone?: 'default' | 'accent' | 'destructive' | 'success';
+    tone?: 'default' | 'accent' | 'destructive' | 'success' | 'warning';
     size?: 'default' | 'sm' | 'xs' | 'icon';
     variant?: 'filled' | 'link';
     icon?: boolean;

package/dist/ui/command-bar/command-bar.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import ChevronRight from '@lucide/svelte/icons/chevron-right';
 	import { cn } from '../../utils/index.js';
-	import { keys, type KeyBindingMap } from '../../utils/hotkeys.js';
+	import { keys, isTextEntryFocused, type KeyBindingMap } from '../../utils/hotkeys.js';
 	import type { CommandBarItem } from './types.js';
 
 	let {
@@ -17,7 +17,8 @@
 		/** Empty-state message when the filter matches nothing. */
 		empty?: string;
 		/** Global binding(s) that focus the bar (tinykeys grammar, e.g.
-		 *  `['/', '$mod+k']`). Ignored while another field has focus. */
+		 *  `['`', 'Escape']`). While another field has focus only Escape
+		 *  acts — it blurs that field instead of stealing the caret. */
 		hotkey?: string | string[];
 		class?: string;
 	} = $props();
@@ -131,15 +132,9 @@
 	}
 
 	// Focus hotkeys: a central map on window (tinykeys grammar). Guarded the
-	// way the terminal guards them — ignored while any other field is focused,
-	// so typing '/' in a text input never steals the caret.
-	function fieldFocused() {
-		const el = document.activeElement;
-		return (
-			el instanceof HTMLElement &&
-			(el.tagName === 'INPUT' || el.tagName === 'TEXTAREA' || el.isContentEditable)
-		);
-	}
+	// way the terminal guards them — while any field is focused, only Escape
+	// acts (it blurs the field); every other binding is ignored so typing a
+	// backtick in a text input never steals the caret.
 	const bindings = $derived.by((): KeyBindingMap => {
 		if (!hotkey) return {};
 		const list = Array.isArray(hotkey) ? hotkey : [hotkey];
@@ -147,7 +142,10 @@
 			list.map((b) => [
 				b,
 				(e: KeyboardEvent) => {
-					if (fieldFocused()) return;
+					if (isTextEntryFocused()) {
+						if (b === 'Escape') (document.activeElement as HTMLElement).blur();
+						return;
+					}
 					e.preventDefault();
 					input?.focus();
 				}

package/dist/ui/command-bar/command-bar.svelte.d.ts

@@ -6,7 +6,8 @@ type $$ComponentProps = {
     /** Empty-state message when the filter matches nothing. */
     empty?: string;
     /** Global binding(s) that focus the bar (tinykeys grammar, e.g.
-     *  `['/', '$mod+k']`). Ignored while another field has focus. */
+     *  `['`', 'Escape']`). While another field has focus only Escape
+     *  acts — it blurs that field instead of stealing the caret. */
     hotkey?: string | string[];
     class?: string;
 };

package/dist/utils/hotkeys.d.ts

@@ -31,13 +31,18 @@ export declare function parseKeybinding(binding: string): KeyBindingPress[];
 export declare function matchKeyBindingPress(event: KeyboardEvent, [mods, key]: KeyBindingPress): boolean;
 /** One listener that walks the whole map, tracking partial sequence matches. */
 export declare function createKeybindingsHandler(bindings: KeyBindingMap, options?: KeyBindingOptions): (event: Event) => void;
-/** Attach a binding map to a target; returns the unsubscriber. */
+/** Attach a binding map to a target; returns the unsubscriber. An empty map
+ *  attaches nothing — a consumer with no bindings costs zero per keystroke. */
 export declare function hotkeys(target: Window | HTMLElement, bindings: KeyBindingMap, options?: KeyBindingOptions): () => void;
 /** Svelte action form — `<svelte:window use:keys={{ '$mod+k': open }} />`. */
 export declare function keys(node: Window | HTMLElement, bindings: KeyBindingMap): {
     update(next: KeyBindingMap): void;
     destroy(): void;
 };
+/** Is the user currently typing somewhere? The standard guard for global
+ *  focus-stealing hotkeys — shared so every consumer agrees on what counts
+ *  as a text-entry context. */
+export declare function isTextEntryFocused(): boolean;
 /** Format one binding for display: `'$mod+k'` → `⌘K` on Apple, `Ctrl+K`
  *  elsewhere. Sequences join with spaces (`'g d'` → `G D`). */
 export declare function formatKeybinding(binding: string): string;

package/dist/utils/hotkeys.js

@@ -87,8 +87,11 @@ export function createKeybindingsHandler(bindings, options = {}) {
             timer = setTimeout(() => possible.clear(), timeout);
     };
 }
-/** Attach a binding map to a target; returns the unsubscriber. */
+/** Attach a binding map to a target; returns the unsubscriber. An empty map
+ *  attaches nothing — a consumer with no bindings costs zero per keystroke. */
 export function hotkeys(target, bindings, options = {}) {
+    if (Object.keys(bindings).length === 0)
+        return () => { };
     const handler = createKeybindingsHandler(bindings, options);
     const event = options.event ?? 'keydown';
     target.addEventListener(event, handler, { capture: options.capture });
@@ -107,6 +110,16 @@ export function keys(node, bindings) {
         }
     };
 }
+/** Is the user currently typing somewhere? The standard guard for global
+ *  focus-stealing hotkeys — shared so every consumer agrees on what counts
+ *  as a text-entry context. */
+export function isTextEntryFocused() {
+    if (typeof document === 'undefined')
+        return false;
+    const el = document.activeElement;
+    return (el instanceof HTMLElement &&
+        (el.tagName === 'INPUT' || el.tagName === 'TEXTAREA' || el.isContentEditable));
+}
 const APPLE_GLYPHS = {
     Meta: '⌘',
     Alt: '⌥',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@signal9/era-ui",
-	"version": "1.26.0",
+	"version": "1.26.1",
 	"scripts": {
 		"dev": "vite dev --host",
 		"build": "vite build && npm run prepack",