Merge pull request #911 from trey-wallis/dev

8.15.10

manifest.json

@@ -9,5 +9,5 @@
 	"fundingUrl": {
 		"Buymeacoffee": "https://www.buymeacoffee.com/treywallis"
 	},
-	"version": "8.15.9"
+	"version": "8.15.10"
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dataloom",
-	"version": "8.15.9",
+	"version": "8.15.10",
 	"description": "Weave together data from diverse sources into different views. Inspired by Excel Spreadsheets and Notion.so.",
 	"main": "main.js",
 	"scripts": {

src/data/main-utils.ts

@@ -53,7 +53,7 @@ export const handleFileRename = async (
 			await file.vault.modify(loomFile, serializeState(updatedState));
 
 			EventManager.getInstance().emit(
-				"app-refresh",
+				"app-refresh-by-state",
 				loomFile.path,
 				-1, //update all looms that match this path
 				updatedState
@@ -62,8 +62,7 @@ export const handleFileRename = async (
 	}
 	if (totalLinksUpdated > 0) {
 		new Notice(
-			`Updated ${totalLinksUpdated} link${
-				totalLinksUpdated > 1 ? "s" : ""
+			`Updated ${totalLinksUpdated} link${totalLinksUpdated > 1 ? "s" : ""
 			} in ${numFilesUpdated} loom file${numFilesUpdated > 1 ? "s" : ""}.`
 		);
 	}

src/main.ts

@@ -298,6 +298,16 @@ export default class DataLoomPlugin extends Plugin {
 			)
 		);
 
+		this.registerEvent(
+			this.app.vault.on("modify", async (file: TAbstractFile) => {
+				if (file instanceof TFile) {
+					if (file.extension === LOOM_EXTENSION) {
+						EventManager.getInstance().emit("app-refresh-by-file", file, this.manifest.version);
+					}
+				}
+			})
+		);
+
 		this.registerSourceEvents();
 	}
 

src/obsidian/dataloom-view.tsx

@@ -114,7 +114,7 @@ export default class DataLoomView extends TextFileView {
 
 		//Trigger an event to refresh the other open views of this file
 		EventManager.getInstance().emit(
-			"app-refresh",
+			"app-refresh-by-state",
 			this.file.path,
 			appId,
 			state

src/obsidian/embedded/embedded-app-manager.tsx

@@ -213,7 +213,12 @@ const handleSave = async (
 	await app.vault.modify(file, serialized);
 
 	//Trigger an event to refresh the other open views of this file
-	EventManager.getInstance().emit("app-refresh", file.path, appId, state);
+	EventManager.getInstance().emit(
+		"app-refresh-by-state",
+		file.path,
+		appId,
+		state
+	);
 };
 
 /**

src/obsidian/modal/import-modal.tsx

@@ -59,7 +59,7 @@ export default class ImportModal extends Modal {
 
 		//Trigger an event to refresh the other open views of this file
 		EventManager.getInstance().emit(
-			"app-refresh",
+			"app-refresh-by-state",
 			this.loomFile.path,
 			"", //No app id. Target all views of this file
 			state

src/react/loom-app/app/hooks/use-source/index.ts

@@ -21,6 +21,7 @@ export const useSource = () => {
 		return JSON.stringify(columns.map((column) => column.frontmatterKey));
 	}, [columns]);
 
+	//TODO fix double update on file modify
 	const updateRowsFromSources = React.useCallback(
 		(fromObsidianEvent = true) => {
 			logger("updateRowsFromSources called");

src/react/loom-app/loom-state-provider/index.tsx

@@ -6,6 +6,8 @@ import { useLogger } from "src/shared/logger";
 import { sortRows } from "src/shared/loom-state/sort-rows";
 import { useAppMount } from "src/react/loom-app/app-mount-provider";
 import EventManager from "src/shared/event/event-manager";
+import { TFile } from "obsidian";
+import { deserializeState } from "src/data/serialize-state";
 
 interface Props {
 	initialState: LoomState;
@@ -75,6 +77,8 @@ export default function LoomStateProvider({
 	const logger = useLogger();
 	const { reactAppId, loomFile, app } = useAppMount();
 
+	const [error, setError] = React.useState<unknown>(null);
+
 	// React.useEffect(() => {
 	// 	const jsonSizeInBytes = new TextEncoder().encode(
 	// 		JSON.stringify(history)
@@ -114,11 +118,47 @@ export default function LoomStateProvider({
 			}
 		}
 
-		EventManager.getInstance().on("app-refresh", handleRefreshEvent);
+		EventManager.getInstance().on(
+			"app-refresh-by-state",
+			handleRefreshEvent
+		);
 		return () =>
-			EventManager.getInstance().off("app-refresh", handleRefreshEvent);
+			EventManager.getInstance().off(
+				"app-refresh-by-state",
+				handleRefreshEvent
+			);
 	}, [reactAppId, loomFile, app]);
 
+	React.useEffect(() => {
+		async function handleRefreshEvent(file: TFile, pluginVersion: string) {
+			if (file.path === loomFile.path) {
+				const fileData = await app.vault.read(loomFile);
+
+				try {
+					const state = deserializeState(fileData, pluginVersion);
+					setLoomState({
+						state,
+						shouldSaveToDisk: false,
+						shouldSaveFrontmatter: false,
+						time: Date.now(),
+					});
+				} catch (err) {
+					setError(err);
+				}
+			}
+		}
+
+		EventManager.getInstance().on(
+			"app-refresh-by-file",
+			handleRefreshEvent
+		);
+		return () =>
+			EventManager.getInstance().off(
+				"app-refresh-by-file",
+				handleRefreshEvent
+			);
+	}, [loomFile, app]);
+
 	function handleToggleSearchBar() {
 		setSearchBarVisible((prevState) => !prevState);
 	}
@@ -199,6 +239,10 @@ export default function LoomStateProvider({
 		[position, history, loomState]
 	);
 
+	if (error) {
+		throw error;
+	}
+
 	return (
 		<LoomStateContext.Provider
 			value={{

src/shared/event/types.ts

@@ -3,7 +3,8 @@ export type DataLoomEvent =
 	| "delete-column"
 	| "add-row"
 	| "delete-row"
-	| "app-refresh"
+	| "app-refresh-by-state"
+	| "app-refresh-by-file"
 	| "file-frontmatter-change"
 	| "file-delete"
 	| "folder-delete"

versions.json

@@ -158,5 +158,6 @@
 	"8.15.6": "1.4.0",
 	"8.15.7": "1.4.0",
 	"8.15.8": "1.4.0",
-	"8.15.9": "1.4.0"
+	"8.15.9": "1.4.0",
+	"8.15.10": "1.4.0"
 }