Merge branch 'root-id'

RafaelGB · RafaelGB · commit 23e351b3c5d4 · 2022-09-02T12:45:19.000+02:00
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
@@ -6,7 +6,7 @@
 ### Improved
 - frontmatter embed links support [ISSUE#123](https://github.com/RafaelGB/obsidian-db-folder/issues/123)
 ### Visual
-- Multi-column sort order information [ISSUE#127](https://github.com/RafaelGB/obsidian-db-folder/issues/127]
+- Multi-column sort order information [ISSUE#127](https://github.com/RafaelGB/obsidian-db-folder/issues/127)
 ### No longer broken
 - Enable frontmatter quotes wrapping does not break config that already has quotes [ISSUE#286](https://github.com/RafaelGB/obsidian-db-folder/issues/286)
 - Problem refreshing column info after modifying the label solved [ISSUE#300](https://github.com/RafaelGB/obsidian-db-folder/issues/300)
diff --git a/src/DatabaseView.tsx b/src/DatabaseView.tsx
@@ -53,7 +53,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
     this.register(
       this.containerEl.onWindowMigrated(() => {
         this.plugin.removeView(this);
-        this.plugin.addView(this, this.data, this.isPrimary);
+        this.plugin.addView(this, this.data);
       })
     );
   }
@@ -66,7 +66,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
     return this.data;
   }
 
-  setViewData(data: string, clear: boolean): void {
+  setViewData(data: string): void {
     if (!isDatabaseNote(data)) {
       this.plugin.databaseFileModes[(this.leaf as any).id || this.file.path] =
         InputType.MARKDOWN;
@@ -76,7 +76,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       return;
     }
 
-    this.plugin.addView(this, data, !clear && this.isPrimary);
+    this.plugin.addView(this, data);
   }
 
   getViewType(): string {
@@ -211,7 +211,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
       this.tableContainer = this.contentEl.createDiv(
         StyleClasses.TABLE_CONTAINER
       );
-      this.tableContainer.setAttribute("id", "root");
+      this.tableContainer.setAttribute("id", file.path);
       this.rootContainer = createRoot(this.tableContainer);
       return await super.onLoadFile(file);
     } catch (e) {
diff --git a/src/StateManager.ts b/src/StateManager.ts
@@ -8,22 +8,21 @@ export default class StateManager {
   public file: TFile;
   constructor(
     initialView: DatabaseView,
-    initialData: string,
     onEmpty: () => void,
     getGlobalSettings: () => DatabaseSettings
   ) {
     this.file = initialView.file;
     this.onEmpty = onEmpty;
     this.getGlobalSettings = getGlobalSettings;
 
-    this.registerView(initialView, initialData, true);
+    this.registerView(initialView);
   }
 
-  registerView(view: DatabaseView, data: string, shouldParseData: boolean) {
-    if (!this.viewSet.has(view)) {
-      this.viewSet.add(view);
-      view.initDatabase();
-    }
+  registerView(view: DatabaseView) {
+    this.viewSet.clear();
+    this.viewSet.add(view);
+    view.initDatabase();
+
   }
 
   unregisterView(view: DatabaseView) {
diff --git a/src/components/DefaultHeader.tsx b/src/components/DefaultHeader.tsx
@@ -56,7 +56,7 @@ export default function DefaultHeader(headerProps: DatabaseHeaderProps) {
   const created: boolean = false;
   /** Properties of header */
   const { header, table } = headerProps;
-  const { tableState } = table.options.meta;
+  const { tableState, view } = table.options.meta;
 
   const [columnInfo, columnActions] = tableState.columns((state) => [
     state.info,
@@ -164,7 +164,7 @@ export default function DefaultHeader(headerProps: DatabaseHeaderProps) {
               labelState={labelState}
               setLabelState={setLabelState}
             />,
-            activeDocument.getElementById("popper-container")
+            activeDocument.getElementById(`${view.file.path}-popper`)
           )
         : null}
     </>
diff --git a/src/components/Table.tsx b/src/components/Table.tsx
@@ -108,6 +108,7 @@ export function Table(tableData: TableDataType) {
     targetColumnId: string,
     columnOrder: string[]
   ): ColumnOrderState => {
+    console.log("reorderColumn", draggedColumnId, targetColumnId, columnOrder);
     columnOrder.splice(
       columnOrder.indexOf(targetColumnId),
       0,
diff --git a/src/components/index/Database.tsx b/src/components/index/Database.tsx
@@ -11,7 +11,10 @@ export function Database(tableProps: TableDataType) {
   return (
     <React.StrictMode>
       <Table {...tableProps} tableStore={tableStore} />
-      <div id="popper-container" key={"popper-container-key"}></div>
+      <div
+        id={`${tableProps.view.file.path}-popper`}
+        key={`${tableProps.view.file.path}-popper-key`}
+      ></div>
     </React.StrictMode>
   );
 }
diff --git a/src/components/portals/CalendarPortal.tsx b/src/components/portals/CalendarPortal.tsx
@@ -9,7 +9,7 @@ import { TableColumn } from "cdm/FolderModel";
 const CalendarPortal = (calendarProps: CellComponentProps) => {
   const { defaultCell } = calendarProps;
   const { row, column, table } = defaultCell;
-  const { tableState } = table.options.meta;
+  const { tableState, view } = table.options.meta;
   const tableColumn = column.columnDef as TableColumn;
   const dataActions = tableState.data((state) => state.actions);
 
@@ -43,7 +43,7 @@ const CalendarPortal = (calendarProps: CellComponentProps) => {
   }
 
   const CalendarContainer = (containerProps: any) => {
-    const el = activeDocument.getElementById("popper-container");
+    const el = activeDocument.getElementById(`${view.file.path}-popper`);
     return <Portal container={el}>{containerProps.children}</Portal>;
   };
   return showDatePicker ? (
diff --git a/src/components/portals/CalendarTimePortal.tsx b/src/components/portals/CalendarTimePortal.tsx
@@ -8,22 +8,15 @@ import { TableColumn } from "cdm/FolderModel";
 const CalendarTimePortal = (calendarTimeProps: CellComponentProps) => {
   const { defaultCell } = calendarTimeProps;
   const { row, table, column } = defaultCell;
+  const { tableState, view } = table.options.meta;
   const tableColumn = column.columnDef as TableColumn;
-  const dataActions = table.options.meta.tableState.data(
-    (state) => state.actions
-  );
+  const dataActions = tableState.data((state) => state.actions);
 
-  const calendatTimeRow = table.options.meta.tableState.data(
-    (state) => state.rows[row.index]
-  );
+  const calendatTimeRow = tableState.data((state) => state.rows[row.index]);
 
-  const columnsInfo = table.options.meta.tableState.columns(
-    (state) => state.info
-  );
+  const columnsInfo = tableState.columns((state) => state.info);
 
-  const configInfo = table.options.meta.tableState.configState(
-    (state) => state.info
-  );
+  const configInfo = tableState.configState((state) => state.info);
 
   // Calendar state
   const calendarTimeState = calendatTimeRow[tableColumn.key];
@@ -49,7 +42,7 @@ const CalendarTimePortal = (calendarTimeProps: CellComponentProps) => {
   }
 
   const CalendarContainer = (containerProps: any) => {
-    const el = activeDocument.getElementById("popper-container");
+    const el = activeDocument.getElementById(`${view.file.path}-popper`);
     return <Portal container={el}>{containerProps.children}</Portal>;
   };
 
diff --git a/src/components/portals/DataviewFiltersPortal.tsx b/src/components/portals/DataviewFiltersPortal.tsx
@@ -274,7 +274,7 @@ const DataviewFiltersPortal = (props: DataviewFiltersProps) => {
       {domReady
         ? ReactDOM.createPortal(
             currentFilters(),
-            activeDocument.getElementById("popper-container")
+            activeDocument.getElementById(`${view.file.path}-popper`)
           )
         : null}
     </>
diff --git a/src/components/portals/PopperSelectPortal.tsx b/src/components/portals/PopperSelectPortal.tsx
@@ -16,22 +16,14 @@ import { TableColumn } from "cdm/FolderModel";
 const PopperSelectPortal = (popperProps: CellComponentProps) => {
   const { defaultCell } = popperProps;
   const { row, column, table } = defaultCell;
+  const { tableState, view } = table.options.meta;
+  const dataActions = tableState.data((state) => state.actions);
 
-  const dataActions = table.options.meta.tableState.data(
-    (state) => state.actions
-  );
-
-  const selectPortalRow = table.options.meta.tableState.data(
-    (state) => state.rows[row.index]
-  );
+  const selectPortalRow = tableState.data((state) => state.rows[row.index]);
 
-  const columns = table.options.meta.tableState.columns(
-    (state) => state.columns
-  );
+  const columns = tableState.columns((state) => state.columns);
 
-  const ddbbConfig = table.options.meta.tableState.configState(
-    (state) => state.ddbbConfig
-  );
+  const ddbbConfig = tableState.configState((state) => state.ddbbConfig);
 
   const tableColumn = column.columnDef as TableColumn;
 
@@ -225,7 +217,7 @@ const PopperSelectPortal = (popperProps: CellComponentProps) => {
       {domReady
         ? ReactDOM.createPortal(
             PortalSelect(),
-            activeDocument.getElementById("popper-container")
+            activeDocument.getElementById(`${view.file.path}-popper`)
           )
         : null}
     </>
diff --git a/src/main.ts b/src/main.ts
@@ -103,16 +103,32 @@ export default class DBFolderPlugin extends Plugin {
 		});
 	}
 
+	unload(): void {
+		Promise.all(
+			app.workspace.getLeavesOfType(DatabaseCore.FRONTMATTER_KEY).map((leaf) => {
+				this.databaseFileModes[(leaf as any).id] = 'markdown';
+				return this.setMarkdownView(leaf);
+			})
+		).then(() => {
+			super.unload();
+		});
+	}
+
 	async onunload() {
+		LOGGER.info('Unloading DBFolder plugin');
+
 		this.windowRegistry.forEach((reg, win) => {
 			reg.viewStateReceivers.forEach((fn) => fn([]));
 			this.unmount(win);
 		});
-		LOGGER.info('Unloading DBFolder plugin');
-		// Unmount views first
-		this.stateManagers.clear();
+
 		this.unmount(window);
+
+		this.stateManagers.clear();
 		this.windowRegistry.clear();
+		this.databaseFileModes = {};
+
+		(app.workspace as any).unregisterHoverLinkSource(DatabaseCore.FRONTMATTER_KEY);
 	}
 
 	/** Update plugin settings. */
@@ -153,7 +169,7 @@ export default class DBFolderPlugin extends Plugin {
 
 	viewStateReceivers: Array<(views: DatabaseView[]) => void> = [];
 
-	addView(view: DatabaseView, data: string, shouldParseData: boolean) {
+	addView(view: DatabaseView, data: string) {
 		const win = view.getWindow();
 		const reg = this.windowRegistry.get(win);
 
@@ -166,15 +182,13 @@ export default class DBFolderPlugin extends Plugin {
 		}
 
 		const file = view.file;
-
 		if (this.stateManagers.has(file)) {
-			this.stateManagers.get(file).registerView(view, data, shouldParseData);
+			this.stateManagers.get(file).registerView(view);
 		} else {
 			this.stateManagers.set(
 				file,
 				new StateManager(
 					view,
-					data,
 					() => this.stateManagers.delete(file),
 					() => this.settings
 				)

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ const DataviewFiltersPortal = (props: DataviewFiltersProps) => {`
`274`	`274`	`{domReady`
`275`	`275`	`? ReactDOM.createPortal(`
`276`	`276`	`currentFilters(),`
`277`		`- activeDocument.getElementById("popper-container")`
	`277`	+ activeDocument.getElementById(`${view.file.path}-popper`)
`278`	`278`	`)`
`279`	`279`	`: null}`
`280`	`280`	`</>`