javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(android): Textfield focus fix (#9885)

Browse Source
This commit is contained in:
farfromrefuge
2022-04-30 19:47:18 +02:00
committed by GitHub
parent 6f68b2f78d
commit 17a87a4a86
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/core/ui/editable-text-base/index.android.ts
View File

@@ -12,37 +12,38 @@ const sdkVersion = lazy(() => parseInt(Device.sdkVersion));
//https://github.com/NativeScript/NativeScript/issues/2942 //https://github.com/NativeScript/NativeScript/issues/2942
export let dismissKeyboardTimeoutId: NodeJS.Timer; export let dismissKeyboardTimeoutId: NodeJS.Timer;
export let dismissKeyboardOwner: WeakRef<EditableTextBase>;
interface EditTextListeners extends android.text.TextWatcher, android.view.View.OnFocusChangeListener, android.widget.TextView.OnEditorActionListener {} interface EditTextListeners extends android.text.TextWatcher, android.view.View.OnFocusChangeListener, android.widget.TextView.OnEditorActionListener {}
interface EditTextListenersClass { interface EditTextListenersClass {
prototype: EditTextListeners; prototype: EditTextListeners;
new (owner: EditableTextBase): EditTextListeners; new (owner: WeakRef<EditableTextBase>): EditTextListeners;
} }
let EditTextListeners: EditTextListenersClass; let EditTextListeners: EditTextListenersClass;
function clearDismissTimer(): void { function clearDismissTimer(): void {
dismissKeyboardOwner = null;
if (dismissKeyboardTimeoutId) { if (dismissKeyboardTimeoutId) {
clearTimeout(dismissKeyboardTimeoutId); clearTimeout(dismissKeyboardTimeoutId);
dismissKeyboardTimeoutId = null; dismissKeyboardTimeoutId = null;
} }
} }
function dismissSoftInput(owner: EditableTextBase): void { function dismissSoftInput(_owner: WeakRef<EditableTextBase>): void {
clearDismissTimer(); clearDismissTimer();
if (!dismissKeyboardTimeoutId) { if (!dismissKeyboardTimeoutId) {
dismissKeyboardTimeoutId = setTimeout(() => { dismissKeyboardTimeoutId = setTimeout(() => {
const owner = dismissKeyboardOwner && dismissKeyboardOwner.get(); const owner = _owner && _owner.get();
const activity = (owner && owner._context) as androidx.appcompat.app.AppCompatActivity; const activity = owner?._context as androidx.appcompat.app.AppCompatActivity;
const nativeView = owner && owner.nativeViewProtected;
dismissKeyboardTimeoutId = null; dismissKeyboardTimeoutId = null;
dismissKeyboardOwner = null;
const focused = activity && activity.getCurrentFocus(); const focused = activity && activity.getCurrentFocus();
if (!focused || !(focused instanceof android.widget.EditText)) { if (focused && !(focused instanceof android.widget.EditText)) {
ad.dismissSoftInput(nativeView); // warning `ad.dismissSoftInput` will actually focus the next view
// if we pass a null parameter!!!
// => focus and show keyboard again
// the fix was for where there were multiple TextField for which it would work!
// with this it will still work without breaking for single TextField
ad.dismissSoftInput(focused);
} }
}, 10); }, 10);
} }
@@ -55,7 +56,7 @@ function initializeEditTextListeners(): void {
@NativeClass @NativeClass
@Interfaces([android.text.TextWatcher, android.view.View.OnFocusChangeListener, android.widget.TextView.OnEditorActionListener]) @Interfaces([android.text.TextWatcher, android.view.View.OnFocusChangeListener, android.widget.TextView.OnEditorActionListener])
class EditTextListenersImpl extends java.lang.Object implements android.text.TextWatcher, android.view.View.OnFocusChangeListener, android.widget.TextView.OnEditorActionListener { class EditTextListenersImpl extends java.lang.Object implements android.text.TextWatcher, android.view.View.OnFocusChangeListener, android.widget.TextView.OnEditorActionListener {
constructor(private owner: EditableTextBase) { constructor(private owner: WeakRef<EditableTextBase>) {
super(); super();
return global.__native(this); return global.__native(this);
@@ -74,7 +75,7 @@ function initializeEditTextListeners(): void {
} }
public afterTextChanged(editable: android.text.Editable): void { public afterTextChanged(editable: android.text.Editable): void {
const owner = this.owner; const owner = this.owner && this.owner.get();
if (!owner || owner._changeFromCode) { if (!owner || owner._changeFromCode) {
return; return;
} }
@@ -92,7 +93,7 @@ function initializeEditTextListeners(): void {
} }
public onFocusChange(view: android.view.View, hasFocus: boolean): void { public onFocusChange(view: android.view.View, hasFocus: boolean): void {
const owner = this.owner; const owner = this.owner && this.owner.get();
if (!owner) { if (!owner) {
return; return;
} }
@@ -113,12 +114,12 @@ function initializeEditTextListeners(): void {
eventName: EditableTextBase.blurEvent, eventName: EditableTextBase.blurEvent,
object: owner, object: owner,
}); });
dismissSoftInput(owner); dismissSoftInput(this.owner);
} }
} }
public onEditorAction(textView: android.widget.TextView, actionId: number, event: android.view.KeyEvent): boolean { public onEditorAction(textView: android.widget.TextView, actionId: number, event: android.view.KeyEvent): boolean {
const owner = this.owner; const owner = this.owner && this.owner.get();
if (!owner) { if (!owner) {
return false; return false;
} }
@@ -170,7 +171,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
const editText = this.nativeTextViewProtected; const editText = this.nativeTextViewProtected;
this._configureEditText(editText); this._configureEditText(editText);
initializeEditTextListeners(); initializeEditTextListeners();
const listeners = new EditTextListeners(this); const listeners = new EditTextListeners(new WeakRef(this));
editText.addTextChangedListener(listeners); editText.addTextChangedListener(listeners);
editText.setOnFocusChangeListener(listeners); editText.setOnFocusChangeListener(listeners);
editText.setOnEditorActionListener(listeners); editText.setOnEditorActionListener(listeners);