@weniatall/dsh-file-viewer 0.3.17 → 0.3.18

package/README.md

@@ -94,6 +94,8 @@ dsh plugin --profile web add <release-tgz-url>
 
 桌面端（Windows）抽屉会自动避让窗口右上角的原生标题栏按钮（最小化 / 最大化 / 关闭）：宿主在 `<html>` 上标记 `data-windows-titlebar` 并给出 `--dsh-windows-titlebar-height`，抽屉顶部从其下方开始，因此标题栏里的图标不会再压在窗口按钮下面；窗口进入全屏后该条带消失，抽屉相应贴到顶边。
 
+这条偏移带 `!important`：抽屉为退出宿主"居中卡片化"而声明的 `inset:0!important` 会展开出同样重要的 `top:0`，普通声明赢不过它——这正是该问题在 v0.3.6 之后复发的原因。现已由测试锁死层叠结果，规范见仓库根目录 `AGENTS.md` 的「桌面版兼容」一节。
+
 ## Git 面板
 
 左侧栏顶部有两个页签：**文件**（目录树）与 **Git**（源代码管理）。Git 页签按 VSCode 源代码管理面板的方式组织：仓库 → 分支 → 提交记录 → 该提交的改动文件。

package/lib/client.js

@@ -443,8 +443,22 @@ window.__ModuleLoader__.load({
          header controls could never be clicked. Start the drawer below the
          strip instead, which also leaves the strip free to drag the window.
          The host sets data-fullscreen while the window is fullscreen and the
-         strip is hidden, so the offset has to drop then. */
-      html[data-windows-titlebar]:not([data-fullscreen]) .fv-scrim{top:var(--dsh-windows-titlebar-height,40px)}
+         strip is hidden, so the offset has to drop then.
+
+         The declaration carries !important on purpose. It is not defensive
+         padding: the drawer's own opt-out above neutralises the host's
+         modal-card treatment with an important inset, and the longhand top that
+         shorthand expands to outranks any normal declaration — including this
+         one. Without !important the strip wins and the drawer slides back under
+         the caption buttons, which is exactly the regression this rule was
+         written for (fixed in 0.2.8, broken again once 0.3.6 added the
+         important inset, because the guard test only checked that the rule
+         exists rather than that it wins the cascade).
+
+         The role="dialog" qualifier keeps this at least as specific as the inset
+         rule it has to beat, so the outcome is decided by the important flag and
+         the attribute count rather than by sheet order. */
+      html[data-windows-titlebar]:not([data-fullscreen]) .fv-scrim[role="dialog"]{top:var(--dsh-windows-titlebar-height,40px)!important}
       @keyframes fv-fade{from{opacity:0}to{opacity:1}}
       @keyframes fv-slide{from{transform:translateX(100%)}to{transform:translateX(0)}}
       @media(prefers-reduced-motion:reduce){.fv-scrim,.fv-shell{animation:none}}
@@ -5656,18 +5670,16 @@ window.__ModuleLoader__.load({
           treeGeneration.current += 1;
           setNodes(new Map());
           if (rootChanged) {
-            // Tabs describe paths inside the root that opened them; carrying
-            // one across a root switch would point it at a different file with
-            // the same name, so the whole set is dropped with the old tree.
-            // (The open path already cleared them; this covers a root switched
-            // from the picker while the drawer stays open.)
-            tabsRef.current = null;
-            setTabs(null);
-            activeTabIdRef.current = "";
-            setActiveTabId("");
-            setTabMenu(null);
+            // Only the tree is rebuilt here. Tabs are deliberately NOT touched:
+            // this effect re-runs on the very commit that resolved `root`, i.e.
+            // *after* the roots effect above has already cleared the previous
+            // visit's tabs and opened the one the arrival path asked for.
+            // Clearing them here wiped that brand-new tab, so the first click on
+            // a file in a conversation (a path or a changes card) opened an empty
+            // pane and only the second click — now that `treeBuiltForRef` and
+            // `visitContextRef` both already name this root — loaded anything.
+            // A root switched from the picker resets tabs in `chooseRoot`.
             setExpanded(new Set());
-            setPane("tree");
           }
           const chain = revealChanged && reveal !== "" ? [...ancestorsOf(reveal), reveal] : [];
           if (chain.length > 0) {
@@ -5820,6 +5832,35 @@ window.__ModuleLoader__.load({
           }
         };
 
+        /**
+         * Switch the root from the header picker.
+         *
+         * A root switch is the one thing that invalidates every open tab: their
+         * ids and paths only mean something inside the root that opened them, so
+         * carrying them over would point at a different file with the same name.
+         * The reset lives here, on the reader's own action, rather than in the
+         * tree-building effect — that effect also re-runs on the commit that
+         * resolves `root` for an arrival, and clearing there wiped the tab the
+         * arrival had just opened (first click on a file did nothing, second one
+         * worked because the guards had caught up by then).
+         */
+        const chooseRoot = (next) => {
+          const resolved = typeof next === "string" ? next : "";
+          if (resolved === "" || resolved === root) return;
+          tabsRef.current = null;
+          setTabs(null);
+          activeTabIdRef.current = "";
+          setActiveTabId("");
+          setTabMenu(null);
+          setPane("tree");
+          setExpanded(new Set());
+          // The arrival context belongs to the root that is being left; naming it
+          // here keeps the next roots response from treating the switch as an
+          // arrival that has to be reset all over again.
+          visitContextRef.current = resolved;
+          setRoot(resolved);
+        };
+
         /** Patch one tab by id. Used by asynchronous reads that outlive a switch. */
         const patchTab = (id, mutator) => {
           const current = tabList();
@@ -6332,7 +6373,7 @@ window.__ModuleLoader__.load({
                   className: "fv-root-select",
                   value: root,
                   "aria-label": "工作区与安全路径",
-                  onChange: (event) => setRoot(event.target.value),
+                  onChange: (event) => chooseRoot(event.target.value),
                 }, ...renderRootOptions(roots))
                 : react.createElement("span", { className: "fv-crumbs" }, activeRoot ? activeRoot.label : ""),
               // The tree shows structure, so the header carries the selected

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weniatall/dsh-file-viewer",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "Workspace file viewer and Git panel for DeepSeek Harness: file tree, syntax-highlighted code, images, PDF, Excel and Word, plus local/remote branches, paged commit history, commit diffs, working-tree changes and changed-file navigation",
   "type": "module",
   "main": "lib/index.js",
@@ -70,6 +70,11 @@
   "engines": {
     "node": ">=20.3"
   },
+  "devDependencies": {
+    "jsdom": "29.1.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
+  },
   "scripts": {
     "test": "node --test test/*.test.mjs && node ../../scripts/check-host-settings.mjs plugins/dsh-file-viewer file-viewer"
   }