dsh-better-workspace 0.7.0 → 0.7.2

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.6.0",
+  "version": "0.7.2",
   "main": "./src/index.js",
   "description": "侧边栏工作区层级树:名称中的 / 即虚拟分组(web/前端 · web/后端),添加工作区的目录流附所属分组弹窗,重命名即时重排层级,可新建空分组。Hierarchy tree for the DSH sidebar workspace list.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "DSH web plugin: a hierarchical workspace tree for the sidebar. Workspace titles containing \"/\" group into virtual folders (web/前端 · web/后端); the add-workspace directory flow gains a parent-group popup; renames re-derive the tree; a new-folder button creates empty levels.",
   "type": "module",
   "repository": {
@@ -43,7 +43,8 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test tests/smoke.mjs"
+    "test": "node --test tests/smoke.mjs",
+    "version": "node -e \"const fs=require('fs');const m=JSON.parse(fs.readFileSync('dsh.plugin.json','utf8'));const v=JSON.parse(fs.readFileSync('package.json','utf8')).version;m.version=v;fs.writeFileSync('dsh.plugin.json',JSON.stringify(m,null,2)+'\\n')\" && git add dsh.plugin.json"
   },
   "keywords": [
     "dsh",

package/src/client.js

@@ -1157,6 +1157,12 @@ window.__ModuleLoader__.load({
       const [customize, setCustomize] = React.useState(null) // { kind, entryKey, name }
       const [errorText, setErrorText] = React.useState(null)
       const [drag, setDrag] = React.useState(null) // { kind: 'workspace'|'session', source, over } | null
+      // Workspace drags arm their state one frame LATE (see workspaceDragEvents):
+      // arming synchronously re-renders during the dragstart dispatch, the chain
+      // expansion inserts rows above the drag source, the cursor leaves the
+      // source element, and Chromium cancels the whole gesture. dragEnd clears
+      // the timer so a same-tick cancel never leaves a ghost drag behind.
+      const wsDragArmTimer = React.useRef(null)
       const normalizedQuery = query.trim().toLowerCase()
       const now = Date.now()
 
@@ -1306,6 +1312,9 @@ window.__ModuleLoader__.load({
       }
       const dragMatches = (kind) => drag !== null && drag.kind === kind
       const canDragWorkspace = typeof insertWorkspaceBefore === 'function'
+      // Session REORDER needs the host insertSessionBefore action; dragging a
+      // session onto a sub-group row (a pure rename) stays available without it.
+      const canReorderSessions = typeof insertSessionBefore === 'function'
 
       /* --------------------- workspace drag & drop -------------------- */
 
@@ -1332,9 +1341,20 @@ window.__ModuleLoader__.load({
           const segs = splitTitleSegs(workspace.title)
           const sourceLeaf = segs.length > 0 ? segs[segs.length - 1] : (workspace.leaf || String(workspace.workspaceId))
           const sourceFolder = segs.length > 1 ? segs.slice(0, -1).join('/') : ''
-          setDrag({ kind: 'workspace', source: { workspaceId: workspace.workspaceId, leaf: sourceLeaf, folderPath: sourceFolder }, over: null })
+          // Deferred by one frame on purpose (Chromium cancels a just-started
+          // drag whose source element is moved out from under the cursor; see
+          // wsDragArmTimer above). By the next frame the gesture has settled
+          // and the chain expansion is an ordinary mid-drag update.
+          if (wsDragArmTimer.current !== null) clearTimeout(wsDragArmTimer.current)
+          wsDragArmTimer.current = setTimeout(() => {
+            wsDragArmTimer.current = null
+            setDrag({ kind: 'workspace', source: { workspaceId: workspace.workspaceId, leaf: sourceLeaf, folderPath: sourceFolder }, over: null })
+          }, 0)
+        },
+        onDragEnd: () => {
+          if (wsDragArmTimer.current !== null) { clearTimeout(wsDragArmTimer.current); wsDragArmTimer.current = null }
+          setDrag(null)
         },
-        onDragEnd: () => setDrag(null),
         onDragOver: (event) => {
           if (!dragMatches('workspace')) return
           event.preventDefault()
@@ -1426,7 +1446,7 @@ window.__ModuleLoader__.load({
         },
         onDragEnd: () => setDrag(null),
         onDragOver: (event) => {
-          if (!dragMatches('session') || drag.source.workspaceId !== workspaceId) return
+          if (!dragMatches('session') || !canReorderSessions || drag.source.workspaceId !== workspaceId) return
           event.preventDefault()
           event.stopPropagation()
           try { event.dataTransfer.dropEffect = 'move' } catch { }
@@ -1436,7 +1456,7 @@ window.__ModuleLoader__.load({
             : (current ? { ...current, over: { kind: 'session', target: session.id, half } } : current))
         },
         onDrop: (event) => {
-          if (!dragMatches('session') || drag.source.workspaceId !== workspaceId) return
+          if (!dragMatches('session') || !canReorderSessions || drag.source.workspaceId !== workspaceId) return
           event.preventDefault()
           event.stopPropagation()
           const half = drag.over && drag.over.kind === 'session' && drag.over.target === session.id ? drag.over.half : rowHalf(event)
@@ -1463,6 +1483,7 @@ window.__ModuleLoader__.load({
       const commitSessionDrop = (workspaceId, targetSessionId, half) => {
         const source = drag.source
         setDrag(null)
+        if (!canReorderSessions) return
         if (source.sessionId === targetSessionId) return
         const workspace = (items || []).find(w => w.workspaceId === workspaceId)
         if (!workspace) return
@@ -2012,6 +2033,12 @@ window.__ModuleLoader__.load({
         insertWorkspaceBefore: typeof workspaces.insertBefore === 'function'
           ? (workspaceId, beforeWorkspaceId) => workspaces.insertBefore(workspaceId, beforeWorkspaceId)
           : undefined,
+        // Official contract exposes session reorder through the WORKSPACES
+        // service (see dsh ui-workspace client index.ts); feature-probed so
+        // older hosts degrade to "group-move only" instead of a TypeError.
+        insertSessionBefore: typeof workspaces.insertSessionBefore === 'function'
+          ? (workspaceId, sessionId, beforeSessionId) => workspaces.insertSessionBefore(workspaceId, sessionId, beforeSessionId)
+          : undefined,
         archiveSession: (sessionId) => uiWorkspace.archiveSession(sessionId),
         createWorkspace: (input) => workspaces.create(input),
         pickDirectory: () => uiWorkspace.pickDirectory(),