Merge pull request #15195 from calixteman/empty_editor

[Editor] No need to click twice to create an editor when the last one is empty
This commit is contained in:
calixteman 2022-07-20 14:29:16 +02:00 committed by GitHub
commit 408c10b5bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions

View File

@ -572,7 +572,8 @@ class AnnotationEditorLayer {
return; return;
} }
this.#allowClick = !this.#uiManager.hasActive(); const editor = this.#uiManager.getActive();
this.#allowClick = !editor || editor.isEmpty();
} }
/** /**

View File

@ -938,7 +938,9 @@ class AnnotationEditorUIManager {
for (const editor of this.#allEditors.values()) { for (const editor of this.#allEditors.values()) {
editor.unselect(); editor.unselect();
} }
this.#dispatchUpdateStates({ hasSelectedEditor: this.hasActive() }); this.#dispatchUpdateStates({
hasSelectedEditor: this.#activeEditor !== null,
});
} }
/** /**
@ -958,14 +960,6 @@ class AnnotationEditorUIManager {
return this.#activeEditor; return this.#activeEditor;
} }
/**
* Check if there is an active editor.
* @returns {boolean}
*/
hasActive() {
return this.#activeEditor !== null;
}
/** /**
* Get the current editor mode. * Get the current editor mode.
* @returns {number} * @returns {number}