@breakside/jskit 2022.3.1 → 2022.7.0

package/Root/Frameworks/UIKit/UINavigationController.js

@@ -35,6 +35,7 @@ JSClass("UINavigationController", UIViewController, {
         this.addChildViewController(rootViewController);
         this._viewControllers = [rootViewController];
         this.navigationBar = UINavigationBar.initWithRootItem(rootViewController.navigationItem, barStyler);
+        this.navigationItem.hidesNavigationBar = true;
     },
 
     initWithSpec: function(spec){
@@ -54,10 +55,28 @@ JSClass("UINavigationController", UIViewController, {
         if (spec.containsKey("delegate")){
             this.delegate = spec.valueForKey("delegate");
         }
+        this.navigationItem.hidesNavigationBar = true;
     },
 
+    // --------------------------------------------------------------------
+    // MARK: - Delegate
+
     delegate: null,
 
+    scheduleDelegateShowViewController: function(viewController){
+        if (this.delegate && this.delegate.navigationControllerWillShowViewController){
+            this.delegate.navigationControllerWillShowViewController(this, viewController);
+        }
+        this.schedule(function(){
+            if (this.topViewController === viewController){
+                if (this.delegate && this.delegate.navigationControllerDidShowViewController){
+                    this.delegate.navigationControllerDidShowViewController(this, viewController);
+                }
+            }
+        });
+    },
+
+    // --------------------------------------------------------------------
     // MARK: - View Lifecycle
 
     viewDidLoad: function(){
@@ -87,6 +106,7 @@ JSClass("UINavigationController", UIViewController, {
         this.topViewController.viewDidDisappear(animated);
     },
 
+    // --------------------------------------------------------------------
     // MARK: - Navigation Bar
 
     navigationBar: JSDynamicProperty('_navigationBar', null),
@@ -104,34 +124,47 @@ JSClass("UINavigationController", UIViewController, {
         this._navigationBar.items = items;
     },
 
+    // --------------------------------------------------------------------
     // MARK: - View Controllers
 
     viewControllers: JSDynamicProperty('_viewControllers', null),
 
     setViewControllers: function(viewControllers){
+        var oldTopViewController = this.topViewController;
         var newTopViewController = viewControllers[viewControllers.length - 1];
-        var newView = newTopViewController.view;
-        if (newTopViewController !== this.topViewController){
-            this.topViewController.viewWillDisappear();
-            newTopViewController.viewWillAppear();
-            if (this.delegate && this.delegate.navigationControllerWillShowViewController){
-                this.delegate.navigationControllerWillShowViewController(this, newTopViewController);
-            }
-        }
-        this.topViewController.view.removeFromSuperview();
         var i, l;
+        var viewController;
         for (i = 0, l = this._viewControllers.length; i < l; ++i){
-            this._viewControllers[i].removeFromParentViewController();
+            viewController = this._viewControllers[i];
+            if (viewControllers.indexOf(viewController) < 0){
+                viewController.removeFromParentViewController();
+            }
         }
         this._viewControllers = JSCopy(viewControllers);
         var items = [];
         for (i = 0, l = this._viewControllers.length; i < l; ++i){
-            this.addChildViewController(this._viewControllers[i]);
-            items.push(this._viewControllers[i].navigationItem);
+            viewController = this._viewControllers[i];
+            this.addChildViewController(viewController);
+            items.push(viewController.navigationItem);
         }
         this._navigationBar.items = items;
-        this.view.insertSubviewBelowSibling(this.topViewController.view, this._navigationBar);
-        this.view.setNeedsLayout();
+        if (this.isViewLoaded){
+            if (this.isViewVisible){
+                if (newTopViewController !== oldTopViewController){
+                    oldTopViewController.scheduleDisappearance();
+                    newTopViewController.scheduleAppearance();
+                    this.scheduleDelegateShowViewController(newTopViewController);
+                }
+            }
+            oldTopViewController.view.removeFromSuperview();
+            if (newTopViewController.navigationItem.hidesNavigationBar){
+                this.view.addSubview(newTopViewController.view);
+            }else{
+                this.view.insertSubviewBelowSibling(newTopViewController.view, this._navigationBar);
+            }
+            this.navigationBar.hidden = newTopViewController.navigationItem.hidesNavigationBar;
+            this.view.setNeedsLayout();
+        }
     },
 
     topViewController: JSReadOnlyProperty(),
@@ -163,59 +196,99 @@ JSClass("UINavigationController", UIViewController, {
         if (this.popAnimator !== null || this.pushAnimator !== null){
             return;
         }
-        if (!this.isViewVisible){
-            animated = false;
-        }
-        if (animated){
-            this.pushAnimator = this.createPushAnimator();
-        }
         var fromViewController = this.topViewController;
+        var fromItem = fromViewController.navigationItem;
+        var fromView = fromViewController.view;
         var view = viewController.view;
-        if (this.isViewVisible){
-            fromViewController.viewWillDisappear(animated);
-            viewController.viewWillAppear(animated);
-        }
-        if (this.delegate && this.delegate.navigationControllerWillShowViewController){
-            this.delegate.navigationControllerWillShowViewController(this, viewController);
-        }
+        var item = viewController.navigationItem;
+        var navigationBar = this._navigationBar;
         this.addChildViewController(viewController);
         this._viewControllers.push(viewController);
-        this._navigationBar.pushItem(viewController.navigationItem, animated);
-        this.view.insertSubviewBelowSibling(view, this._navigationBar);
-        if (!animated){
+        if (this.isViewLoaded){
             if (this.isViewVisible){
-                fromViewController.enqueueDidDisappear();
-                viewController.enqueueDidAppear();
-            }
-            if (this.delegate && this.delegate.navigationControllerDidShowViewController){
-                this.delegate.navigationControllerDidShowViewController(this, viewController);
+                var isHidingNavigationBar = !fromItem.hidesNavigationBar && item.hidesNavigationBar;
+                var isShowingNavigationBar = fromItem.hidesNavigationBar && !item.hidesNavigationBar;
+                if (animated){
+                    this.pushAnimator = this.createPushAnimator();
+                    fromViewController.beginDisappearanceWithAnimator(this.pushAnimator);
+                    viewController.beginAppearanceWithAnimator(this.pushAnimator);
+                    if (this.delegate && this.delegate.navigationControllerWillShowViewController){
+                        this.delegate.navigationControllerWillShowViewController(this, viewController);
+                    }
+                    if (isShowingNavigationBar){
+                        this.view.addSubview(navigationBar);
+                        this.view.insertSubviewBelowSibling(view, navigationBar);
+                        navigationBar.pushItem(item, false);
+                    }else if (isHidingNavigationBar){
+                        this.view.addSubview(view);
+                    }else{
+                        this.view.insertSubviewAboveSibling(view, fromView);
+                        navigationBar.pushItem(item, animated);
+                    }
+                    this.layoutChildViewController(viewController);
+                    view.transform = JSAffineTransform.Translated(view.bounds.size.width, 0);
+                    view.shadowColor = JSColor.windowShadow;
+                    view.shadowRadius = 20;
+                    if (isShowingNavigationBar){
+                        navigationBar.transform = view.transform;
+                        navigationBar.hidden = false;
+                    }
+                    this.pushAnimator.addAnimations(function(){
+                        view.transform = JSAffineTransform.Identity;
+                        fromView.transform = JSAffineTransform.Translated(-fromView.bounds.size.width / 2, 0);
+                        if (isShowingNavigationBar){
+                            navigationBar.transform = JSAffineTransform.Identity;
+                        }else if (isHidingNavigationBar){
+                            navigationBar.transform = fromView.transform;
+                        }
+                    });
+                    this.pushAnimator.addCompletion(function(){
+                        this.pushAnimator = null;
+                        navigationBar.hidden = item.hidesNavigationBar;
+                        if (isHidingNavigationBar){
+                            navigationBar.transform = JSAffineTransform.Identity;
+                            navigationBar.pushItem(item, false);
+                        }
+                        fromView.removeFromSuperview();
+                        fromView.transform = JSAffineTransform.Identity;
+                        view.shadowColor = null;
+                        if (this.delegate && this.delegate.navigationControllerDidShowViewController){
+                            this.delegate.navigationControllerDidShowViewController(this, viewController);
+                        }
+                    }, this);
+                    this.pushAnimator.start();
+                }else{
+                    fromViewController.scheduleDisappearance();
+                    viewController.scheduleAppearance();
+                    this.scheduleDelegateShowViewController(viewController);
+                    if (isShowingNavigationBar){
+                        this.view.addSubview(navigationBar);
+                        this.view.insertSubviewBelowSibling(view, navigationBar);
+                        navigationBar.pushItem(item, false);
+                    }else if (isHidingNavigationBar){
+                        this.view.addSubview(view);
+                    }else{
+                        this.view.insertSubviewAboveSibling(view, fromView);
+                        navigationBar.pushItem(item, animated);
+                    }
+                    fromView.removeFromSuperview();
+                    this.view.setNeedsLayout();
+                    navigationBar.hidden = item.hidesNavigationBar;
+                }
+            }else{
+                fromView.removeFromSuperview();
+                if (item.hidesNavigationBar){
+                    this.view.addSubview(view);
+                }else{
+                    this.view.insertSubviewBelowSibling(view, navigationBar);
+                }
+                navigationBar.pushItem(item, false);
+                navigationBar.hidden = item.hidesNavigationBar;
+                this.view.setNeedsLayout();
             }
-            fromViewController.view.removeFromSuperview();
-            this.view.setNeedsLayout();
         }else{
-            var navController = this;
-            this.layoutChildView(viewController.view);
-            viewController.view.transform = JSAffineTransform.Translated(viewController.view.bounds.size.width, 0);
-            viewController.view.shadowColor = JSColor.windowShadow;
-            viewController.view.shadowRadius = 20;
-            this.pushAnimator.addAnimations(function(){
-                viewController.view.transform = JSAffineTransform.Identity;
-                fromViewController.view.transform = JSAffineTransform.Translated(-fromViewController.view.bounds.size.width / 2, 0);
-            });
-            this.pushAnimator.addCompletion(function(){
-                navController.pushAnimator = null;
-                fromViewController.view.removeFromSuperview();
-                fromViewController.viewDidDisappear(true);
-                fromViewController.view.transform = JSAffineTransform.Identity;
-                viewController.shadowColor = null;
-                viewController.viewDidAppear(true);
-                if (navController.delegate && navController.delegate.navigationControllerDidShowViewController){
-                    navController.delegate.navigationControllerDidShowViewController(navController, viewController);
-                }
-            });
-            JSRunLoop.main.schedule(function(){
-                this.pushAnimator.start();
-            }, this);
+            navigationBar.hidden = item.hidesNavigationBar;
+            navigationBar.pushItem(item, false);
         }
     },
 
@@ -241,59 +314,100 @@ JSClass("UINavigationController", UIViewController, {
         if (index === this._viewControllers.length - 1){
             return;
         }
-        if (!this.isViewVisible){
-            animated = false;
-        }
-        if (animated){
-            this.popAnimator = this.createPopAnimator();
-        }
         var fromViewController = this.topViewController;
+        var fromView = fromViewController.view;
+        var fromItem = fromViewController.navigationItem;
         var view = viewController.view;
-        if (this.isViewVisible){
-            fromViewController.viewWillDisappear(animated);
-            viewController.viewWillAppear(animated);
-        }
-        if (this.delegate && this.delegate.navigationControllerWillShowViewController){
-            this.delegate.navigationControllerWillShowViewController(this, viewController);
+        var item = viewController.navigationItem;
+        var navigationBar = this._navigationBar;
+        var i, l;
+        for (i = this._viewControllers.length - 1; i > index; --i){
+            this._viewControllers[i].removeFromParentViewController();
+            this._viewControllers.pop();
         }
-        this._viewControllers.splice(index + 1, this._viewControllers.length - index);
-        this._navigationBar.popToItem(viewController.navigationItem, animated);
-        this.view.insertSubviewBelowSibling(view, fromViewController.view);
-        if (!animated){
+        if (this.isViewLoaded){
             if (this.isViewVisible){
-                fromViewController.enqueueDidDisappear();
-                viewController.enqueueDidAppear();
-            }
-            if (this.delegate && this.delegate.navigationControllerDidShowViewController){
-                this.delegate.navigationControllerDidShowViewController(this, viewController);
+                var isHidingNavigationBar = !fromItem.hidesNavigationBar && item.hidesNavigationBar;
+                var isShowingNavigationBar = fromItem.hidesNavigationBar && !item.hidesNavigationBar;
+                if (animated){
+                    this.popAnimator = this.createPopAnimator();
+                    fromViewController.beginDisappearanceWithAnimator(this.popAnimator);
+                    viewController.beginAppearanceWithAnimator(this.popAnimator);
+                    if (this.delegate && this.delegate.navigationControllerWillShowViewController){
+                        this.delegate.navigationControllerWillShowViewController(this, viewController);
+                    }
+                    if (isShowingNavigationBar){
+                        this.view.insertSubviewBelowSibling(view, navigationBar);
+                        navigationBar.popToItem(item, false);
+                    }else if (isHidingNavigationBar){
+                        this.view.insertSubviewBelowSibling(view, fromView);
+                    }else{
+                        this.view.insertSubviewBelowSibling(view, fromView);
+                        navigationBar.popToItem(item, animated);   
+                    }
+                    this.layoutChildViewController(viewController);
+                    view.transform = JSAffineTransform.Translated(-view.bounds.size.width / 2, 0);
+                    fromView.shadowColor = JSColor.windowShadow;
+                    fromView.shadowRadius = 20;
+                    if (isShowingNavigationBar){
+                        navigationBar.transform = view.transform;
+                        navigationBar.hidden = false;
+                    }
+                    this.popAnimator.addAnimations(function(){
+                        view.transform = JSAffineTransform.Identity;
+                        fromView.transform = JSAffineTransform.Translated(fromView.bounds.size.width, 0);
+                        if (isShowingNavigationBar){
+                            navigationBar.transform = JSAffineTransform.Identity;
+                        }else if (isHidingNavigationBar){
+                            navigationBar.transform = fromView.transform;
+                        }
+                    });
+                    this.popAnimator.addCompletion(function(){
+                        this.popAnimator = null;
+                        navigationBar.hidden = item.hidesNavigationBar;
+                        if (isHidingNavigationBar){
+                            navigationBar.transform = JSAffineTransform.Identity;
+                            navigationBar.setItem(item, false);
+                        }
+                        fromView.removeFromSuperview();
+                        fromView.shadowColor = null;
+                        fromView.transform = JSAffineTransform.Identity;
+                        if (this.delegate && this.delegate.navigationControllerDidShowViewController){
+                            this.delegate.navigationControllerDidShowViewController(this, viewController);
+                        }
+                    }, this);
+                    this.popAnimator.start();
+                }else{
+                    fromViewController.scheduleDisappearance();
+                    viewController.scheduleAppearance();
+                    this.scheduleDelegateShowViewController(viewController);
+                    if (isShowingNavigationBar){
+                        this.view.insertSubviewBelowSibling(view, navigationBar);
+                        navigationBar.popToItem(item, false);
+                    }else if (isHidingNavigationBar){
+                        this.view.insertSubviewBelowSibling(view, fromView);
+                    }else{
+                        this.view.insertSubviewBelowSibling(view, fromView);
+                        navigationBar.popToItem(item, animated);   
+                    }
+                    fromView.removeFromSuperview();
+                    this.view.setNeedsLayout();
+                    navigationBar.hidden = item.hidesNavigationBar;
+                }
+            }else{
+                fromView.removeFromSuperview();
+                if (item.hidesNavigationBar){
+                    this.view.addSubview(view);
+                }else{
+                    this.view.insertSubviewBelowSibling(view, navigationBar);
+                }
+                navigationBar.popToItem(item, false);
+                navigationBar.hidden = item.hidesNavigationBar;
+                this.view.setNeedsLayout();
             }
-            fromViewController.view.removeFromSuperview();
-            this.view.setNeedsLayout();
         }else{
-            var navController = this;
-            this.layoutChildView(viewController.view);
-            viewController.view.transform = JSAffineTransform.Translated(-viewController.view.bounds.size.width / 2, 0);
-            fromViewController.view.shadowColor = JSColor.windowShadow;
-            fromViewController.view.shadowRadius = 20;
-            this.popAnimator.addAnimations(function(){
-                viewController.view.transform = JSAffineTransform.Identity;
-                fromViewController.view.transform = JSAffineTransform.Translated(fromViewController.view.bounds.size.width, 0);
-            });
-            this.popAnimator.addCompletion(function(){
-                fromViewController.view.removeFromSuperview();
-                navController.popAnimator = null;
-                fromViewController.removeFromParentViewController();
-                fromViewController.shadowColor = null;
-                viewController.viewDidAppear(animated);
-                fromViewController.viewDidDisappear(animated);
-                fromViewController.view.transform = JSAffineTransform.Identity;
-                if (navController.delegate && navController.delegate.navigationControllerDidShowViewController){
-                    navController.delegate.navigationControllerDidShowViewController(navController, viewController);
-                }
-            });
-            JSRunLoop.main.schedule(function(){
-                this.popAnimator.start();
-            }, this);
+            navigationBar.hidden = item.hidesNavigationBar;
+            navigationBar.popToItem(item, false);
         }
     },
 
@@ -314,6 +428,7 @@ JSClass("UINavigationController", UIViewController, {
         this.pushViewController(viewController, animated);
     },
 
+    // --------------------------------------------------------------------
     // MARK: Layout
 
     automaticallyAdjustsInsets: true,
@@ -321,18 +436,19 @@ JSClass("UINavigationController", UIViewController, {
     viewDidLayoutSubviews: function(){
         var barHeight = this._navigationBar.intrinsicSize.height;
         var size = this.view.bounds.size;
-        var contentView = this.topViewController.view;
         this._navigationBar.frame = JSRect(0, 0, size.width, barHeight);
-        this.layoutChildView(contentView);
+        this.layoutChildViewController(this.topViewController);
     },
 
-    layoutChildView: function(view){
+    layoutChildViewController: function(viewController){
         var y;
+        var view = viewController.view;
         var size = this.view.bounds.size;
         var barFrame = this._navigationBar.frame;
-        if (this._navigationBar.coversContent){
+        var barHidden = viewController.navigationItem.hidesNavigationBar;
+        if (barHidden || this._navigationBar.coversContent){
             y = barFrame.origin.y;
-            if (this.automaticallyAdjustsInsets && view.isKindOfClass(UIScrollView)){
+            if (!barHidden && this.automaticallyAdjustsInsets && view.isKindOfClass(UIScrollView)){
                 var insets = JSInsets(view.contentInsets);
                 insets.top = this._navigationBar.coveredContentTopInset;
                 view.contentInsets = insets;

package/Root/Frameworks/UIKit/UINavigationItem.js

@@ -21,6 +21,7 @@ JSClass("UINavigationItem", JSObject, {
 
     title: JSDynamicProperty('_title', null),
     view: JSDynamicProperty('_view', null),
+    hidesNavigationBar: false,
     backBarButtonItem: JSDynamicProperty('_backBarButtonItem', null),
     rightBarItems: JSDynamicProperty('_rightBarItems', null),
     leftBarItems: JSDynamicProperty('_leftBarItems', null),
@@ -40,6 +41,9 @@ JSClass("UINavigationItem", JSObject, {
         if (spec.containsKey("view")){
             this._view = spec.valueForKey("view", UIView);
         }
+        if (spec.containsKey("hidesNavigationBar")){
+            this.hidesNavigationBar = spec.valueForKey("hidesNavigationBar");
+        }
         if (spec.containsKey("backBarButtonItem")){
             this._backBarButtonItem = spec.valueForKey("backBarButtonItem", UINavigationItem);
         }

package/Root/Frameworks/UIKit/UIPopupButton.js

@@ -782,6 +782,7 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
     activeBackgroundColor: null,
     overBackgroundColor: null,
     cornerRadius: 0,
+    titleInsets: null,
 
     init: function(){
         this.initWithColor(JSColor.text);
@@ -814,6 +815,9 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
         if (spec.containsKey("cornerRadius")){
             this.cornerRadius = spec.valueForKey("cornerRadius");
         }
+        if (spec.containsKey("titleInsets")){
+            this.titleInsets = spec.valueForKey("titleInsets", JSInsets);
+        }
         this._fillInMissingColors();
     },
 
@@ -824,6 +828,9 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
         if (this.disabledColor === null){
             this.disabledColor = this.normalColor.colorWithAlpha(0.5);
         }
+        if (this.titleInsets === null){
+            this.titleInsets = JSInsets.Zero;
+        }
     },
 
     initializeControl: function(button){
@@ -835,6 +842,7 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
         button._indicatorView.frame = JSRect.Zero;
         button._imageView.hidden = false;
         button.cornerRadius = this.cornerRadius;
+        button.titleInsets = this.titleInsets;
         this.updateControl(button);
     },