feat(editor-store): force-close inline edit sessions on deletion and …

…doc switch clearCanvasSelectionDraft (page/VC/document switches) and pruneCanvasSelectionDraft (node deletion, incl. swept descendants) now clear activeInlineEdit, funnelling every stale-session path through the same helpers the selection already uses. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
CoreBunch · DavidBabinec · Jun 11, 2026 · Jun 10, 2026 · Jun 10, 2026 · Jun 10, 2026
commit 6bfcbf6545a490067387ce4bfa34972b05e62ec3
diff --git a/src/__tests__/editor-store/inlineEditSlice.test.ts b/src/__tests__/editor-store/inlineEditSlice.test.ts
@@ -211,3 +211,42 @@ describe('cancelInlineEdit', () => {
     expect(nodeText(nodeId)).toBe('Hello')
   })
 })
+
+describe('force-close', () => {
+  it('clears the session when the edited node is deleted', () => {
+    const { nodeId } = setupSiteWithTextNode()
+    useEditorStore.getState().startInlineEdit(nodeId, 'bp')
+    useEditorStore.getState().deleteNode(nodeId)
+    expect(useEditorStore.getState().activeInlineEdit).toBeNull()
+  })
+
+  it('clears the session when the edited node is swept with a deleted ancestor', () => {
+    const store = useEditorStore.getState()
+    const site = store.createSite('Inline Edit Test Site')
+    const rootId = site.pages[0].rootNodeId
+    const containerId = useEditorStore.getState().insertNode('base.container', {}, rootId)
+    const textId = useEditorStore.getState().insertNode('base.text', { text: 'Hi' }, containerId)
+    useEditorStore.getState().startInlineEdit(textId, 'bp')
+    expect(useEditorStore.getState().activeInlineEdit).not.toBeNull()
+    useEditorStore.getState().deleteNode(containerId)
+    expect(useEditorStore.getState().activeInlineEdit).toBeNull()
+  })
+
+  it('clears the session on page switch', () => {
+    const { nodeId, pageId } = setupSiteWithTextNode()
+    // addPage activates the new page — hop back before starting the session.
+    const pageB = useEditorStore.getState().addPage('Second', 'second')
+    useEditorStore.getState().openPageInCanvas(pageId)
+    useEditorStore.getState().startInlineEdit(nodeId, 'bp')
+    expect(useEditorStore.getState().activeInlineEdit).not.toBeNull()
+    useEditorStore.getState().openPageInCanvas(pageB.id)
+    expect(useEditorStore.getState().activeInlineEdit).toBeNull()
+  })
+
+  it('clears the session on active-document switch', () => {
+    const { nodeId } = setupSiteWithTextNode()
+    useEditorStore.getState().startInlineEdit(nodeId, 'bp')
+    useEditorStore.getState().setActiveDocument({ kind: 'visualComponent', vcId: 'vc-x' })
+    expect(useEditorStore.getState().activeInlineEdit).toBeNull()
+  })
+})
diff --git a/src/admin/pages/site/store/slices/selectionSlice.ts b/src/admin/pages/site/store/slices/selectionSlice.ts
@@ -194,6 +194,10 @@ export function clearCanvasSelectionDraft(state: EditorStore): void {
   state.hoveredNodeId = null
   state.hoveredBreakpointId = null
   state.activeClassId = null
+  // A document/page switch invalidates any inline text-edit session — the
+  // node it points at is no longer on the canvas. Live keystrokes already
+  // committed; clearing here is the spec's "force-close without committing".
+  state.activeInlineEdit = null
 }
 
 /**
@@ -209,6 +213,12 @@ export function clearCanvasSelectionDraft(state: EditorStore): void {
  */
 export function pruneCanvasSelectionDraft(state: EditorStore): void {
   const tree = getActiveTree(state)
+  // Inline edit prunes by tree-membership too — the edited node may be a
+  // descendant swept away with a deleted subtree, and it may not be part of
+  // the selection at all, so this must run before the early return below.
+  if (state.activeInlineEdit && !tree?.nodes[state.activeInlineEdit.nodeId]) {
+    state.activeInlineEdit = null
+  }
   const surviving = tree
     ? state.selectedNodeIds.filter((id) => Boolean(tree.nodes[id]))
     : []