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(ios-frame): tearDownUI and reset UINavigationController

Browse Source
This commit is contained in:
ADjenkov
2019-01-23 10:29:24 +02:00
parent 4a37b79634
commit 88f1ab6b74
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/css-perf-test/main-page.ts
View File

@@ -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) { export function navigatedTo(args: ObservableEventData) {
setTimeout(() => { setTimeout(() => {

6
apps/app/cuteness.io/main-page.ts
View File

@@ -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 { Page } from "tns-core-modules/ui/page";
import {ItemEventData as ListViewItemEventData } from "tns-core-modules/ui/list-view"; import { ItemEventData as ListViewItemEventData } from "tns-core-modules/ui/list-view";
import {topmost as topmostFrame } from "tns-core-modules/ui/frame"; import { topmost as topmostFrame } from "tns-core-modules/ui/frame";
import { AppViewModel } from "./reddit-app-view-model"; import { AppViewModel } from "./reddit-app-view-model";
var appViewModel = new AppViewModel(); var appViewModel = new AppViewModel();

11
tns-core-modules/ui/frame/frame.ios.ts
View File

@@ -33,6 +33,12 @@ export class Frame extends FrameBase {
this.nativeViewProtected = this._ios.controller.view; this.nativeViewProtected = this._ios.controller.view;
} }
public disposeNativeView() {
this._ios.controller = null;
this.viewController = null;
super.disposeNativeView();
}
public get ios(): iOSFrame { public get ios(): iOSFrame {
return this._ios; return this._ios;
} }
@@ -373,6 +379,7 @@ class UINavigationControllerImpl extends UINavigationController {
const owner = this._owner.get(); const owner = this._owner.get();
if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) { if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) {
owner.callUnloaded(); owner.callUnloaded();
owner._tearDownUI(true);
} }
} }
@@ -580,6 +587,10 @@ class iOSFrame implements iOSFrameDefinition {
return this._controller; return this._controller;
} }
public set controller(value: UINavigationControllerImpl) {
this._controller = value;
}
public get showNavigationBar(): boolean { public get showNavigationBar(): boolean {
return this._showNavigationBar; return this._showNavigationBar;
} }