Skip to content

Revert "Enhance layout change handling" #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Signynt merged 1 commit into from
Jan 25, 2026
Merged

Revert "Enhance layout change handling" #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,6 @@ export default class VirtualFooterPlugin extends Plugin {
private lastSeparateTabContents: Map<string, { content: string, sourcePath: string }> = new Map();
private lastHoveredLink: HTMLElement | null = null;
private popoverObserver: MutationObserver | null = null;
/** Track the last processed file to avoid redundant refreshes on layout-change */
private lastProcessedFile: string | null = null;

/**
* Called when the plugin is loaded.
Expand Down Expand Up @@ -375,40 +373,17 @@ export default class VirtualFooterPlugin extends Plugin {
// Define event handlers
const handleViewUpdate = () => {
// Always trigger an update if the layout is ready.
// Used for file-open.
// Used for file-open and layout-change.
if (this.initialLayoutReadyProcessed) {
this.handleActiveViewChange();
}
};

const handleLayoutChange = () => {
// Only trigger if layout is ready
if (!this.initialLayoutReadyProcessed) return;

const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
const currentFile = activeView?.file?.path ?? null;

// Only refresh if the active file has actually changed
if (currentFile !== this.lastProcessedFile) {
this.handleActiveViewChange();
} else {
// console.log(`[VirtualFooter] layout-change Skipped: file not changed (${currentFile})`);
}
};

const handleFocusChange = () => {
// This is the "focus change" or "switching files" part, conditional on the setting.
// Used for active-leaf-change.
if (this.settings.refreshOnFileOpen && this.initialLayoutReadyProcessed) {
const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
const currentFile = activeView?.file?.path ?? null;

// Only refresh if the active file has actually changed
if (currentFile !== this.lastProcessedFile) {
this.handleActiveViewChange();
} else {
// console.log(`[VirtualFooter] active-leaf-change Skipped: file not changed (${currentFile})`);
}
this.handleActiveViewChange();
}
};

Expand All @@ -417,7 +392,7 @@ export default class VirtualFooterPlugin extends Plugin {
this.app.workspace.on('file-open', handleViewUpdate)
);
this.registerEvent(
this.app.workspace.on('layout-change', handleLayoutChange)
this.app.workspace.on('layout-change', handleViewUpdate)
);
this.registerEvent(
this.app.workspace.on('active-leaf-change', handleFocusChange)
Expand Down Expand Up @@ -911,9 +886,6 @@ export default class VirtualFooterPlugin extends Plugin {
* @param view The MarkdownView to process.
*/
private async _processView(view: MarkdownView | null): Promise<void> {
if (view?.file) {
this.lastProcessedFile = view.file.path;
}
if (!view || !view.file) {
// If 'refresh on focus' is off, we clear the sidebar when focus is lost from a markdown file.
// If it's on, we only clear the sidebar if the last markdown file has been closed,
Expand Down