Merge pull request NativeScript#1934 from NativeScript/raikov/side-drawer-fix

tzraikov · tzraikov · commit 7693e3abb72c · 2016-04-13T14:25:25.000+03:00
fixed: some transitions in side drawer are not working
diff --git a/application/application.d.ts b/application/application.d.ts
@@ -579,4 +579,11 @@ declare module "application" {
          */
         removeNotificationObserver(observer: any, notificationName: string): void;
     }
+    
+    /* tslint:disable */
+    export interface RootViewControllerImpl {
+
+        contentController: any;
+
+    }
 }
diff --git a/application/application.ios.ts b/application/application.ios.ts
@@ -13,6 +13,43 @@ class Responder extends UIResponder {
     //
 }
 
+class RootViewControllerImpl extends UIViewController implements definition.RootViewControllerImpl {
+    private _contentController: UIViewController;
+
+    get contentController(): UIViewController {
+        return this._contentController;
+    }
+
+    set contentController(contentController: UIViewController) {
+
+        if (contentController.parentViewController !== null) {
+            contentController.willMoveToParentViewController(null);
+            contentController.view.removeFromSuperview();
+            contentController.removeFromParentViewController();
+            contentController.didMoveToParentViewController(this);
+        }
+
+        if (this._contentController) {
+            this._contentController.willMoveToParentViewController(null);
+            this._contentController.view.removeFromSuperview();
+            this._contentController.removeFromParentViewController();
+        }
+
+        this.addChildViewController(contentController);
+        this.view.addSubview(contentController.view);
+        contentController.view.frame = this.view.bounds;
+        contentController.view.autoresizingMask = UIViewAutoresizing.UIViewAutoresizingFlexibleWidth | UIViewAutoresizing.UIViewAutoresizingFlexibleHeight;
+
+        this._contentController = contentController;
+        this._contentController.didMoveToParentViewController(this);
+    }
+
+    public viewDidLoad(): void {
+        super.viewDidLoad();
+        this.view.backgroundColor = UIColor.whiteColor();
+    }
+}
+
 class Window extends UIWindow {
 
     private _content;
@@ -140,11 +177,13 @@ class IOSApplication implements definition.iOSApplication {
 
             rootView = frame;
         }
-        
+
         this._window.content = rootView;
 
         if (rootView instanceof Frame) {
-            this.rootController = this._window.rootViewController = rootView.ios.controller;
+            let rootController = new RootViewControllerImpl();
+            this.rootController = this._window.rootViewController = rootController;
+            rootController.contentController = rootView.ios.controller;
         }
         else if (rootView.ios instanceof UIViewController) {
             this.rootController = this._window.rootViewController = rootView.ios;
diff --git a/ui/frame/frame.ios.ts b/ui/frame/frame.ios.ts
@@ -430,6 +430,7 @@ class UINavigationControllerImpl extends UINavigationController {
     }
 
     public viewDidLoad(): void {
+        super.viewDidLoad();
         let owner = this._owner.get();
         if (owner) {
             owner.onLoaded();

Original file line number	Diff line number	Diff line change
`@@ -579,4 +579,11 @@ declare module "application" {`
`579`	`579`	`*/`
`580`	`580`	`removeNotificationObserver(observer: any, notificationName: string): void;`
`581`	`581`	`}`
	`582`	`+`
	`583`	`+ /* tslint:disable */`
	`584`	`+ export interface RootViewControllerImpl {`
	`585`	`+`
	`586`	`+ contentController: any;`
	`587`	`+`
	`588`	`+ }`
`582`	`589`	`}`
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,7 @@ class UINavigationControllerImpl extends UINavigationController {`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`public viewDidLoad(): void {`
	`433`	`+ super.viewDidLoad();`
`433`	`434`	`let owner = this._owner.get();`
`434`	`435`	`if (owner) {`
`435`	`436`	`owner.onLoaded();`