flexdesk 0.4.0 → 0.4.2

package/README.md

@@ -106,13 +106,15 @@ lives in `demo/`.
 
 ### Opt-in shell features
 
-Two features change what the user sees, so both are off until you ask:
+These change what the user sees, so all of them are off until you ask:
 
 ```js
 await createShell({
     // …everything above…
     snapPromotion: true,     // drag a floating window onto a tile: it snaps, and docks back in
     promoteInPlace: true,    // a window floated out of a tile stays inside that tile's pane
+    backToOpenList: true,    // Back in a record opened beside its list closes onto that list
+    floatActiveTab: true,    // floating a tile takes the tab on screen, not the whole pane
     chrome: {
         topNav: document.getElementById('nav'),
         zoom:   document.getElementById('status-bar'),   // content zoom, 50–200%
@@ -130,6 +132,25 @@ for a settings pane. An embedder that builds its own `WindowManager` instead of
 calling `createShell` mounts the same control with `mountZoomControl(el, { root,
 host })`.
 
+**`backToOpenList`** is for apps that open a record from a list in a new tab.
+Without it, Back in that record has no history to pop, so it walks the taxonomy
+up and rewrites the record into its parent, and the tile now shows the list
+twice. With it, Back closes the record tab and activates the list it came from:
+the nearest tab to the left, else to the right, that is not a record (no
+`props.id`) and belongs to the same top-nav section. Per-tab history still comes
+first, and a record with no such list beside it still walks up in place.
+
+**`floatActiveTab`** is for apps whose tabs are separate records rather than
+views of one pane. The float button, Alt+F and the tile menu take only the tab
+on screen and leave its siblings in the tile, so the window holds one tab and
+draws no strip. Without it the whole pane floats, strip and all.
+
+**Back in a floating window** always acts on that window, whichever option is
+set. The last click decides: inside a window, Backspace walks that window up;
+anywhere else, it walks the focused tile as before. With `backToOpenList`, a
+record in a window closes onto an open list of its section, first among the
+window's own tabs and then in any tile of its desktop.
+
 ## The host port
 
 FlexDesk never touches `pywebview`, `fetch`, `localStorage` or the filesystem. It

package/dist/wm.js

@@ -2902,7 +2902,7 @@ var TileRenderer = class {
                 <button class="twm-leaf__btn" data-action="split-v" title="Split vertically (Alt+V)">
                     <span class="material-symbols-outlined">splitscreen_add</span>
                 </button>
-                <button class="twm-leaf__btn" data-action="promote" title="Float this pane as a window (Alt+F)">
+                <button class="twm-leaf__btn" data-action="promote" title="Float this ${this.ctx.wm?.floatActiveTab ? "tab" : "pane"} as a window (Alt+F)">
                     <span class="material-symbols-outlined">web_asset</span>
                 </button>`}
             <button class="twm-leaf__btn" data-action="close" title="Close (Alt+W)">
