@breakside/jskit 2021.42.0 → 2021.46.1

package/Root/Frameworks/UIKit/UIView.js

@@ -211,10 +211,16 @@ JSClass('UIView', UIResponder, {
     subviews: null,
 
     addSubview: function(subview){
+        if (!(subview instanceof UIView)){
+            throw new TypeError("addSubview() given view is not a UIView");
+        }
         return this._insertSubviewAtIndex(subview, this.subviews.length, this.layer.sublayers.length);
     },
 
     insertSubviewAtIndex: function(subview, index){
+        if (!(subview instanceof UIView)){
+            throw new TypeError("insertSubviewAtIndex() given view is not a UIView");
+        }
         var layerIndex;
         if (index < this.subviews.length){
             layerIndex = this.subviews[index].layer.sublayerIndex;
@@ -225,6 +231,9 @@ JSClass('UIView', UIResponder, {
     },
 
     insertSubviewBelowSibling: function(subview, sibling){
+        if (!(subview instanceof UIView)){
+            throw new TypeError("insertSubviewBelowSibling() given view is not a UIView");
+        }
         if (sibling.superview !== this){
             throw Error('Cannot insert subview [%s] in view [%s] because sibling view [%s] is not a valid subview.');
         }
@@ -232,6 +241,9 @@ JSClass('UIView', UIResponder, {
     },
 
     insertSubviewAboveSibling: function(subview, sibling){
+        if (!(subview instanceof UIView)){
+            throw new TypeError("insertSubviewAboveSibling() given view is not a UIView");
+        }
         if (sibling.superview !== this){
             throw Error('Cannot insert subview [%s] in view [%s] because sibling view [%s] is not a valid subview.');
         }
@@ -239,6 +251,9 @@ JSClass('UIView', UIResponder, {
     },
 
     removeSubview: function(subview){
+        if (!(subview instanceof UIView)){
+            throw new TypeError("removeSubview() given subview is not a UIView");
+        }
         if (subview.superview === this){
             this.layer.removeSublayer(subview.layer);
             for (var i = subview.subviewIndex + 1, l = this.subviews.length; i < l; ++i){
@@ -464,6 +479,7 @@ JSClass('UIView', UIResponder, {
     // MARK: - Layout
 
     frame: UIViewLayerProperty(),
+    untransformedFrame: UIViewLayerProperty(),
     bounds: UIViewLayerProperty(),
     position: UIViewLayerProperty(),
     anchorPoint: UIViewLayerProperty(),

package/Root/Frameworks/UIKit/UIViewController.js

@@ -192,6 +192,42 @@ JSClass("UIViewController", UIResponder, {
     didMoveToParentViewController: function(parentViewController){
     },
 
+    replaceChildViewController: function(previousChildViewController, childViewController, animator){
+        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 (previousChildViewController !== null){
+                    previousChildViewController.viewDidDisappear(animated);
+                }
+                if (childViewController !== null){
+                    childViewController.viewDidAppear(animated);
+                }
+            };
+            if (animated){
+                animator.addCompletion(completion, this);
+            }else{
+                this.view.layer._displayServer.schedule(completion, this);
+            }
+        }else{
+            if (previousChildViewController !== null){
+                previousChildViewController.removeFromParentViewController();
+            }
+            if (childViewController !== null){
+                this.addChildViewController(childViewController);
+            }
+        }
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Responder
 

package/Root/Frameworks/UIKit/UIWindow.js

@@ -1431,7 +1431,7 @@ JSClass("UIWindowTitlelessStyler", UIWindowStyler, {
     closeButtonImages: null,
 
     init: function(){
-        UIWindowDefaultStyler.$super.init.call(this);
+        UIWindowTitlelessStyler.$super.init.call(this);
         this.shadowColor = JSColor.windowShadow;
         this.backgroundColor = JSColor.window;
         this.closeButtonImages = {
@@ -1443,8 +1443,42 @@ JSClass("UIWindowTitlelessStyler", UIWindowStyler, {
         this.toolbarTitleColor = JSColor.toolbarTitle;
     },
 
+    initWithSpec: function(spec){
+        UIWindowTitlelessStyler.$super.initWithSpec.call(this, spec);
+        if (spec.containsKey("backgroundColor")){
+            this.backgroundColor = spec.valueForKey("backgroundColor", JSColor);
+        }else{
+            this.backgroundColor = JSColor.window;
+        }
+        if (spec.containsKey("shadowColor")){
+            this.shadowColor = spec.valueForKey("shadowColor", JSColor);
+        }else{
+            this.shadowColor = JSColor.windowShadow;
+        }
+        if (spec.containsKey("shadowRadius")){
+            this.shadowRadius = spec.valueForKey("shadowRadius");
+        }
+        if (spec.containsKey("inactiveShadowRadius")){
+            this.inactiveShadowRadius = spec.valueForKey("inactiveShadowRadius");
+        }
+        if (spec.containsKey("cornerRadius")){
+            this.cornerRadius = spec.valueForKey("cornerRadius");
+        }
+        if (spec.containsKey("toolbarTitleColor")){
+            this.toolbarTitleColor = spec.valueForKey("toolbarTitleColor", JSColor);
+        }else{
+            this.toolbarTitleColor = JSColor.toolbarTitle;
+        }
+        this.closeButtonImages = {
+            inactive: images.closeInactive,
+            normal: images.closeNormal,
+            over: images.closeOver,
+            active: images.closeActive
+        };
+    },
+
     initializeWindow: function(window){
-        UIWindowDefaultStyler.$super.initializeWindow.call(this, window);
+        UIWindowTitlelessStyler.$super.initializeWindow.call(this, window);
         var closeButton = UIButton.initWithStyler(UIButton.Styler.custom);
         closeButton.setImageForState(this.closeButtonImages.normal, UIControl.State.normal);
         closeButton.setImageForState(this.closeButtonImages.over, UIControl.State.over);
@@ -1468,7 +1502,7 @@ JSClass("UIWindowTitlelessStyler", UIWindowStyler, {
     },
 
     layoutWindow: function(window){
-        UIWindowDefaultStyler.$super.layoutWindow.call(this, window);
+        UIWindowTitlelessStyler.$super.layoutWindow.call(this, window);
         var controlsView = window.stylerProperties.controlsView;
         var closeButton = window.stylerProperties.closeButton;
         var toolbar = window.stylerProperties.toolbar;

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -580,7 +580,7 @@ JSClass("UIWindowServer", JSObject, {
         }
 
         if (ignore){
-            logger.warn("Ignoring mouse event: %d".sprintf(type));
+            logger.info("Ignoring mouse event: %d".sprintf(type));
             return;
         }
 
@@ -904,7 +904,7 @@ JSClass("UIWindowServer", JSObject, {
         // Create or update the active touch event
         if (this.activeTouchEvent === null){
             if (type != UIEvent.Type.touchesBegan){
-                logger.warn("Ignoring touch event: %d", type);
+                logger.info("Ignoring touch event: %d", type);
                 return;
             }
             this.activeTouchEvent = UIEvent.initTouchEventWithType(type, timestamp);

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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