dsh-edit-turn 0.3.2 → 0.3.3

package/README.md

@@ -250,6 +250,12 @@ ln -s /path/to/dsh-install/node_modules ./node_modules
 
 ### 更新日志
 
+**0.3.3** —— 编辑器锚定到刚按下的铅笔，位置不再跑到屏幕另一端。
+
+- 回复的编辑按钮在 turn-tail 操作条里，而编辑器的锚点行可能是比屏幕还高的回答行；0.3.2 会把它钳到视口顶部，按钮可达但离点击处很远。现在把锚点记为按下的按钮本身：优先贴在按钮下方，放不下就贴在按钮上方，再按视口钳制。
+- 长草稿仍由编辑器自身滚动、footer sticky，保存/取消始终可见。
+- **测试**：`npm test` **213/213**、`npm run verify:contract` **96** 项、`npm run verify:client` **184** 项。
+
 **0.3.2** —— 修复编辑器在长回答或页面底部时位置错误、按钮点不到的问题。
 
 - **视口钳制**：编辑框优先放在行下方；放不下就翻到行上方；行比屏幕高、底部在视口外时钉在视口底部，不再跟着行跑到屏幕外。

package/lib/client.js

@@ -42,7 +42,7 @@ window.__ModuleLoader__.load({
     const RERUN_PREFIX = '/dsh-rerun-turn'
 
     /** Keep in sync with package.json and lib/index.js. */
-    const PLUGIN_VERSION = '0.3.2'
+    const PLUGIN_VERSION = '0.3.3'
 
     // --- copy -----------------------------------------------------------------
 
@@ -364,6 +364,7 @@ window.__ModuleLoader__.load({
         this.editorElement = null
         this.editorBox = null
         this.editorRow = null
+        this.editorAnchor = null
         this.editorFocus = false
         this.editorDraft = ''
         // The block list being edited: what the carrier will be rebuilt from.
@@ -563,6 +564,9 @@ window.__ModuleLoader__.load({
             }
           : target
         this.editor = normalized
+        this.editorAnchor = target.anchor !== undefined && target.anchor !== null && target.anchor.isConnected === true
+          ? target.anchor
+          : null
         this.editorBlocks = replyBlocks
         this.editorBlockIndex = chosen === undefined ? null : chosen.index
         this.editorBlockKind = chosen === undefined ? null : chosen.kind
@@ -644,6 +648,7 @@ window.__ModuleLoader__.load({
         this.editorElement = null
         this.editorBox = null
         this.editorRow = null
+        this.editorAnchor = null
         this.editorFocus = false
         this.editor = null
         this.editorDraft = ''
@@ -1197,9 +1202,9 @@ window.__ModuleLoader__.load({
      * at all and reads exactly like a dead pencil.
      */
     function wireAction(button) {
-      pressable(button, () => {
+      pressable(button, (event) => {
         const activate = button[ACTIVATE]
-        if (typeof activate === 'function') activate()
+        if (typeof activate === 'function') activate(event)
       })
     }
 
@@ -1815,7 +1820,14 @@ window.__ModuleLoader__.load({
       } else if (button.dataset !== undefined && button.dataset.dshetFallback !== undefined) {
         delete button.dataset.dshetFallback
       }
-      button[ACTIVATE] = () => controller.open(entry.target)
+      button[ACTIVATE] = (event) => controller.open({
+        ...entry.target,
+        // The editor belongs beside the pencil the user just pressed, not at the
+        // top of a row that may be taller than the screen.
+        anchor: event !== undefined && event !== null && event.currentTarget !== undefined
+          ? event.currentTarget
+          : button,
+      })
       liveHosts.add(host)
       if (button.getAttribute('aria-label') !== label) {
         button.setAttribute('aria-label', label)
@@ -1961,10 +1973,16 @@ window.__ModuleLoader__.load({
     // past the bottom edge where nothing could reach it. Flip above the row when
     // there is room, otherwise pin the box to the bottom of the viewport and let
     // its own scrollbar carry the content; the footer stays sticky either way.
-    function placeEditor(row, box) {
+    function placeEditor(row, box, anchor = null) {
       const layer = ensureEditorLayer()
       if (box.parentElement !== layer) layer.appendChild(box)
       const rect = row.getBoundingClientRect()
+      let anchorRect = null
+      if (anchor !== null && anchor !== undefined && anchor.isConnected === true && typeof anchor.getBoundingClientRect === 'function') {
+        const candidate = anchor.getBoundingClientRect()
+        if (candidate.width > 0 && candidate.height > 0) anchorRect = candidate
+      }
+      const vertical = anchorRect === null ? rect : anchorRect
       const viewport = viewportSize()
       const margin = 8
       const width = viewport.width > 0
@@ -1973,11 +1991,11 @@ window.__ModuleLoader__.load({
       box.style.width = `${Math.round(width)}px`
       const measured = box.getBoundingClientRect()
       const height = (measured && measured.height) || box.offsetHeight || 0
-      let top = rect.bottom + 6
+      let top = vertical.bottom + 6
       if (viewport.height > 0 && height > 0) {
         const maxTop = Math.max(margin, viewport.height - height - margin)
         if (top + height > viewport.height - margin) {
-          const above = rect.top - height - 6
+          const above = vertical.top - height - 6
           top = above >= margin ? above : maxTop
         }
         // A row taller than the screen has its bottom above the viewport after
@@ -2019,7 +2037,7 @@ window.__ModuleLoader__.load({
         pressed = true
         event.preventDefault()
         event.stopPropagation()
-        action()
+        action(event)
       }
       button.onclick = (event) => {
         event.preventDefault()
@@ -2028,7 +2046,7 @@ window.__ModuleLoader__.load({
           pressed = false
           return
         }
-        action()
+        action(event)
       }
     }
 
@@ -2270,7 +2288,7 @@ window.__ModuleLoader__.load({
         ? controller.editorBox
         : null
       if (existing && existing.dataset.dshetFor === marker) {
-        placeEditor(row, existing)
+        placeEditor(row, existing, controller.editorAnchor)
         return
       }
 
@@ -2337,13 +2355,13 @@ window.__ModuleLoader__.load({
         fitEditorHeight(area)
         const row = controller.editorRow
         const box = controller.editorBox
-        if (row !== null && box !== null && box.isConnected === true) placeEditor(row, box)
+        if (row !== null && box !== null && box.isConnected === true) placeEditor(row, box, controller.editorAnchor)
       })
       area.addEventListener('compositionend', () => {
         fitEditorHeight(area)
         const row = controller.editorRow
         const box = controller.editorBox
-        if (row !== null && box !== null && box.isConnected === true) placeEditor(row, box)
+        if (row !== null && box !== null && box.isConnected === true) placeEditor(row, box, controller.editorAnchor)
       })
       area.addEventListener('focus', () => {
         controller.editorFocus = true
@@ -2458,7 +2476,7 @@ window.__ModuleLoader__.load({
       controller.editorRow = row
       controller.editorElement = area
       fitEditorHeight(area)
-      placeEditor(row, box)
+      placeEditor(row, box, controller.editorAnchor)
       if (!view.confirming && !view.pending && (fresh || wasFocused)) {
         try {
           area.focus()
@@ -2932,6 +2950,7 @@ window.__ModuleLoader__.load({
         event.preventDefault()
         event.stopPropagation()
         controller.open({
+          anchor: event.currentTarget,
           seq: entry.seq,
           mode: 'reply',
           turn: entry.turn,
@@ -2985,7 +3004,7 @@ window.__ModuleLoader__.load({
         const keepPlaced = () => {
           const row = controller.editorRow
           const box = controller.editorBox
-          if (row !== null && box !== null && box.isConnected === true) placeEditor(row, box)
+          if (row !== null && box !== null && box.isConnected === true) placeEditor(row, box, controller.editorAnchor)
         }
         document.addEventListener('pointerdown', onPointerDown, true)
         // Scroll events do not bubble; capture reaches the inner scroller too.

package/lib/index.js

@@ -80,7 +80,7 @@ export const PLUGIN_ID = 'dsh-edit-turn'
 export const name = PLUGIN_ID
 
 /** Keep in sync with package.json and lib/client.js. */
-export const PLUGIN_VERSION = '0.3.2'
+export const PLUGIN_VERSION = '0.3.3'
 
 // A ring of the last few requests, answering "did the browser half even ask, and
 // what did it get?" without needing its console. Read-only diagnostics: the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-edit-turn",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Edit any message in DeepSeek Harness in place: a prompt is replaced where it stands; a model reply block (answer text or reasoning) is patched through a plugin record and a message projection, so the turn stays where it is, later turns are untouched and the log grows by one small record. Falls back to the replay splice on hosts without the projection API. The append-only session log is never rewritten.",
   "type": "module",
   "main": "lib/index.js",