neil/silverbullet
1
0
Fork 0
Code

Maintain modal focus

Browse Source
This commit is contained in:
Zef Hemel 2023-07-29 12:19:35 +02:00
parent 9a113c7105
commit 7442aac7e0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/client.ts
View File

@ -130,7 +130,7 @@ export class Client {
parent: document.getElementById("sb-editor")!, parent: document.getElementById("sb-editor")!,
}); });
this.openPages = new OpenPages(this.editorView); this.openPages = new OpenPages(this);
this.focus(); this.focus();

11
web/open_pages.ts
View File

@ -1,3 +1,4 @@
import { Client } from "./client.ts";
import { EditorSelection, EditorView } from "./deps.ts"; import { EditorSelection, EditorView } from "./deps.ts";
class PageState { class PageState {
@ -10,11 +11,11 @@ class PageState {
export class OpenPages { export class OpenPages {
openPages = new Map<string, PageState>(); openPages = new Map<string, PageState>();
constructor(private editorView: EditorView) {} constructor(private client: Client) {}
restoreState(pageName: string): boolean { restoreState(pageName: string): boolean {
const pageState = this.openPages.get(pageName); const pageState = this.openPages.get(pageName);
const editorView = this.editorView; const editorView = this.client.editorView;
if (pageState) { if (pageState) {
// Restore state // Restore state
try { try {
@ -40,7 +41,7 @@ export class OpenPages {
scrollIntoView: true, scrollIntoView: true,
}); });
} }
editorView.focus(); this.client.focus();
return !!pageState; return !!pageState;
} }
@ -48,8 +49,8 @@ export class OpenPages {
this.openPages.set( this.openPages.set(
currentPage, currentPage,
new PageState( new PageState(
this.editorView.scrollDOM.scrollTop, this.client.editorView.scrollDOM.scrollTop,
this.editorView.state.selection, this.client.editorView.state.selection,
), ),
); );
} }