dsh-m 0.9.57 → 0.9.59

package/CHANGELOG.md

@@ -8,6 +8,18 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 0.9.59 优化：分类行左缘内缩 8px + 全屏下空转 ⌃ 收起钮按行数派生隐藏
+
+- **分类行内缩（`f42e5be`）**：分类 chips 行与搜索框/卡片左缘齐平，小颗粒胶囊贴着大元素左缘视觉憋仄；分类行整体右移 8px 留出呼吸空间。仅作用分类行（ZoneChips），上方分区 chips 行不随动。`offsetLeft` 与 absolute 定位同以 `.dshm-chips` 的 padding 盒为原点 → `+N` 跟随、右侧筛选钉位、`offsetTop` 裁剪几何均不受影响。
+- **⌃ 空转修复（`7cbdf11`）**：全屏等宽容器下分类 chips 可能排进 ≤ maxRows（2）行，展开态 `⌃` 收起钮点击后布局零变化（`hiddenCount=0` 连 `+N` 都不会出现），成死按钮。新增展开态行数测量 `expRows`（复用 `chipRows` 纯函数，measure 展开态分支只写 `expRows` 不动 `geom`），`⌃` 仅当展开行数 > maxRows 时渲染；ResizeObserver 在展开态也挂载——全屏↔窗口切换的宽度变化正是重测触发源，全屏下 `⌃` 自动隐藏、退回窗口自动恢复，行数含 `⌃` 自身故显隐收敛不振荡。
+- **验证**：1224 项测试全绿；真实 DSH Web 实测窗口/全屏两态 `⌃` 显隐与收起行为、分类行 8px 内缩生效。
+
+### 0.9.58 优化：+N 动态紧跟末可见分类，并与其框高一致
+
+- **位置（`4ade54f`）**：在 0.9.57 的独立安全槽位中，根据末可见分类 chip 的实测右缘设置 `+N` 左缘 = 右缘 + 6px；槽位由 52px 扩为 60px，窄宽时仍不与分类或筛选重叠。精选区没有筛选时不额外预留筛选 gutter；展开态 `⌃` 仍位于列表尾部。
+- **框高（`aeed14c`）**：`+N` 直接采用末可见分类的实测 border-box 高度，并以 inline-flex 居中数字，不再依赖西文数字与中文标签各自的浏览器自动行高。只改 `+N`，不改变分区 chip 的尺寸。
+- **验证**：1224 项测试与 typecheck 全绿；用真实 DSH 目录数据在 880/700/520/420/320px 社区区测得两框同高 21px、顶边差 0、水平间距约 5–6px、相交面积 0；260px 精选区也无重叠，精选↔社区往返正常。
+
 ### 0.9.57 修复：精选切换后面板崩溃/无法重开 + 折叠筛选双框与 +N 重叠
 
 - **根因（0.9.56 真机复现）**：精选区的标签对象可能每次父级重渲染都重建；layout effect 依赖 `chips` 数组引用及自身更新的 `geom`，同步测量反复进入、最终触发 React `Maximum update depth exceeded`（#185）。React 清空面板树但留下 `#dshm-panel-root`，旧入口守卫只检查容器存在，导致点击入口永久无效。叠加折叠筛选定位壳和按钮的双边框、以及 +N 位置夹取/文档流试验在窄宽下压住相邻 chip。
