dsh-m 0.9.57 → 0.9.58

package/CHANGELOG.md

@@ -8,6 +8,12 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 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 +432,12 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### 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

@@ -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}
@@ -2755,8 +2755,17 @@ function ZoneChips({ zone, counts, labels, active, onPick, trailing, wrapTitle }
       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);
@@ -2818,6 +2827,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,12 +2869,12 @@ 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 ? [

package/package.json

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