fix: icon in title when changing an icon

FlorianWoelki · Oct 14, 2023 · 9b41bca · 9b41bca
1 parent a0dac40
commit 9b41bca
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 12 deletions.
diff --git a/src/lib/icon.ts b/src/lib/icon.ts
@@ -335,12 +335,14 @@ const getAllWithPath = (plugin: IconFolderPlugin): IconWithPath[] => {
   return result;
 };
 
-const getIconByPath = (plugin: IconFolderPlugin, path: string): Icon | null => {
-  const iconNameWithPrefix = getByPath(plugin, path);
-  if (!iconNameWithPrefix) {
-    return null;
-  }
-
+/**
+ * Returns the {@link Icon} for the given icon name. It is important, that the icon name
+ * contains the icon pack prefix.
+ * @param iconNameWithPrefix String that contains the icon pack prefix combined with the
+ * icon name.
+ * @returns Icon if it exists, `null` otherwise.
+ */
+const getIconByName = (iconNameWithPrefix: string): Icon | null => {
   const iconNextIdentifier = nextIdentifier(iconNameWithPrefix);
   const iconName = iconNameWithPrefix.substring(iconNextIdentifier);
   const iconPrefix = iconNameWithPrefix.substring(0, iconNextIdentifier);
@@ -353,10 +355,26 @@ const getIconByPath = (plugin: IconFolderPlugin, path: string): Icon | null => {
   return icon;
 };
 
+/**
+ * Returns the {@link Icon} for the given path.
+ * @param plugin IconFolderPlugin instance.
+ * @param path String which is the path to get the icon of.
+ * @returns Icon if it exists, `null` otherwise.
+ */
+const getIconByPath = (plugin: IconFolderPlugin, path: string): Icon | null => {
+  const iconNameWithPrefix = getByPath(plugin, path);
+  if (!iconNameWithPrefix) {
+    return null;
+  }
+
+  return getIconByName(iconNameWithPrefix);
+};
+
 export default {
   addAll,
   getByPath,
   getAllWithPath,
   getIconByPath,
+  getIconByName,
   checkMissingIcons,
 };
diff --git a/src/main.ts b/src/main.ts
@@ -144,18 +144,23 @@ export default class IconFolderPlugin extends Plugin {
             const modal = new IconsPickerModal(this.app, this, file.path);
             modal.open();
 
-            // Update icon in tab when setting is enabled.
-            if (this.getSettings().iconInTabsEnabled) {
-              modal.onSelect = (iconName: string): void => {
+            modal.onSelect = (iconName: string): void => {
+              // Update icon in tab when setting is enabled.
+              if (this.getSettings().iconInTabsEnabled) {
                 const tabLeaves = iconTabs.getTabLeavesOfFilePath(
                   this,
                   file.path,
                 );
                 for (const tabLeaf of tabLeaves) {
                   iconTabs.update(this, iconName, tabLeaf.tabHeaderInnerIconEl);
                 }
-              };
-            }
+              }
+
+              // Update icon in title when setting is enabled.
+              if (this.getSettings().iconInTitleEnabled) {
+                this.addIconInTitle(iconName);
+              }
+            };
           });
         };
 
@@ -178,6 +183,7 @@ export default class IconFolderPlugin extends Plugin {
               inheritance.add(this, folderPath, iconName, {
                 file,
                 onAdd: (file) => {
+                  // Update icon in tab when setting is enabled.
                   if (this.getSettings().iconInTabsEnabled) {
                     const tabLeaves = iconTabs.getTabLeavesOfFilePath(
                       this,
@@ -194,6 +200,11 @@ export default class IconFolderPlugin extends Plugin {
                       );
                     }
                   }
+
+                  // Update icon in title when setting is enabled.
+                  if (this.getSettings().iconInTitleEnabled) {
+                    this.addIconInTitle(iconName);
+                  }
                 },
               });
             }
@@ -351,7 +362,6 @@ export default class IconFolderPlugin extends Plugin {
 
       // Adds the title icon to the active leaf view.
       if (this.getSettings().iconInTitleEnabled) {
-        // const usedIconsWithPaths = icon.getAllWithPath(this);
         for (const openedFile of getAllOpenedFiles(this)) {
           const iconName = icon.getByPath(this, openedFile.path);
           const activeView = openedFile.leaf.view;
@@ -570,6 +580,21 @@ export default class IconFolderPlugin extends Plugin {
     return fontSize * inlineTitleSize;
   }
 
+  addIconInTitle(iconName: string): void {
+    for (const openedFile of getAllOpenedFiles(this)) {
+      const activeView = openedFile.leaf.view;
+      if (activeView instanceof MarkdownView) {
+        const possibleIcon = icon.getIconByName(iconName);
+
+        if (possibleIcon) {
+          titleIcon.add(activeView.contentEl, possibleIcon.svgElement, {
+            fontSize: this.calculateIconInTitleSize(),
+          });
+        }
+      }
+    }
+  }
+
   private saveInheritanceData(
     folderPath: string,
     icon: Icon | string | null,