flexdesk 0.4.0 → 0.4.1

package/README.md

@@ -106,13 +106,14 @@ 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
     chrome: {
         topNav: document.getElementById('nav'),
         zoom:   document.getElementById('status-bar'),   // content zoom, 50–200%
@@ -130,6 +131,14 @@ 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.
+
 ## The host port
 
 FlexDesk never touches `pywebview`, `fetch`, `localStorage` or the filesystem. It

package/dist/wm.js

@@ -3978,7 +3978,8 @@ var WindowManager = class _WindowManager {
     panelDefaults = null,
     snapPromotion = false,
     promoteInPlace = false,
-    tabLayout = null
+    tabLayout = null,
+    backToOpenList = false
   }) {
     if (!taxonomy) throw new Error("WindowManager: a taxonomy is required");
     if (!content || typeof content.mount !== "function") {
@@ -4004,6 +4005,7 @@ var WindowManager = class _WindowManager {
     this.panelDefaults = panelDefaults || null;
     this.snapPromotion = !!snapPromotion;
     this.promoteInPlace = !!promoteInPlace;
+    this.backToOpenList = !!backToOpenList;
     this._snapCtl = null;
     this.desktops = new DesktopManager({
       seed: this._rootLeaf,
@@ -4186,6 +4188,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 +4233,64 @@ 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;
+  }
   navigateActiveTab(leafId, kind, props = {}) {
     const tree = this._tree();
     const leaf = tree.get(leafId);
@@ -6843,6 +6904,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 +7420,7 @@ async function createShell({
   panels = null,
   snapPromotion = false,
   promoteInPlace = false,
+  backToOpenList = false,
   tabLayout = null,
   chrome = {},
   // An embedder that moved its sections out of the top bar — into an icon
@@ -7395,6 +7460,7 @@ async function createShell({
     panelDefaults: panels,
     snapPromotion,
     promoteInPlace,
+    backToOpenList,
     tabLayout,
     // `ctx` is the delivery vehicle for leaf-mounted chrome: tile_renderer
     // spreads it into every content factory, which is how the breadcrumb