@breakside/jskit 2021.46.1 → 2022.4.0

package/Root/Frameworks/UIKit/UIViewController.js

@@ -16,7 +16,7 @@
 // #import Foundation
 // #import "UIResponder.js"
 // #import "UITabView.js"
-/* global UINavigationItem, UINavigationController */
+/* global UINavigationItem, UINavigationController, UIApplication */
 'use strict';
 
 JSClass("UIViewController", UIResponder, {
@@ -98,33 +98,9 @@ JSClass("UIViewController", UIResponder, {
     // -------------------------------------------------------------------------
     // MARK: - View Lifecycle
 
-    _needsDidAppear: false,
-    _needsDidDisappear: false,
     isViewVisible: JSReadOnlyProperty("_isViewVisible", false),
 
-    enqueueDidAppear: function(){
-        if (!this._needsDidAppear){
-            this._needsDidAppear = true;
-            this.view.layer._displayServer.schedule(function(){
-                if (this._needsDidAppear){
-                    this._needsDidAppear = false;
-                    this.viewDidAppear(false);
-                }
-            }, this);
-        }
-    },
-
-    enqueueDidDisappear: function(){
-        if (!this._needsDidDisappear){
-            this._needsDidDisappear = true;
-            this.view.layer._displayServer.schedule(function(){
-                if (this._needsDidDisappear){
-                    this._needsDidDisappear = false;
-                    this.viewDidDisappear(false);
-                }
-            }, this);
-        }
-    },
+    lifecycleState: JSReadOnlyProperty("_lifecycleState", 0),
 
     viewDidLoad: function(){
     },
@@ -132,15 +108,18 @@ JSClass("UIViewController", UIResponder, {
     viewDidUnload: function(){
     },
 
-    viewWillAppear: function(){
+    viewWillAppear: function(animated){
+        this._lifecycleState = UIViewController.LifecycleState.appearing;
         this._loadViewIfNeeded();
     },
 
-    viewDidAppear: function(){
+    viewDidAppear: function(animated){
+        this._lifecycleState = UIViewController.LifecycleState.appeared;
         this._isViewVisible = true;
     },
 
-    viewWillDisappear: function(){
+    viewWillDisappear: function(animated){
+        this._lifecycleState = UIViewController.LifecycleState.disappearing;
         if (this.isViewLoaded){
             var window = this.view.window;
             if (window !== null){
@@ -158,10 +137,106 @@ JSClass("UIViewController", UIResponder, {
         }
     },
 
-    viewDidDisappear: function(){
+    viewDidDisappear: function(animated){
+        this._lifecycleState = UIViewController.LifecycleState.disappeared;
         this._isViewVisible = false;
     },
 
+    // -------------------------------------------------------------------------
+    // MARK: - Lifecycle Control Methods
+
+    beginAppearance: function(animated){
+        this.beginAppearanceTransition(true, animated);
+    },
+
+    endAppearance: function(){
+        this.endAppearanceTransition();
+    },
+
+    beginAppearanceWithAnimator: function(animator){
+        this.beginAppearance(true);
+        animator.addCompletion(function(){
+            this.endAppearance();
+        }, this);
+    },
+
+    scheduleAppearance: function(){
+        this.beginAppearance(false);
+        this._scheduleAppearanceTransition();
+    },
+
+    beginDisappearance: function(animated){
+        this.beginAppearanceTransition(false, animated);
+    },
+
+    endDisappearance: function(){
+        this.endAppearanceTransition();
+    },
+
+    beginDisappearanceWithAnimator: function(animator){
+        this.beginDisappearance(true);
+        animator.addCompletion(function(){
+            this.endDisappearance();
+        }, this);
+    },
+
+    scheduleDisappearance: function(){
+        this.beginDisappearance(false);
+        this._scheduleAppearanceTransition();
+    },
+
+    beginAppearanceTransition: function(isAppearing, animated){
+        this._appearanceTransitionAnimated = animated;
+        if (isAppearing){
+            if (this._lifecycleState === UIViewController.LifecycleState.disappeared || this._lifecycleState === UIViewController.LifecycleState.disappearing){
+                this.viewWillAppear(animated);
+            }
+        }else{
+            if (this._lifecycleState === UIViewController.LifecycleState.appeared || this._lifecycleState === UIViewController.LifecycleState.appearing){
+                this.viewWillDisappear(animated);
+            }
+        }
+    },
+
+    endAppearanceTransition: function(){
+        if (this._appearanceTransitionAnimated){
+            this._endAppearanceTransition(true);
+        }else{
+            this._scheduleAppearanceTransition();
+        }
+    },
+
+    _endAppearanceTransition: function(){
+        this._appearanceTransitionScheduled = false;
+        if (this._lifecycleState === UIViewController.LifecycleState.appearing){
+            this.viewDidAppear(this._appearanceTransitionAnimated);
+        }else if (this._lifecycleState === UIViewController.LifecycleState.disappearing){
+            this.viewDidDisappear(this._appearanceTransitionAnimated);
+        }
+    },
+
+    _appearanceTransitionAnimated: false,
+    _appearanceTransitionScheduled: false,
+
+    _scheduleAppearanceTransition: function(){
+        if (this._appearanceTransitionScheduled){
+            return;
+        }
+        this._appearanceTransitionScheduled = true;
+        this.schedule(this._endAppearanceTransition);
+    },
+
+    // -------------------------------------------------------------------------
+    // MARK: - Display Loop Syncrhonization
+
+    schedule: function(callback){
+        var displayServer = UIApplication.shared.windowServer.displayServer;
+        displayServer.schedule(callback, this);
+    },
+
+    // -------------------------------------------------------------------------
+    // MARK: - Layout
+
     viewDidLayoutSubviews: function(){
     },
 
@@ -169,18 +244,32 @@ JSClass("UIViewController", UIResponder, {
         this.view.sizeToFitSize(size);
     },
 
+    contentSizeThatFitsSize: function(maxSize){
+        this.view.sizeToFitSize(maxSize);
+        return JSSize(this.view.bounds.size);
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Child View Controllers
 
     parentViewController: null,
 
     addChildViewController: function(viewController){
+        if (viewController.parentViewController === this){
+            return;
+        }
+        if (viewController.parentViewController !== null){
+            viewController.removeFromParentViewController();
+        }
         viewController.willMoveToParentViewController(this);
         viewController.parentViewController = this;
         viewController.didMoveToParentViewController(this);
     },
 
     removeFromParentViewController: function(){
+        if (this.parentViewController === null){
+            return;
+        }
         this.willMoveToParentViewController(null);
         this.parentViewController = null;
         this.didMoveToParentViewController(null);
@@ -193,30 +282,28 @@ JSClass("UIViewController", UIResponder, {
     },
 
     replaceChildViewController: function(previousChildViewController, childViewController, animator){
+        if (previousChildViewController === childViewController){
+            return;
+        }
         if (this.isViewLoaded && this.isViewVisible){
-            var animated = animator !== undefined && animator !== null;
-            if (previousChildViewController !== null){
-                previousChildViewController.viewWillDisappear(animated);
-                previousChildViewController.removeFromParentViewController();
-            }
-            if (childViewController !== null){
-                // trigger childViewController.viewDidLoad by accessing .view
-                var view = childViewController.view;
-                this.addChildViewController(childViewController);
-                childViewController.viewWillAppear(animated);
-            }
-            var completion = function(){
+            if (animator !== undefined && animator !== null){
+                if (previousChildViewController !== null){
+                    previousChildViewController.beginDisappearanceWithAnimator(animator);
+                    previousChildViewController.removeFromParentViewController();
+                }
+                if (childViewController !== null){
+                    this.addChildViewController(childViewController);
+                    childViewController.beginAppearanceWithAnimator(animator);
+                }
+            }else{                
                 if (previousChildViewController !== null){
-                    previousChildViewController.viewDidDisappear(animated);
+                    previousChildViewController.scheduleDisappearance();
+                    previousChildViewController.removeFromParentViewController();
                 }
                 if (childViewController !== null){
-                    childViewController.viewDidAppear(animated);
+                    this.addChildViewController(childViewController);
+                    childViewController.scheduleAppearance();
                 }
-            };
-            if (animated){
-                animator.addCompletion(completion, this);
-            }else{
-                this.view.layer._displayServer.schedule(completion, this);
             }
         }else{
             if (previousChildViewController !== null){
@@ -324,4 +411,11 @@ JSClass("UIViewController", UIResponder, {
     }
 
 
-});
+});
+
+UIViewController.LifecycleState = {
+    disappeared: 0,
+    appearing: 1,
+    appeared: 2,
+    disappearing: 3
+};

package/Root/Frameworks/UIKit/UIWindow.js

@@ -214,27 +214,16 @@ JSClass('UIWindow', UIView, {
 
     setContentViewController: function(contentViewController){
         var previousViewController = this._contentViewController;
-        var contentView = null;
-        // load the view before calling viewWillAppear
-        if (contentViewController){
-            contentView = contentViewController.view;
-        }
         if (this._isVisible){
             if (previousViewController !== null){
-                previousViewController.viewWillDisappear(false);
+                previousViewController.scheduleDisappearance();
             }
             if (contentViewController !== null){
-                contentViewController.viewWillAppear(false);
+                contentViewController.scheduleAppearance();
             }
         }
-        this.contentView = contentView;
-        if (this._isVisible){
-            if (previousViewController !== null){
-                previousViewController.viewDidDisappear(false);
-            }
-            if (contentViewController !== null){
-                contentViewController.viewDidAppear(false);
-            }
+        if (contentViewController !== null){
+            this.contentView = contentViewController.view;
         }
         this._contentViewController = contentViewController;
     },

package/Root/Frameworks/UIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKitTesting
-JSBundleVersion: 2021.46.1
+JSBundleVersion: 2022.4.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/UIKitTesting/UIMockApplication.js

@@ -59,6 +59,12 @@ JSClass("UIMockApplication", UIApplication, {
         UIMockApplication.$super.deinit.call(this);
     },
 
+    setScreenSize: function(size){
+        var oldFrame = this.windowServer.screen.frame;
+        this.windowServer.screen.frame = JSRect(JSPoint.Zero, size);
+        this.windowServer.screenDidChangeFrame(oldFrame);
+    },
+
     displayTime: 0,
 
     updateDisplay: function(dt){

package/package.json

@@ -9,7 +9,7 @@
     "node": ">=10.10.0"
   },
   "name": "@breakside/jskit",
-  "version": "2021.46.1",
+  "version": "2022.4.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"