dsh-focus-overlay 0.7.0 → 0.7.2

package/README.en.md

@@ -117,7 +117,7 @@ In the sidebar "Settings → Plugins → Plugin configuration", expand the "Focu
 | Option | Description |
 | --- | --- |
 | Auto-enter focus mode when the AI finishes a reply | On a normal completion: auto-open at your question when closed, or a "New reply ready" toast when open (default off) |
-| Sync the current reading position when entering focus mode | Open at the message you're reading; off opens at the latest (default on) |
+| Sync the current reading position when entering focus mode | Open at the message you're reading; off opens at your most recent question (default on) |
 | Show right-side turn navbar | One navigation dot per user message (turn) — hover to preview, click to jump (default on) |
 | Text width | 480–1200px slider for the reading column (default 760px) |
 

package/README.md

@@ -115,7 +115,7 @@ dsh web
 | 选项 | 说明 |
 | --- | --- |
 | AI完成回复后，自动进入专注模式 | AI 正常完成回复后自动进入并定位到你的提问；已打开时弹「新回复已生成」（默认关） |
-| 进入专注模式时，同步当前阅读位置 | 进入时定位到你正在阅读的消息；关闭则定位到最新（默认开） |
+| 进入专注模式时，同步当前阅读位置 | 进入时定位到你正在阅读的消息；关闭则定位到你最近一次提问（默认开） |
 | 显示右侧轮次导航条 | 在右侧显示导航圆点，每个用户消息（一轮）对应一个，悬停预览、点击跳转（默认开） |
 | 文字区宽度 | 480–1200px 滑块，调整正文阅读列宽（默认 760px） |
 

package/lib/client.js

@@ -477,6 +477,7 @@ window.__ModuleLoader__.load({
 			const [activeKey, setActiveKey] = (0, react.useState)(navKeys.length ? navKeys[navKeys.length - 1] : null);
 			const [atBottom, setAtBottom] = (0, react.useState)(true);
 			const rafId = (0, react.useRef)(null);
+			const overlayRef = (0, react.useRef)(null);
 			const computeActive = () => {
 				if (!bodyEl) return null;
 				let cur = null;
@@ -537,6 +538,18 @@ window.__ModuleLoader__.load({
 				if (prefs.scroll === "preserve" && idx >= 0) {
 					scrollToKey("fm-" + idx, false);
 					setActiveKey("fm-" + idx);
+				} else if (prefs.scroll !== "preserve") {
+					const lastIdx = lastUserIndex(items);
+					if (lastIdx >= 0) {
+						scrollToKey("fm-" + lastIdx, false);
+						setActiveKey("fm-" + lastIdx);
+					} else if (bodyEl) {
+						bodyEl.scrollTo({
+							top: bodyEl.scrollHeight,
+							behavior: "auto"
+						});
+						setActiveKey(navKeys.length ? navKeys[navKeys.length - 1] : null);
+					}
 				} else if (bodyEl) {
 					bodyEl.scrollTo({
 						top: bodyEl.scrollHeight,
@@ -545,6 +558,18 @@ window.__ModuleLoader__.load({
 					setActiveKey(navKeys.length ? navKeys[navKeys.length - 1] : null);
 				}
 			}, []);
+			(0, react.useEffect)(() => {
+				overlayRef.current?.focus();
+				const onKey = (e) => {
+					if (e.key === "Escape") {
+						e.preventDefault();
+						e.stopPropagation();
+						focusStore.set(false);
+					}
+				};
+				window.addEventListener("keydown", onKey, true);
+				return () => window.removeEventListener("keydown", onKey, true);
+			}, []);
 			const loadImage = (0, react.useCallback)((attachment) => {
 				if (!conversation || !currentId) return Promise.reject(/* @__PURE__ */ new Error("dsh-focus-overlay: conversation service unavailable"));
 				return conversation.resolveImage(currentId, attachment);
@@ -725,11 +750,8 @@ window.__ModuleLoader__.load({
 			}) : null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "fm-overlay",
+				ref: overlayRef,
 				tabIndex: -1,
-				autoFocus: true,
-				onKeyDown: (e) => {
-					if (e && e.key === "Escape") focusStore.set(false);
-				},
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "fm-topbar",
@@ -1065,7 +1087,7 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 			"settings.navbar": "显示右侧轮次导航条",
 			"settings.navbar.hint": "在右侧显示导航圆点，每个用户消息（一轮）对应一个，悬停预览、点击跳转",
 			"settings.scrollPreserve": "进入专注模式时，同步当前阅读位置",
-			"settings.scrollPreserve.hint": "进入时定位到你正在阅读的消息；关闭则定位到最新",
+			"settings.scrollPreserve.hint": "进入时定位到你正在阅读的消息；关闭则定位到你最近一次提问",
 			"settings.autoFocus": "AI完成回复后，自动进入专注模式",
 			"settings.autoFocus.hint": "AI 正常完成回复后自动进入并定位到你的提问",
 			"settings.width": "文字区宽度",
@@ -1116,7 +1138,7 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 			"settings.navbar": "Show right-side turn navbar",
 			"settings.navbar.hint": "Show one navigation dot per user message (turn) — hover to preview, click to jump",
 			"settings.scrollPreserve": "Sync the current reading position when entering focus mode",
-			"settings.scrollPreserve.hint": "Open at the message you're reading; off opens at the latest",
+			"settings.scrollPreserve.hint": "Open at the message you're reading; off opens at your most recent question",
 			"settings.autoFocus": "Auto-enter focus mode when the AI finishes a reply",
 			"settings.autoFocus.hint": "Auto-open at your question after a normal reply",
 			"settings.width": "Text width",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-focus-overlay",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Focus Mode for the dsh web GUI: a full-screen reading overlay that hides chrome and folds the AI tool-call flow into summaries, reusing the official Markdown / image primitives.",
   "type": "module",
   "main": "lib/index.mjs",