Merge pull request #1055 from hgiesel/editorfocustofix

Do not execute caretToEnd when Alt-tabbing back to application
This commit is contained in:
Damien Elmes 2021-03-07 09:40:57 +10:00 committed by GitHub
commit 312fa27898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,7 +20,6 @@ function focusField(field: EditingArea) {
field.focusEditable(); field.focusEditable();
bridgeCommand(`focus:${field.ord}`); bridgeCommand(`focus:${field.ord}`);
enableButtons(); enableButtons();
caretToEnd(field);
} }
// For distinguishing focus by refocusing window from deliberate focus // For distinguishing focus by refocusing window from deliberate focus
@ -31,10 +30,14 @@ export function onFocus(evt: FocusEvent): void {
const previousFocus = evt.relatedTarget as EditingArea; const previousFocus = evt.relatedTarget as EditingArea;
if ( if (
previousFocus === previousActiveElement || !(previousFocus instanceof EditingArea) ||
!(previousFocus instanceof EditingArea) previousFocus === previousActiveElement
) { ) {
focusField(currentField); focusField(currentField);
if (previousFocus) {
caretToEnd(currentField);
}
} }
} }