@breakside/jskit 2021.40.1 → 2021.43.0

package/Root/Frameworks/NotificationKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.NotificationKit
-JSBundleVersion: 2021.40.1
+JSBundleVersion: 2021.43.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/PDFKit/Info.yaml

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

package/Root/Frameworks/QRKit/Info.yaml

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

package/Root/Frameworks/SearchKit/Info.yaml

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

package/Root/Frameworks/SecurityKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.SecurityKit
-JSBundleVersion: 2021.40.1
+JSBundleVersion: 2021.43.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKit
-JSBundleVersion: 2021.40.1
+JSBundleVersion: 2021.43.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKitTesting/Info.yaml

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

package/Root/Frameworks/TestKit/Info.yaml

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

package/Root/Frameworks/UIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKit
-JSBundleVersion: 2021.40.1
+JSBundleVersion: 2021.43.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/UIKit/UIButton.js

@@ -440,18 +440,20 @@ JSClass("UIButtonStyler", UIControlStyler, {
         var image = button.getImageForState(UIControl.State.normal);
         var contentRect = button.bounds.rectWithInsets(button._titleInsets);
         if (button._titleLabel !== null){
+            var titleSize = button._titleLabel.intrinsicSize;
+            var x, y;
             if (image !== null){
                 var imageScale = contentRect.size.height / image.size.height;
                 var imageSize = JSSize(image.size.width * imageScale, contentRect.size.height);
                 button._imageView.frame = JSRect(contentRect.origin, imageSize);
-                var x = contentRect.origin.x + imageSize.width + this.titleImageSpacing;
-                var w = Math.max(0, contentRect.origin.x + contentRect.size.width - x);
-                var titleSize = button._titleLabel.intrinsicSize;
-                var y = (contentRect.size.height - titleSize.height) / 2;
-                button._titleLabel.frame = JSRect(x, contentRect.origin.y + y, w, titleSize.height);
+                x = contentRect.origin.x + imageSize.width + this.titleImageSpacing;
+                y = (contentRect.size.height - titleSize.height) / 2;
             }else{
-                button._titleLabel.frame = contentRect;
+                x = contentRect.origin.x;
+                y = (contentRect.size.height - titleSize.height) / 2;
             }
+            var w = Math.max(0, contentRect.origin.x + contentRect.size.width - x);
+            button._titleLabel.frame = JSRect(x, contentRect.origin.y + y, w, titleSize.height);
         }else if (image !== null){
             button._imageView.frame = contentRect;
         }

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -936,11 +936,10 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
                 color = window.backgroundColor;
             }
         }
-        if (color !== null){
-            this.themeColorElement.setAttribute("content", color.cssString());
-        }else{
-            this.themeColorElement.setAttribute("content", JSColor.background);
+        if (color === null){
+            color = JSColor.background;
         }
+        this.themeColorElement.setAttribute("content", color.cssString());
     },
 
     // --------------------------------------------------------------------

package/Root/Frameworks/UIKit/UILayer.js

