Skip to content

fix: don't update view when it was the source of the state change #593

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

Closed
wants to merge 1 commit into from
Closed

fix: don't update view when it was the source of the state change #593

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
21 changes: 12 additions & 9 deletions packages/editor/src/lib/Workspace.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ export class Workspace {
const file = files.find((file) => file.name === name) as File;

if (file) {
this.#update_state(file, state);
this.#update_state(file, state, true);
} else {
this.states.delete(name);
}
Expand All @@ -314,7 +314,7 @@ export class Workspace {
this.#reset_diagnostics();
}

update_file(file: File) {
update_file(file: File, update_view = true) {
if (file.name === this.#current.name) {
this.#current = file;
}
Expand All @@ -336,7 +336,7 @@ export class Workspace {

const state = this.states.get(file.name);
if (state) {
this.#update_state(file, state);
this.#update_state(file, state, update_view);
}

this.#onupdate(file);
Expand Down Expand Up @@ -374,10 +374,13 @@ export class Workspace {
if (update.docChanged) {
const state = this.#view!.state!;

this.update_file({
...this.#current,
contents: state.doc.toString()
});
this.update_file(
{
...this.#current,
contents: state.doc.toString()
},
false
);

// preserve undo/redo across files
this.states.set(this.#current.name, state);
Expand Down Expand Up @@ -461,7 +464,7 @@ export class Workspace {
this.#view?.setState(this.#get_state(this.#current));
}

#update_state(file: File, state: EditorState) {
#update_state(file: File, state: EditorState, update_view: boolean) {
const existing = state.doc.toString();

if (file.contents !== existing) {
Expand All @@ -481,7 +484,7 @@ export class Workspace {

this.states.set(file.name, transaction.state);

if (file === this.#current) {
if (update_view && file === this.#current) {
this.#view?.setState(transaction.state);
}
}
Expand Down
Loading