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): Utils.dismissKeyboard() not working with modal (#10375)

Browse Source
This commit is contained in:
Juan de Dios Martínez Vallejo
2023-09-28 04:04:42 +02:00
committed by GitHub
parent 6f599fef1c
commit 6d44c2d6e0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/utils/android/index.ts
View File

@@ -1,5 +1,6 @@
import { Application } from '../../application';
import { Trace } from '../../trace';
import { topmost } from '../../ui/frame/frame-stack';
let application: android.app.Application;
let applicationContext: android.content.Context;
@@ -67,7 +68,9 @@ export function dismissSoftInput(nativeView?: android.view.View): void {
}
windowToken = nativeView.getWindowToken();
} else if (getCurrentActivity() instanceof androidx.appcompat.app.AppCompatActivity) {
const decorView = getCurrentActivity().getWindow().getDecorView();
const modalDialog = (topmost()?._modalParent ?? topmost())?.modal?._dialogFragment?.getDialog();
const window = (modalDialog ?? getCurrentActivity()).getWindow();
const decorView = window.getDecorView();
if (decorView) {
windowToken = decorView.getWindowToken();
decorView.requestFocus();

9
packages/core/utils/index.android.ts
View File

@@ -2,6 +2,7 @@ import { Trace } from '../trace';
import { getFileExtension } from './common';
import { SDK_VERSION } from './constants';
import { android as AndroidUtils } from './native-helper';
import { topmost } from '../ui/frame/frame-stack';
export { clearInterval, clearTimeout, setInterval, setTimeout } from '../timer';
export * from './common';
@@ -178,10 +179,10 @@ export function dismissSoftInput(nativeView?: any): void {
export function dismissKeyboard() {
dismissSoftInput();
const activity = AndroidUtils.getCurrentActivity();
if (activity) {
const focus = activity.getCurrentFocus();
const modalDialog = (topmost()?._modalParent ?? topmost())?.modal?._dialogFragment?.getDialog();
const view = modalDialog ?? AndroidUtils.getCurrentActivity();
if (view) {
const focus = view.getCurrentFocus();
if (focus) {
focus.clearFocus();