gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't save appState in canvas - app state should be reset after each load

Browse Source
This commit is contained in:
zadam 2023-09-21 11:54:54 +02:00
parent a749e24147
commit a16555bbff
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/public/app/widgets/type_widgets/canvas.js
View File

@ -52,8 +52,8 @@ const TPL = `
* for sketching. Excalidraw has a vibrant and active community. * for sketching. Excalidraw has a vibrant and active community.
* *
* Functionality: * Functionality:
* We store the excalidraw assets (elements, appState, files) in the note. In addition to that, we * We store the excalidraw assets (elements and files) in the note. In addition to that, we
* export the SVG from the canvas on every update. The SVG is also saved in the note. It is used when * export the SVG from the canvas on every update and store it in the note's attachment. It is used when
* calling api/images and makes referencing very easy. * calling api/images and makes referencing very easy.
* *
* Paths not taken. * Paths not taken.
@ -173,6 +173,10 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
await sleep(200); await sleep(200);
} }
const appState = {
theme: this.themeStyle
};
/** /**
* new and empty note - make sure that canvas is empty. * new and empty note - make sure that canvas is empty.
* If we do not set it manually, we occasionally get some "bleeding" from another * If we do not set it manually, we occasionally get some "bleeding" from another
@ -182,9 +186,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
if (!blob.content?.trim()) { if (!blob.content?.trim()) {
const sceneData = { const sceneData = {
elements: [], elements: [],
appState: { appState,
theme: this.themeStyle
},
collaborators: [] collaborators: []
}; };
@ -201,19 +203,12 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
content = { content = {
elements: [], elements: [],
appState: {},
files: [], files: [],
}; };
} }
const {elements, appState, files} = content; const {elements, files} = content;
appState.theme = this.themeStyle;
/**
* use widths and offsets of current view, since stored appState has the state from
* previous edit. using the stored state would lead to pointer mismatch.
*/
const boundingClientRect = this.excalidrawWrapperRef.current.getBoundingClientRect(); const boundingClientRect = this.excalidrawWrapperRef.current.getBoundingClientRect();
appState.width = boundingClientRect.width; appState.width = boundingClientRect.width;
appState.height = boundingClientRect.height; appState.height = boundingClientRect.height;
@ -276,10 +271,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
*/ */
const files = this.excalidrawRef.current.getFiles(); const files = this.excalidrawRef.current.getFiles();
/** // parallel svg export to combat bitrot and enable rendering image for note inclusion, preview, and share
* parallel svg export to combat bitrot and enable rendering image for note inclusion,
* preview, and share.
*/
const svg = await window.ExcalidrawLib.exportToSvg({ const svg = await window.ExcalidrawLib.exportToSvg({
elements, elements,
appState, appState,
@ -300,7 +292,6 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
type: "excalidraw", type: "excalidraw",
version: 2, version: 2,
elements, elements,
appState,
files: activeFiles files: activeFiles
}; };