@@ -145,6 +145,23 @@ JSClass("UILayer", JSObject, {
         this.didChangeProperty('position');
     },
 
+    untransformedFrame: JSDynamicProperty(),
+
+    getUntransformedFrame: function(){
+        var bounds = this.model.bounds;
+        var anchorPoint = this.model.anchorPoint;
+        var offset = JSPoint(anchorPoint.x * bounds.size.width, anchorPoint.y * bounds.size.height);
+        return JSRect(this.model.position.subtracting(offset), bounds.size);
+    },
+
+    setUntransformedFrame: function(frame){
+        var bounds = this.model.bounds;
+        var anchorPoint = this.model.anchorPoint;
+        var offset = JSPoint(anchorPoint.x * frame.size.width, anchorPoint.y * frame.size.height);
+        this.bounds = JSRect(bounds.origin, frame.size);
+        this.position = frame.origin.adding(offset);
+    },
+
     setBounds: function(bounds){
         // When the bounds origin changes, it's like a scrolling view, and we need to update the sublayers
         // When the bounds change size, the position and frame both need to be recalculated accordingly

package/Root/Frameworks/UIKit/UIListView.js

@@ -142,6 +142,12 @@ JSClass("UIListView", UIScrollView, {
         if (spec.containsKey("showsFocusRing")){
             this._showsFocusRing = spec.valueForKey("showsFocusRing");
         }
+        if (spec.containsKey("listHeaderView")){
+            this.listHeaderView = spec.valueForKey("listHeaderView", UIView);
+        }
+        if (spec.containsKey("listFooterView")){
+            this.listFooterView = spec.valueForKey("listFooterView", UIView);
+        }
     },
 
     _commonListInit: function(){
@@ -1553,8 +1559,7 @@ JSClass("UIListView", UIScrollView, {
         cell.position = JSPoint(rect.origin.x + cell.bounds.size.width * cell.anchorPoint.x, rect.origin.y + cell.bounds.size.height * cell.anchorPoint.y);
         cell.active = false;
         this._updateCellState(cell);
-        var styler = cell._styler || this._styler;
-        styler.updateCell(cell, indexPath);
+        cell.update();
         cell.setNeedsLayout();
         return cell;
     },
@@ -1961,12 +1966,10 @@ JSClass("UIListView", UIScrollView, {
 
     _updateVisibleCellStyles: function(){
         var item;
-        var styler;
         for (var i = 0, l = this._visibleItems.length; i < l; ++i){
             item = this._visibleItems[i];
             if (item.kind === VisibleItem.Kind.cell){
-                styler = item.view._styler || this._styler;
-                styler.updateCell(item.view, item.view.indexPath);
+                item.view.update();
             }
         }
     },
@@ -2291,18 +2294,16 @@ JSClass("UIListView", UIScrollView, {
     // --------------------------------------------------------------------
     // MARK: - Touch Events
 
-    _touchActiveCell: null,
-    _touchTimer: null,
+    _touch: null,
 
     _cancelTouchSelection: function(){
-        if (this._touchActiveCell){
-            this._touchActiveCell.active = false;
-            this._touchActiveCell = null;
+        if (this._touch.cell){
+            this._touch.cell.active = false;
         }
-        if (this._touchTimer !== null){
-            this._touchTimer.invalidate();
-            this._touchTimer = null;
+        if (this._touch.timer !== null){
+            this._touch.timer.invalidate();
         }
+        this._touch = null;
     },
 
     _makeTouchActiveCell: function(touch){
@@ -2316,7 +2317,7 @@ JSClass("UIListView", UIScrollView, {
             return;
         }
         cell.active = true;
-        this._touchActiveCell = cell;
+        this._touch.cell = cell;
     },
 
     touchesBegan: function(touches, event){
@@ -2324,15 +2325,25 @@ JSClass("UIListView", UIScrollView, {
         if (touches.length > 1){
             return;
         }
-        this._touchTimer = JSTimer.scheduledTimerWithInterval(0.05, function(){
-            this._touchTimer = null;
-            this._makeTouchActiveCell(touches[0]);
-        }, this);
+        this._touch = {
+            location0: touches[0].locationInView(this),
+            cell: null,
+            timer: JSTimer.scheduledTimerWithInterval(0.05, function(){
+                this._touch.timer = null;
+                this._makeTouchActiveCell(touches[0]);
+            }, this)
+        };
     },
 
     touchesMoved: function(touches, event){
         UIListView.$super.touchesMoved.call(this, touches, event);
-        this._cancelTouchSelection();
+        if (this._touch !== null){
+            var location = touches[0].locationInView(this);
+            var diff = location.subtracting(this._touch.location0);
+            if ((diff.x * diff.x + diff.y * diff.y) > 2){
+                this._cancelTouchSelection();
+            }
+        }
     },
 
     touchesEnded: function(touches, event){
@@ -2340,15 +2351,16 @@ JSClass("UIListView", UIScrollView, {
         if (touches.length > 1){
             return;
         }
-        if (this._touchTimer !== null){
-            this._touchTimer.invalidate();
-            this._touchTimer = null;
-            this._makeTouchActiveCell(touches[0]);
-        }
-        if (this._touchActiveCell){
-            this._touchActiveCell.active = false;
-            this._setSelectedIndexPaths([this._touchActiveCell.indexPath], {notifyDelegate: true});
-            this._touchActiveCell = null;
+        if (this._touch !== null){
+            if (this._touch.timer !== null){
+                this._touch.timer.invalidate();
+                this._makeTouchActiveCell(touches[0]);
+            }
+            if (this._touch.cell){
+                this._touch.cell.active = false;
+                this._setSelectedIndexPaths([this._touch.cell.indexPath], {notifyDelegate: true});
+            }
+            this._touch = null;
         }
     },
 
@@ -2378,6 +2390,10 @@ JSClass("UIListView", UIScrollView, {
         return null;
     },
 
+    indexPathOfCell: function(cell){
+        return cell.indexPath;
+    },
+
     /// Get the visible cell that contains the given location, if any
     ///
     /// Only visible cells are checked in the search, because those are the only

package/Root/Frameworks/UIKit/UINavigationBar.js

@@ -44,7 +44,7 @@ JSClass("UINavigationBar", UIView, {
         this._items = [];
 
         if (spec.containsKey("styler")){
-            this._styler = spec.valueForKey("styler", UINavigationBarStyler);
+            this._styler = spec.valueForKey("styler", UINavigationBar.Styler);
         }
         this._commonNavigationBarInit();
     },
@@ -90,11 +90,11 @@ JSClass("UINavigationBar", UIView, {
     pushAnimator: null,
 
     createPushAnimator: function(){
-        return UIViewPropertyAnimator.initWithDuration(0.2, UIAnimation.Timing.easeOut);
+        return UIViewPropertyAnimator.initWithDuration(0.2, UIAnimation.Timing.easeInOut);
     },
 
     createPopAnimator: function(){
-        return UIViewPropertyAnimator.initWithDuration(0.2, UIAnimation.Timing.easeOut);
+        return UIViewPropertyAnimator.initWithDuration(0.2, UIAnimation.Timing.easeInOut);
     },
 
     pushItem: function(item, animated){
@@ -510,10 +510,10 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             }
             removingBackBarItemView.alpha = 0;
             removingTitleLabel.alpha = 0;
-            removingTitleLabel.transform = JSAffineTransform.Translated(backTitleFrame.origin.x - removingTitleLabel.frame.origin.x, 0).scaledBy(1 / backToTitleScale);
+            removingTitleLabel.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - removingTitleLabel.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
             if (removingCustomView){
                 removingCustomView.alpha = 0;
-                removingCustomView.transform = JSAffineTransform.Translated(backTitleFrame.origin.x - removingCustomView.frame.origin.x, 0).scaledBy(1 / backToTitleScale);
+                removingCustomView.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - removingCustomView.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
             }
             props.titleLabel.alpha = 1;
             props.titleLabel.transform = JSAffineTransform.Identity;
@@ -570,10 +570,10 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         props.backBarItemView.alpha = 0;
         var backTitleFrame = removingBackBarItemView.titleLabel.convertRectToView(removingBackBarItemView.titleLabel.bounds, props.backBarItemView.superview);
         if (props.customView){
-            props.customView.transform = JSAffineTransform.Translated(backTitleFrame.origin.x - props.customView.frame.origin.x, 0).scaledBy(1 / backToTitleScale);
+            props.customView.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - props.customView.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
             props.customView.alpha = 0;
         }else{
-            props.titleLabel.transform = JSAffineTransform.Translated(backTitleFrame.origin.x - props.titleLabel.frame.origin.x, 0).scaledBy(1 / backToTitleScale);
+            props.titleLabel.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - props.titleLabel.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
         }
         animator.addAnimations(function(){
             var i, l;
@@ -693,6 +693,7 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
     },
 
     layoutBar: function(navigationBar){
+        var item = navigationBar.topItem;
         var size = navigationBar.bounds.size;
         var props = navigationBar.stylerProperties;
         var xLeft = this.itemInsets.left;
@@ -706,7 +707,7 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         if (!barItemView.hidden){
             xLeft += barItemView.bounds.size.width;
         }
-        for (i = 0, l = props.leftBarItemViews; i < l; ++i){
+        for (i = 0, l = props.leftBarItemViews.length; i < l; ++i){
             barItemView = props.leftBarItemViews[i];
             barItemView.sizeToFitSize(JSSize(xRight - xLeft, itemHeight));
             barItemView.frame = JSRect(JSPoint(xLeft, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
@@ -731,20 +732,18 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
                 props.titleLabel.hidden = false;
                 titleView = props.titleLabel;
             }
-            titleView.sizeToFitSize(JSSize(availableTitleWidth, Number.MAX_VALUE));
+            titleView.sizeToFitSize(JSSize(availableTitleWidth, size.height));
             var viewSize = titleView.bounds.size;
             var minX = xLeft;
             var maxX = xRight - viewSize.width;
             var centeredX = (size.width - viewSize.width) / 2;
             var centeredY = (size.height - viewSize.height) / 2;
-            if (this.titleTextAlignment === JSTextAlignment.center){
+            var titleTextAlignment = item ? item.titleTextAlignment || this.titleTextAlignment : this.titleTextAlignment;
+            if (titleTextAlignment === JSTextAlignment.center){
                 titleView.frame = JSRect(JSPoint(Math.min(Math.max(minX, centeredX), maxX), centeredY), viewSize);
-            }else if (this.titleTextAlignment === JSTextAlignment.right){
+            }else if (titleTextAlignment === JSTextAlignment.right){
                 titleView.frame = JSRect(JSPoint(maxX - viewSize.width, centeredY), viewSize);
             }else{
-                if (props.backBarItemView && props.backBarItemView.hidden){
-                    minX += props.backBarItemView.bounds.size.width;
-                }
                 titleView.frame = JSRect(JSPoint(minX, centeredY), viewSize);
             }
         }else{

package/Root/Frameworks/UIKit/UINavigationItem.js

@@ -25,6 +25,7 @@ JSClass("UINavigationItem", JSObject, {
     rightBarItems: JSDynamicProperty('_rightBarItems', null),
     leftBarItems: JSDynamicProperty('_leftBarItems', null),
     hidesBackButton: false,
+    titleTextAlignment: null,
 
     init: function(args){
         this._rightBarItems = [];
@@ -45,6 +46,9 @@ JSClass("UINavigationItem", JSObject, {
         if (spec.containsKey("hidesBackButton")){
             this.hidesBackButton = spec.valueForKey("hidesBackButton");
         }
+        if (spec.containsKey("titleTextAlignment")){
+            this.titleTextAlignment = spec.valueForKey("titleTextAlignment", JSTextAlignment);
+        }
         this._rightBarItems = [];
         this._leftBarItems = [];
         var i, l;

package/Root/Frameworks/UIKit/UIPopupButton.js

@@ -566,6 +566,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
         if (spec.containsKey("indicatorSpacing")){
             this.indicatorSpacing = spec.valueForKey("indicatorSpacing");
         }
+        if (spec.containsKey("cornerRadius")){
+            this.cornerRadius = spec.valueForKey("cornerRadius");
+        }
 
         this._fillInMissingColors();
     },

package/Root/Frameworks/UIKit/UISplitViewController.js

@@ -31,8 +31,6 @@ JSClass("UISplitViewController", UIViewController, {
     splitView: JSReadOnlyProperty(),
     _defaultViewClass: UISplitView,
 
-    _mainHidden: false,
-
     initWithSpec: function(spec){
         if (spec.containsKey('leadingViewController')){
             this._leadingViewController = spec.valueForKey("leadingViewController");
@@ -190,6 +188,10 @@ JSClass("UISplitViewController", UIViewController, {
     },
 
     setMainViewController: function(mainViewController){
+        if (this.isViewLoaded && this.view.mainHidden){
+            this._setMainViewControllerCollapsed(mainViewController);
+            return;
+        }
         var callAppearanceMethods = this.isViewVisible;
         var disappearingViewController = null;
         if (this._mainViewController !== null && this._mainViewController.parentViewController === this){
@@ -200,32 +202,45 @@ JSClass("UISplitViewController", UIViewController, {
             this._mainViewController.removeFromParentViewController();
         }
         this._mainViewController = mainViewController;
-        if (this.isViewLoaded && this.view.mainHidden){
-            if (this._mainViewController){
-                this._leadingViewController.show(this._mainViewController, this);
+        if (this._mainViewController){
+            if (callAppearanceMethods){
+                this._mainViewController.viewWillAppear(false);
             }
-        }else{
-            if (this._mainViewController){
-                if (callAppearanceMethods){
-                    this._mainViewController.viewWillAppear(false);
-                }
-                this.addChildViewController(this._mainViewController);
+            this.addChildViewController(this._mainViewController);
+        }
+        if (this._view !== null){
+            var view = null;
+            if (this._mainViewController !== null){
+                view = this._mainViewController.view;
             }
-            if (this._view !== null){
-                var view = null;
-                if (this._mainViewController !== null){
-                    view = this._mainViewController.view;
-                }
-                this._view.mainView = view;
+            this._view.mainView = view;
+        }
+        if (callAppearanceMethods){
+            if (disappearingViewController !== null){
+                disappearingViewController.enqueueDidDisappear();
             }
-            if (callAppearanceMethods){
-                if (disappearingViewController !== null){
-                    disappearingViewController.enqueueDidDisappear();
+            if (this._mainViewController !== null){
+                this._mainViewController.enqueueDidAppear();
+            }
+        }
+    },
+
+    _setMainViewControllerCollapsed: function(mainViewController){
+        if (this._mainViewController !== null){
+            if (this._leadingViewController.isKindOfClass(UINavigationController)){
+                if (this._mainViewController === this._leadingViewController.topViewController){
+                    this._leadingViewController.popViewController(false);
                 }
-                if (this._mainViewController !== null){
-                    this._mainViewController.enqueueDidAppear();
+            }else{
+                if (this._mainViewController === this._leadingViewController.presentedViewController){
+                    this._leadingViewController.dismiss(false);
                 }
             }
+            this._leadingViewController.view.layoutIfNeeded();
+        }
+        this._mainViewController = mainViewController;
+        if (this._mainViewController !== null){
+            this._leadingViewController.show(this._mainViewController, this);
         }
     },
 

package/Root/Frameworks/UIKit/UIToolbar.js

@@ -43,7 +43,7 @@ JSClass("UIToolbar", UIView, {
     initWithSpec: function(spec){
         UIToolbar.$super.initWithSpec.call(this, spec);
         if (spec.containsKey("styler")){
-            this._styler = spec.valueForKey("styler", UIToolbarStyler);
+            this._styler = spec.valueForKey("styler", UIToolbar.Styler);
         }else{
             this._styler = UIToolbar.Styler.default;
         }

package/Root/Frameworks/UIKit/UIView.js

@@ -464,6 +464,7 @@ JSClass('UIView', UIResponder, {
     // MARK: - Layout
 
     frame: UIViewLayerProperty(),
+    untransformedFrame: UIViewLayerProperty(),
     bounds: UIViewLayerProperty(),
     position: UIViewLayerProperty(),
     anchorPoint: UIViewLayerProperty(),

package/Root/Frameworks/UIKit/UIWindow.js

@@ -1122,6 +1122,11 @@ JSClass("UIRootWindow", UIWindow, {
         return this.application.accessibilityLabel;
     },
 
+    _commonWindowInit: function(){
+        UIRootWindow.$super._commonWindowInit.call(this);
+        this.frame = this.application.windowServer.screen.frame;
+    },
+
     isAccessibilityElement: false,
 
 });
@@ -1426,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 = {
@@ -1438,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);
@@ -1463,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/UIKitTesting/Info.yaml

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

package/package.json

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