@@ -426,6 +438,18 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### Improved in 0.9.59 — 8px category-row inset and a derived visibility for the no-op collapse toggle
+
+- **Category-row inset (`f42e5be`)**: the category chip row sat flush with the search box and card grid, and small pills hugging large elements felt cramped; the row now starts 8px further right for breathing room. Only the category row (ZoneChips) moves — the zone chip row above stays put. `offsetLeft` and absolute positioning share the `.dshm-chips` padding-box origin, so `+N` tracking, the pinned Filter trigger and `offsetTop`-based clip geometry are all unaffected.
+- **No-op `⌃` fix (`7cbdf11`)**: at fullscreen width all category chips can fit within maxRows (2) rows, where clicking the expanded-state `⌃` collapse toggle changed nothing visually (`hiddenCount=0`, not even a `+N` appears) — a dead button. Added an expanded-state row measurement `expRows` (reusing the pure `chipRows` helper; the expanded measure branch only writes `expRows`, never `geom`), and `⌃` renders only when expanded rows exceed maxRows. The ResizeObserver now also observes while expanded — the width change of fullscreen↔window switches is exactly the remeasure trigger — so `⌃` hides itself in fullscreen and returns back in the window; counting includes `⌃` itself, so visibility converges without oscillation.
+- **Verification**: 1224 tests pass; verified against real DSH Web for `⌃` visibility and collapse behavior in both window and fullscreen, and for the 8px category-row inset.
+
+### Improved in 0.9.58 — the +N toggle follows the last visible category at matching height
+
+- **Position (`4ade54f`)**: within the 0.9.57 reserved, overlap-free slot, position `+N` from the measured right edge of the last visible category chip plus 6px. The slot grows from 52px to 60px to preserve clearance at narrow widths. Curated rows without a Filter trigger still reserve no unnecessary Filter gutter; expanded `⌃` remains at list end.
+- **Equal height (`aeed14c`)**: use the last visible chip’s measured border-box height for `+N` and center its text with inline-flex, rather than letting Latin-only text and CJK category labels acquire different automatic line heights. Other chips keep their existing dimensions.
+- **Verification**: 1224 tests and typecheck pass. Against the real DSH catalog, community layouts at 880/700/520/420/320px showed equal 21px boxes, 0px top-edge delta, roughly 5–6px horizontal separation, and zero overlap; the 260px curated layout had zero overlap and curated↔community switching remained stable.
+
 ### Fixed in 0.9.57 — curated-zone update loop, dead panel entry, and collapsed filter/overflow overlaps
 
 - **Root cause (reproduced on 0.9.56)**: curated labels may get a fresh object on every parent render; the layout effect depended on the `chips` array identity and on its own `geom` update. Synchronous remeasurement repeatedly entered the same commit, eventually throwing React `Maximum update depth exceeded` (#185). React emptied the panel tree while leaving `#dshm-panel-root`; the old entry guard checked only for a container and silently blocked every later open. The pinned Filter wrapper also added a second border around its bordered button, while the clamped/inline `+N` iterations overlapped neighboring chips at narrow widths.

package/lib/client.js

@@ -1573,7 +1573,7 @@ var h = React.createElement;
 var { useState, useEffect, useLayoutEffect, useCallback, useMemo, useRef } = React;
 var PLUGIN_ID = "dsh-m";
 var API = "/dshm";
-var { DEFAULT_PAGE_SIZE: DEFAULT_PAGE_SIZE2, MARKET_PAGE_SIZES: MARKET_PAGE_SIZES2, pageItems: pageItems2, createZoneState: createZoneState2, normalizeMarketQuery: normalizeMarketQuery2, resetPageOnFilterChange: resetPageOnFilterChange2, normalizeMarketResponse: normalizeMarketResponse2, registryNotice: registryNotice2, zoneChips: zoneChips2, marketNotice: marketNotice2, searchSourceOf: searchSourceOf2, mergeLatestFields: mergeLatestFields2, countBeyondRows: countBeyondRows2, clipTopOf: clipTopOf2, visibleRowTop: visibleRowTop2, autoExpandDecision: autoExpandDecision2 } = (init_market_state(), __toCommonJS(market_state_exports));
+var { DEFAULT_PAGE_SIZE: DEFAULT_PAGE_SIZE2, MARKET_PAGE_SIZES: MARKET_PAGE_SIZES2, pageItems: pageItems2, createZoneState: createZoneState2, normalizeMarketQuery: normalizeMarketQuery2, resetPageOnFilterChange: resetPageOnFilterChange2, normalizeMarketResponse: normalizeMarketResponse2, registryNotice: registryNotice2, zoneChips: zoneChips2, marketNotice: marketNotice2, searchSourceOf: searchSourceOf2, mergeLatestFields: mergeLatestFields2, chipRows: chipRows2, countBeyondRows: countBeyondRows2, clipTopOf: clipTopOf2, visibleRowTop: visibleRowTop2, autoExpandDecision: autoExpandDecision2 } = (init_market_state(), __toCommonJS(market_state_exports));
 var { readMarketSnapshot: readMarketSnapshot2, writeMarketSnapshot: writeMarketSnapshot2, isDefaultFirstPageQuery: isDefaultFirstPageQuery2 } = (init_market_snapshot(), __toCommonJS(market_snapshot_exports));
 var { backdropCloseHandlers: backdropCloseHandlers2 } = (init_backdrop(), __toCommonJS(backdrop_exports));
 var { createMarkdown: createMarkdown2 } = (init_markdown(), __toCommonJS(markdown_exports));
@@ -2204,11 +2204,11 @@ var CSS = `
 .dshm-chips{display:flex;flex-wrap:wrap;gap:6px;position:relative}
 .dshm-chips-clip{overflow:hidden}
 .dshm-chips-gutter{padding-right:var(--dshm-clip-gutter,96px)}
-/* +N/\u7B5B\u9009\u5206\u522B\u5360\u53F3\u4FA7 52/96px\uFF0C\u4E0D\u80FD\u8BA9 gutter \u540C\u7279\u5F02\u6027\u89C4\u5219\u8986\u76D6\u603B\u9884\u7559\u5BBD\u5EA6\u3002 */
-.dshm-chips.dshm-chips-clip.dshm-chips-reserve{padding-right:52px}
-.dshm-chips.dshm-chips-clip.dshm-chips-gutter.dshm-chips-reserve{padding-right:calc(var(--dshm-clip-gutter,96px) + 52px)}
+/* +N/\u7B5B\u9009\u5206\u522B\u5360\u53F3\u4FA7 60/96px\uFF1B\u4FDD\u7559\u4F18\u5148\u7EA7\u9AD8\u4E8E\u5355\u72EC\u7684\u7B5B\u9009 gutter\u3002 */
+.dshm-chips.dshm-chips-clip.dshm-chips-reserve{padding-right:60px}
+.dshm-chips.dshm-chips-clip.dshm-chips-gutter.dshm-chips-reserve{padding-right:calc(var(--dshm-clip-gutter,96px) + 60px)}
 .dsvm-chipmore{position:absolute;right:8px}
-.dsvm-chipmore-plus{position:absolute;right:calc(var(--dshm-clip-gutter,96px) + 6px);z-index:1;background-color:var(--dsw-alias-bg-base,#fff);background-image:linear-gradient(var(--dsw-alias-bg-base,#fff),var(--dsw-alias-bg-base,#fff)),linear-gradient(var(--dsw-alias-bg-base,#fff),var(--dsw-alias-bg-base,#fff))}
+.dsvm-chipmore-plus{position:absolute;z-index:1;box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;background-color:var(--dsw-alias-bg-base,#fff);background-image:linear-gradient(var(--dsw-alias-bg-base,#fff),var(--dsw-alias-bg-base,#fff)),linear-gradient(var(--dsw-alias-bg-base,#fff),var(--dsw-alias-bg-base,#fff))}
 .dsvm-searchrow{display:flex;align-items:center;gap:8px}
 .dsvm-searchrow .dshm-search{flex:1;display:flex}
 .dshm-search{position:relative}
@@ -2230,6 +2230,10 @@ var CSS = `
 .dshm-chip:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(38,49,72,.06))}
 .dshm-chip.on{background:var(--dsw-specific-sidebar-nav-item-active,rgba(38,49,72,.08));border-color:transparent;color:var(--dsw-alias-label-primary,inherit);font-weight:500}
 .dsvm-chipswrap{position:sticky;top:-14px;z-index:5;background:var(--dsw-alias-bg-base,#fff);padding:8px 0;margin:-8px 0;border-bottom:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.14))}
+/* 0.9.59 \u5206\u7C7B\u884C\u5DE6\u7F18\u5185\u7F29 8px\uFF1A\u4E0E\u641C\u7D22\u6846/\u5361\u7247\u5DE6\u7F18\u9F50\u5E73\u65F6\u80F6\u56CA\u884C\u89C6\u89C9\u618B\u4EC4\uFF0C\u6574\u4F53\u53F3\u79FB\u7559\u51FA\u547C\u5438\u7A7A\u95F4\u3002
+   \u4EC5\u4F5C\u7528\u5206\u7C7B\u884C\uFF08ZoneChips\uFF09\uFF0C\u4E0A\u65B9\u5206\u533A chips \u884C\u4E0D\u968F\u52A8\uFF1BoffsetLeft \u4E0E absolute \u5B9A\u4F4D\u540C\u4EE5
+   .dshm-chips \u7684 padding \u76D2\u4E3A\u539F\u70B9 \u2192 +N \u8DDF\u968F\u3001\u53F3\u4FA7\u7B5B\u9009\u9489\u4F4D\u3001offsetTop \u88C1\u526A\u51E0\u4F55\u5747\u4E0D\u53D7\u5F71\u54CD\u3002 */
+.dsvm-chipswrap .dshm-chips{padding-left:8px}
 .dsvm-pagejump{display:inline-flex;align-items:center;gap:4px;margin-left:8px}
 .dsvm-pagejump-input{width:56px;height:24px;box-sizing:border-box;border:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.28));background:transparent;color:var(--dsw-alias-label-secondary,#4b5563);border-radius:999px;padding:0 10px;font:inherit;font-size:12px;outline:none;text-align:center;transition:border-color .15s,color .15s}
 .dsvm-pagejump-input:hover{color:var(--dsw-alias-label-primary,inherit)}
@@ -2732,6 +2736,7 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
   const chipsSignature = JSON.stringify(chips.map((c) => [c.id, c.labelKey ? lookup(c.labelKey) : c.label, c.count]));
   const [expanded, setExpanded] = useState(false);
   const [stuck, setStuck] = useState(false);
+  const [expRows, setExpRows] = useState(0);
   const [geom, setGeom] = useState(null);
   const [rowHeight, setRowHeight] = useState(0);
   const wrapRef = useRef(null);
@@ -2742,7 +2747,7 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
   const maxH = maxRows * (rowHeight || 22) + (maxRows - 1) * 6;
   const measure = useCallback(() => {
     const el = wrapRef.current;
-    if (!el || expanded) return;
+    if (!el) return;
     const tops = [];
     let rh = 0;
     for (const k of el.children) {
@@ -2751,12 +2756,26 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
       if (!rh && k.offsetHeight) rh = k.offsetHeight;
     }
     if (!tops.length) return;
+    if (expanded) {
+      const rows = chipRows2(tops);
+      setExpRows((prev) => prev === rows ? prev : rows);
+      return;
+    }
     setGeom((prev) => {
       const clipTopV = clipTopOf2(tops, maxRows);
       const hiddenCount2 = countBeyondRows2(tops, maxRows);
       const lastVisTop2 = visibleRowTop2(tops, maxRows);
-      const next = { tops, clipTop: clipTopV, hiddenCount: hiddenCount2, lastVisTop: lastVisTop2 };
-      const same = prev && prev.hiddenCount === next.hiddenCount && prev.clipTop === next.clipTop && prev.lastVisTop === next.lastVisTop && prev.tops.length === next.tops.length && prev.tops.every((t, i) => t === next.tops[i]);
+      let lastVisRight = 0;
+      let lastVisHeight = rh;
+      for (const k of el.children) {
+        if (!(k instanceof HTMLElement) || k.getAttribute("data-chip") !== "1") continue;
+        if (k.offsetTop < clipTopV) {
+          lastVisRight = k.offsetLeft + k.offsetWidth;
+          lastVisHeight = k.offsetHeight;
+        }
+      }
+      const next = { tops, clipTop: clipTopV, hiddenCount: hiddenCount2, lastVisTop: lastVisTop2, lastVisRight, lastVisHeight };
+      const same = prev && prev.hiddenCount === next.hiddenCount && prev.clipTop === next.clipTop && prev.lastVisTop === next.lastVisTop && prev.lastVisRight === next.lastVisRight && prev.lastVisHeight === next.lastVisHeight && prev.tops.length === next.tops.length && prev.tops.every((t, i) => t === next.tops[i]);
       return same ? prev : next;
     });
     setRowHeight((prev) => Math.abs(prev - rh) <= 0.5 ? prev : rh);
@@ -2775,7 +2794,7 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
     if (d.expand) setExpanded(true);
   }, [active, activeIdx, expanded, geom]);
   useLayoutEffect(() => {
-    if (!expanded) measure();
+    measure();
   }, [chipsSignature, active, expanded, zone, stuck, rowHeight, measure]);
   useEffect(() => {
     if (expanded || !geom || typeof requestAnimationFrame !== "function") return;
@@ -2784,7 +2803,7 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
   }, [geom, expanded, measure]);
   useEffect(() => {
     const el = wrapRef.current;
-    if (!el || expanded || typeof ResizeObserver === "undefined") return;
+    if (!el || typeof ResizeObserver === "undefined") return;
     let raf = 0;
     const ro = new ResizeObserver(() => {
       cancelAnimationFrame(raf);
@@ -2795,7 +2814,7 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
       ro.disconnect();
       cancelAnimationFrame(raf);
     };
-  }, [expanded, measure]);
+  }, [measure]);
   useEffect(() => {
     if (expanded || typeof document === "undefined" || !document.fonts?.ready) return;
     let cancelled = false;
@@ -2818,6 +2837,8 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
   const clipTop = geom ? geom.clipTop : Infinity;
   const hiddenCount = geom ? geom.hiddenCount : 0;
   const lastVisTop = geom ? geom.lastVisTop : 0;
+  const moreLeft = geom ? geom.lastVisRight + 6 : 0;
+  const moreHeight = geom ? geom.lastVisHeight : rowHeight || 22;
   const btn = (c, i) => {
     const top = geom ? geom.tops[i + 1] : null;
     const clipped = clip && geom && typeof top === "number" && top >= clipTop;
@@ -2858,16 +2879,18 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
         ...chips.map((c, i) => btn(c, i)),
         // 折叠态 +N（0.9.57 终版）：绝对定位钉在「末可见行右端预留槽」——出流不挤压 chip、不参与
         // 行分组（data-more）；预留槽由 .dshm-chips-clip 的 padding-right 划出，几何保证零重叠；
-        // 位置右对齐紧贴筛选 gutter 左侧，垂直对齐末可见行（top = lastVisTop，测量派生）。
+        // 左缘动态紧贴末可见 chip 右侧 6px，仍受右侧预留槽保护；垂直对齐末可见行。
         clip && geom && hiddenCount > 0 ? h("button", {
           key: "more",
           "data-more": "1",
           className: "dshm-chip dsvm-chipmore-plus",
-          style: { top: `${lastVisTop}px` },
+          style: { top: `${lastVisTop}px`, left: `${moreLeft}px`, height: `${moreHeight}px` },
           onClick: () => setExpanded(true)
         }, `+${hiddenCount}`) : null,
         expanded ? [
-          h("button", {
+          // 0.9.59：仅当展开布局真实超过 maxRows 行才渲染 ⌃——否则收起是零变化空操作（死按钮）。
+          // 行数含 ⌃ 自身：若它恰好独占一行，隐藏后行数回落仍 ≤ maxRows，显隐收敛不振荡。
+          expRows > maxRows ? h("button", {
             key: "collapse",
             "data-chip": "1",
             className: "dshm-chip",
@@ -2877,7 +2900,7 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
               if (active) autoRef.current = active;
               setExpanded(false);
             }
-          }, "\u2303"),
+          }, "\u2303") : null,
           trailing || null
         ] : null
       ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.9.57",
+  "version": "0.9.59",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",