diff --git a/apps/app/css-perf-test/main-page.ts b/apps/app/css-perf-test/main-page.ts index c22a93868..eccc8d67c 100644 --- a/apps/app/css-perf-test/main-page.ts +++ b/apps/app/css-perf-test/main-page.ts @@ -1,4 +1,4 @@ -import {EventData as ObservableEventData } from "tns-core-modules/data/observable"; +import { EventData as ObservableEventData } from "tns-core-modules/data/observable"; export function navigatedTo(args: ObservableEventData) { setTimeout(() => { diff --git a/apps/app/cuteness.io/main-page.ts b/apps/app/cuteness.io/main-page.ts index 6fc3b9429..b2a89b2c3 100644 --- a/apps/app/cuteness.io/main-page.ts +++ b/apps/app/cuteness.io/main-page.ts @@ -1,7 +1,7 @@ -import {EventData as ObservableEventData } from "tns-core-modules/data/observable"; +import { EventData as ObservableEventData } from "tns-core-modules/data/observable"; import { Page } from "tns-core-modules/ui/page"; -import {ItemEventData as ListViewItemEventData } from "tns-core-modules/ui/list-view"; -import {topmost as topmostFrame } from "tns-core-modules/ui/frame"; +import { ItemEventData as ListViewItemEventData } from "tns-core-modules/ui/list-view"; +import { topmost as topmostFrame } from "tns-core-modules/ui/frame"; import { AppViewModel } from "./reddit-app-view-model"; var appViewModel = new AppViewModel(); diff --git a/tns-core-modules/ui/frame/frame.ios.ts b/tns-core-modules/ui/frame/frame.ios.ts index 6ace89148..172245a7a 100644 --- a/tns-core-modules/ui/frame/frame.ios.ts +++ b/tns-core-modules/ui/frame/frame.ios.ts @@ -33,6 +33,12 @@ export class Frame extends FrameBase { this.nativeViewProtected = this._ios.controller.view; } + public disposeNativeView() { + this._ios.controller = null; + this.viewController = null; + super.disposeNativeView(); + } + public get ios(): iOSFrame { return this._ios; } @@ -373,6 +379,7 @@ class UINavigationControllerImpl extends UINavigationController { const owner = this._owner.get(); if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) { owner.callUnloaded(); + owner._tearDownUI(true); } } @@ -580,6 +587,10 @@ class iOSFrame implements iOSFrameDefinition { return this._controller; } + public set controller(value: UINavigationControllerImpl) { + this._controller = value; + } + public get showNavigationBar(): boolean { return this._showNavigationBar; }