obsidian-plugin/lostpaul_obsidian-folder-notes
1
0
Fork 0
mirror of https://github.com/lostpaul/obsidian-folder-notes.git synced 2026-07-22 07:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #301 from mjkerrison/fix/excluded-folders-reset-293

Browse source 
fix: prevent excluded folders list from being reset
This commit is contained in:
Paul 2026-01-26 20:51:13 +01:00 committed by GitHub
commit 5908ff0b79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ExcludeFolders/modals/WhitelistedFoldersSettings.ts
View file

@ -40,7 +40,7 @@ export default class WhitelistedFoldersSettings extends Modal {
this.plugin.settingsTab, contentEl, whitelistedFolder,
);
addWhitelistedFolder(this.plugin, whitelistedFolder);
this.settingsTab.display();
this.settingsTab.renderSettingsPage(this.settingsTab.plugin.settings.settingsTab);
});
});

2
src/functions/folderNoteFunctions.ts
View file

@ -410,7 +410,7 @@ export async function deleteFolderNote(
if (!folder) return;
plugin.settings.excludeFolders = plugin.settings.excludeFolders.filter(
(excludedFolder) => (excludedFolder.path !== folder.path) && excludedFolder.showFolderNote);
(excludedFolder) => (excludedFolder.path !== folder.path) || !excludedFolder.showFolderNote);
plugin.saveSettings(false);
removeCSSClassFromFileExplorerEL(folder.path, 'has-folder-note', false, plugin);

8
src/functions/styleFunctions.ts
View file

@ -14,8 +14,10 @@ import type FolderOverviewPlugin from 'src/obsidian-folder-overview/src/main';
* @description Refreshes the CSS classes for all folder notes in the file explorer.
*/
export function refreshAllFolderStyles(forceReload = false, plugin: FolderNotesPlugin): void {
if (plugin.activeFileExplorer === getFileExplorer(plugin) && !forceReload) { return; }
plugin.activeFileExplorer = getFileExplorer(plugin);
const fileExplorer = getFileExplorer(plugin);
if (!fileExplorer) { return; }
if (plugin.activeFileExplorer === fileExplorer && !forceReload) { return; }
plugin.activeFileExplorer = fileExplorer;
plugin.app.vault.getAllLoadedFiles().forEach(async (file) => {
if (file instanceof TFolder) {
await updateCSSClassesForFolder(file.path, plugin);
@ -226,7 +228,7 @@ export function showFolderNoteInFileExplorer(path: string, plugin: FolderNotesPl
export function hideFolderNoteInFileExplorer(folderPath: string, plugin: FolderNotesPlugin): void {
plugin.settings.excludeFolders = plugin.settings.excludeFolders.filter(
(folder) => (folder.path !== folderPath) && folder.showFolderNote);
(folder) => (folder.path !== folderPath) || !folder.showFolderNote);
plugin.saveSettings(false);
removeCSSClassFromFileExplorerEL(folderPath, 'show-folder-note-in-explorer', true, plugin);
updateCSSClassesForFolder(folderPath, plugin);

17
src/functions/utils.ts
View file

@ -42,15 +42,17 @@ export function getParentFolderPath(path: string): string {
export function getFileExplorer(
plugin: FolderNotesPlugin | FolderOverviewPlugin,
): FileExplorerWorkspaceLeaf {
): FileExplorerWorkspaceLeaf | undefined {
// eslint-disable-next-line max-len
let leaf = plugin.app.workspace.getLeavesOfType('file-explorer')[0] as unknown as FileExplorerWorkspaceLeaf;
if (!leaf) { return undefined; }
/* make.md plugin integration */
if (leaf.containerEl.lastChild.dataset.type == 'mk-path-view') {
if ((leaf.containerEl?.lastChild as HTMLElement)?.dataset?.type == 'mk-path-view') {
plugin.app.workspace.iterateAllLeaves((x) => {
if (x.tabHeaderEl.dataset.type == 'file-explorer') {
leaf = x;
if ((x as FileExplorerWorkspaceLeaf).tabHeaderEl?.dataset?.type == 'file-explorer') {
leaf = x as FileExplorerWorkspaceLeaf;
}
});
}
@ -58,12 +60,13 @@ export function getFileExplorer(
return leaf;
}
export function getFileExplorerView(plugin: FolderNotesPlugin): FileExplorerView {
return getFileExplorer(plugin).view;
export function getFileExplorerView(plugin: FolderNotesPlugin): FileExplorerView | undefined {
return getFileExplorer(plugin)?.view;
}
export function getFocusedItem(plugin: FolderNotesPlugin): TreeNode<FileTreeItem> | null {
const fileExplorer = getFileExplorer(plugin) as unknown as FileExplorerLeaf;
const fileExplorer = getFileExplorer(plugin) as unknown as FileExplorerLeaf | undefined;
if (!fileExplorer) { return null; }
const { focusedItem } = fileExplorer.view.tree;
return focusedItem;
}

2
src/settings/ExcludedFoldersSettings.ts
View file

@ -93,7 +93,7 @@ export async function renderExcludeFolders(settingsTab: SettingsTab): Promise<vo
);
addExcludeFolderListItem(settingsTab, containerEl, excludedFolder);
addExcludedFolder(settingsTab.plugin, excludedFolder);
settingsTab.display();
settingsTab.renderSettingsPage(settingsTab.plugin.settings.settingsTab);
});
});