fix: issue with setting icon in tabs

src/lib/custom-rule.ts

@@ -30,15 +30,15 @@ const doesMatchFileType = (
  * Determines whether a given file or folder matches a specified custom rule.
  * @param plugin Plugin instance.
  * @param rule CustomRule to check against the file or folder.
- * @param file TAbstractFile to check against the custom rule.
+ * @param filePath String to check against the custom rule.
  * @returns Promise that resolves to `true` if the file matches the rule, `false` otherwise.
  */
 const isApplicable = async (
   plugin: Plugin,
   rule: CustomRule,
-  file: TAbstractFile,
+  filePath: string,
 ): Promise<boolean> => {
-  const metadata = await plugin.app.vault.adapter.stat(file.path);
+  const metadata = await plugin.app.vault.adapter.stat(filePath);
   if (!metadata) {
     return false;
   }
@@ -51,7 +51,7 @@ const isApplicable = async (
     return false;
   }
 
-  return doesMatchPath(rule, file.path);
+  return doesMatchPath(rule, filePath);
 };
 
 /**
@@ -140,7 +140,7 @@ const add = async (
     return false;
   }
 
-  const doesMatch = await isApplicable(plugin, rule, file);
+  const doesMatch = await isApplicable(plugin, rule, file.path);
   if (doesMatch) {
     IconCache.getInstance().set(file.path, {
       iconNameWithPrefix: rule.icon,
@@ -192,7 +192,7 @@ const getFileItems = async (
   for (const fileExplorer of plugin.getRegisteredFileExplorers()) {
     const files = Object.values(fileExplorer.fileItems);
     for (const fileItem of files) {
-      if (await isApplicable(plugin, rule, fileItem.file)) {
+      if (await isApplicable(plugin, rule, fileItem.file.path)) {
         result.push(fileItem);
       }
     }

src/lib/icon-tabs.ts

@@ -1,4 +1,3 @@
-import { TFile } from 'obsidian';
 import IconizePlugin, { FolderIconObject } from '@app/main';
 import { DEFAULT_FILE_ICON, getAllOpenedFiles } from '@app/util';
 import { TabHeaderLeaf } from '@app/@types/obsidian';
@@ -41,13 +40,13 @@ interface AddOptions {
  * Adds an icon to the tab and its container. This function respects the
  * custom rules and individually icon set.
  * @param plugin IconizePlugin instance.
- * @param file TFile instance of the file to add the icon to.
+ * @param filePath String file path to add the icon to.
  * @param iconContainer HTMLElement where the icon will be added to.
  * @param options AddOptions for the add function which can optionally be used.
  */
 const add = async (
   plugin: IconizePlugin,
-  file: TFile,
+  filePath: string,
   iconContainer: HTMLElement,
   options?: AddOptions,
 ): Promise<void> => {
@@ -69,7 +68,7 @@ const add = async (
 
   // Add icons to tabs if a custom rule is applicable.
   for (const rule of customRule.getSortedRules(plugin)) {
-    const isApplicable = await customRule.isApplicable(plugin, rule, file);
+    const isApplicable = await customRule.isApplicable(plugin, rule, filePath);
     if (isApplicable) {
       dom.setIconForNode(plugin, rule.icon, iconContainer, {
         color: rule.color,
@@ -81,7 +80,7 @@ const add = async (
   }
 
   // Add icons to tabs if there is an icon set.
-  const iconData = data.find(([dataPath]) => dataPath === file.path);
+  const iconData = data.find(([dataPath]) => dataPath === filePath);
   if (!iconData) {
     return;
   }

src/lib/icon.ts

@@ -18,7 +18,7 @@ import {
   nextIdentifier,
 } from '@app/icon-pack-manager';
 import config from '@app/config';
-import { MarkdownView, Notice, requireApiVersion } from 'obsidian';
+import { Notice, requireApiVersion } from 'obsidian';
 import { IconCache } from './icon-cache';
 import { logger } from './logger';
 
@@ -193,15 +193,11 @@ const addAll = (
       // Adds icons to already open file tabs.
       if (plugin.getSettings().iconInTabsEnabled) {
         for (const leaf of plugin.app.workspace.getLeavesOfType('markdown')) {
-          if (!(leaf.view instanceof MarkdownView)) {
-            continue;
-          }
-
-          const file = leaf.view.file;
-          if (file) {
+          const filePath = leaf.view.file?.path ?? leaf.view.getState().file;
+          if (typeof filePath === 'string') {
             const tabHeaderLeaf = leaf as TabHeaderLeaf;
-            const iconColor = plugin.getIconColor(file.path);
-            iconTabs.add(plugin, file, tabHeaderLeaf.tabHeaderInnerIconEl, {
+            const iconColor = plugin.getIconColor(filePath);
+            iconTabs.add(plugin, filePath, tabHeaderLeaf.tabHeaderInnerIconEl, {
               iconColor,
             });
           }

src/main.ts

@@ -177,11 +177,7 @@ export default class IconizePlugin extends Plugin {
                 for (const tabLeaf of tabLeaves) {
                   // Add timeout to ensure that the default icon is already set.
                   setTimeout(() => {
-                    iconTabs.add(
-                      this,
-                      file as TFile,
-                      tabLeaf.tabHeaderInnerIconEl,
-                    );
+                    iconTabs.add(this, file.path, tabLeaf.tabHeaderInnerIconEl);
                   }, 5);
                 }
               }
@@ -343,7 +339,7 @@ export default class IconizePlugin extends Plugin {
         this.addIconInTitle(rule.icon);
         const tabLeaves = iconTabs.getTabLeavesOfFilePath(this, file.path);
         for (const tabLeaf of tabLeaves) {
-          iconTabs.add(this, file as TFile, tabLeaf.tabHeaderInnerIconEl, {
+          iconTabs.add(this, file.path, tabLeaf.tabHeaderInnerIconEl, {
             iconName: rule.icon,
           });
         }
@@ -521,7 +517,7 @@ export default class IconizePlugin extends Plugin {
           for (const openedFile of getAllOpenedFiles(this)) {
             const leaf = openedFile.leaf as TabHeaderLeaf;
             const iconColor = this.getIconColor(leaf.view.file.path);
-            iconTabs.add(this, openedFile, leaf.tabHeaderInnerIconEl, {
+            iconTabs.add(this, openedFile.path, leaf.tabHeaderInnerIconEl, {
               iconColor,
             });
           }
@@ -683,7 +679,7 @@ export default class IconizePlugin extends Plugin {
             for (const openedFile of getAllOpenedFiles(this)) {
               const leaf = openedFile.leaf as TabHeaderLeaf;
               const iconColor = this.getIconColor(leaf.view.file.path);
-              iconTabs.add(this, openedFile, leaf.tabHeaderInnerIconEl, {
+              iconTabs.add(this, openedFile.path, leaf.tabHeaderInnerIconEl, {
                 iconColor,
               });
             }
@@ -699,7 +695,7 @@ export default class IconizePlugin extends Plugin {
             const iconColor = this.getIconColor(tabHeaderLeaf.view.file.path);
             iconTabs.add(
               this,
-              tabHeaderLeaf.view.file,
+              tabHeaderLeaf.view.file.path,
               tabHeaderLeaf.tabHeaderInnerIconEl,
               {
                 iconColor,

src/settings/ui/customIconRule.ts

@@ -62,7 +62,7 @@ export default class CustomIconRuleSetting extends IconFolderSetting {
         const applicable = await customRule.isApplicable(
           this.plugin,
           rule,
-          openedFile,
+          openedFile.path,
         );
         if (!applicable) {
           continue;
@@ -74,10 +74,15 @@ export default class CustomIconRuleSetting extends IconFolderSetting {
             replaceWithDefaultIcon: true,
           });
         } else {
-          iconTabs.add(this.plugin, openedFile, leaf.tabHeaderInnerIconEl, {
-            iconName: rule.icon,
-            iconColor: rule.color,
-          });
+          iconTabs.add(
+            this.plugin,
+            openedFile.path,
+            leaf.tabHeaderInnerIconEl,
+            {
+              iconName: rule.icon,
+              iconColor: rule.color,
+            },
+          );
         }
       }
     }

src/settings/ui/toggleIconInTabs.ts

@@ -26,7 +26,7 @@ export default class ToggleIconInTabs extends IconFolderSetting {
                     // Adds the icons to already opened files.
                     iconTabs.add(
                       this.plugin,
-                      file,
+                      file.path,
                       tabHeaderLeaf.tabHeaderInnerIconEl,
                     );
                   } else {