fix: Properly handles the icon manager not finding an icon node

javalent · Mar 29, 2022 · 4470170 · 4470170
1 parent 3c101d0
commit 4470170
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/callout/manager.ts b/src/callout/manager.ts
@@ -176,9 +176,9 @@ export default class CalloutManager extends Component {
         } else {
             rule = `.callout[data-callout="${admonition.type}"] {
         --callout-color: ${admonition.color};
-        --callout-icon: '${this.plugin.iconManager
+        --callout-icon: '${(this.plugin.iconManager
             .getIconNode(admonition.icon)
-            .outerHTML.replace(/(width|height)=(\\?"|')\d+(\\?"|')/g, "")}';
+            ?.outerHTML ?? "").replace(/(width|height)=(\\?"|')\d+(\\?"|')/g, "")}';
     }`;
         }
         if (this.indexing.contains(admonition.type)) {

diff --git a/src/modal/index.ts b/src/modal/index.ts
@@ -308,7 +308,9 @@ export class IconSuggestionModal extends SuggestionModal<AdmonitionIconDefinitio
         }
 
         const iconDiv = createDiv("suggestion-flair admonition-suggester-icon");
-        iconDiv.appendChild(this.plugin.iconManager.getIconNode(item));
+        iconDiv.appendChild(
+            this.plugin.iconManager.getIconNode(item) ?? createDiv()
+        );
         content.prepend(iconDiv);
         content.createDiv({
             cls: "suggestion-note",
@@ -388,7 +390,9 @@ class AdmonitionSuggestionModal extends SuggestionModal<Admonition> {
 
         const iconDiv = createDiv("suggestion-flair admonition-suggester-icon");
         iconDiv
-            .appendChild(this.plugin.iconManager.getIconNode(item.icon))
+            .appendChild(
+                this.plugin.iconManager.getIconNode(item.icon) ?? createDiv()
+            )
             .setAttribute("color", `rgb(${item.color})`);
 
         content.prepend(iconDiv);

diff --git a/src/settings.ts b/src/settings.ts
@@ -708,9 +708,9 @@ export default class AdmonitionSetting extends PluginSettingTab {
                         const value = this.plugin.admonitions[key];
 
                         admonition_icons[key] = {
-                            icon: this.plugin.iconManager.getIconNode(
-                                value.icon
-                            ).outerHTML,
+                            icon:
+                                this.plugin.iconManager.getIconNode(value.icon)
+                                    ?.outerHTML ?? "",
                             color: value.color
                         };
                     }
@@ -1055,9 +1055,9 @@ class SettingsModal extends Modal {
                         ".admonition-title-icon"
                     );
 
-                    iconEl.innerHTML = this.plugin.iconManager.getIconNode(
-                        this.icon
-                    ).outerHTML;
+                    iconEl.innerHTML =
+                        this.plugin.iconManager.getIconNode(this.icon)
+                            ?.outerHTML ?? "";
                 };
 
                 const modal = new IconSuggestionModal(this.plugin, text);