@@ -3978,7 +3978,9 @@ var WindowManager = class _WindowManager {
     panelDefaults = null,
     snapPromotion = false,
     promoteInPlace = false,
-    tabLayout = null
+    tabLayout = null,
+    backToOpenList = false,
+    floatActiveTab = false
   }) {
     if (!taxonomy) throw new Error("WindowManager: a taxonomy is required");
     if (!content || typeof content.mount !== "function") {
@@ -3994,6 +3996,7 @@ var WindowManager = class _WindowManager {
     this.eventBus = eventBus || null;
     this.onChange = onChange || (() => {
     });
+    this.floatActiveTab = !!floatActiveTab;
     this._rootLeaf = () => {
       const kind = this.taxonomy.root;
       return {
@@ -4004,6 +4007,13 @@ var WindowManager = class _WindowManager {
     this.panelDefaults = panelDefaults || null;
     this.snapPromotion = !!snapPromotion;
     this.promoteInPlace = !!promoteInPlace;
+    this.backToOpenList = !!backToOpenList;
+    this._backWindowId = null;
+    const doc = rootEl?.ownerDocument || globalThis.document;
+    doc?.addEventListener?.("pointerdown", (e) => {
+      const el = e.target?.closest?.("[data-window-id]");
+      this._backWindowId = el && this._windowToLeaf.has(el.getAttribute("data-window-id")) ? el.getAttribute("data-window-id") : null;
+    }, true);
     this._snapCtl = null;
     this.desktops = new DesktopManager({
       seed: this._rootLeaf,
@@ -4148,6 +4158,7 @@ var WindowManager = class _WindowManager {
    *  methods (openFromContext / openInLeaf / navigateActiveTab) —
    *  they all record history by default. */
   navigateBack() {
+    if (this._navigateBackInWindow()) return;
     const tree = this._tree();
     const focusedId = tree.focusedLeafId;
     const primaryId = tree.primaryLeafId();
@@ -4186,6 +4197,7 @@ var WindowManager = class _WindowManager {
       this._notifyChange("navigate-back");
       return;
     }
+    if (this.backToOpenList && this._backToOpenList(id)) return;
     const leaf = tree.get(id);
     if (!leaf?.content) return;
     const { kind, props } = leaf.content;
@@ -4230,6 +4242,132 @@ var WindowManager = class _WindowManager {
   /** Navigate inside the current tab — preserves every other tab in
    *  the leaf. Used by Backspace + breadcrumb segments + anything
    *  else that should walk WITHIN the tile rather than reset it. */
+  /**
+   * C32. BACK FROM AN OPENED RECORD RETURNS TO THE LIST, IT DOES NOT MAKE ONE.
+   *
+   * The gesture this is for: a list tab, a record opened from it into a NEW
+   * tab, and Backspace in that record. With nothing left in the record tab's
+   * own history, step (3) of `navigateBack` walks the taxonomy up and REWRITES
+   * the record tab into its parent — so the tile ends up showing the list
+   * twice, once in the tab you started from and once in the tab you just left.
+   * The user's model is a browser's: you came from the list, the list is still
+   * open, so going back means closing this and being on the list again.
+   *
+   * So: when the active tab is an ENTITY — its props carry an `id`, the same
+   * test `swapToPage` uses for "the caller asked for a specific entity" — look
+   * for an open tab of the SAME section that is NOT one. That is the list or
+   * landing page the record belongs to. Close the record and activate it.
+   *
+   * NEAREST TO THE LEFT FIRST. New tabs are appended at the end, so the tab a
+   * record was opened from sits to its left; when several lists of the section
+   * are open, the nearest one on that side is the one it most plausibly came
+   * from. The right side is searched only after the left has nothing.
+   *
+   * DECLINES, and leaves step (3) to walk up in place, whenever there is no
+   * such tab: a record that is the tile's only tab, or one whose section has no
+   * list open. That keeps the one guarantee the whole rule exists for — Back
+   * never leaves two copies of a list — without ever closing a record into a
+   * tile that has nothing of its own to show.
+   *
+   * Matching is by SECTION (`topNavFor`) and not by kind, because the list a
+   * record was opened from is often not the record's taxonomy parent: a root
+   * landing page that renders the section, or a list that a flattened taxonomy
+   * files beside the record rather than above it.
+   *
+   * @returns {boolean} whether it closed a tab
+   */
+  _backToOpenList(leafId) {
+    const tree = this._tree();
+    const leaf = tree.get(leafId);
+    if (!leaf || leaf.kind !== "leaf") return false;
+    const tabs = Array.isArray(leaf.tabs) ? leaf.tabs : [];
+    if (tabs.length < 2) return false;
+    const activeIdx = Math.max(0, Math.min(tabs.length - 1, leaf.activeTabIdx || 0));
+    const active = tabs[activeIdx];
+    if (!_isEntityTab(active)) return false;
+    const section = this.taxonomy.topNavFor(active.kind);
+    if (!section) return false;
+    const isList = (t) => t && !_isEntityTab(t) && this.taxonomy.topNavFor(t.kind) === section;
+    let target = -1;
+    for (let i = activeIdx - 1; i >= 0 && target < 0; i--) if (isList(tabs[i])) target = i;
+    for (let i = activeIdx + 1; i < tabs.length && target < 0; i++) if (isList(tabs[i])) target = i;
+    if (target < 0) return false;
+    tree.removeLeafTab(leafId, activeIdx);
+    tree.setActiveLeafTab(leafId, target > activeIdx ? target - 1 : target);
+    tree.focus(leafId);
+    this.renderer.render();
+    this._persist();
+    this._notifyChange("navigate-back-close");
+    return true;
+  }
+  /**
+   * C34. Back while a floating window is the thing being read. Returns true
+   * when it handled the press, false to let the tile path run.
+   *
+   * Only the window's ACTIVE tab is considered, in this order:
+   *   (1) with `backToOpenList`, a record closes onto an open list of its
+   *       section: first among the window's own tabs, then any tile of the
+   *       window's desktop, primary tile first. Closing the last tab closes
+   *       the window, which discards it (a plain close never docks back).
+   *   (2) otherwise it walks up IN the window, exactly as a tile does.
+   * A window whose content has nowhere to go still counts as handled: the
+   * press was aimed at it, and moving the tile behind it would be the bug.
+   */
+  _navigateBackInWindow() {
+    const winId = this._backWindowId;
+    const rec = winId ? this._windowToLeaf.get(winId) : null;
+    if (!rec) {
+      this._backWindowId = null;
+      return false;
+    }
+    const tabs = Array.isArray(rec.tabs) && rec.tabs.length ? rec.tabs : [rec.original].filter(Boolean);
+    const activeIdx = Math.max(0, Math.min(tabs.length - 1, rec.activeTabIdx || 0));
+    const active = tabs[activeIdx];
+    if (!active) return true;
+    const section = this.backToOpenList && _isEntityTab(active) ? this.taxonomy.topNavFor(active.kind) : null;
+    const isList = (t) => !!t && !_isEntityTab(t) && this.taxonomy.topNavFor(t.kind) === section;
+    if (section) {
+      let own = -1;
+      for (let i = activeIdx - 1; i >= 0 && own < 0; i--) if (isList(tabs[i])) own = i;
+      for (let i = activeIdx + 1; i < tabs.length && own < 0; i++) if (isList(tabs[i])) own = i;
+      if (own >= 0 && Array.isArray(rec.tabs) && rec.tabs.length > 1) {
+        this._windowTabAction(winId, "close", { idx: activeIdx });
+        this.showWindowTab(winId, own > activeIdx ? own - 1 : own);
+        return true;
+      }
+      const desk = this.desktops.desktops[rec.desktopIdx] || this.desktops.active();
+      const tree = desk.tree;
+      const leaves = tree.leaves?.() || [];
+      const primaryId = tree.primaryLeafId();
+      const ordered = [...leaves.filter((l) => l.id === primaryId), ...leaves.filter((l) => l.id !== primaryId)];
+      for (const leaf of ordered) {
+        const ltabs = Array.isArray(leaf.tabs) ? leaf.tabs : [];
+        const cur = Math.max(0, Math.min(ltabs.length - 1, leaf.activeTabIdx || 0));
+        const hit = isList(ltabs[cur]) ? cur : ltabs.findIndex(isList);
+        if (hit < 0) continue;
+        this._backWindowId = null;
+        if (Array.isArray(rec.tabs) && rec.tabs.length > 1) this._windowTabAction(winId, "close", { idx: activeIdx });
+        else {
+          try {
+            rec.window.close({ force: true });
+          } catch {
+          }
+        }
+        if (this.desktops.active().tree === tree) {
+          tree.setActiveLeafTab(leaf.id, hit);
+          tree.focus(leaf.id);
+          this.renderer.render();
+        }
+        this._persist();
+        this._notifyChange("navigate-back-close");
+        return true;
+      }
+    }
+    const up = this.taxonomy.parentOf?.(active.kind, active.props || {});
+    const parentKind = up ? up.kind : this.taxonomy.parentKindFor(active.kind);
+    if (parentKind) this.openInWindow(winId, parentKind, up ? up.props || {} : {});
+    return true;
+  }
   navigateActiveTab(leafId, kind, props = {}) {
     const tree = this._tree();
     const leaf = tree.get(leafId);
@@ -4571,6 +4709,11 @@ var WindowManager = class _WindowManager {
     const tree = this._tree();
     const focused = tree.focused();
     if (!focused) return null;
+    const tabs = Array.isArray(focused.tabs) ? focused.tabs : [];
+    if (this.floatActiveTab && tabs.length > 1) {
+      const idx = Math.max(0, Math.min(tabs.length - 1, focused.activeTabIdx || 0));
+      return this.floatTabAsWindow(focused.id, idx);
+    }
     return this.floatPane(focused.id);
   }
   /** R8. Float a pane — every tab, with the strip — into a managed window.
@@ -6843,6 +6986,9 @@ function _swapSiblings(tree, aId, bId) {
   parent.sizes[j] = size;
   return true;
 }
+function _isEntityTab(tab) {
+  return !!tab && tab.props != null && tab.props.id != null && tab.props.id !== "";
+}
 
 // src/tiling/tile_tab_menu.js
 var PAGE_SIZE = 10;
@@ -7356,6 +7502,8 @@ async function createShell({
   panels = null,
   snapPromotion = false,
   promoteInPlace = false,
+  backToOpenList = false,
+  floatActiveTab = false,
   tabLayout = null,
   chrome = {},
   // An embedder that moved its sections out of the top bar — into an icon
@@ -7395,6 +7543,8 @@ async function createShell({
     panelDefaults: panels,
     snapPromotion,
     promoteInPlace,
+    backToOpenList,
+    floatActiveTab,
     tabLayout,
     // `ctx` is the delivery vehicle for leaf-mounted chrome: tile_renderer
     // spreads it into every content factory, which is how the breadcrumb
@@ -7722,7 +7872,7 @@ function _tileContextMenu(wm, leafId, x, y) {
     // direction is a dead control; in the mean direction it is a missing
     // feature, and this file has shipped one of each.
     {
-      label: "Float this pane as a window",
+      label: wm.floatActiveTab ? "Float this tab as a window" : "Float this pane as a window",
       icon: "web_asset",
       action: "promote",
       disabled: isPanel || !leaf.content || wm.renderer?.leafChrome?.(leafId)?.promote === false