diff --git a/src/click-handler.ts b/src/click-handler.ts index 359eaca..16fe1c7 100644 --- a/src/click-handler.ts +++ b/src/click-handler.ts @@ -19,7 +19,7 @@ export const getClickHandler = (plugin: ALxFolderNote) => { getFileItemInnerTitleEl(item).contains(evt.target as Node) ) || // ignore file being renamed - item.fileExplorer.fileBeingRenamed === item.file + item.view.fileBeingRenamed === item.file ) return false; @@ -64,8 +64,8 @@ export const pressHandler = ( item: FolderItem, _evt: LongPressEvent, ): boolean => { - if (!item || item.fileExplorer.fileBeingRenamed === item.file) return false; + if (!item || item.view.fileBeingRenamed === item.file) return false; const folder = item.file; - item.fileExplorer.folderNoteUtils?.folderFocus.toggleFocusFolder(folder); + item.view.folderNoteUtils?.folderFocus.toggleFocusFolder(folder); return true; }; diff --git a/src/fe-handler/folder-focus.ts b/src/fe-handler/folder-focus.ts index 66bfa4c..2f7f06a 100644 --- a/src/fe-handler/folder-focus.ts +++ b/src/fe-handler/folder-focus.ts @@ -54,12 +54,13 @@ export default class FolderFocus extends FEHandler_Base { // @ts-ignore this.plugin.app.nextFrame(() => { // @ts-ignore - this.fileExplorer.dom.infinityScroll.computeSync(); + this.fileExplorer.tree.infinityScroll.compute(); // @ts-ignore - this.fileExplorer.dom.infinityScroll.scrollIntoView(item); + this.fileExplorer.tree.infinityScroll.scrollIntoView(item); }); } - this.fileExplorer.dom.navFileContainerEl.toggleClass(focusModeCls, !!item); + console.log('§2§') + this.fileExplorer.navFileContainerEl.toggleClass(focusModeCls, !!item); } toggleFocusFolder(folder: TFolder | null) { const folderItem = folder diff --git a/src/fe-patch.ts b/src/fe-patch.ts index ece0b89..6f46b18 100644 --- a/src/fe-patch.ts +++ b/src/fe-patch.ts @@ -65,7 +65,7 @@ const PatchFileExplorer = (plugin: ALxFolderNote) => { const self = this; next.call(self); self.folderNoteUtils = getFileExplorerHandlers(plugin, self); - AddLongPressEvt(plugin, self.dom.navFileContainerEl); + AddLongPressEvt(plugin, self.navFileContainerEl); self.containerEl.on( "auxclick", ".nav-folder", diff --git a/src/typings/obsidian-ex.d.ts b/src/typings/obsidian-ex.d.ts index c5f7033..fc8dbfe 100644 --- a/src/typings/obsidian-ex.d.ts +++ b/src/typings/obsidian-ex.d.ts @@ -14,10 +14,10 @@ declare module "obsidian" { getViewType(): string; getDisplayText(): string; onClose(): Promise; - dom: { + tree: { infinityScroll: HTMLDivElement; - navFileContainerEl: HTMLDivElement; }; + navFileContainerEl: HTMLDivElement; onOpen(): Promise; onFileClick(evt: MouseEvent, navEl: HTMLDivElement): void; handleFileClick(evt: MouseEvent, item: AFItem): boolean; @@ -48,7 +48,7 @@ declare module "obsidian" { class FileItem { el: HTMLDivElement; file: TFile; - fileExplorer: FileExplorerView; + view: FileExplorerView; // Starting from Obsidian 1.5.4 the .fileExplorer field was renamed to .view info: any; /** * @deprecated After Obsidian 1.2.0, use `selfEl` instead. @@ -64,7 +64,7 @@ declare module "obsidian" { class FolderItem { el: HTMLDivElement; - fileExplorer: FileExplorerView; + view: FileExplorerView; // Starting from Obsidian 1.5.4 the .fileExplorer field was renamed to .view info: any; /** * @deprecated After Obsidian 1.2.0, use `selfEl` instead.