fix(aliases): simplify logic

yoyurec · Oct 2, 2022 · 2c2394d · 2c2394d
1 parent 62ba786
commit 2c2394d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ From Logseq store - `Plugins -> Marketplace`.
 ### ✨ Page icons
 
 Enable feature to show Logseq page (or aliased page) icon for internal links in content.
-In addition you can config icon inheriting from related page (or its alias) proprty, to avoid manual setting `icon::` for common pages.
+In addition you can config icon inheriting from related page proprty, to avoid manual setting `icon::` for common pages.
 For ex.:
 * create "Projects" page, set `icon::` for it
 * create "Some project" page, set `page-type:: [[Projects]]`

diff --git a/src/js/awesomeLinks.ts b/src/js/awesomeLinks.ts
@@ -196,6 +196,20 @@ const setPageIcons = async (linkList: NodeListOf<HTMLAnchorElement>) => {
         }
 
         if (!pageIcon && pluginConfig.featureInheritPageIcons) {
+            if (!pageIcon) {
+                // inherited from page props, when props linked to page
+                const inheritedPropsTitle = await getInheritedPropsTitle(pageTitle, pluginConfig.featureInheritPageIcons);
+                if (inheritedPropsTitle) {
+                    pageIcon = await getPageIcon(inheritedPropsTitle);
+                    // if (!pageIcon) {
+                    //     // inherited from page props, when props linked to aliased
+                    //     const aliasedPageTitle = await getAliasedPageTitle(inheritedPropsTitle);
+                    //     if (aliasedPageTitle) {
+                    //         pageIcon = await getPageIcon(aliasedPageTitle);
+                    //     }
+                    // }
+                }
+            }
             if (!pageIcon) {
                 // inherited from aliased page props, when props linked to page
                 const aliasedPageTitle = await getAliasedPageTitle(pageTitle);
@@ -206,20 +220,6 @@ const setPageIcons = async (linkList: NodeListOf<HTMLAnchorElement>) => {
                     }
                 }
             }
-            if (!pageIcon) {
-                // inherited from page props, when props linked to page
-                const inheritedPropsTitle = await getInheritedPropsTitle(pageTitle, pluginConfig.featureInheritPageIcons);
-                if (inheritedPropsTitle) {
-                    pageIcon = await getPageIcon(inheritedPropsTitle);
-                    if (!pageIcon) {
-                        // inherited from page props, when props linked to aliased
-                        const aliasedPageTitle = await getAliasedPageTitle(inheritedPropsTitle);
-                        if (aliasedPageTitle) {
-                            pageIcon = await getPageIcon(aliasedPageTitle);
-                        }
-                    }
-                }
-            }
         }
         if (pageIcon) {
             linkItem.insertAdjacentHTML('afterbegin', `<span class="link-icon">${pageIcon}</span>`);