diff --git a/manifest-beta.json b/manifest-beta.json index 7a83c2e..d3ffc29 100644 --- a/manifest-beta.json +++ b/manifest-beta.json @@ -1,7 +1,7 @@ { "id": "folder-notes", "name": "Folder notes beta", - "version": "1.7.30-15-beta", + "version": "1.7.30-16-beta", "minAppVersion": "0.15.0", "description": "Create notes within folders that can be accessed without collapsing the folder, similar to the functionality offered in Notion.", "author": "Lost Paul", diff --git a/src/main.ts b/src/main.ts index effc7b8..0ba2382 100644 --- a/src/main.ts +++ b/src/main.ts @@ -21,6 +21,7 @@ import { getFocusedItem } from './functions/utils'; import { FOLDER_OVERVIEW_VIEW, FolderOverviewView } from './obsidian-folder-overview/src/view'; import { getFolderPathFromString } from './functions/utils'; import { registerOverviewCommands } from './obsidian-folder-overview/src/Commands'; +import { updateOverviewView, updateViewDropdown } from './obsidian-folder-overview/src/main'; export default class FolderNotesPlugin extends Plugin { observer: MutationObserver; @@ -252,13 +253,8 @@ export default class FolderNotesPlugin extends Plugin { workspace.revealLeaf(leaf); } - async updateOverviewView() { - const { workspace } = this.app; - const leaf = workspace.getLeavesOfType(FOLDER_OVERVIEW_VIEW)[0]; - if (!leaf) return; - const view = leaf.view as any as FolderOverviewView; - view.display(view.contentEl, view.yaml, this, view.defaultSettings, view.display, undefined, undefined, view.activeFile); - } + updateOverviewView = updateOverviewView + updateViewDropdown = updateViewDropdown isEmptyFolderNoteFolder(folder: TFolder): boolean { let attachmentFolderPath = this.app.vault.getConfig('attachmentFolderPath') as string; diff --git a/src/obsidian-folder-overview b/src/obsidian-folder-overview index 2ea07c0..9baffd2 160000 --- a/src/obsidian-folder-overview +++ b/src/obsidian-folder-overview @@ -1 +1 @@ -Subproject commit 2ea07c04a668e159b64fcd56617bba231baa01af +Subproject commit 9baffd271f683a048462e15187135c53925f65da diff --git a/styles.css b/styles.css index ed5c4eb..24bb6f6 100644 --- a/styles.css +++ b/styles.css @@ -1,3 +1,5 @@ + + .fn-whitespace-stop-collapsing .nav-folder-title-content { flex-grow: 1 !important; display: flex; @@ -42,6 +44,9 @@ body:not(.disable-folder-highlight) .tree-item-self.fn-is-active { cursor: pointer; } +.hide { + display: none; +} .hide-folder-note .is-folder-note { display: none; @@ -177,6 +182,16 @@ body:not(.disable-folder-highlight) .tree-item-self.fn-is-active { font-size: 1.2rem; } +.overview-setting-item-fv { + border-top: 1px solid var(--background-modifier-border); + padding: 0.75em 0; + align-items: center; +} + +.overview-setting-item-fv .setting-item { + padding: 0; +} + .folder-overview-grid-item { flex: 1 1 auto;