Merge branch '257-split-pane-options-missing'

Author: RafaelGB

package.json

@@ -39,7 +39,7 @@
 		"eslint": "8.21.0",
 		"jest": "28.1.3",
 		"jest-mock-extended": "2.0.7",
-		"obsidian": "0.15.4",
+		"obsidian": "0.15.9",
 		"rollup": "2.77.0",
 		"rollup-plugin-typescript2": "0.32.1",
 		"rollup-plugin-terser": "7.0.2",

src/DatabaseView.tsx

@@ -15,6 +15,7 @@ import { DbFolderException } from "errors/AbstractException";
 import { DatabaseCore, InputType, StyleClasses } from "helpers/Constants";
 import obtainInitialType from "helpers/InitialType";
 import { adapterTFilesToRows, isDatabaseNote } from "helpers/VaultManagement";
+import { getParentWindow } from "helpers/WindowElement";
 import DBFolderPlugin from "main";
 
 import {
@@ -46,6 +47,13 @@ export class DatabaseView extends TextFileView implements HoverParent {
   constructor(leaf: WorkspaceLeaf, plugin: DBFolderPlugin) {
     super(leaf);
     this.plugin = plugin;
+
+    this.register(
+      this.containerEl.onWindowMigrated(() => {
+        this.plugin.removeView(this);
+        this.plugin.addView(this, this.data, this.isPrimary);
+      })
+    );
   }
 
   /**
@@ -84,6 +92,11 @@ export class DatabaseView extends TextFileView implements HoverParent {
   get isPrimary(): boolean {
     return this.plugin.getStateManager(this.file)?.getAView() === this;
   }
+
+  getWindow() {
+    return getParentWindow(this.containerEl) as Window & typeof globalThis;
+  }
+
   onPaneMenu(menu: Menu, source: string, callSuper: boolean = true): void {
     if (source !== "more-options") {
       super.onPaneMenu(menu, source);

src/api/plugin-api.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/helpers/VaultManagement.ts

@@ -0,0 +1,7 @@
+export function getParentWindow(el: Element) {
+    return el.win;
+}
+
+export function getParentBodyElement(el: Element) {
+    return el.doc.body;
+}