fix #487

mProjectsCode · mProjectsCode · commit 47f146ca6f70 · 2024-12-22T23:15:16.000+01:00
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -34,34 +34,34 @@
 		"@tsconfig/svelte": "^5.0.4",
 		"@types/bun": "^1.1.14",
 		"builtin-modules": "^4.0.0",
-		"elysia": "^1.1.25",
-		"esbuild": "^0.24.0",
+		"elysia": "^1.1.26",
+		"esbuild": "^0.24.2",
 		"esbuild-plugin-copy-watch": "^2.3.1",
 		"esbuild-svelte": "^0.8.2",
-		"eslint": "^9.15.0",
+		"eslint": "^9.17.0",
 		"eslint-plugin-import": "^2.31.0",
 		"eslint-plugin-isaacscript": "^4.0.0",
 		"eslint-plugin-no-relative-import-paths": "^1.5.5",
 		"eslint-plugin-only-warn": "^1.1.0",
-		"eslint-plugin-svelte": "^2.46.0",
-		"prettier": "^3.4.0",
+		"eslint-plugin-svelte": "^2.46.1",
+		"prettier": "^3.4.2",
 		"prettier-plugin-svelte": "^3.3.2",
 		"string-argv": "^0.3.2",
-		"svelte-check": "^4.1.0",
+		"svelte-check": "^4.1.1",
 		"svelte-preprocess": "^6.0.3",
 		"tslib": "^2.8.1",
 		"typescript": "^5.7.2",
-		"typescript-eslint": "^8.16.0",
+		"typescript-eslint": "^8.18.1",
 		"yaml": "^2.6.1"
 	},
 	"dependencies": {
 		"@codemirror/legacy-modes": "^6.4.2",
 		"@lemons_dev/parsinom": "^0.0.12",
-		"itertools-ts": "^1.27.1",
-		"mathjs": "^14.0.0",
+		"itertools-ts": "^1.28.0",
+		"mathjs": "^14.0.1",
 		"moment": "^2.30.1",
-		"svelte": "^5.2.8",
-		"zod": "^3.23.8",
+		"svelte": "^5.15.0",
+		"zod": "^3.24.1",
 		"zod-validation-error": "^3.4.0"
 	},
 	"private": true,
