fix: cleanup the modal parent once closed.

on iOS as the UILayoutViewController can be used for other widget we need to let it know it is for modal so that it still loads/unloads the view (there was a test for parent).
NativeScript · Nov 16, 2023 · cb52301 · cb52301
1 parent cb7743c
commit cb52301
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
@@ -298,6 +298,7 @@ function initializeDialogFragment() {
 
 				owner._isAddedToNativeVisualTree = false;
 				owner._tearDownUI(true);
+				owner.parent = null;
 			}
 		}
 	}

diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
@@ -500,10 +500,11 @@ export class View extends ViewCommon implements ViewDefinition {
 		this._setupAsRootView({});
 
 		super._showNativeModalView(<ViewCommon>parentWithController, options);
-		let controller = this.viewController;
+		let controller: IOSHelper.UILayoutViewController = this.viewController;
 		if (!controller) {
 			const nativeView = this.ios || this.nativeViewProtected;
-			controller = <UIViewController>IOSHelper.UILayoutViewController.initWithOwner(new WeakRef(this));
+			controller = <IOSHelper.UILayoutViewController>IOSHelper.UILayoutViewController.initWithOwner(new WeakRef(this));
+			controller.modal = true;
 			this.parent = Application.getRootView();
 
 			if (nativeView instanceof UIView) {

diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
@@ -436,6 +436,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 					}
 
 					this._tearDownUI(true);
+					this.parent = null;
 				}
 			};
 

diff --git a/packages/core/ui/core/view/view-helper/index.d.ts b/packages/core/ui/core/view/view-helper/index.d.ts
@@ -54,8 +54,9 @@ export namespace IOSHelper {
 	export function getFrameFromPosition(position: { left; top; right; bottom }, insets?: { left; top; right; bottom }): any; /* CGRect */
 	export function shrinkToSafeArea(view: View, frame: any /* CGRect */): any; /* CGRect */
 	export function expandBeyondSafeArea(view: View, frame: any /* CGRect */): any; /* CGRect */
-	export class UILayoutViewController {
+	export class UILayoutViewController extends UIViewController {
 		public static initWithOwner(owner: WeakRef<View>): UILayoutViewController;
+		modal?: boolean;
 	}
 	export class UIAdaptivePresentationControllerDelegateImp {
 		public static initWithOwnerAndCallback(owner: WeakRef<View>, whenClosedCallback: Function): UIAdaptivePresentationControllerDelegateImp;

diff --git a/packages/core/ui/core/view/view-helper/index.ios.ts b/packages/core/ui/core/view/view-helper/index.ios.ts
@@ -11,6 +11,9 @@ export * from './view-helper-common';
 @NativeClass
 class UILayoutViewController extends UIViewController {
 	public owner: WeakRef<View>;
+	// used to know if we are a modal controller
+	// in this case the owner has a parent (rootView) but we still need to load/unload it
+	public modal;
 
 	public static initWithOwner(owner: WeakRef<View>): UILayoutViewController {
 		const controller = <UILayoutViewController>UILayoutViewController.new();
@@ -97,15 +100,15 @@ class UILayoutViewController extends UIViewController {
 
 		IOSHelper.updateAutoAdjustScrollInsets(this, owner);
 
-		if (!owner.isLoaded && !owner.parent) {
+		if (!owner.isLoaded && (!owner.parent || this.modal)) {
 			owner.callLoaded();
 		}
 	}
 
 	public viewDidDisappear(animated: boolean): void {
 		super.viewDidDisappear(animated);
 		const owner = this.owner?.deref();
-		if (owner && owner.isLoaded && !owner.parent) {
+		if (owner && owner.isLoaded && (!owner.parent || this.modal)) {
 			owner.callUnloaded();
 		}
 	}