Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: fix crash when resizing window due to a memory leak

Abdullah Atta47a396ffaf76
diff --git a/packages/editor/src/extensions/keep-in-view/keep-in-view.ts b/packages/editor/src/extensions/keep-in-view/keep-in-view.ts
index 7cff15375..ae50fe7cb 100644
--- a/packages/editor/src/extensions/keep-in-view/keep-in-view.ts
+++ b/packages/editor/src/extensions/keep-in-view/keep-in-view.ts
@@ -24,27 +24,40 @@ type KeepInViewOptions = {
scrollIntoViewOnWindowResize: boolean;
};
-let onWindowResize: ((this: Window, ev: UIEvent) => void) | undefined =
- undefined;
-export const KeepInView = Extension.create<KeepInViewOptions>({
+export const KeepInView = Extension.create<
+ KeepInViewOptions,
+ {
+ onWindowResize?: ((this: Window, ev: UIEvent) => void) | undefined;
+ }
+>({
name: "keepinview",
addOptions() {
return {
scrollIntoViewOnWindowResize: true
};
},
+
+ addStorage() {
+ return {
+ onWindowResize: undefined
+ };
+ },
+
onCreate() {
if (!this.options.scrollIntoViewOnWindowResize) return;
- onWindowResize = () => {
+ if (this.storage.onWindowResize) return;
+
+ this.storage.onWindowResize = () => {
keepLastLineInView(this.editor);
};
- window.addEventListener("resize", onWindowResize);
+ window.addEventListener("resize", this.storage.onWindowResize);
},
onDestroy() {
- if (!onWindowResize) return;
- window.removeEventListener("resize", onWindowResize);
- onWindowResize = undefined;
+ console.log("DESTROYING!");
+ if (!this.storage.onWindowResize) return;
+ window.removeEventListener("resize", this.storage.onWindowResize);
+ this.storage.onWindowResize = undefined;
},
onSelectionUpdate() {
inlineDebounce(