diff --git a/packages/core/src/fields/button/ButtonField.ts b/packages/core/src/fields/button/ButtonField.ts
@@ -102,7 +102,7 @@ export class ButtonField extends Mountable {
 
 	protected onUnmount(): void {
 		if (this.buttonComponent) {
-			unmount(this.buttonComponent);
+			void unmount(this.buttonComponent);
 		}
 
 		if (!this.isInline && !this.isPreview) {
diff --git a/packages/core/src/fields/button/ButtonGroupField.ts b/packages/core/src/fields/button/ButtonGroupField.ts
@@ -71,7 +71,7 @@ export class ButtonGroupField extends Mountable {
 				buttonId,
 				(buttonConfig: ButtonConfig) => {
 					if (initialButton) {
-						unmount(initialButton);
+						void unmount(initialButton);
 					}
 					initialButton = undefined;
 					button = new ButtonField(
@@ -89,7 +89,7 @@ export class ButtonGroupField extends Mountable {
 
 			this.registerUnmountCb(() => {
 				if (initialButton) {
-					unmount(initialButton);
+					void unmount(initialButton);
 				}
 				initialButton = undefined;
 				button?.unmount();
diff --git a/packages/core/src/fields/inputFields/InputFieldSvelteWrapper.ts b/packages/core/src/fields/inputFields/InputFieldSvelteWrapper.ts
@@ -82,7 +82,7 @@ export class InputFieldSvelteWrapper<Value, SvelteExports = object> {
 	 */
 	public unmount(): void {
 		if (this.svelteComponentInstance) {
-			unmount(this.svelteComponentInstance);
+			void unmount(this.svelteComponentInstance);
 		}
 
 		this.mounted = false;
diff --git a/packages/core/src/fields/metaBindTable/TableMountable.ts b/packages/core/src/fields/metaBindTable/TableMountable.ts
@@ -209,7 +209,7 @@ export class TableMountable extends FieldMountable {
 
 		this.unregisterSelfFromMetadataManager();
 		if (this.tableComponent) {
-			unmount(this.tableComponent);
+			void unmount(this.tableComponent);
 		}
 
 		showUnloadedMessage(targetEl, 'table');
diff --git a/packages/core/src/fields/viewFields/fields/ImageVF.ts b/packages/core/src/fields/viewFields/fields/ImageVF.ts
@@ -83,7 +83,7 @@ export class ImageVF extends AbstractViewField<string> {
 	protected async onRerender(container: HTMLElement, value: string | undefined): Promise<void> {
 		const linkList = value ? MDLinkParser.parseLinkList(value) : [];
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 		this.component = mount(ImageGrid, {
 			target: container,
@@ -98,7 +98,7 @@ export class ImageVF extends AbstractViewField<string> {
 		super.onUnmount();
 
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 }
diff --git a/packages/core/src/fields/viewFields/fields/LinkVF.ts b/packages/core/src/fields/viewFields/fields/LinkVF.ts
@@ -158,7 +158,7 @@ export class LinkVF extends AbstractViewField<string> {
 		super.onUnmount();
 
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 }
diff --git a/packages/core/src/modals/modalContents/SvelteModalContent.ts b/packages/core/src/modals/modalContents/SvelteModalContent.ts
@@ -26,7 +26,7 @@ export class SvelteModalContent<T extends SvelteComponent> extends ModalContent
 
 	protected onUnmount(targetEl: HTMLElement): void {
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		DomHelpers.empty(targetEl);
diff --git a/packages/core/src/modals/modalContents/buttonBuilder/ButtonBuilderModal.ts b/packages/core/src/modals/modalContents/buttonBuilder/ButtonBuilderModal.ts
@@ -28,7 +28,7 @@ export class ButtonBuilderModal extends ModalContent {
 	protected onMount(targetEl: HTMLElement): void {
 		DomHelpers.empty(targetEl);
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		this.component = mount(ButtonBuilderModalComponent, {
@@ -44,7 +44,7 @@ export class ButtonBuilderModal extends ModalContent {
 	protected onUnmount(targetEl: HTMLElement): void {
 		DomHelpers.empty(targetEl);
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 
diff --git a/packages/core/src/utils/Mountable.ts b/packages/core/src/utils/Mountable.ts
@@ -49,7 +49,13 @@ export abstract class Mountable {
 	 */
 	public mount(targetEl: HTMLElement): void {
 		if (this.mounted || this.targetEl) {
-			throw new Error('Mountable is already mounted');
+			console.warn('Mountable is already mounted', this);
+			return;
+		}
+
+		if (targetEl === undefined) {
+			console.error('Mountable target element is undefined', this);
+			return;
 		}
 
 		this.mounted = true;
@@ -60,11 +66,11 @@ export abstract class Mountable {
 
 	/**
 	 * Unmount the mountable from the current element.
-	 * Will throw an error if the mountable is not mounted.
 	 */
 	public unmount(): void {
 		if (!this.mounted || !this.targetEl) {
-			throw new Error('Mountable is not mounted');
+			console.warn('Mountable is not mounted', this);
+			return;
 		}
 
 		this.mounted = false;
diff --git a/packages/core/src/utils/components/MountableComponent.svelte b/packages/core/src/utils/components/MountableComponent.svelte
@@ -1,21 +1,24 @@
 <script lang="ts">
 	import type { Mountable } from 'packages/core/src/utils/Mountable';
-	import { onDestroy, onMount } from 'svelte';
+	import { onDestroy } from 'svelte';
 
-	const {
+	let {
 		mountable,
 	}: {
 		mountable: Mountable;
 	} = $props();
 
 	let element: HTMLElement;
+	let current: Mountable | undefined;
 
-	onMount(() => {
-		mountable.mount(element);
+	$effect(() => {
+		current?.unmount();
+		current = mountable;
+		current.mount(element);
 	});
 
 	onDestroy(() => {
-		mountable.unmount();
+		current?.unmount();
 	});
 </script>
 
diff --git a/packages/obsidian/src/playground/PlaygroundView.ts b/packages/obsidian/src/playground/PlaygroundView.ts
@@ -37,7 +37,7 @@ export class PlaygroundView extends ItemView {
 
 	async onClose(): Promise<void> {
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 }
diff --git a/packages/obsidian/src/settings/buttonTemplateSetting/ButtonTemplatesSettingModal.ts b/packages/obsidian/src/settings/buttonTemplateSetting/ButtonTemplatesSettingModal.ts
@@ -20,7 +20,7 @@ export class ButtonTemplatesSettingModal extends Modal {
 	public onOpen(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		this.component = mount(ButtonTemplatesSettingComponent, {
@@ -35,7 +35,7 @@ export class ButtonTemplatesSettingModal extends Modal {
 	public onClose(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 
diff --git a/packages/obsidian/src/settings/excludedFoldersSetting/ExcludedFoldersSettingModal.ts b/packages/obsidian/src/settings/excludedFoldersSetting/ExcludedFoldersSettingModal.ts
@@ -18,7 +18,7 @@ export class ExcludedFoldersSettingModal extends Modal {
 	public onOpen(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		this.component = mount(ExcludedFoldersSettingComponent, {
@@ -34,7 +34,7 @@ export class ExcludedFoldersSettingModal extends Modal {
 	public onClose(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 
diff --git a/packages/obsidian/src/settings/inputFieldTemplateSetting/InputFieldTemplatesSettingModal.ts b/packages/obsidian/src/settings/inputFieldTemplateSetting/InputFieldTemplatesSettingModal.ts
@@ -19,7 +19,7 @@ export class InputFieldTemplatesSettingModal extends Modal {
 	public onOpen(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 
 		this.component = mount(InputFieldTemplatesSettingComponent, {
@@ -35,7 +35,7 @@ export class InputFieldTemplatesSettingModal extends Modal {
 	public onClose(): void {
 		this.contentEl.empty();
 		if (this.component) {
-			unmount(this.component);
+			void unmount(this.component);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ export class ButtonField extends Mountable {`
`102`	`102`
`103`	`103`	`protected onUnmount(): void {`
`104`	`104`	`if (this.buttonComponent) {`
`105`		`- unmount(this.buttonComponent);`
	`105`	`+ void unmount(this.buttonComponent);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`if (!this.isInline && !this.isPreview) {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export class InputFieldSvelteWrapper<Value, SvelteExports = object> {`
`82`	`82`	`*/`
`83`	`83`	`public unmount(): void {`
`84`	`84`	`if (this.svelteComponentInstance) {`
`85`		`- unmount(this.svelteComponentInstance);`
	`85`	`+ void unmount(this.svelteComponentInstance);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`this.mounted = false;`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ export class TableMountable extends FieldMountable {`
`209`	`209`
`210`	`210`	`this.unregisterSelfFromMetadataManager();`
`211`	`211`	`if (this.tableComponent) {`
`212`		`- unmount(this.tableComponent);`
	`212`	`+ void unmount(this.tableComponent);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`showUnloadedMessage(targetEl, 'table');`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export class ImageVF extends AbstractViewField<string> {`
`83`	`83`	`protected async onRerender(container: HTMLElement, value: string \| undefined): Promise<void> {`
`84`	`84`	`const linkList = value ? MDLinkParser.parseLinkList(value) : [];`
`85`	`85`	`if (this.component) {`
`86`		`- unmount(this.component);`
	`86`	`+ void unmount(this.component);`
`87`	`87`	`}`
`88`	`88`	`this.component = mount(ImageGrid, {`
`89`	`89`	`target: container,`
`@@ -98,7 +98,7 @@ export class ImageVF extends AbstractViewField<string> {`
`98`	`98`	`super.onUnmount();`
`99`	`99`
`100`	`100`	`if (this.component) {`
`101`		`- unmount(this.component);`
	`101`	`+ void unmount(this.component);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ export class LinkVF extends AbstractViewField<string> {`
`158`	`158`	`super.onUnmount();`
`159`	`159`
`160`	`160`	`if (this.component) {`
`161`		`- unmount(this.component);`
	`161`	`+ void unmount(this.component);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export class SvelteModalContent<T extends SvelteComponent> extends ModalContent`
`26`	`26`
`27`	`27`	`protected onUnmount(targetEl: HTMLElement): void {`
`28`	`28`	`if (this.component) {`
`29`		`- unmount(this.component);`
	`29`	`+ void unmount(this.component);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`DomHelpers.empty(targetEl);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export class ButtonBuilderModal extends ModalContent {`
`28`	`28`	`protected onMount(targetEl: HTMLElement): void {`
`29`	`29`	`DomHelpers.empty(targetEl);`
`30`	`30`	`if (this.component) {`
`31`		`- unmount(this.component);`
	`31`	`+ void unmount(this.component);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`this.component = mount(ButtonBuilderModalComponent, {`
`@@ -44,7 +44,7 @@ export class ButtonBuilderModal extends ModalContent {`
`44`	`44`	`protected onUnmount(targetEl: HTMLElement): void {`
`45`	`45`	`DomHelpers.empty(targetEl);`
`46`	`46`	`if (this.component) {`
`47`		`- unmount(this.component);`
	`47`	`+ void unmount(this.component);`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`