feat(fe-handler): focused folder now auto unfold and scroll into view

aidenlx · Nov 28, 2021 · a872028 · a872028
1 parent f61b44f
commit a872028
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/modules/fe-handler.ts b/src/modules/fe-handler.ts
@@ -329,13 +329,35 @@ export default class FEHandler extends FEHandler_Base {
   //#endregion
 
   //#region folder focus setup
-  private _focusedFolder: FolderItem | null = null;
+  private _focusedFolder: {
+    folder: FolderItem;
+    collapsedCache: boolean;
+  } | null = null;
   get focusedFolder() {
-    return this._focusedFolder;
+    return this._focusedFolder?.folder ?? null;
   }
-  set focusedFolder(val: FolderItem | null) {
-    this._focusedFolder = val;
-    this.fileExplorer.dom.navFileContainerEl.toggleClass(focusModeCls, !!val);
+  set focusedFolder(item: FolderItem | null) {
+    // restore previous folder collapse state
+    if (this._focusedFolder) {
+      const { folder, collapsedCache } = this._focusedFolder;
+      if (folder.collapsed !== collapsedCache)
+        folder.setCollapsed(collapsedCache);
+    }
+    this._focusedFolder = item
+      ? { folder: item, collapsedCache: item.collapsed }
+      : null;
+    // unfold folder if it's collapsed
+    if (item && item.collapsed) {
+      item.setCollapsed(false);
+      // @ts-ignore
+      this.plugin.app.nextFrame(() => {
+        // @ts-ignore
+        this.fileExplorer.dom.infinityScroll.computeSync();
+        // @ts-ignore
+        this.fileExplorer.dom.infinityScroll.scrollIntoView(item);
+      });
+    }
+    this.fileExplorer.dom.navFileContainerEl.toggleClass(focusModeCls, !!item);
   }
   toggleFocusFolder(folder: TFolder | null) {
     const folderItem = folder

diff --git a/src/typings/obsidian-ex.d.ts b/src/typings/obsidian-ex.d.ts
@@ -10,6 +10,7 @@ declare module "obsidian" {
     getDisplayText(): string;
     onClose(): Promise<void>;
     dom: {
+      infinityScroll: HTMLDivElement;
       navFileContainerEl: HTMLDivElement;
     };
   }
@@ -37,6 +38,7 @@ declare module "obsidian" {
     collapseIndicatorEl: HTMLDivElement;
     collapsed: boolean;
     pusherEl: HTMLDivElement;
+    setCollapsed(collapsed: boolean): Promise<void>;
   }
 
   interface Vault {