flexdesk 0.4.0 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flexdesk",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "A tiling window manager and widget set for desktop-class web applications. Zero runtime dependencies.",
     "license": "MIT",
     "repository": {

package/src/tiling/shell.js

@@ -86,6 +86,11 @@ import { openForm } from '../ui/components/modal.js';
  *                                      window onto a tile puts it back in the
  *                                      tree. Default off — it changes what a
  *                                      drag to an edge does.
+ * @param {boolean}    [cfg.backToOpenList] C32. Whether Backspace on a record
+ *                                      tab closes it and returns to a list of
+ *                                      its section that is already open, rather
+ *                                      than rewriting it into a second copy of
+ *                                      that list. Default off.
  * @param {'top'|'bottom'} [cfg.tabLayout] C22. Where a multi-tab leaf draws its
  *                                      tabs. `'bottom'` is the framework's own
  *                                      spreadsheet strip under the tile body
@@ -122,6 +127,7 @@ export 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
@@ -163,6 +169,7 @@ export 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

package/src/tiling/wm.js

@@ -34,7 +34,7 @@ const PANEL_TITLES = {
 export class WindowManager {
     constructor({ rootEl, api, ctx, onChange, eventBus, host, taxonomy, events, content,
                   panelDefaults = null, snapPromotion = false,
-                  promoteInPlace = false, tabLayout = null }) {
+                  promoteInPlace = false, tabLayout = null, backToOpenList = false }) {
         if (!taxonomy) throw new Error('WindowManager: a taxonomy is required');
         if (!content || typeof content.mount !== 'function') {
             throw new Error('WindowManager: a content registry is required '
@@ -83,6 +83,12 @@ export class WindowManager {
          *  changes where a promoted window can be dragged, and an existing
          *  embedder upgrading must not find its windows suddenly clipped. */
         this.promoteInPlace = !!promoteInPlace;
+        /** C32. Whether Backspace on an ENTITY tab closes it and returns to a list
+         *  that is already open, instead of turning the tab into a second copy of
+         *  that list. See `_backToOpenList`. Default off: it changes what the key
+         *  does, and an existing embedder upgrading must not find tabs closing
+         *  where they used to navigate. */
+        this.backToOpenList = !!backToOpenList;
         this._snapCtl = null;
         this.desktops = new DesktopManager({
             seed: this._rootLeaf, panelDefaults: this.panelDefaults });
@@ -285,7 +291,10 @@ export class WindowManager {
             this._notifyChange('navigate-back');
             return;
         }
-        // (2) Taxonomy fallback — the user's path is gone, so walk the
+        // (2) C32. An entity tab with nowhere left to go back to, beside a list
+        // of its own section that is already open: close it and land there.
+        if (this.backToOpenList && this._backToOpenList(id)) return;
+        // (3) Taxonomy fallback — the user's path is gone, so walk the
         // canonical parent instead. An ENTITY-level parent wins (the
         // instance one level up, e.g. the parent an id names); failing
         // that, the KIND-level parent (this page's section).
@@ -347,6 +356,68 @@ export 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);
+        // Removing the active tab shifts everything after it one to the left.
+        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);
@@ -3641,3 +3712,8 @@ function _swapSiblings(tree, aId, bId) {
     return true;
 }
 
+/** A tab showing ONE record rather than a list: its props name an `id`. The same
+ *  test `swapToPage` applies to "the caller asked for a specific entity". */
+function _isEntityTab(tab) {
+    return !!tab && tab.props != null && tab.props.id != null && tab.props.id !== '';
+}