gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

make sure nothing breaks on fresh empty note or note that has already content

Browse Source
This commit is contained in:
Tom 2022-04-10 16:04:32 +02:00
parent 7f01032b6d
commit f1c9dda366
1 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/public/app/widgets/type_widgets/canvas_note.js
View File

@ -41,6 +41,9 @@ const TPL = `
* FIXME: FONTS from unpkg.com are loaded. Change font to HELVETICA? * FIXME: FONTS from unpkg.com are loaded. Change font to HELVETICA?
* See: https://www.npmjs.com/package/@excalidraw/excalidraw => FONT_FAMILY * See: https://www.npmjs.com/package/@excalidraw/excalidraw => FONT_FAMILY
*/ */
/**
* FIXME: somehow the files array keeps increasing. Somehow the files from one note are transferred to another?
*/
/** /**
* Discussion?: add complete @excalidraw/excalidraw, utils, react, react-dom as library? maybe also node_modules? * Discussion?: add complete @excalidraw/excalidraw, utils, react, react-dom as library? maybe also node_modules?
*/ */
@ -130,9 +133,9 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
// see if note changed, since we do not get a new class for a new note // see if note changed, since we do not get a new class for a new note
this.log("doRefresh note KKKK", this.currentNoteId, note.noteId); this.log("doRefresh note KKKK", this.currentNoteId, note.noteId);
const noteChanged = this.currentNoteId !== note.noteId; const noteChanged = this.currentNoteId !== note.noteId;
// reset scene to omit unnecessary onchange handler
if (noteChanged) { if (noteChanged) {
this.log("doRefresh resetCurrentSceneVersion = -1"); this.log("doRefresh resetCurrentSceneVersion = -1");
// reset scene to omit unnecessary onchange handler
this.currentSceneVersion = -1; this.currentSceneVersion = -1;
} }
this.currentNoteId = note.noteId; this.currentNoteId = note.noteId;
@ -149,53 +152,66 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
await sleep(200); await sleep(200);
} }
if (this.excalidrawRef.current && noteComplement.content) { /**
const content = JSON.parse(noteComplement.content || ""); * new and empty note
const {elements, appState, files} = content; */
if (this.excalidrawRef.current && noteComplement.content === "") {
}
/**
* load saved content into excalidraw canvas
*/
else if (this.excalidrawRef.current && noteComplement.content) {
try {
const content = JSON.parse(noteComplement.content || "");
const {elements, appState, files} = content;
/** /**
* use widths and offsets of current view, since stored appState has the state from * 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. * 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;
appState.offsetLeft = boundingClientRect.left; appState.offsetLeft = boundingClientRect.left;
appState.offsetTop = boundingClientRect.top; appState.offsetTop = boundingClientRect.top;
const sceneData = { const sceneData = {
elements, elements,
appState, appState,
// appState: {}, // appState: {},
collaborators: [] collaborators: []
}; };
// files are expected in an array when loading. they are stored as an key-index object // files are expected in an array when loading. they are stored as an key-index object
// see example for loading here: // see example for loading here:
// https://github.com/excalidraw/excalidraw/blob/c5a7723185f6ca05e0ceb0b0d45c4e3fbcb81b2a/src/packages/excalidraw/example/App.js#L68 // https://github.com/excalidraw/excalidraw/blob/c5a7723185f6ca05e0ceb0b0d45c4e3fbcb81b2a/src/packages/excalidraw/example/App.js#L68
const fileArray = []; const fileArray = [];
for (const fileId in files) { for (const fileId in files) {
const file = files[fileId]; const file = files[fileId];
// TODO: dataURL is replaceable with a trilium image url // TODO: dataURL is replaceable with a trilium image url
// maybe we can save normal images (pasted) with base64 data url, and trilium images // maybe we can save normal images (pasted) with base64 data url, and trilium images
// with their respective url! nice // with their respective url! nice
// file.dataURL = "http://localhost:8080/api/images/ltjOiU8nwoZx/start.png"; // file.dataURL = "http://localhost:8080/api/images/ltjOiU8nwoZx/start.png";
fileArray.push(file); fileArray.push(file);
} }
this.log("doRefresh(note) sceneData, files", sceneData, files, fileArray); this.log("doRefresh(note) sceneData, files", sceneData, files, fileArray);
this.sceneVersion = window.Excalidraw.getSceneVersion(elements); this.sceneVersion = window.Excalidraw.getSceneVersion(elements);
this.log("doRefresh sceneVersion", window.Excalidraw.getSceneVersion(elements)); this.log("doRefresh sceneVersion", window.Excalidraw.getSceneVersion(elements));
this.excalidrawRef.current.updateScene(sceneData); this.excalidrawRef.current.updateScene(sceneData);
this.excalidrawRef.current.addFiles(fileArray); this.excalidrawRef.current.addFiles(fileArray);
} catch(err) {
// set initial version console.error("Error (note, noteComplement, err)", note, noteComplement, err);
if (this.currentSceneVersion === -1) {
this.currentSceneVersion = this.getSceneVersion();
} }
} }
// set initial scene version
if (this.currentSceneVersion === -1) {
this.currentSceneVersion = this.getSceneVersion();
}
} }
/** /**
@ -218,7 +234,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
elements, elements,
appState, appState,
files, files,
time time,
}; };
this.log('getContent()', content); this.log('getContent()', content);
@ -247,15 +263,16 @@ export default class ExcalidrawTypeWidget extends TypeWidget {
// is desired to save? (add) // is desired to save? (add)
// upon updateScene, onchange is called, even though "nothing really changed" that is worth saving // upon updateScene, onchange is called, even though "nothing really changed" that is worth saving
const isInitialScene = this.currentSceneVersion === -1; const isNotInitialScene = this.currentSceneVersion !== -1;
const shouldSave = isNewSceneVersion && !isInitialScene; const shouldSave = isNewSceneVersion && isNotInitialScene;
if (shouldSave) { if (shouldSave) {
this.updateSceneVersion(); this.updateSceneVersion();
this.saveData(); this.saveData();
} else { } else {
// do nothing // do nothing
this.log("onChangeHandler() no update", isNewSceneVersion, isNotInitialScene);
} }
} }