When toggling from raw mode back to BlockNote, the editor now correctly re-parses content from tab.content instead of using stale cached blocks. Key changes: - useEditorTabSwap: detect rawMode true→false transition, invalidate block cache, and re-parse from tab.content. Added rawSwapPendingRef guard to prevent a second effect run from re-caching stale blocks before the deferred doSwap microtask runs. - useRawMode: added onBeforeRawEnd callback to flush debounced raw editor content synchronously before toggling off. - Editor.tsx: wired rawLatestContentRef and handleBeforeRawEnd to ensure the latest raw content reaches tab.content before the swap. - RawEditorView: exposed latestContentRef so parent can read the latest keystroke content without waiting for the 500ms debounce. - EditorContent: threaded rawLatestContentRef through to RawEditorView. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
273 lines
10 KiB
TypeScript
273 lines
10 KiB
TypeScript
import { useRef, useEffect, useCallback, memo } from 'react'
|
|
import { useEditorTabSwap, getH1TextFromBlocks } from '../hooks/useEditorTabSwap'
|
|
import { useHeadingTitleSync } from '../hooks/useHeadingTitleSync'
|
|
import { useCreateBlockNote } from '@blocknote/react'
|
|
import '@blocknote/mantine/style.css'
|
|
import { uploadImageFile } from '../hooks/useImageDrop'
|
|
import type { VaultEntry, GitCommit, NoteStatus } from '../types'
|
|
import type { NoteListItem } from '../utils/ai-context'
|
|
import type { FrontmatterValue } from './Inspector'
|
|
import { ResizeHandle } from './ResizeHandle'
|
|
import { TabBar } from './TabBar'
|
|
import { useDiffMode } from '../hooks/useDiffMode'
|
|
import { useRawMode } from '../hooks/useRawMode'
|
|
import { useEditorFocus } from '../hooks/useEditorFocus'
|
|
import { EditorRightPanel } from './EditorRightPanel'
|
|
import { EditorContent } from './EditorContent'
|
|
import { schema } from './editorSchema'
|
|
import './Editor.css'
|
|
import './EditorTheme.css'
|
|
|
|
interface Tab {
|
|
entry: VaultEntry
|
|
content: string
|
|
}
|
|
|
|
interface EditorProps {
|
|
tabs: Tab[]
|
|
activeTabPath: string | null
|
|
entries: VaultEntry[]
|
|
onSwitchTab: (path: string) => void
|
|
onCloseTab: (path: string) => void
|
|
onReorderTabs?: (fromIndex: number, toIndex: number) => void
|
|
onNavigateWikilink: (target: string) => void
|
|
onLoadDiff?: (path: string) => Promise<string>
|
|
onLoadDiffAtCommit?: (path: string, commitHash: string) => Promise<string>
|
|
getNoteStatus?: (path: string) => NoteStatus
|
|
onCreateNote?: () => void
|
|
inspectorCollapsed: boolean
|
|
onToggleInspector: () => void
|
|
inspectorWidth: number
|
|
onInspectorResize: (delta: number) => void
|
|
inspectorEntry: VaultEntry | null
|
|
inspectorContent: string | null
|
|
gitHistory: GitCommit[]
|
|
onUpdateFrontmatter?: (path: string, key: string, value: FrontmatterValue) => Promise<void>
|
|
onDeleteProperty?: (path: string, key: string) => Promise<void>
|
|
onAddProperty?: (path: string, key: string, value: FrontmatterValue) => Promise<void>
|
|
onCreateAndOpenNote?: (title: string) => Promise<boolean>
|
|
showAIChat?: boolean
|
|
onToggleAIChat?: () => void
|
|
vaultPath?: string
|
|
noteList?: NoteListItem[]
|
|
noteListFilter?: { type: string | null; query: string }
|
|
onTrashNote?: (path: string) => void
|
|
onRestoreNote?: (path: string) => void
|
|
onDeleteNote?: (path: string) => void
|
|
onArchiveNote?: (path: string) => void
|
|
onUnarchiveNote?: (path: string) => void
|
|
onRenameTab?: (path: string, newTitle: string) => void
|
|
onContentChange?: (path: string, content: string) => void
|
|
onSave?: () => void
|
|
/** Called when H1→title sync updates the title (debounced). */
|
|
onTitleSync?: (path: string, newTitle: string) => void
|
|
canGoBack?: boolean
|
|
canGoForward?: boolean
|
|
onGoBack?: () => void
|
|
onGoForward?: () => void
|
|
leftPanelsCollapsed?: boolean
|
|
isDarkTheme?: boolean
|
|
/** Mutable ref that Editor registers its raw-mode toggle into, for command palette access. */
|
|
rawToggleRef?: React.MutableRefObject<() => void>
|
|
/** Mutable ref that Editor registers its diff-mode toggle into, for command palette access. */
|
|
diffToggleRef?: React.MutableRefObject<() => void>
|
|
onFileCreated?: (relativePath: string) => void
|
|
onFileModified?: (relativePath: string) => void
|
|
onVaultChanged?: () => void
|
|
}
|
|
|
|
function useEditorModeExclusion({
|
|
diffMode, rawMode, handleToggleDiff, handleToggleRaw, rawToggleRef, diffToggleRef,
|
|
}: {
|
|
diffMode: boolean
|
|
rawMode: boolean
|
|
handleToggleDiff: () => void | Promise<void>
|
|
handleToggleRaw: () => void
|
|
rawToggleRef?: React.MutableRefObject<() => void>
|
|
diffToggleRef?: React.MutableRefObject<() => void>
|
|
}) {
|
|
const handleToggleDiffExclusive = useCallback(async () => {
|
|
if (!diffMode && rawMode) handleToggleRaw()
|
|
await handleToggleDiff()
|
|
}, [diffMode, rawMode, handleToggleDiff, handleToggleRaw])
|
|
|
|
const handleToggleRawExclusive = useCallback(() => {
|
|
if (!rawMode && diffMode) handleToggleDiff()
|
|
handleToggleRaw()
|
|
}, [rawMode, diffMode, handleToggleDiff, handleToggleRaw])
|
|
|
|
useEffect(() => {
|
|
if (rawToggleRef) rawToggleRef.current = handleToggleRawExclusive
|
|
}, [rawToggleRef, handleToggleRawExclusive])
|
|
|
|
useEffect(() => {
|
|
if (diffToggleRef) diffToggleRef.current = handleToggleDiffExclusive
|
|
}, [diffToggleRef, handleToggleDiffExclusive])
|
|
|
|
return { handleToggleDiffExclusive, handleToggleRawExclusive }
|
|
}
|
|
|
|
function EditorEmptyState() {
|
|
return (
|
|
<div className="flex flex-1 flex-col items-center justify-center gap-2 text-center text-muted-foreground">
|
|
<p className="m-0 text-[15px]">Select a note to start editing</p>
|
|
<span className="text-xs text-muted-foreground">Cmd+P to search · Cmd+N to create</span>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
export const Editor = memo(function Editor({
|
|
tabs, activeTabPath, entries, onSwitchTab, onCloseTab, onReorderTabs, onNavigateWikilink,
|
|
onLoadDiff, onLoadDiffAtCommit, getNoteStatus, onCreateNote,
|
|
inspectorCollapsed, onToggleInspector, inspectorWidth, onInspectorResize,
|
|
inspectorEntry, inspectorContent, gitHistory,
|
|
onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateAndOpenNote,
|
|
showAIChat, onToggleAIChat,
|
|
vaultPath, noteList, noteListFilter,
|
|
onTrashNote, onRestoreNote, onDeleteNote, onArchiveNote, onUnarchiveNote,
|
|
onRenameTab, onContentChange, onSave, onTitleSync,
|
|
canGoBack, canGoForward, onGoBack, onGoForward, leftPanelsCollapsed,
|
|
isDarkTheme,
|
|
rawToggleRef,
|
|
diffToggleRef,
|
|
onFileCreated,
|
|
onFileModified,
|
|
onVaultChanged,
|
|
}: EditorProps) {
|
|
const vaultPathRef = useRef(vaultPath)
|
|
useEffect(() => { vaultPathRef.current = vaultPath }, [vaultPath])
|
|
|
|
const editor = useCreateBlockNote({
|
|
schema,
|
|
uploadFile: (file: File) => uploadImageFile(file, vaultPathRef.current),
|
|
})
|
|
|
|
const activeTab = tabs.find((t) => t.entry.path === activeTabPath) ?? null
|
|
|
|
const { syncActiveRef, onH1Changed, onManualRename } = useHeadingTitleSync({
|
|
activeTabPath,
|
|
currentTitle: activeTab?.entry.title ?? null,
|
|
onTitleSync: onTitleSync ?? (() => {}),
|
|
})
|
|
|
|
// Ref updated by RawEditorView on every keystroke — used to flush
|
|
// debounced content synchronously before leaving raw mode.
|
|
const rawLatestContentRef = useRef<string | null>(null)
|
|
|
|
const handleBeforeRawEnd = useCallback(() => {
|
|
if (rawLatestContentRef.current != null && activeTabPath) {
|
|
onContentChange?.(activeTabPath, rawLatestContentRef.current)
|
|
}
|
|
rawLatestContentRef.current = null
|
|
}, [activeTabPath, onContentChange])
|
|
|
|
const { rawMode, handleToggleRaw } = useRawMode({
|
|
activeTabPath, onBeforeRawEnd: handleBeforeRawEnd,
|
|
})
|
|
|
|
const { handleEditorChange, editorMountedRef } = useEditorTabSwap({
|
|
tabs, activeTabPath, editor, onContentChange,
|
|
onH1Change: onH1Changed, syncActiveRef, rawMode,
|
|
})
|
|
useEditorFocus(editor, editorMountedRef)
|
|
|
|
const handleRenameTabWithSync = useCallback((path: string, newTitle: string) => {
|
|
const h1Text = getH1TextFromBlocks(editor.document)
|
|
onManualRename(newTitle, h1Text)
|
|
onRenameTab?.(path, newTitle)
|
|
}, [editor, onManualRename, onRenameTab])
|
|
|
|
const { diffMode, diffContent, diffLoading, handleToggleDiff, handleViewCommitDiff } = useDiffMode({
|
|
activeTabPath, onLoadDiff, onLoadDiffAtCommit,
|
|
})
|
|
|
|
const { handleToggleDiffExclusive, handleToggleRawExclusive } = useEditorModeExclusion({
|
|
diffMode, rawMode, handleToggleDiff, handleToggleRaw, rawToggleRef, diffToggleRef,
|
|
})
|
|
|
|
const isLoadingNewTab = activeTabPath !== null && !activeTab
|
|
const activeStatus = activeTab ? getNoteStatus?.(activeTab.entry.path) ?? 'clean' : 'clean'
|
|
const showDiffToggle = !!(activeTab && (diffMode || activeStatus === 'modified'))
|
|
|
|
return (
|
|
<div className="editor flex flex-col min-h-0 overflow-hidden bg-background text-foreground">
|
|
<TabBar
|
|
tabs={tabs}
|
|
activeTabPath={activeTabPath}
|
|
getNoteStatus={getNoteStatus}
|
|
onSwitchTab={onSwitchTab}
|
|
onCloseTab={onCloseTab}
|
|
onCreateNote={onCreateNote}
|
|
onReorderTabs={onReorderTabs}
|
|
onRenameTab={handleRenameTabWithSync}
|
|
canGoBack={canGoBack}
|
|
canGoForward={canGoForward}
|
|
onGoBack={onGoBack}
|
|
onGoForward={onGoForward}
|
|
leftPanelsCollapsed={leftPanelsCollapsed}
|
|
/>
|
|
<div className="flex flex-1 min-h-0">
|
|
{tabs.length === 0
|
|
? <EditorEmptyState />
|
|
: <EditorContent
|
|
activeTab={activeTab}
|
|
isLoadingNewTab={isLoadingNewTab}
|
|
entries={entries}
|
|
editor={editor}
|
|
diffMode={diffMode}
|
|
diffContent={diffContent}
|
|
diffLoading={diffLoading}
|
|
onToggleDiff={handleToggleDiffExclusive}
|
|
rawMode={rawMode}
|
|
onToggleRaw={handleToggleRawExclusive}
|
|
onRawContentChange={onContentChange}
|
|
onSave={onSave}
|
|
activeStatus={activeStatus}
|
|
showDiffToggle={showDiffToggle}
|
|
showAIChat={showAIChat}
|
|
onToggleAIChat={onToggleAIChat}
|
|
inspectorCollapsed={inspectorCollapsed}
|
|
onToggleInspector={onToggleInspector}
|
|
onNavigateWikilink={onNavigateWikilink}
|
|
onEditorChange={handleEditorChange}
|
|
onTrashNote={onTrashNote}
|
|
onRestoreNote={onRestoreNote}
|
|
onDeleteNote={onDeleteNote}
|
|
onArchiveNote={onArchiveNote}
|
|
onUnarchiveNote={onUnarchiveNote}
|
|
vaultPath={vaultPath}
|
|
isDarkTheme={isDarkTheme}
|
|
rawLatestContentRef={rawLatestContentRef}
|
|
/>
|
|
}
|
|
{(showAIChat || !inspectorCollapsed) && <ResizeHandle onResize={onInspectorResize} />}
|
|
<EditorRightPanel
|
|
showAIChat={showAIChat}
|
|
inspectorCollapsed={inspectorCollapsed}
|
|
inspectorWidth={inspectorWidth}
|
|
inspectorEntry={inspectorEntry}
|
|
inspectorContent={inspectorContent}
|
|
entries={entries}
|
|
gitHistory={gitHistory}
|
|
vaultPath={vaultPath ?? ''}
|
|
openTabs={tabs.map(t => t.entry)}
|
|
noteList={noteList}
|
|
noteListFilter={noteListFilter}
|
|
onToggleInspector={onToggleInspector}
|
|
onToggleAIChat={onToggleAIChat}
|
|
onNavigateWikilink={onNavigateWikilink}
|
|
onViewCommitDiff={handleViewCommitDiff}
|
|
onUpdateFrontmatter={onUpdateFrontmatter}
|
|
onDeleteProperty={onDeleteProperty}
|
|
onAddProperty={onAddProperty}
|
|
onCreateAndOpenNote={onCreateAndOpenNote}
|
|
onOpenNote={onNavigateWikilink}
|
|
onFileCreated={onFileCreated}
|
|
onFileModified={onFileModified}
|
|
onVaultChanged={onVaultChanged}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)
|
|
})
|