toolcraft-openapi 0.0.170 → 0.0.171

package/dist/composition.json

@@ -33,12 +33,12 @@
     },
     {
       "name": "toolcraft-openapi",
-      "version": "0.0.170",
+      "version": "0.0.171",
       "license": "MIT"
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.170",
+      "version": "0.0.171",
       "license": "MIT"
     },
     {

package/node_modules/toolcraft-design/dist/explorer/reducer.js

@@ -652,7 +652,7 @@ function detailContentLineCount(item) {
     return (item.renderedContent ?? "").split("\n").length;
 }
 function detailBodyHeight(state) {
-    if (state.layout === "too-narrow" || state.layout === "narrow-list-only") {
+    if (state.layout === "too-narrow" || (state.layout === "narrow-list-only" && state.focused !== "detail")) {
         return 0;
     }
     const rows = normalizeSize(state.size.rows);

package/node_modules/toolcraft-design/dist/explorer/render/detail.js

@@ -14,38 +14,33 @@ export function renderDetail(state, screen, layout) {
     const row = state.rows.find((r) => r.id === state.detail.rowId) ?? null;
     const pane = state.paneDefinitions[1];
     const title = pane?.titleForRow?.(row ?? undefined) ?? pane?.title ?? "Preview";
-    if (layout.mode === "narrow-vertical") {
-        drawPaneFrame(screen, rect, title, state.focused === "detail" ? styles.borderFocused : styles.border, { focused: state.focused === "detail", indicator: scrollIndicator(state) });
-        renderDetailBody(state, screen, paneBodyRect(rect), row);
-        return;
-    }
-    drawPaneFrame(screen, rect, title, state.focused === "detail" ? styles.borderFocused : styles.border, { focused: state.focused === "detail", indicator: scrollIndicator(state) });
-    renderDetailBody(state, screen, paneBodyRect(rect), row);
+    const { start, max } = renderDetailBody(state, screen, paneBodyRect(rect), row);
+    drawPaneFrame(screen, rect, title, state.focused === "detail" ? styles.borderFocused : styles.border, { focused: state.focused === "detail", indicator: scrollIndicator(state, start, max) });
 }
 function renderDetailBody(state, screen, rect, row) {
     const styles = getExplorerStyles();
     const items = state.detail.items;
     if (rect.width <= 0 || rect.height <= 0) {
-        return;
+        return { start: 0, max: 0 };
     }
     if (items === null) {
         writeLine(screen, rect, 0, row === null ? state.emptyHint : "Loading detail...", styles.muted);
-        return;
+        return { start: 0, max: 0 };
     }
     if (items.length === 0) {
         writeLine(screen, rect, 0, state.emptyHint, styles.muted);
-        return;
+        return { start: 0, max: 0 };
     }
     if (items.length === 1 && items[0]?.title === undefined) {
-        renderBlob(screen, rect, renderItemMarkdown(items[0], rect, row), state.detail.scroll);
-        return;
+        return renderBlob(screen, rect, renderItemMarkdown(items[0], rect, row), state.detail.scroll);
     }
-    renderListMode(state, screen, rect, items, row);
+    return renderListMode(state, screen, rect, items, row);
 }
 function renderListMode(state, screen, rect, items, row) {
     const styles = getExplorerStyles();
     let y = 0;
-    const start = clamp(state.detail.scroll, 0, Math.max(0, items.length - 1));
+    const max = Math.max(0, items.length - 1);
+    const start = clamp(state.detail.scroll, 0, max);
     for (let index = start; index < items.length && y < rect.height; index += 1) {
         const item = items[index];
         const cursor = index === state.detail.cursor;
@@ -70,6 +65,7 @@ function renderListMode(state, screen, rect, items, row) {
             y += 1;
         }
     }
+    return { start, max };
 }
 function renderBlob(screen, rect, text, scroll) {
     const allLines = [[]];
@@ -79,7 +75,8 @@ function renderBlob(screen, rect, text, scroll) {
         else
             allLines.at(-1).push(cell);
     }
-    const start = clamp(scroll, 0, Math.max(0, allLines.length - rect.height));
+    const max = Math.max(0, allLines.length - rect.height);
+    const start = clamp(scroll, 0, max);
     const lines = allLines.slice(start);
     for (let row = 0; row < rect.height; row += 1) {
         let x = rect.x;
@@ -90,6 +87,7 @@ function renderBlob(screen, rect, text, scroll) {
             x += cell.width;
         }
     }
+    return { start, max };
 }
 function renderItemMarkdown(item, rect, row) {
     const content = renderItem(item, rect, row);
@@ -131,12 +129,10 @@ function writeLine(screen, rect, row, text, style = {}) {
 function clamp(value, min, max) {
     return Math.min(max, Math.max(min, value));
 }
-function scrollIndicator(state) {
+function scrollIndicator(state, start, max) {
     if (state.detail.loading)
         return "⠋";
-    const content = state.detail.items?.[state.detail.cursor]?.renderedContent ?? "";
-    const total = Math.max(1, content.split("\n").length);
-    return `${Math.min(100, Math.round((state.detail.scroll / Math.max(1, total - 1)) * 100))}%`;
+    return `${max === 0 ? 0 : Math.round((start / max) * 100)}%`;
 }
 function contentHash(content) {
     let hash = 2166136261;

package/node_modules/toolcraft-schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-schema",
-  "version": "0.0.170",
+  "version": "0.0.171",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-openapi",
-  "version": "0.0.170",
+  "version": "0.0.171",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "toolcraft-openapi-generate": "dist/bin/generate.js"
   },
   "dependencies": {
-    "toolcraft": "0.0.170",
+    "toolcraft": "0.0.171",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",
     "sisteransi": "^1.0.5",
@@ -45,7 +45,7 @@
     "directory": "packages/toolcraft-openapi"
   },
   "optionalDependencies": {
-    "toolcraft-schema": "0.0.170",
+    "toolcraft-schema": "0.0.171",
     "toolcraft-design": "*",
     "@poe-code/frontmatter": "*"
   },