vintage-frames 0.19.0 → 0.19.1

package/dist/menu-press.js

@@ -1,7 +1,8 @@
 import { DocumentListenersController as e } from "./document-listeners.js";
 import "./motion.js";
+import { openPath as t } from "./menu-navigation.js";
 //#region src/menu-press.ts
-var t = class {
+var n = class {
 	#e;
 	#t;
 	#n;
@@ -9,89 +10,122 @@ var t = class {
 	#i;
 	#a;
 	#o;
+	#s;
+	#c;
+	#l;
 	constructor(t, n) {
-		this.target = n, this.#e = !1, this.#t = !1, this.#n = !1, this.#r = null, this.#i = 0, this.#a = null, this.onPointerDown = (e) => {
+		this.target = n, this.#e = !1, this.#t = !1, this.#n = !1, this.#r = null, this.#i = 0, this.#a = !1, this.#o = !1, this.#s = null, this.onPointerDown = (e) => {
 			if (e.button > 0 || !e.isPrimary) return;
-			let t = this.#p(e.clientX, e.clientY);
-			if (t) {
-				if (e.preventDefault(), this.#e = !0, this.#n = !1, this.#r = t.item ?? t.menu, this.#i = e.timeStamp, this.#t = !t.menu.open, this.#o.attach(), t.item) {
-					this.#f(t.item);
+			let t = this.#_(e.clientX, e.clientY);
+			if (!(!t || !t.title && !t.item)) {
+				if (e.preventDefault(), this.#e = !0, this.#n = !1, this.#r = t.item ?? t.menu, this.#i = e.timeStamp, this.#t = !t.menu.open, this.#l.attach(), t.item) {
+					this.#h(t);
 					return;
 				}
 				t.menu.focus(), this.#t && this.target.open(t.menu);
 			}
-		}, this.#s = (e) => {
-			if (!this.#e) return;
-			e.preventDefault();
-			let t = this.#p(e.clientX, e.clientY), n = t ? t.item ?? t.menu : null;
-			!this.#n && n !== this.#r && (this.#n = !0), t && !t.item && !t.menu.open && this.target.open(t.menu), this.#f(t?.item ?? null);
-		}, this.#c = (e) => {
+		}, this.#u = (e) => {
+			if (this.#o) return;
+			let t = this.#_(e.clientX, e.clientY);
+			if (this.#e) {
+				e.preventDefault();
+				let n = t ? t.item ?? (t.title ? t.menu : null) : null;
+				!this.#n && n !== this.#r && (this.#n = !0), t?.title && !t.menu.open && this.target.open(t.menu);
+			}
+			this.#h(t);
+		}, this.#d = (e) => {
 			if (!this.#e) return;
-			let t = this.#p(e.clientX, e.clientY), n = this.#t, r = !this.#n, i = e.timeStamp - this.#i < 200;
-			this.#u(), !(n && r && i) && this.#d(t?.item ?? null);
-		}, this.#l = () => {
-			this.#u(), this.#f(null);
-		}, t.addController(this), this.#o = new e(t, () => [
+			let t = this.#_(e.clientX, e.clientY), n = this.#t, r = !this.#n, i = e.timeStamp - this.#i < 200;
+			this.#p(), !(n && r && i) && this.#m(t && !t.title ? t : null);
+		}, this.#f = () => {
+			this.#p(), this.#h(null);
+		}, t.addController(this), this.#l = new e(t, () => [
 			[
 				document,
 				"pointermove",
-				this.#s,
+				this.#u,
 				!0
 			],
 			[
 				document,
 				"pointerup",
-				this.#c,
+				this.#d,
 				!0
 			],
 			[
 				document,
 				"pointercancel",
-				this.#l,
+				this.#f,
 				!0
 			]
 		]);
 	}
 	hostDisconnected() {
-		this.#u(), this.#f(null);
+		this.#p(), this.track(!1);
 	}
-	#s;
-	#c;
-	#l;
-	#u() {
-		this.#e && (this.#e = !1, this.#r = null, this.#o.detach());
+	track(e) {
+		if (this.#a = e, e) {
+			this.#l.attach();
+			return;
+		}
+		this.#o = !1, this.#s = null, this.#g(), this.#e || this.#l.detach();
 	}
-	#d(e) {
-		if (!e || e.disabled) {
-			this.#f(null), this.target.close();
+	#u;
+	#d;
+	#f;
+	#p() {
+		this.#e && (this.#e = !1, this.#r = null, this.#a || this.#l.detach());
+	}
+	#m(e) {
+		let t = e?.item;
+		if (!e || !t || t.disabled) {
+			this.target.close();
 			return;
 		}
-		this.#f(e), this.#a = null, e.activate();
+		if (this.#g(), t.submenu) {
+			e.menu.expand(t);
+			return;
+		}
+		this.#h(e), this.#o = !0, t.activate();
+	}
+	#h(e) {
+		let n = e && !e.title ? {
+			menu: e.menu,
+			row: e.item && !e.item.disabled ? e.item : null
+		} : null, r = this.#s;
+		if (r?.menu === n?.menu && r?.row === n?.row) return;
+		this.#s = n;
+		for (let e of this.target.menus()) if (e.open) for (let r of t(e)) r.pointerOver(r === n?.menu ? n.row : void 0);
+		if (this.#g(), !n) return;
+		let { menu: i, row: a } = n, o = i.expandedItem;
+		(a === null || a !== o) && (o ? this.#c = window.setTimeout(() => i.expand(a?.submenu ? a : null), 300) : a?.submenu && (this.#c = window.setTimeout(() => i.expand(a), 150)));
 	}
-	#f(e) {
-		let t = e && !e.disabled ? e : null;
-		t !== this.#a && (this.#a && (this.#a.active = !1), this.#a = t, t && (t.active = !0));
+	#g() {
+		this.#c !== void 0 && window.clearTimeout(this.#c), this.#c = void 0;
 	}
