Merge pull request #1048 from hgiesel/focusfieldsfix

Fix focus handling when coming from top left buttons
This commit is contained in:
Damien Elmes 2021-03-02 13:00:24 +10:00 committed by GitHub
commit 92aaaf7146
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
import type { EditingArea } from ".";
import { EditingArea } from ".";
import { bridgeCommand } from "./lib";
import { enableButtons, disableButtons } from "./toolbar";
@ -30,7 +30,10 @@ export function onFocus(evt: FocusEvent): void {
const currentField = evt.currentTarget as EditingArea;
const previousFocus = evt.relatedTarget as EditingArea;
if (previousFocus === previousActiveElement || !previousFocus) {
if (
previousFocus === previousActiveElement ||
!(previousFocus instanceof EditingArea)
) {
focusField(currentField);
}
}