@mak-98/dirvi-app 0.11.0-beta.5 → 0.11.0-beta.7

package/dist/ui/view.js

@@ -1,17 +1,28 @@
+function foldId(parentPath, firstId) {
+    return `fold:${JSON.stringify([...parentPath, firstId])}`;
+}
 export const View = {
-    createRows(rootNode, navNodeApi, cursor, cursorApi) {
-        const rootCursor = [];
-        const rootRow = viewRowForEntry(rootNode, null, cursorApi.equal(cursor, rootCursor), navNodeApi);
+    createRows(rootNode, navNodeApi, cursor, cursorMethods, presentNode) {
+        const rootCursor = { path: [] };
+        const inlineFoldIds = new Set();
+        if (rootNode.children !== null) {
+            for (const position of navNodeApi.cursors(rootNode.children)) {
+                if (cursorMethods.isFoldCursor(position)) {
+                    inlineFoldIds.add(foldId(position.parentPath, position.firstId));
+                }
+            }
+        }
+        const rootRow = viewRowForEntry(rootNode, null, cursorMethods.equal(cursor, rootCursor), navNodeApi, presentNode, inlineFoldIds);
         if (rootNode.children === null) {
             return [rootRow];
         }
         return [
             rootRow,
-            ...viewRowsAtNode(rootNode.children, [], navNodeApi, cursor, cursorApi),
+            ...viewRowsAtNode(rootNode.children, [], navNodeApi, cursor, cursorMethods, presentNode, inlineFoldIds),
         ];
     },
-    create(rootNode, navNodeApi, cursor, cursorApi, viewportHeight, viewportStart) {
-        const rows = View.createRows(rootNode, navNodeApi, cursor, cursorApi);
+    create(rootNode, navNodeApi, cursor, cursorMethods, viewportHeight, viewportStart, presentNode) {
+        const rows = View.createRows(rootNode, navNodeApi, cursor, cursorMethods, presentNode);
         return {
             rows: rows.slice(viewportStart, viewportStart + viewportHeight),
         };
@@ -20,52 +31,98 @@ export const View = {
 /**
  * Converts one NavNode and its descendants into display ViewRows.
  *
- * `node` is the directory currently being visited.
- *
  * `parentPath` is the path of that directory. For example:
  *
  *   []              root directory
  *   ['src']         root/src
  *   ['src', 'lib']  root/src/lib
  */
-function viewRowsAtNode(node, parentPath, navNodeApi, cursor, cursorApi) {
+function viewRowsAtNode(node, parentPath, navNodeApi, cursor, cursorMethods, presentNode, inlineFoldIds) {
     const rows = [];
     for (const entry of node.entries) {
-        const entryCursor = [...parentPath, entry.id];
-        const isCursor = cursorApi.equal(cursor, entryCursor);
-        rows.push(viewRowForEntry(entry, parentPath, isCursor, navNodeApi));
+        if (navNodeApi.entryIsFold(entry)) {
+            const firstEntry = entry.folded[0];
+            // Match navigation's guard for empty or richer future fold contents.
+            if (firstEntry === undefined || navNodeApi.entryIsFold(firstEntry)) {
+                continue;
+            }
+            const id = foldId(parentPath, firstEntry.id);
+            // Unordered summaries belong to the parent, not separate rows.
+            if (!inlineFoldIds.has(id)) {
+                continue;
+            }
+            const entryCursor = {
+                parentPath: [...parentPath],
+                firstId: firstEntry.id,
+            };
+            // Reuse the first hidden entry's highlight until folds have a presenter.
+            const { highlight } = presentNode(firstEntry.id, navNodeApi.entryIsBranch(firstEntry));
+            rows.push({
+                id,
+                indent: parentPath.length + 1,
+                content: `… ${entry.folded.length} folded`,
+                cursor: cursorMethods.equal(cursor, entryCursor),
+                selected: false,
+                highlight,
+                type: 'fold',
+                foldedCount: entry.folded.length,
+            });
+            // Hidden descendants are never rendered separately.
+            continue;
+        }
+        const entryCursor = {
+            path: [...parentPath, entry.id],
+        };
+        const isCursor = cursorMethods.equal(cursor, entryCursor);
+        rows.push(viewRowForEntry(entry, parentPath, isCursor, navNodeApi, presentNode, inlineFoldIds));
         // Case where there's no branches
         if (!navNodeApi.entryIsBranch(entry) || entry.children === null) {
             continue;
         }
-        rows.push(...viewRowsAtNode(entry.children, [...parentPath, entry.id], navNodeApi, cursor, cursorApi));
+        rows.push(...viewRowsAtNode(entry.children, [...parentPath, entry.id], navNodeApi, cursor, cursorMethods, presentNode, inlineFoldIds));
     }
     return rows;
 }
-function viewRowForEntry(entry, parentPath, cursor, navNodeApi) {
+function viewRowForEntry(entry, parentPath, cursor, navNodeApi, presentNode, inlineFoldIds) {
     const id = entryId(parentPath ?? [], entry.id);
     const indent = parentPath ? parentPath.length + 1 : 0;
     const selected = false;
     if (navNodeApi.entryIsBranch(entry)) {
-        const foldedCount = entry.children === null || entry.children.folded === null
-            ? 0
-            : entry.children.folded.entries.length;
+        const { content, highlight } = presentNode(entry.id, true);
+        const entryPath = parentPath === null ? [] : [...parentPath, entry.id];
+        const foldedCount = entry.children?.entries.reduce((count, entry) => {
+            if (!navNodeApi.entryIsFold(entry)) {
+                return count;
+            }
+            const firstEntry = entry.folded[0];
+            if (firstEntry === undefined || navNodeApi.entryIsFold(firstEntry)) {
+                return count;
+            }
+            // Ordered folds already have their own rows.
+            if (inlineFoldIds.has(foldId(entryPath, firstEntry.id))) {
+                return count;
+            }
+            return count + entry.folded.length;
+        }, 0) ?? 0;
         return {
             id,
             indent,
             selected,
             cursor,
-            content: `${String(entry.id)}/`,
+            content: content,
+            highlight,
             type: 'branch',
             foldedCount,
         };
     }
+    const { content, highlight } = presentNode(entry.id, false);
     return {
         id,
         indent,
         selected,
         cursor,
-        content: String(entry.id),
+        content,
+        highlight,
         type: 'leaf',
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mak-98/dirvi-app",
-  "version": "0.11.0-beta.5",
+  "version": "0.11.0-beta.7",
   "description": "Shared React application logic for dirvi hosts.",
   "type": "module",
   "license": "GPL-3.0-or-later",
@@ -16,8 +16,8 @@
     "dist"
   ],
   "dependencies": {
-    "dirvi-apis": "0.11.0-beta.5",
-    "dirvi-lib": "0.11.0-beta.5",
+    "dirvi-apis": "0.11.0-beta.7",
+    "dirvi-lib": "0.11.0-beta.7",
     "zod": "^4.4.3"
   },
   "peerDependencies": {