Merge pull request #1272 from hgiesel/clickondiv

Move selection into editable, if it's not there after focus
This commit is contained in:
Damien Elmes 2021-07-04 15:52:06 +10:00 committed by GitHub
commit 972deba041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,10 @@
// Copyright: Ankitects Pty Ltd and contributors // Copyright: Ankitects Pty Ltd and contributors
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
/* eslint
@typescript-eslint/no-non-null-assertion: "off",
*/
import { enableButtons, disableButtons } from "./toolbar"; import { enableButtons, disableButtons } from "./toolbar";
import type { EditingArea } from "./editing-area"; import type { EditingArea } from "./editing-area";
@ -10,6 +14,12 @@ import { bridgeCommand } from "./lib";
export function onFocus(evt: FocusEvent): void { export function onFocus(evt: FocusEvent): void {
const currentField = evt.currentTarget as EditingArea; const currentField = evt.currentTarget as EditingArea;
currentField.focus(); currentField.focus();
if (currentField.shadowRoot!.getSelection()!.anchorNode === null) {
// selection is not inside editable after focusing
currentField.caretToEnd();
}
bridgeCommand(`focus:${currentField.ord}`); bridgeCommand(`focus:${currentField.ord}`);
enableButtons(); enableButtons();
} }