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

fix: android modal not following activity windowSoftInputMode (#9042)

Browse Source 
* fix android modal not following activity windowSoftInputMode

Also added an android modal parameter to set a custom windowSoftInputMode

* fix softInputMode set too soon

* Update packages/core/ui/core/view/index.android.ts

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

* Update packages/core/ui/core/view-base/index.d.ts

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

* Update packages/core/ui/core/view-base/index.ts

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>
This commit is contained in:
Martin Guillon
2020-12-28 13:47:00 +01:00
committed by GitHub
parent 4204ac8308
commit d09a564296
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/ui/core/view-base/index.d.ts vendored
View File

@ -83,6 +83,11 @@ export interface ShowModalOptions {
* An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.
*/ */
cancelable?: boolean; cancelable?: boolean;
/**
* An optional parameter specifying the windowSoftInputMode of the dialog window
* For possible values see https://developer.android.com/reference/android/view/WindowManager.LayoutParams#softInputMode
*/
windowSoftInputMode?: number;
}; };
/** /**
* An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.

6
packages/core/ui/core/view-base/index.ts
View File

@ -87,6 +87,12 @@ export interface ShowModalOptions {
* An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.
*/ */
cancelable?: boolean; cancelable?: boolean;
/**
* An optional parameter specifying the windowSoftInputMode of the dialog window.
* For possible values see https://developer.android.com/reference/android/view/WindowManager.LayoutParams#softInputMode
*/
windowSoftInputMode?: number;
}; };
/** /**
* An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode. * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.

24
packages/core/ui/core/view/index.android.ts
View File

@ -76,6 +76,7 @@ interface DialogOptions {
animated: boolean; animated: boolean;
stretched: boolean; stretched: boolean;
cancelable: boolean; cancelable: boolean;
windowSoftInputMode: number;
shownCallback: () => void; shownCallback: () => void;
dismissCallback: () => void; dismissCallback: () => void;
} }
@ -168,6 +169,7 @@ function initializeDialogFragment() {
class DialogFragmentImpl extends androidx.fragment.app.DialogFragment { class DialogFragmentImpl extends androidx.fragment.app.DialogFragment {
public owner: View; public owner: View;
private _fullscreen: boolean; private _fullscreen: boolean;
private _windowSoftInputMode: number;
private _animated: boolean; private _animated: boolean;
private _stretched: boolean; private _stretched: boolean;
private _cancelable: boolean; private _cancelable: boolean;
@ -192,6 +194,7 @@ function initializeDialogFragment() {
this._stretched = options.stretched; this._stretched = options.stretched;
this._dismissCallback = options.dismissCallback; this._dismissCallback = options.dismissCallback;
this._shownCallback = options.shownCallback; this._shownCallback = options.shownCallback;
this._windowSoftInputMode = options.windowSoftInputMode;
this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0); this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0);
let theme = this.getTheme(); let theme = this.getTheme();
@ -229,6 +232,16 @@ function initializeDialogFragment() {
owner._setupAsRootView(this.getActivity()); owner._setupAsRootView(this.getActivity());
owner._isAddedToNativeVisualTree = true; owner._isAddedToNativeVisualTree = true;
// we need to set the window SoftInputMode here.
// it wont work is set in onStart
const window = this.getDialog().getWindow();
if (this._windowSoftInputMode !== undefined) {
window.setSoftInputMode(this._windowSoftInputMode);
} else {
// the dialog seems to not follow the default activity softInputMode,
// thus set we set it here.
window.setSoftInputMode((<androidx.appcompat.app.AppCompatActivity>owner._context).getWindow().getAttributes().softInputMode);
}
return owner.nativeViewProtected; return owner.nativeViewProtected;
} }
@ -672,10 +685,14 @@ export class View extends ViewCommon {
df.setArguments(args); df.setArguments(args);
let cancelable = true; let cancelable = true;
let windowSoftInputMode: number;
if (options.android && (<any>options).android.cancelable !== undefined) { if (options.android) {
cancelable = !!(<any>options).android.cancelable; if ((<any>options).android.cancelable !== undefined) {
console.log('ShowModalOptions.android.cancelable is deprecated. Use ShowModalOptions.cancelable instead.'); cancelable = !!(<any>options).android.cancelable;
console.log('ShowModalOptions.android.cancelable is deprecated. Use ShowModalOptions.cancelable instead.');
}
windowSoftInputMode = (<any>options).android.windowSoftInputMode;
} }
cancelable = options.cancelable !== undefined ? !!options.cancelable : cancelable; cancelable = options.cancelable !== undefined ? !!options.cancelable : cancelable;
@ -686,6 +703,7 @@ export class View extends ViewCommon {
animated: !!options.animated, animated: !!options.animated,
stretched: !!options.stretched, stretched: !!options.stretched,
cancelable: cancelable, cancelable: cancelable,
windowSoftInputMode: windowSoftInputMode,
shownCallback: () => this._raiseShownModallyEvent(), shownCallback: () => this._raiseShownModallyEvent(),
dismissCallback: () => this.closeModal(), dismissCallback: () => this.closeModal(),
}; };