Skip to content
Draft
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f046493
feat(subMenu): use subMenu instead of menu
Mara-Li Sep 8, 2023
e11ec17
fix(menu): use label to prevent strange empty menu
Mara-Li Sep 8, 2023
cc2d4c5
Merge branch 'main' into main
Mara-Li Sep 10, 2023
5e1caa1
Merge pull request #20 from FlorianWoelki/main
Mara-Li Sep 11, 2023
a9dbf80
Merge branch 'FlorianWoelki:main' into main
Mara-Li Sep 11, 2023
e26e414
fix: issues with adding and removing icon packs
FlorianWoelki Sep 11, 2023
e096a51
fix: issue with not normalized icon names (#221)
FlorianWoelki Sep 11, 2023
fac7935
build: bump to v2.2.1
FlorianWoelki Sep 11, 2023
5f74b8a
Merge branch 'main' of github.com:Lisandra-dev/obsidian-icon-folder
Mara-Li Sep 11, 2023
bb9c05a
Merge branch 'main' of https://github.com/FlorianWoelki/obsidian-icon…
Mara-Li Sep 11, 2023
9411840
Merge branch 'FlorianWoelki-main'
Mara-Li Sep 11, 2023
7ddeb07
Merge branch 'main' of github.com:Lisandra-dev/obsidian-icon-folder i…
Mara-Li Sep 12, 2023
1cbe548
Merge branch 'main' into submenu
Mara-Li Oct 1, 2023
b12dd9d
fix: merge problem with submenu
Mara-Li Oct 1, 2023
dede377
fix: merge with main
Mara-Li Jan 5, 2024
f5307cf
Merge branch 'subMenu-item' into submenu
Mara-Li Jan 5, 2024
ba1bb12
Merge branch 'subMenu-item' into submenu
Mara-Li Jan 14, 2024
9f8ed4f
fix(merge): merge main with submenu branch
Mara-Li Jan 14, 2024
1ff4811
Merge branch 'FlorianWoelki-main' into submenu
Mara-Li Jan 14, 2024
633b774
Merge branch 'FlorianWoelki:main' into submenu
Mara-Li Feb 25, 2024
82be438
Merge branch 'main' into submenu
Mara-Li Nov 23, 2024
e2ce594
Merge branch 'FlorianWoelki:main' into submenu
Mara-Li Dec 3, 2024
5fa6a65
Merge branch 'FlorianWoelki:main' into submenu
Mara-Li Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions src/main.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import {
Plugin,
MenuItem,
Menu,
TFile,
WorkspaceLeaf,
requireApiVersion,
MarkdownView,
Notice,
Platform,
} from 'obsidian';
import {
EditorWithEditorComponent,
Expand Down Expand Up @@ -243,28 +245,39 @@ export default class IconizePlugin extends Plugin {
});
};

menu.addItem(addIconMenuItem);

const filePathData = this.getData()[file.path];
const hasNestedIcon =
typeof filePathData === 'object' &&
(filePathData as FolderIconObject).iconName !== null;
// Only add remove icon menu item when the file path exists in the data.
// We do not want to show this menu item for e.g. custom rules.
if (
filePathData &&
(typeof filePathData === 'string' || hasNestedIcon)
) {
const icon =
typeof filePathData === 'string'
? filePathData
: (filePathData as FolderIconObject).iconName;
if (!emoji.isEmoji(icon)) {
menu.addItem(changeColorOfIcon);
menu.addItem((item: MenuItem) => {
if (Platform.isDesktop) item.setTitle('Iconize').setIcon('tag')
else {
menu.addSeparator();
item.setIsLabel(true);
}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
const subMenu = Platform.isDesktop ? (item.setSubmenu() as Menu) : menu;
subMenu.addItem(addIconMenuItem);

const filePathData = this.getData()[file.path];
const hasNestedIcon =
typeof filePathData === 'object' &&
(filePathData as FolderIconObject).iconName !== null;
// Only add remove icon menu item when the file path exists in the data.
// We do not want to show this menu item for e.g. custom rules.
if (
filePathData &&
(typeof filePathData === 'string' || hasNestedIcon)
) {
const icon =
typeof filePathData === 'string'
? filePathData
: (filePathData as FolderIconObject).iconName;
if (!emoji.isEmoji(icon)) {
subMenu.addItem(changeColorOfIcon);
}

menu.addItem(removeIconMenuItem);
}
subMenu.addItem(removeIconMenuItem);
}
if (!Platform.isDesktop) menu.addSeparator();
});
}),
);

Expand Down
Loading