gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 13:34:30 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fix(board): columns leaking between notes

Browse Source
This commit is contained in:
Elian Doran 2025-11-15 12:24:18 +02:00
parent df8da0fd4f
commit 5e35aa8079
No known key found for this signature in database
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/client/src/widgets/collections/NoteList.tsx
View File

@ -77,8 +77,8 @@ export function CustomNoteList<T extends object>({ note, isEnabled: shouldEnable
props = { props = {
note, noteIds, notePath, note, noteIds, notePath,
highlightedTokens, highlightedTokens,
viewConfig: viewModeConfig[0], viewConfig: viewModeConfig.config,
saveConfig: viewModeConfig[1], saveConfig: viewModeConfig.storeFn,
onReady: onReady ?? (() => {}), onReady: onReady ?? (() => {}),
...restProps ...restProps
} }
@ -192,7 +192,11 @@ export function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOpt
} }
export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) { export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) {
const [ viewConfig, setViewConfig ] = useState<[T | undefined, (data: T) => void]>(); const [ viewConfig, setViewConfig ] = useState<{
config: T | undefined;
storeFn: (data: T) => void;
note: FNote;
}>();
useEffect(() => { useEffect(() => {
if (!note || !viewType) return; if (!note || !viewType) return;
@ -200,12 +204,14 @@ export function useViewModeConfig<T extends object>(note: FNote | null | undefin
const viewStorage = new ViewModeStorage<T>(note, viewType); const viewStorage = new ViewModeStorage<T>(note, viewType);
viewStorage.restore().then(config => { viewStorage.restore().then(config => {
const storeFn = (config: T) => { const storeFn = (config: T) => {
setViewConfig([ config, storeFn ]); setViewConfig({ note, config, storeFn });
viewStorage.store(config); viewStorage.store(config);
}; };
setViewConfig([ config, storeFn ]); setViewConfig({ note, config, storeFn });
}); });
}, [ note, viewType ]); }, [ note, viewType ]);
// Only expose config for the current note, avoid leaking notes when switching between them.
if (viewConfig?.note !== note) return undefined;
return viewConfig; return viewConfig;
} }