From 03b6de9db74137463fef71aadbdd1dc31767b965 Mon Sep 17 00:00:00 2001 From: Nightwish2710 Date: Mon, 18 Aug 2025 14:21:10 +0700 Subject: [PATCH 1/3] feat: update command menu for mobile rendering --- src/Commands.ts | 330 ++++++++++++++++++++++++------------------------ 1 file changed, 168 insertions(+), 162 deletions(-) diff --git a/src/Commands.ts b/src/Commands.ts index a27b541..1c0843f 100644 --- a/src/Commands.ts +++ b/src/Commands.ts @@ -298,208 +298,214 @@ export class Commands { } } - // eslint-disable-next-line complexity - menu.addItem(async (menuItem) => { - if ( - Platform.isDesktop && - !Platform.isTablet && - this.plugin.settings.useSubmenus - ) { - menuItem - .setTitle('Folder Note Commands') - .setIcon('folder-edit'); - } - let subMenu: Menu; - if ( - !Platform.isDesktopApp || - !Platform.isDesktop || - Platform.isTablet || - !this.plugin.settings.useSubmenus - ) { - subMenu = menu; - menuItem.setDisabled(true); - } else { - subMenu = menuItem.setSubmenu() as Menu; - } - if (file instanceof TFile) { - subMenu.addItem((subItem) => { - subItem.setTitle('Create folder note') - .setIcon('edit') - .onClick(async () => { - if (!folder) return; - let newPath = folder.path + '/' + file.basename; - if (folder.path === '' || folder.path === '/') { - newPath = file.basename; - } - if (this.plugin.app.vault.getAbstractFileByPath(newPath)) { - return new Notice('Folder already exists'); - } - const automaticallyCreateFolderNote = - this.plugin.settings.autoCreate; - this.plugin.settings.autoCreate = false; - this.plugin.saveSettings(); - await this.plugin.app.vault.createFolder(newPath); - const newFolder = this.plugin.app.vault - .getAbstractFileByPath(newPath); - if (!(newFolder instanceof TFolder)) return; - await createFolderNote( - this.plugin, - newFolder.path, - true, - '.' + file.extension, - false, - file, - ); - this.plugin.settings.autoCreate = automaticallyCreateFolderNote; - this.plugin.saveSettings(); - }); + const addFolderNoteActions = (menu: Menu) => { + if (file instanceof TFile) { + menu.addItem((item) => { + item.setTitle('Create folder note'); + item.setIcon('edit'); + item.onClick(async () => { + if (!folder) return; + let newPath = folder.path + '/' + file.basename; + if (folder.path === '' || folder.path === '/') { + newPath = file.basename; + } + if (this.plugin.app.vault.getAbstractFileByPath(newPath)) { + return new Notice('Folder already exists'); + } + const automaticallyCreateFolderNote = + this.plugin.settings.autoCreate; + this.plugin.settings.autoCreate = false; + this.plugin.saveSettings(); + await this.plugin.app.vault.createFolder(newPath); + const newFolder = this.plugin.app.vault + .getAbstractFileByPath(newPath); + if (!(newFolder instanceof TFolder)) return; + await createFolderNote( + this.plugin, + newFolder.path, + true, + '.' + file.extension, + false, + file, + ); + this.plugin.settings.autoCreate = automaticallyCreateFolderNote; + this.plugin.saveSettings(); + }); }); + if (getFolderPathFromString(file.path) === '') return; - if (!(folder instanceof TFolder)) return; - if (folder.path === '' || folder.path === '/') return; - subMenu.addItem((item) => { - item.setTitle(`Turn into folder note for ${folder?.name}`) - .setIcon('edit') - .onClick(() => { - if (!folder || !(folder instanceof TFolder)) return; - const folderNote = getFolderNote(this.plugin, folder.path); - turnIntoFolderNote(this.plugin, file, folder, folderNote); - }); + + if (!(folder instanceof TFolder)) return; + + if (folder.path === '' || folder.path === '/') return; + + menu.addItem((item) => { + item.setTitle(`Turn into folder note for ${folder?.name}`); + item.setIcon('edit'); + item.onClick(() => { + if (!folder || !(folder instanceof TFolder)) return; + const folderNote = getFolderNote(this.plugin, folder.path); + turnIntoFolderNote(this.plugin, file, folder, folderNote); + }); }); } + if (!(file instanceof TFolder)) return; + const excludedFolder = getExcludedFolder(this.plugin, file.path, false); const detachedExcludedFolder = getDetachedFolder(this.plugin, file.path); - if (excludedFolder && !excludedFolder.hideInSettings) { + + if (excludedFolder && !excludedFolder.hideInSettings) { // I'm not sure if I'm ever going to add this because of the possibility that a folder got more than one excluded - // subMenu.addItem((item) => { - // item.setTitle('Manage excluded folder') - // .setIcon('settings-2') - // .onClick(() => { - // if (excludedFolder instanceof ExcludedFolder) { - // new ExcludedFolderSettings(this.plugin.app, this.plugin, excludedFolder).open(); - // } else if (excludedFolder instanceof ExcludePattern) { - // new PatternSettings(this.plugin.app, this.plugin, excludedFolder).open(); - // } - // }) - // }) - subMenu.addItem((item) => { - item.setTitle('Remove folder from excluded folders') - .setIcon('trash') - .onClick(() => { - this.plugin.settings.excludeFolders = - this.plugin.settings.excludeFolders.filter( - (excluded) => - (excluded.path !== file.path) || excluded.detached, - ); - this.plugin.saveSettings(true); - new Notice('Successfully removed folder from excluded folders'); - }); + // menu.addItem((item) => { + // item.setTitle('Manage excluded folder'); + // item.setIcon('settings-2'); + // item.onClick(() => { + // if (excludedFolder instanceof ExcludedFolder) { + // new ExcludedFolderSettings(this.plugin.app, this.plugin, excludedFolder).open(); + // } else if (excludedFolder instanceof ExcludePattern) { + // new PatternSettings(this.plugin.app, this.plugin, excludedFolder).open(); + // } + // }); + // }); + + menu.addItem((item) => { + item.setTitle('Remove folder from excluded folders'); + item.setIcon('trash'); + item.onClick(() => { + this.plugin.settings.excludeFolders = + this.plugin.settings.excludeFolders.filter( + (excluded) => + (excluded.path !== file.path) || excluded.detached, + ); + this.plugin.saveSettings(true); + new Notice('Successfully removed folder from excluded folders'); + }); }); + return; } + if (detachedExcludedFolder) { - subMenu.addItem((item) => { - item.setTitle('Remove folder from detached folders') - .setIcon('trash') - .onClick(() => { - deleteExcludedFolder(this.plugin, detachedExcludedFolder); - }); + menu.addItem((item) => { + item.setTitle('Remove folder from detached folders'); + item.setIcon('trash'); + item.onClick(() => { + deleteExcludedFolder(this.plugin, detachedExcludedFolder); + }); }); } + if (detachedExcludedFolder) { return; } - subMenu.addItem((item) => { - item.setTitle('Exclude folder from folder notes') - .setIcon('x-circle') - .onClick(() => { - const newExcludedFolder = new ExcludedFolder( - file.path, - this.plugin.settings.excludeFolders.length, - undefined, - this.plugin, - ); - this.plugin.settings.excludeFolders.push(newExcludedFolder); - this.plugin.saveSettings(true); - new Notice('Successfully excluded folder from folder notes'); - }); + + menu.addItem((item) => { + item.setTitle('Exclude folder from folder notes'); + item.setIcon('x-circle'); + item.onClick(() => { + const newExcludedFolder = new ExcludedFolder( + file.path, + this.plugin.settings.excludeFolders.length, + undefined, + this.plugin, + ); + this.plugin.settings.excludeFolders.push(newExcludedFolder); + this.plugin.saveSettings(true); + new Notice('Successfully excluded folder from folder notes'); + }); }); + if (!(file instanceof TFolder)) return; - const folderNote = getFolderNote(this.plugin, file.path); - if (folderNote instanceof TFile && !detachedExcludedFolder) { - subMenu.addItem((item) => { - item.setTitle('Delete folder note') - .setIcon('trash') - .onClick(() => { - deleteFolderNote(this.plugin, folderNote, true); - }); + + const folderNote = getFolderNote(this.plugin, file.path); + + if (folderNote instanceof TFile && !detachedExcludedFolder) { + menu.addItem((item) => { + item.setTitle('Delete folder note'); + item.setIcon('trash'); + item.onClick(() => { + deleteFolderNote(this.plugin, folderNote, true); + }); }); - subMenu.addItem((item) => { - item.setTitle('Open folder note') - .setIcon('chevron-right-square') - .onClick(() => { - openFolderNote(this.plugin, folderNote); - }); + menu.addItem((item) => { + item.setTitle('Open folder note'); + item.setIcon('chevron-right-square'); + item.onClick(() => { + openFolderNote(this.plugin, folderNote); + }); }); - subMenu.addItem((item) => { - item.setTitle('Detach folder note') - .setIcon('unlink') - .onClick(() => { - detachFolderNote(this.plugin, folderNote); - }); + menu.addItem((item) => { + item.setTitle('Detach folder note'); + item.setIcon('unlink'); + item.onClick(() => { + detachFolderNote(this.plugin, folderNote); + }); }); - subMenu.addItem((item) => { - item.setTitle('Copy Obsidian URL') - .setIcon('link') - .onClick(() => { - this.app.copyObsidianUrl(folderNote); - }); + menu.addItem((item) => { + item.setTitle('Copy Obsidian URL'); + item.setIcon('link'); + item.onClick(() => { + this.app.copyObsidianUrl(folderNote); + }); }); if (this.plugin.settings.hideFolderNote) { if (excludedFolder?.showFolderNote) { - subMenu.addItem((item) => { - item.setTitle('Hide folder note in explorer') - .setIcon('eye-off') - .onClick(() => { - hideFolderNoteInFileExplorer(file.path, this.plugin); - }); + menu.addItem((item) => { + item.setTitle('Hide folder note in explorer'); + item.setIcon('eye-off'); + item.onClick(() => { + hideFolderNoteInFileExplorer(file.path, this.plugin); + }); }); } else { - subMenu.addItem((item) => { - item.setTitle('Show folder note in explorer') - .setIcon('eye') - .onClick(() => { - showFolderNoteInFileExplorer(file.path, this.plugin); - }); + menu.addItem((item) => { + item.setTitle('Show folder note in explorer'); + item.setIcon('eye'); + item.onClick(() => { + showFolderNoteInFileExplorer(file.path, this.plugin); + }); }); } } - } else { - subMenu.addItem((item) => { - item.setTitle('Create markdown folder note') - .setIcon('edit') - .onClick(() => { - createFolderNote(this.plugin, file.path, true, '.md'); - }); + menu.addItem((item) => { + item.setTitle('Create markdown folder note'); + item.setIcon('edit'); + item.onClick(() => { + createFolderNote(this.plugin, file.path, true, '.md'); + }); }); this.plugin.settings.supportedFileTypes.forEach((fileType) => { if (fileType === 'md') return; - subMenu.addItem((item) => { - item.setTitle(`Create ${fileType} folder note`) - .setIcon('edit') - .onClick(() => { - // eslint-disable-next-line max-len - createFolderNote(this.plugin, file.path, true, '.' + fileType); - }); + menu.addItem((item) => { + item.setTitle(`Create ${fileType} folder note`); + item.setIcon('edit'); + item.onClick(() => { + // eslint-disable-next-line max-len + createFolderNote(this.plugin, file.path, true, '.' + fileType); + }); }); }); } - }); + }; + + if ( + Platform.isDesktop && + !Platform.isTablet && + this.plugin.settings.useSubmenus + ) { + menu.addItem(async (item) => { + item.setTitle('Folder Note Commands').setIcon('folder-edit'); + let subMenu: Menu = item.setSubmenu() as Menu; + addFolderNoteActions(subMenu); + }) + } else { + addFolderNoteActions(menu); + } })); } From 203d9f4119df3b66790004f89d025d90f2501cbc Mon Sep 17 00:00:00 2001 From: Nightwish2710 Date: Mon, 18 Aug 2025 14:28:23 +0700 Subject: [PATCH 2/3] feat: update command menu for mobile rendering --- src/Commands.ts | 188 ++++++++++++++++++++++++------------------------ 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/src/Commands.ts b/src/Commands.ts index 1c0843f..b8f2a97 100644 --- a/src/Commands.ts +++ b/src/Commands.ts @@ -298,55 +298,55 @@ export class Commands { } } - const addFolderNoteActions = (menu: Menu) => { - if (file instanceof TFile) { + const addFolderNoteActions = (menu: Menu) => { + if (file instanceof TFile) { menu.addItem((item) => { item.setTitle('Create folder note'); item.setIcon('edit'); item.onClick(async () => { - if (!folder) return; - let newPath = folder.path + '/' + file.basename; - if (folder.path === '' || folder.path === '/') { - newPath = file.basename; - } - if (this.plugin.app.vault.getAbstractFileByPath(newPath)) { - return new Notice('Folder already exists'); - } - const automaticallyCreateFolderNote = - this.plugin.settings.autoCreate; - this.plugin.settings.autoCreate = false; - this.plugin.saveSettings(); - await this.plugin.app.vault.createFolder(newPath); - const newFolder = this.plugin.app.vault - .getAbstractFileByPath(newPath); - if (!(newFolder instanceof TFolder)) return; - await createFolderNote( - this.plugin, - newFolder.path, - true, - '.' + file.extension, - false, - file, - ); - this.plugin.settings.autoCreate = automaticallyCreateFolderNote; - this.plugin.saveSettings(); - }); + if (!folder) return; + let newPath = folder.path + '/' + file.basename; + if (folder.path === '' || folder.path === '/') { + newPath = file.basename; + } + if (this.plugin.app.vault.getAbstractFileByPath(newPath)) { + return new Notice('Folder already exists'); + } + const automaticallyCreateFolderNote = + this.plugin.settings.autoCreate; + this.plugin.settings.autoCreate = false; + this.plugin.saveSettings(); + await this.plugin.app.vault.createFolder(newPath); + const newFolder = this.plugin.app.vault + .getAbstractFileByPath(newPath); + if (!(newFolder instanceof TFolder)) return; + await createFolderNote( + this.plugin, + newFolder.path, + true, + '.' + file.extension, + false, + file, + ); + this.plugin.settings.autoCreate = automaticallyCreateFolderNote; + this.plugin.saveSettings(); + }); }); if (getFolderPathFromString(file.path) === '') return; - if (!(folder instanceof TFolder)) return; + if (!(folder instanceof TFolder)) return; - if (folder.path === '' || folder.path === '/') return; + if (folder.path === '' || folder.path === '/') return; - menu.addItem((item) => { + menu.addItem((item) => { item.setTitle(`Turn into folder note for ${folder?.name}`); item.setIcon('edit'); item.onClick(() => { - if (!folder || !(folder instanceof TFolder)) return; - const folderNote = getFolderNote(this.plugin, folder.path); - turnIntoFolderNote(this.plugin, file, folder, folderNote); - }); + if (!folder || !(folder instanceof TFolder)) return; + const folderNote = getFolderNote(this.plugin, folder.path); + turnIntoFolderNote(this.plugin, file, folder, folderNote); + }); }); } @@ -355,32 +355,32 @@ export class Commands { const excludedFolder = getExcludedFolder(this.plugin, file.path, false); const detachedExcludedFolder = getDetachedFolder(this.plugin, file.path); - if (excludedFolder && !excludedFolder.hideInSettings) { + if (excludedFolder && !excludedFolder.hideInSettings) { // I'm not sure if I'm ever going to add this because of the possibility that a folder got more than one excluded // menu.addItem((item) => { // item.setTitle('Manage excluded folder'); // item.setIcon('settings-2'); // item.onClick(() => { - // if (excludedFolder instanceof ExcludedFolder) { - // new ExcludedFolderSettings(this.plugin.app, this.plugin, excludedFolder).open(); - // } else if (excludedFolder instanceof ExcludePattern) { - // new PatternSettings(this.plugin.app, this.plugin, excludedFolder).open(); - // } - // }); + // if (excludedFolder instanceof ExcludedFolder) { + // new ExcludedFolderSettings(this.plugin.app, this.plugin, excludedFolder).open(); + // } else if (excludedFolder instanceof ExcludePattern) { + // new PatternSettings(this.plugin.app, this.plugin, excludedFolder).open(); + // } + // }); // }); menu.addItem((item) => { item.setTitle('Remove folder from excluded folders'); item.setIcon('trash'); item.onClick(() => { - this.plugin.settings.excludeFolders = - this.plugin.settings.excludeFolders.filter( - (excluded) => - (excluded.path !== file.path) || excluded.detached, - ); - this.plugin.saveSettings(true); - new Notice('Successfully removed folder from excluded folders'); - }); + this.plugin.settings.excludeFolders = + this.plugin.settings.excludeFolders.filter( + (excluded) => + (excluded.path !== file.path) || excluded.detached, + ); + this.plugin.saveSettings(true); + new Notice('Successfully removed folder from excluded folders'); + }); }); return; @@ -391,64 +391,64 @@ export class Commands { item.setTitle('Remove folder from detached folders'); item.setIcon('trash'); item.onClick(() => { - deleteExcludedFolder(this.plugin, detachedExcludedFolder); - }); + deleteExcludedFolder(this.plugin, detachedExcludedFolder); + }); }); } if (detachedExcludedFolder) { return; } - menu.addItem((item) => { + menu.addItem((item) => { item.setTitle('Exclude folder from folder notes'); item.setIcon('x-circle'); item.onClick(() => { - const newExcludedFolder = new ExcludedFolder( - file.path, - this.plugin.settings.excludeFolders.length, - undefined, - this.plugin, - ); - this.plugin.settings.excludeFolders.push(newExcludedFolder); - this.plugin.saveSettings(true); - new Notice('Successfully excluded folder from folder notes'); - }); + const newExcludedFolder = new ExcludedFolder( + file.path, + this.plugin.settings.excludeFolders.length, + undefined, + this.plugin, + ); + this.plugin.settings.excludeFolders.push(newExcludedFolder); + this.plugin.saveSettings(true); + new Notice('Successfully excluded folder from folder notes'); + }); }); if (!(file instanceof TFolder)) return; - const folderNote = getFolderNote(this.plugin, file.path); + const folderNote = getFolderNote(this.plugin, file.path); - if (folderNote instanceof TFile && !detachedExcludedFolder) { + if (folderNote instanceof TFile && !detachedExcludedFolder) { menu.addItem((item) => { item.setTitle('Delete folder note'); item.setIcon('trash'); item.onClick(() => { - deleteFolderNote(this.plugin, folderNote, true); - }); + deleteFolderNote(this.plugin, folderNote, true); + }); }); menu.addItem((item) => { item.setTitle('Open folder note'); item.setIcon('chevron-right-square'); item.onClick(() => { - openFolderNote(this.plugin, folderNote); - }); + openFolderNote(this.plugin, folderNote); + }); }); menu.addItem((item) => { item.setTitle('Detach folder note'); item.setIcon('unlink'); item.onClick(() => { - detachFolderNote(this.plugin, folderNote); - }); + detachFolderNote(this.plugin, folderNote); + }); }); menu.addItem((item) => { item.setTitle('Copy Obsidian URL'); item.setIcon('link'); item.onClick(() => { - this.app.copyObsidianUrl(folderNote); - }); + this.app.copyObsidianUrl(folderNote); + }); }); if (this.plugin.settings.hideFolderNote) { @@ -457,16 +457,16 @@ export class Commands { item.setTitle('Hide folder note in explorer'); item.setIcon('eye-off'); item.onClick(() => { - hideFolderNoteInFileExplorer(file.path, this.plugin); - }); + hideFolderNoteInFileExplorer(file.path, this.plugin); + }); }); } else { menu.addItem((item) => { item.setTitle('Show folder note in explorer'); item.setIcon('eye'); item.onClick(() => { - showFolderNoteInFileExplorer(file.path, this.plugin); - }); + showFolderNoteInFileExplorer(file.path, this.plugin); + }); }); } } @@ -475,8 +475,8 @@ export class Commands { item.setTitle('Create markdown folder note'); item.setIcon('edit'); item.onClick(() => { - createFolderNote(this.plugin, file.path, true, '.md'); - }); + createFolderNote(this.plugin, file.path, true, '.md'); + }); }); this.plugin.settings.supportedFileTypes.forEach((fileType) => { @@ -485,27 +485,27 @@ export class Commands { item.setTitle(`Create ${fileType} folder note`); item.setIcon('edit'); item.onClick(() => { - // eslint-disable-next-line max-len - createFolderNote(this.plugin, file.path, true, '.' + fileType); - }); + // eslint-disable-next-line max-len + createFolderNote(this.plugin, file.path, true, '.' + fileType); + }); }); }); } - }; + }; - if ( + if ( Platform.isDesktop && !Platform.isTablet && this.plugin.settings.useSubmenus - ) { - menu.addItem(async (item) => { - item.setTitle('Folder Note Commands').setIcon('folder-edit'); - let subMenu: Menu = item.setSubmenu() as Menu; - addFolderNoteActions(subMenu); - }) - } else { - addFolderNoteActions(menu); - } + ) { + menu.addItem(async (item) => { + item.setTitle('Folder Note Commands').setIcon('folder-edit'); + let subMenu: Menu = item.setSubmenu() as Menu; + addFolderNoteActions(subMenu); + }) + } else { + addFolderNoteActions(menu); + } })); } From 08b8056df64dcd9672a462ccbc136b3fc75e19b9 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Mon, 18 Aug 2025 09:53:19 +0200 Subject: [PATCH 3/3] Fix linter issues --- src/Commands.ts | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/Commands.ts b/src/Commands.ts index b8f2a97..c64830d 100644 --- a/src/Commands.ts +++ b/src/Commands.ts @@ -270,6 +270,7 @@ export class Commands { fileCommands(): void { this.plugin.registerEvent( + // eslint-disable-next-line complexity this.app.workspace.on('file-menu', (menu: Menu, file: TAbstractFile) => { let folder: TAbstractFile | TFolder | null = file.parent; if (file instanceof TFile) { @@ -298,9 +299,10 @@ export class Commands { } } - const addFolderNoteActions = (menu: Menu) => { + // eslint-disable-next-line complexity + const addFolderNoteActions = (folderMenu: Menu): void => { if (file instanceof TFile) { - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Create folder note'); item.setIcon('edit'); item.onClick(async () => { @@ -339,7 +341,7 @@ export class Commands { if (folder.path === '' || folder.path === '/') return; - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle(`Turn into folder note for ${folder?.name}`); item.setIcon('edit'); item.onClick(() => { @@ -369,7 +371,7 @@ export class Commands { // }); // }); - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Remove folder from excluded folders'); item.setIcon('trash'); item.onClick(() => { @@ -387,7 +389,7 @@ export class Commands { } if (detachedExcludedFolder) { - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Remove folder from detached folders'); item.setIcon('trash'); item.onClick(() => { @@ -398,7 +400,7 @@ export class Commands { if (detachedExcludedFolder) { return; } - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Exclude folder from folder notes'); item.setIcon('x-circle'); item.onClick(() => { @@ -419,7 +421,7 @@ export class Commands { const folderNote = getFolderNote(this.plugin, file.path); if (folderNote instanceof TFile && !detachedExcludedFolder) { - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Delete folder note'); item.setIcon('trash'); item.onClick(() => { @@ -427,7 +429,7 @@ export class Commands { }); }); - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Open folder note'); item.setIcon('chevron-right-square'); item.onClick(() => { @@ -435,7 +437,7 @@ export class Commands { }); }); - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Detach folder note'); item.setIcon('unlink'); item.onClick(() => { @@ -443,7 +445,7 @@ export class Commands { }); }); - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Copy Obsidian URL'); item.setIcon('link'); item.onClick(() => { @@ -453,7 +455,7 @@ export class Commands { if (this.plugin.settings.hideFolderNote) { if (excludedFolder?.showFolderNote) { - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Hide folder note in explorer'); item.setIcon('eye-off'); item.onClick(() => { @@ -461,7 +463,7 @@ export class Commands { }); }); } else { - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Show folder note in explorer'); item.setIcon('eye'); item.onClick(() => { @@ -471,7 +473,7 @@ export class Commands { } } } else { - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle('Create markdown folder note'); item.setIcon('edit'); item.onClick(() => { @@ -481,11 +483,10 @@ export class Commands { this.plugin.settings.supportedFileTypes.forEach((fileType) => { if (fileType === 'md') return; - menu.addItem((item) => { + folderMenu.addItem((item) => { item.setTitle(`Create ${fileType} folder note`); item.setIcon('edit'); item.onClick(() => { - // eslint-disable-next-line max-len createFolderNote(this.plugin, file.path, true, '.' + fileType); }); }); @@ -494,15 +495,15 @@ export class Commands { }; if ( - Platform.isDesktop && - !Platform.isTablet && - this.plugin.settings.useSubmenus + Platform.isDesktop && + !Platform.isTablet && + this.plugin.settings.useSubmenus ) { menu.addItem(async (item) => { item.setTitle('Folder Note Commands').setIcon('folder-edit'); let subMenu: Menu = item.setSubmenu() as Menu; addFolderNoteActions(subMenu); - }) + }); } else { addFolderNoteActions(menu); }