@dfosco/storyboard-react 3.11.0-beta.8 → 3.11.0-beta.9

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dfosco/storyboard-react",
-  "version": "3.11.0-beta.8",
+  "version": "3.11.0-beta.9",
   "type": "module",
   "dependencies": {
-    "@dfosco/storyboard-core": "3.11.0-beta.8",
-    "@dfosco/tiny-canvas": "3.11.0-beta.8",
+    "@dfosco/storyboard-core": "3.11.0-beta.9",
+    "@dfosco/tiny-canvas": "3.11.0-beta.9",
     "@neodrag/react": "^2.3.1",
     "glob": "^11.0.0",
     "jsonc-parser": "^3.3.1"

package/src/canvas/CanvasPage.jsx

@@ -321,8 +321,11 @@ export default function CanvasPage({ name }) {
   /**
    * Selection handler — shift+click toggles in/out of multi-select set,
    * plain click single-selects (clears others).
+   * Suppressed immediately after a multi-drag to prevent the post-drag
+   * click from collapsing the selection.
    */
   const handleWidgetSelect = useCallback((widgetId, shiftKey) => {
+    if (justDraggedRef.current) return
     if (shiftKey) {
       setSelectedWidgetIds(prev => {
         const next = new Set(prev)
@@ -338,62 +341,53 @@ export default function CanvasPage({ name }) {
     }
   }, [])
 
-  // --- Multi-select live drag preview via imperative DOM transforms ---
-  // On drag start, snapshot ALL articles' translate values (same coord space).
-  // On each tick, read dragged article's current translate, compute delta
-  // from its snapshot, apply same delta to all peers.
-  const draggedArticleRef = useRef(null)
-  const draggedStartTranslate = useRef({ x: 0, y: 0 })
-  const peerSnapshots = useRef(new Map())
-
-  function parseTranslate(article) {
-    const raw = article?.style.translate || '0px 0px'
-    const parts = raw.match(/-?[\d.]+/g) || [0, 0]
-    return { x: parseFloat(parts[0]) || 0, y: parseFloat(parts[1]) || 0 }
-  }
+  // --- Multi-select drag: peers animate to new positions on drag end ---
+  // During drag, only the dragged widget moves (via neodrag). On drag end,
+  // peer widget positions are updated via React state, and we add the
+  // tc-on-translation class so they animate smoothly to their new spots.
+  const peerArticlesRef = useRef(new Map())
+  // Flag to suppress the click-based selection reset that fires after a drag
+  const justDraggedRef = useRef(false)
 
-  const handleItemDragStart = useCallback((dragId) => {
+  const handleItemDragStart = useCallback((dragId, position) => {
     const ids = selectedIdsRef.current
-    peerSnapshots.current.clear()
-    draggedArticleRef.current = null
+    peerArticlesRef.current.clear()
     if (ids.size <= 1 || !ids.has(dragId)) return
 
-    // Snapshot dragged widget's article translate
-    const draggedEl = document.getElementById(dragId)
-    const draggedArticle = draggedEl?.closest('article')
-    if (!draggedArticle) return
-    draggedArticleRef.current = draggedArticle
-    draggedStartTranslate.current = parseTranslate(draggedArticle)
+    // Suppress selection changes for the duration of the drag
+    justDraggedRef.current = true
 
-    // Snapshot each peer's article translate
+    // Collect peer article elements for transition on drag end
     for (const id of ids) {
       if (id === dragId) continue
       const widgetEl = document.getElementById(id)
       const article = widgetEl?.closest('article')
       if (!article) continue
-      peerSnapshots.current.set(id, {
-        article,
-        ...parseTranslate(article),
-      })
+      peerArticlesRef.current.set(id, article)
     }
   }, [])
 
   const handleItemDrag = useCallback(() => {
-    if (!draggedArticleRef.current) return
-
-    // Read dragged article's CURRENT translate (set by neodrag)
-    const current = parseTranslate(draggedArticleRef.current)
-    const dx = current.x - draggedStartTranslate.current.x
-    const dy = current.y - draggedStartTranslate.current.y
+    // Peers stay put during drag — they animate on drag end
+  }, [])
 
-    for (const [, peer] of peerSnapshots.current) {
-      peer.article.style.translate = `${peer.x + dx}px ${peer.y + dy}px`
+  /** Add transition class to peer articles so they animate to new positions. */
+  const transitionPeers = useCallback(() => {
+    for (const [, article] of peerArticlesRef.current) {
+      article.classList.add('tc-on-translation')
     }
+    // Remove class after animation completes
+    const articles = [...peerArticlesRef.current.values()]
+    setTimeout(() => {
+      for (const article of articles) {
+        article.classList.remove('tc-on-translation')
+      }
+    }, 250 * 4)
+    peerArticlesRef.current.clear()
   }, [])
 
   const clearDragPreview = useCallback(() => {
-    peerSnapshots.current.clear()
-    draggedArticleRef.current = null
+    peerArticlesRef.current.clear()
   }, [])
 
   if (canvas !== trackedCanvas) {
@@ -515,40 +509,39 @@ export default function CanvasPage({ name }) {
   }, [name, debouncedSourceSave, undoRedo, snapEnabled, snapGridSize])
 
   const handleItemDragEnd = useCallback((dragId, position) => {
-    if (!dragId || !position) return
-    const rounded = { x: Math.max(0, roundPosition(position.x)), y: Math.max(0, roundPosition(position.y)) }
-
-    if (dragId.startsWith('jsx-')) {
-      undoRedo.snapshot(stateRef.current, 'move', dragId)
-      const sourceExport = dragId.replace(/^jsx-/, '')
-      setLocalSources((prev) => {
-        const current = Array.isArray(prev) ? prev : []
-        const next = current.some((s) => s?.export === sourceExport)
-          ? current.map((s) => (s?.export === sourceExport ? { ...s, position: rounded } : s))
-          : [...current, { export: sourceExport, position: rounded }]
-        queueWrite(() =>
-          updateCanvas(name, { sources: next }).catch((err) =>
-            console.error('[canvas] Failed to save source position:', err)
-          )
-        )
-        return next
-      })
+    if (!dragId || !position) {
+      clearDragPreview()
       return
     }
+    const rounded = { x: Math.max(0, roundPosition(position.x)), y: Math.max(0, roundPosition(position.y)) }
 
     const ids = selectedIdsRef.current
     // Multi-select move: apply same delta to all selected widgets
+    // Checked BEFORE the jsx- early return so mixed selections work
     if (ids.size > 1 && ids.has(dragId)) {
-      clearDragPreview()
+      transitionPeers()
+      // Suppress the click-based selection reset that fires after pointerup
+      justDraggedRef.current = true
+      requestAnimationFrame(() => { justDraggedRef.current = false })
       undoRedo.snapshot(stateRef.current, 'multi-move')
-      const currentWidgets = stateRef.current.widgets ?? []
-      const draggedWidget = currentWidgets.find(w => w.id === dragId)
-      if (!draggedWidget) return
-      const oldPos = draggedWidget.position || { x: 0, y: 0 }
+
+      // Compute delta from the dragged widget's old position
+      const isJsx = dragId.startsWith('jsx-')
+      let oldPos = { x: 0, y: 0 }
+      if (isJsx) {
+        const sourceExport = dragId.replace(/^jsx-/, '')
+        const source = (stateRef.current.sources ?? []).find(s => s?.export === sourceExport)
+        oldPos = source?.position || { x: 0, y: 0 }
+      } else {
+        const draggedWidget = (stateRef.current.widgets ?? []).find(w => w.id === dragId)
+        oldPos = draggedWidget?.position || { x: 0, y: 0 }
+      }
       const dx = rounded.x - oldPos.x
       const dy = rounded.y - oldPos.y
 
       debouncedSave.cancel()
+
+      // Update JSON widget positions
       setLocalWidgets((prev) => {
         if (!prev) return prev
         const next = prev.map((w) => {
@@ -571,6 +564,57 @@ export default function CanvasPage({ name }) {
         )
         return next
       })
+
+      // Update JSX source positions
+      setLocalSources((prev) => {
+        const current = Array.isArray(prev) ? prev : []
+        let changed = false
+        const next = current.map((s) => {
+          if (!s?.export) return s
+          const sid = `jsx-${s.export}`
+          if (sid === dragId) {
+            changed = true
+            return { ...s, position: rounded }
+          }
+          if (ids.has(sid)) {
+            changed = true
+            return {
+              ...s,
+              position: {
+                x: Math.max(0, roundPosition((s.position?.x ?? 0) + dx)),
+                y: Math.max(0, roundPosition((s.position?.y ?? 0) + dy)),
+              },
+            }
+          }
+          return s
+        })
+        if (changed) {
+          queueWrite(() =>
+            updateCanvas(name, { sources: next }).catch((err) =>
+              console.error('[canvas] Failed to save multi-move sources:', err)
+            )
+          )
+        }
+        return changed ? next : current
+      })
+      return
+    }
+
+    if (dragId.startsWith('jsx-')) {
+      undoRedo.snapshot(stateRef.current, 'move', dragId)
+      const sourceExport = dragId.replace(/^jsx-/, '')
+      setLocalSources((prev) => {
+        const current = Array.isArray(prev) ? prev : []
+        const next = current.some((s) => s?.export === sourceExport)
+          ? current.map((s) => (s?.export === sourceExport ? { ...s, position: rounded } : s))
+          : [...current, { export: sourceExport, position: rounded }]
+        queueWrite(() =>
+          updateCanvas(name, { sources: next }).catch((err) =>
+            console.error('[canvas] Failed to save source position:', err)
+          )
+        )
+        return next
+      })
       return
     }
 
@@ -587,7 +631,7 @@ export default function CanvasPage({ name }) {
       )
       return next
     })
-  }, [name, undoRedo, debouncedSave, clearDragPreview])
+  }, [name, undoRedo, debouncedSave, transitionPeers, clearDragPreview])
 
   useEffect(() => {
     zoomRef.current = zoom

package/src/canvas/CanvasPage.multiselect.test.jsx

@@ -15,10 +15,14 @@ vi.mock('./useUndoRedo.js', () => ({
   default: () => MOCK_UNDO_REDO,
 }))
 
-// Expose onDragEnd so tests can trigger drags with specific IDs
+// Expose drag callbacks so tests can trigger drags with specific IDs
+let capturedOnDragStart = null
+let capturedOnDrag = null
 let capturedOnDragEnd = null
 vi.mock('@dfosco/tiny-canvas', () => ({
-  Canvas: ({ children, onDragEnd }) => {
+  Canvas: ({ children, onDragStart, onDrag, onDragEnd }) => {
+    capturedOnDragStart = onDragStart
+    capturedOnDrag = onDrag
     capturedOnDragEnd = onDragEnd
     return <div data-testid="tiny-canvas">{children}</div>
   },
@@ -109,6 +113,8 @@ describe('CanvasPage multi-select', () => {
     delete window.__storyboardCanvasBridgeState
     window.__SB_LOCAL_DEV__ = true
     vi.clearAllMocks()
+    capturedOnDragStart = null
+    capturedOnDrag = null
     capturedOnDragEnd = null
   })
 
@@ -257,4 +263,83 @@ describe('CanvasPage multi-select', () => {
       })
     )
   })
+
+  it('multi-select drag captures peer articles on drag start', async () => {
+    render(<CanvasPage name="test-canvas" />)
+
+    // Multi-select w1 and w2
+    fireEvent.click(screen.getByTestId('select-w1'))
+    fireEvent.click(screen.getByTestId('shift-select-w2'))
+    await act(async () => { await new Promise((r) => setTimeout(r, 0)) })
+
+    // All drag callbacks should be captured
+    expect(capturedOnDragStart).toBeTruthy()
+    expect(capturedOnDrag).toBeTruthy()
+
+    // Trigger drag start — should not throw
+    act(() => {
+      capturedOnDragStart('w1', { x: 100, y: 100 })
+    })
+
+    // Drag tick — peers stay put (no live preview), should not throw
+    act(() => {
+      capturedOnDrag('w1', { x: 150, y: 200 })
+    })
+  })
+
+  it('multi-select drag preserves selection after drag end', async () => {
+    render(<CanvasPage name="test-canvas" />)
+
+    // Multi-select w1 and w2
+    fireEvent.click(screen.getByTestId('select-w1'))
+    fireEvent.click(screen.getByTestId('shift-select-w2'))
+    await act(async () => { await new Promise((r) => setTimeout(r, 0)) })
+
+    expect(screen.getByTestId('chrome-w1').dataset.selected).toBeDefined()
+    expect(screen.getByTestId('chrome-w2').dataset.selected).toBeDefined()
+
+    // Simulate full drag: start → drag → end
+    act(() => {
+      capturedOnDragStart('w1', { x: 100, y: 100 })
+    })
+    act(() => {
+      capturedOnDragEnd('w1', { x: 150, y: 200 })
+    })
+    await act(async () => { await new Promise((r) => setTimeout(r, 0)) })
+
+    // Selection should still include both widgets (justDraggedRef prevents collapse)
+    expect(screen.getByTestId('chrome-w1').dataset.selected).toBeDefined()
+    expect(screen.getByTestId('chrome-w2').dataset.selected).toBeDefined()
+  })
+
+  it('any selected widget can serve as drag handler for the group', async () => {
+    render(<CanvasPage name="test-canvas" />)
+
+    // Multi-select w1 (100,100), w2 (300,100), w3 (500,200)
+    fireEvent.click(screen.getByTestId('select-w1'))
+    fireEvent.click(screen.getByTestId('shift-select-w2'))
+    fireEvent.click(screen.getByTestId('shift-select-w3'))
+    await act(async () => { await new Promise((r) => setTimeout(r, 0)) })
+
+    // Drag w2 (the middle one) to (350, 150) → delta (+50, +50)
+    act(() => {
+      capturedOnDragStart('w2', { x: 300, y: 100 })
+    })
+    act(() => {
+      capturedOnDragEnd('w2', { x: 350, y: 150 })
+    })
+    await act(async () => { await new Promise((r) => setTimeout(r, 0)) })
+
+    // All selected widgets should move by the same delta (+50, +50)
+    expect(updateCanvas).toHaveBeenCalledWith(
+      'test-canvas',
+      expect.objectContaining({
+        widgets: expect.arrayContaining([
+          expect.objectContaining({ id: 'w1', position: { x: 150, y: 150 } }),
+          expect.objectContaining({ id: 'w2', position: { x: 350, y: 150 } }),
+          expect.objectContaining({ id: 'w3', position: { x: 550, y: 250 } }),
+        ]),
+      })
+    )
+  })
 })