Merge pull request #295 from decaf-dev/dev

1.39.0

Author: decaf-dev

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "vault-explorer",
 	"name": "Vault Explorer",
-	"version": "1.38.0",
+	"version": "1.39.0",
 	"minAppVersion": "1.4.13",
 	"description": "Explore your vault in visual format",
 	"author": "DecafDev",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-vault-explorer",
-	"version": "1.38.0",
+	"version": "1.39.0",
 	"description": "Explore your vault in visual format",
 	"main": "main.js",
 	"scripts": {

src/constants.ts

@@ -95,7 +95,12 @@ export const DEFAULT_SETTINGS: VaultExplorerPluginSettings = {
 	filterGroupsWidth: "300px",
 	shouldWrapFilterGroups: false,
 	pageSize: 25,
-	viewOrder: [TExplorerView.GRID, TExplorerView.LIST, TExplorerView.FEED],
+	viewOrder: [
+		TExplorerView.GRID,
+		TExplorerView.LIST,
+		TExplorerView.TABLE,
+		TExplorerView.FEED,
+	],
 	configDir: ".vaultexplorer",
 	pluginVersion: null,
 	logLevel: LOG_LEVEL_WARN,

src/main.ts

@@ -19,6 +19,7 @@ import { PluginEvent } from "./event/types";
 import { isVersionLessThan } from "./utils";
 import License from "./svelte/shared/services/license";
 import { clearSocialMediaImageCache } from "./svelte/app/services/social-media-image-cache";
+import store from "./svelte/shared/services/store";
 
 export default class VaultExplorerPlugin extends Plugin {
 	settings: VaultExplorerPluginSettings = DEFAULT_SETTINGS;
@@ -28,6 +29,8 @@ export default class VaultExplorerPlugin extends Plugin {
 		await this.loadSettings();
 		this.setupLogger();
 
+		store.plugin.set(this);
+
 		await License.getInstance().loadStoredKey();
 
 		this.registerView(

src/migrations/index.ts

@@ -28,6 +28,7 @@ import Migrate_1_31_0 from "./migrate_1_31_0";
 import Migrate_1_33_0 from "./migrate_1_33_0";
 import Migrate_1_37_0 from "./migrate_1_37_0";
 import Migrate_1_38_0 from "./migrate_1_38_0";
+import Migrate_1_39_0 from "./migrate_1_39_0";
 
 const migrations: TMigration[] = [
 	{
@@ -165,6 +166,11 @@ const migrations: TMigration[] = [
 		to: "1.38.0",
 		migrate: Migrate_1_38_0,
 	},
+	{
+		from: "1.38.0",
+		to: "1.39.0",
+		migrate: Migrate_1_39_0,
+	},
 ];
 
 export const preformMigrations = (

src/migrations/migrate_1_38_0.ts

@@ -1,10 +1,11 @@
 import { VaultExplorerPluginSettings_1_37_2 } from "src/types/types-1-37-0";
 import MigrationInterface from "./migration_interface";
 import { VaultExplorerPluginSettings } from "src/types";
+import { VaultExplorerPluginSettings_1_38_0 } from "src/types/types-1.38.0";
 
 export default class Migrate_1_38_0 implements MigrationInterface {
 	migrate(data: Record<string, unknown>) {
-		const typedData = data as unknown as VaultExplorerPluginSettings_1_37_2;
+		const typedData = data as unknown as VaultExplorerPluginSettings_1_38_0;
 		const newData: VaultExplorerPluginSettings = {
 			...typedData,
 			loadBodyTags: true,

src/migrations/migrate_1_39_0.ts

@@ -0,0 +1,26 @@
+import MigrationInterface from "./migration_interface";
+import { TExplorerView, VaultExplorerPluginSettings } from "src/types";
+import { VaultExplorerPluginSettings_1_38_0 } from "src/types/types-1.38.0";
+
+export default class Migrate_1_39_0 implements MigrationInterface {
+	migrate(data: Record<string, unknown>) {
+		const typedData = data as unknown as VaultExplorerPluginSettings_1_38_0;
+		const newData: VaultExplorerPluginSettings = {
+			...typedData,
+			viewOrder: [
+				TExplorerView.GRID,
+				TExplorerView.LIST,
+				TExplorerView.TABLE,
+				TExplorerView.FEED,
+			],
+			views: {
+				...typedData.views,
+				table: {
+					isEnabled: true,
+				},
+			},
+		};
+
+		return newData as unknown as Record<string, unknown>;
+	}
+}

src/obsidian/vault-explorer-settings-tab.ts

@@ -247,8 +247,6 @@ export default class VaultExplorerSettingsTab extends PluginSettingTab {
 
 		new Setting(containerEl).setName("Table view").addToggle((toggle) =>
 			toggle
-				.setDisabled(true) //TODO implement
-				.setTooltip("This view is not yet implemented.")
 				.setValue(this.plugin.settings.views.table.isEnabled)
 				.onChange(async (value) => {
 					this.plugin.settings.views.table.isEnabled = value;

src/obsidian/vault-explorer-view.ts

@@ -2,7 +2,6 @@ import { ItemView, WorkspaceLeaf } from "obsidian";
 
 import { VAULT_EXPLORER_VIEW } from "src/constants";
 import VaultExplorerApp from "../svelte/app/index.svelte";
-import store from "../svelte/shared/services/store";
 import VaultExplorerPlugin from "src/main";
 
 export default class VaultExplorerView extends ItemView {
@@ -35,7 +34,6 @@ export default class VaultExplorerView extends ItemView {
 
 		const containerEl = this.containerEl.children[1];
 
-		store.plugin.set(this.plugin);
 		this.component = new VaultExplorerApp({
 			target: containerEl,
 		});

src/svelte/app/components/feed-card.svelte

@@ -49,8 +49,8 @@
 	const dispatch = createEventDispatcher();
 
 	let plugin: VaultExplorerPlugin;
-	store.plugin.subscribe((value) => {
-		plugin = value;
+	store.plugin.subscribe((p) => {
+		plugin = p;
 		enableFileIcons = plugin.settings.enableFileIcons;
 		removeH1 = plugin.settings.views.feed.removeH1;
 		collapseStyle = plugin.settings.views.feed.collapseStyle;
@@ -158,10 +158,6 @@
 		});
 	}
 
-	function handleTitleContextMenu(e: Event) {
-		handleCardContextMenu(e);
-	}
-
 	function handleCardMouseOver(e: MouseEvent) {
 		const targetEl = e.currentTarget as HTMLElement;
 		plugin.app.workspace.trigger("hover-link", {
@@ -233,14 +229,6 @@
 		role="link"
 		class="vault-explorer-feed-card__title"
 		on:focus={() => {}}
-		on:click={(e) => {
-			e.preventDefault();
-			handleTitleClick();
-		}}
-		on:contextmenu={(e) => {
-			e.preventDefault();
-			handleTitleContextMenu(e);
-		}}
 		on:keydown={(e) => {
 			if (e.key === "Enter" || e.key === " ") {
 				e.preventDefault();
@@ -285,7 +273,7 @@
 	}
 
 	.vault-explorer-feed-card:focus-visible {
-		box-shadow: 0 0 0 3px var(--background-modifier-border-focus);
+		box-shadow: 0 0 0 3px var(--background-modifier-focus);
 	}
 
 	.vault-explorer-feed-card__title {