fixing split view compatibility

Author: RafaelGB

src/helpers/VaultManagement.ts

@@ -1,4 +1,4 @@
-import { RowDataType, NormalizedPath, TableDataType, TableColumn } from 'cdm/FolderModel';
+import { RowDataType, NormalizedPath, TableColumn } from 'cdm/FolderModel';
 import { Notice, TFile } from 'obsidian';
 import { VaultManagerDB } from 'services/FileManagerService';
 import { LOGGER } from "services/Logger";
@@ -12,7 +12,6 @@ import { DatabaseYaml } from 'cdm/DatabaseModel';
 import { Literal } from 'obsidian-dataview/lib/data-model/value';
 import { DataArray } from 'obsidian-dataview/lib/api/data-array';
 import { EditionError } from 'errors/ErrorTypes';
-import { TableStateInterface } from 'cdm/TableStateInterface';
 import { LocalSettings } from 'cdm/SettingsModel';
 
 const noBreakSpace = /\u00A0/g;
@@ -22,35 +21,34 @@ const noBreakSpace = /\u00A0/g;
  * @param data 
  * @returns 
  */
-export function hasFrontmatterKey(data: string | TFile): boolean {
+export function hasFrontmatter(data: string): boolean {
   if (!data) return false;
 
-  if (typeof data === 'string') {
-    const frontmatterRegex = /^---[\s\S]+?---/g;
-    return frontmatterRegex.test(data);
-  }
+  const frontmatterRegex = /^---[\s\S]+?---/g;
+  return frontmatterRegex.test(data);
+}
 
+/** Check if file is a database note */
+export function isDatabaseNote(data: string | TFile) {
   if (data instanceof TFile) {
+    if (!data) return false;
+
     const cache = app.metadataCache.getFileCache(data);
-    return !!cache?.frontmatter && !!cache?.frontmatter['kanban-plugin'];
-  }
 
-  return false;
-}
+    return !!cache?.frontmatter && !!cache?.frontmatter[DatabaseCore.FRONTMATTER_KEY];
+  } else {
+    const match = data.match(/---\s+([\w\W]+?)\s+---/);
 
-/** Check if file is a database note */
-export function isDatabaseNote(data: string): boolean {
-  if (!data) return false;
-  const match = data.match(/---\s+([\w\W]+?)\s+---/);
+    if (!match) {
+      return false;
+    }
 
-  if (!match) {
-    return false;
-  }
+    if (!match[1].contains(DatabaseCore.FRONTMATTER_KEY)) {
+      return false;
+    }
 
-  if (!match[1].contains(DatabaseCore.FRONTMATTER_KEY)) {
-    return false;
+    return true;
   }
-  return true;
 }
 
 export function getNormalizedPath(path: string): NormalizedPath {
@@ -336,7 +334,7 @@ export async function updateRowFile(file: TFile, columnId: string, newValue: Lit
     // Execute action
     if (updateOptions[option]) {
       // Check if file has frontmatter
-      if (!hasFrontmatterKey(content)) {
+      if (!hasFrontmatter(content)) {
         // If not, add it
         await addFrontmatter();
       }

src/main.ts

@@ -31,7 +31,7 @@ import { LOGGER } from 'services/Logger';
 import { DatabaseCore, DatabaseFrontmatterOptions, DEFAULT_SETTINGS, YAML_INDENT } from 'helpers/Constants';
 import { PreviewDatabaseModeService } from 'services/MarkdownPostProcessorService';
 import { unmountComponentAtNode } from 'react-dom';
-import { hasFrontmatterKey } from 'helpers/VaultManagement';
+import { isDatabaseNote } from 'helpers/VaultManagement';
 import { getParentWindow } from 'helpers/WindowElement';
 
 interface WindowRegistry {
@@ -187,6 +187,16 @@ export default class DBFolderPlugin extends Plugin {
 		return this.stateManagers.get(file);
 	}
 
+	getStateManagerFromViewID(id: string, win: Window) {
+		const view = this.getDatabaseView(id, win);
+
+		if (!view) {
+			return null;
+		}
+
+		return this.stateManagers.get(view.file);
+	}
+
 	removeView(view: DatabaseView) {
 		const entry = Array.from(this.windowRegistry.entries()).find(([, reg]) => {
 			return reg.viewMap.has(view.id);
@@ -251,8 +261,20 @@ export default class DBFolderPlugin extends Plugin {
 		return [];
 	}
 
-	getDatabaseView(id: string) {
-		return this.viewMap.get(id);
+	getDatabaseView(id: string, win: Window) {
+		const reg = this.windowRegistry.get(win);
+
+		if (reg?.viewMap.has(id)) {
+			return reg.viewMap.get(id);
+		}
+
+		for (const reg of this.windowRegistry.values()) {
+			if (reg.viewMap.has(id)) {
+				return reg.viewMap.get(id);
+			}
+		}
+
+		return null;
 	}
 
 	mount(win: Window) {
@@ -326,26 +348,26 @@ export default class DBFolderPlugin extends Plugin {
 					});
 					return;
 				}
+				console.log('file-menu');
 				if (
 					!Platform.isMobile &&
 					file instanceof TFile &&
 					leaf &&
 					source === 'sidebar-context-menu' &&
-					hasFrontmatterKey(file)
+					isDatabaseNote(file)
 				) {
 					const views = this.getDatabaseViews(
 						getParentWindow(leaf.view.containerEl)
 					);
-					let haveDatabaseView = false;
 
-					for (const view of views) {
+					const haveDatabaseView = views.some((view) => {
 						if (view.file === file) {
 							view.onPaneMenu(menu, 'more-options', false);
-							haveDatabaseView = true;
-							break;
+							return true;
 						}
-					}
-
+						return false;
+					});
+					console.log('haveDatabaseView', haveDatabaseView);
 					if (!haveDatabaseView) {
 						menu.addItem((item) => {
 							item
@@ -358,7 +380,6 @@ export default class DBFolderPlugin extends Plugin {
 									this.setDatabaseView(leaf);
 								});
 						});
-
 						return;
 					}
 				}
@@ -367,7 +388,7 @@ export default class DBFolderPlugin extends Plugin {
 					leaf?.view instanceof MarkdownView &&
 					file instanceof TFile &&
 					source === 'pane-more-options' &&
-					hasFrontmatterKey(file)
+					isDatabaseNote(file)
 				) {
 					menu.addItem((item) => {
 						item
@@ -455,43 +476,6 @@ export default class DBFolderPlugin extends Plugin {
 				},
 			})
 		);
-
-		// //Add a menu item to go back to database view
-		// this.register(
-		// 	around(MarkdownView.prototype, {
-		// 		onPaneMenu(next) {
-		// 			return function (menu: Menu) {
-		// 				const file = this.file;
-		// 				const cache = file
-		// 					? self.app.metadataCache.getFileCache(file)
-		// 					: null;
-
-		// 				if (
-		// 					!file ||
-		// 					!cache?.frontmatter ||
-		// 					!cache.frontmatter[DatabaseCore.FRONTMATTER_KEY]
-		// 				) {
-		// 					return next.call(this, menu);
-		// 				}
-
-		// 				menu
-		// 					.addItem((item) => {
-		// 						item
-		// 							.setTitle('Open as database folder')
-		// 							.setIcon(databaseIcon)
-		// 							.onClick(() => {
-		// 								self.databaseFileModes[this.leaf.id || file.path] =
-		// 									DatabaseCore.FRONTMATTER_KEY;
-		// 								self.setDatabaseView(this.leaf);
-		// 							});
-		// 					})
-		// 					.addSeparator();
-
-		// 				next.call(this, menu);
-		// 			};
-		// 		},
-		// 	})
-		// );
 	}
 
 	// private debuggingMobile(plugin:Plugin){