-	#p(e, t) {
-		let r = this.target.menus(), i = r.find((e) => e.open);
-		if (i) {
-			for (let r of i.allItems) if (n(r.getBoundingClientRect(), e, t)) return {
+	#_(e, n) {
+		let i = this.target.menus(), a = i.find((e) => e.open);
+		if (a) for (let i of t(a).reverse()) {
+			let t = i.panelRect;
+			if (!(!t || !r(t, e, n))) return {
 				menu: i,
-				item: r
+				title: !1,
+				item: i.allItems.find((t) => r(t.getBoundingClientRect(), e, n)) ?? null
 			};
 		}
-		for (let i of r) {
-			let r = i.labelRect;
-			if (r && n(r, e, t)) return {
-				menu: i,
+		for (let t of i) {
+			let i = t.labelRect;
+			if (i && r(i, e, n)) return {
+				menu: t,
+				title: !0,
 				item: null
 			};
 		}
 		return null;
 	}
 };
-function n(e, t, n) {
+function r(e, t, n) {
 	return t >= e.left && t < e.right && n >= e.top && n < e.bottom;
 }
 //#endregion
-export { t as MenuPressController };
+export { n as MenuPressController };

package/dist/motion.d.ts

@@ -19,6 +19,16 @@ export declare function prefersReducedMotion(): boolean;
  * drag-pick regardless of duration.
  */
 export declare const PRESS_HOLD_MS = 200;
+/**
+ * How long (ms) the pointer rests on a menu item before its submenu opens,
+ * and how long it may stray onto another row of the same menu before an open
+ * submenu closes. The second is the longer, so a diagonal slide from an item
+ * into its submenu can cross the rows between. Not gated on
+ * `prefers-reduced-motion`: they are the interaction, not decoration, the
+ * reasoning {@link MENU_SCROLL_INTERVAL_MS} gives. Provisional, tuned by hand.
+ */
+export declare const SUBMENU_OPEN_MS = 150;
+export declare const SUBMENU_CLOSE_MS = 300;
 /**
  * How long (ms) a press on a selected icon's name waits before it opens the
  * rename box — long enough that a double-click has already declared itself.

package/dist/shell/catalog.d.ts

@@ -17,8 +17,10 @@
  *   on the startup disk (the desktop without one) holding Apple Menu Items
  *   and Startup Items, listed after the volumes. What they hold is anyone's,
  *   and the shell reads it: the Apple menu, and what opens at startup.
- * - An alias stands for another item: its data names the original's id, and
- *   `resolve` finds the original wherever it moved, until it is removed.
+ * - An alias stands for another item: its data names the original's id and
+ *   kind, and `resolve` finds the original wherever it moved, until it is
+ *   removed. An alias of a container takes a drop for its original, and
+ *   keeps taking one, to say so, once the original is gone.
  * - A folder never goes into itself or a folder inside it. A parent with no
  *   record reads as the desktop.
  * - An item whose kind no application registers is left out of the listing
@@ -166,6 +168,26 @@ export declare function isInside(state: CatalogState, id: string, ancestor: stri
 export declare function enclosingFolders(state: CatalogState, id: string | null | undefined): string[];
 /** Whether `id` is the Trash or anything inside it. */
 export declare function isTrashed(state: CatalogState, id: string | null | undefined): boolean;
+/**
+ * Whether Make Alias takes item `id`: an application, a document, a folder
+ * or the startup disk, or an alias of one, outside the Trash. Never the
+ * Trash itself, and never an alias whose original is gone.
+ */
+export declare function canAlias(state: CatalogState, id: string | null | undefined): boolean;
+/** What a drop onto an item files into: a container's id, or the alias of a container whose original is gone. */
+export type DropTarget = {
+    folder: string;
+} | {
+    missing: Item;
+};
+/**
+ * What a drop onto item `id` files into. A container takes it itself, and
+ * an alias of one passes it to the original, so filing judges the original:
+ * a folder never goes into itself through an alias either. An alias of a
+ * container whose original is gone still takes the drop and files nothing:
+ * `missing`, the alias. Anything else takes none: null.
+ */
+export declare function dropTargetOf(state: CatalogState, id: string | null | undefined): DropTarget | null;
 /** Everything under a container, each container before what it holds; a loop is walked once. */
 export declare function descendantsOf(state: CatalogState, parent: string | null): Item[];
 /** The first free folder name in a container: "untitled folder", "untitled folder 2", … */
@@ -182,6 +204,22 @@ export declare function aliasName(state: CatalogState, parent: string | null, na
 export declare const appleMenuItemsOf: (state: CatalogState) => Item[];
 /** What Startup Items holds, by name: what opens at startup. None without the System Folder. */
 export declare const startupItemsOf: (state: CatalogState) => Item[];
+/** One entry of the Apple menu, and what it holds when it is a folder's. */
+export interface AppleMenuEntry {
+    /** The entry's own item: an alias stays the alias. */
+    item: Item;
+    /** What the folder holds, or the folder an alias stands for, by name. */
+    entries?: AppleMenuEntry[];
+}
+/**
+ * The Apple menu as a tree: what Apple Menu Items holds, by name, and for a
+ * folder in it, or an alias of one, what that folder holds, the same way,
+ * down to five levels below the menu. A folder already on the way down
+ * (Apple Menu Items starts it), an empty folder and a folder past the fifth
+ * level have no entries, so the tree never loops. None without the System
+ * Folder.
+ */
+export declare function appleMenuOf(state: CatalogState): AppleMenuEntry[];
 /** The catalog's operations, over its listing. */
 export interface Catalog {
     get(): CatalogState;