@breakside/jskit 2021.52.0 → 2022.3.0

package/Root/Frameworks/UIKit/UILayer.js

@@ -201,6 +201,9 @@ JSClass("UILayer", JSObject, {
     },
 
     setTransform: function(transform){
+        if (transform.isEqual(this.model.transform)){
+            return;
+        }
         // When the transform changes, the frame needs to be recalculated.  The position, however, does
         // not change.  The transform essentially defines a new relationship between the position and frame
         this._addImplicitAnimationForKey('transform');

package/Root/Frameworks/UIKit/UIListView.js

@@ -126,7 +126,7 @@ JSClass("UIListView", UIScrollView, {
                 if (typeof(reuse) === 'string'){
                     this.registerHeaderFooterClassForReuseIdentifier(JSClass.FromName(reuse), identifier);
                 }else{
-                    this.registerCellClassForReuseIdentifier(JSClass.FromName(reuse.valueForKey('className')), identifier);
+                    this.registerHeaderFooterClassForReuseIdentifier(JSClass.FromName(reuse.valueForKey('className')), identifier);
                 }
             }
         }
@@ -140,7 +140,7 @@ JSClass("UIListView", UIScrollView, {
             this._headersStickToTop = spec.valueForKey("headersStickToTop");
         }
         if (spec.containsKey("showsFocusRing")){
-            this._showsFocusRing = spec.valueForKey("showsFocusRing");
+            this.showsFocusRing = spec.valueForKey("showsFocusRing");
         }
         if (spec.containsKey("listHeaderView")){
             this.listHeaderView = spec.valueForKey("listHeaderView", UIView);
@@ -339,7 +339,6 @@ JSClass("UIListView", UIScrollView, {
         var lastVisibleItem = this._visibleItems[this._visibleItems.length - 1];
         var searcher = JSBinarySearcher(this._visibleItems, VisibleItem.cellIndexPathCompare);
         var visibleSizeChanged = false;
-        var listView = this;
         var contentSize = JSSize(this.contentSize);
         var contentOffset = JSPoint(this.contentOffset);
 
@@ -391,13 +390,13 @@ JSClass("UIListView", UIScrollView, {
 
         if (animator && visibleSizeChanged){
             animator.addAnimations(function(){
-                listView.contentSize = contentSize;
-                listView.contentOffset = contentOffset;
-                listView._layoutVisibleItems(this._visibleItems, y0);
-            });
+                this.contentSize = contentSize;
+                this.contentOffset = contentOffset;
+                this._layoutVisibleItems(this._visibleItems, y0);
+            }, this);
         }else{
-            listView.contentSize = contentSize;
-            listView.contentOffset = contentOffset;
+            this.contentSize = contentSize;
+            this.contentOffset = contentOffset;
         }
 
     },

package/Root/Frameworks/UIKit/UIMenu.js

@@ -894,7 +894,7 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
         var item = menu.items[itemIndex];
         var window = this.windowForMenu(menu);
         if (window !== null){
-            return window.viewForITem(item);
+            return window.viewForItem(item);
         }
         return null;
     }

package/Root/Frameworks/UIKit/UIMenuView.js

@@ -214,7 +214,11 @@ JSClass("UIMenuWindow", UIWindow, {
     },
 
     viewForItem: function(item){
-        return this._itemViewIndexesByItemId[item.objectID] || null;
+        var index = this._itemViewIndexesByItemId[item.objectID];
+        if (index !== undefined){
+            return this.menuView.itemViews[index];
+        }
+        return null;
     },
 
     // -----------------------------------------------------------------------

package/Root/Frameworks/UIKit/UINavigationBar.js

@@ -490,9 +490,9 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         props.backBarItemView.alpha = 0;
         var backTitleFrame = props.backBarItemView.titleLabel.convertRectToView(props.backBarItemView.titleLabel.bounds, props.backBarItemView.superview);
         if (removingCustomView){
-            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(removingCustomView.frame.origin.x - backTitleFrame.origin.x, 0).scaledBy(backToTitleScale);
+            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(Math.max(0, removingCustomView.frame.origin.x - backTitleFrame.origin.x), 0).scaledBy(backToTitleScale);
         }else{
-            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(removingTitleLabel.frame.origin.x - backTitleFrame.origin.x, 0).scaledBy(backToTitleScale);
+            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(Math.max(0, removingTitleLabel.frame.origin.x - backTitleFrame.origin.x), 0).scaledBy(backToTitleScale);
         }
         animator.addAnimations(function(){
             var i, l;

package/Root/Frameworks/UIKit/UIPopupButton.js

@@ -467,18 +467,21 @@ JSClass("UIPopupButtonStyler", UIControlStyler, {
 
 JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
 
-    showsOverState: false,
     titleInsets: null,
     normalBackgroundColor: null,
     disabledBackgroundColor: null,
+    overBackgroundColor: null,
     activeBackgroundColor: null,
     normalBackgroundGradient: null,
+    overBackgroundGradient: null,
     disabledBackgroundGradient: null,
     activeBackgroundGradient: null,
     normalBorderColor: null,
     disabledBorderColor: null,
+    overBorderColor: null,
     activeBorderColor: null,
     normalTitleColor: null,
+    overTitleColor: null,
     disabledTitleColor: null,
     activeTitleColor: null,
     borderWidth: 0,
@@ -508,7 +511,7 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
     },
 
     initWithSpec: function(spec){
-        UIPopupButtonCustomStyler.$super.initWithSpec(spec);
+        UIPopupButtonCustomStyler.$super.initWithSpec.call(this, spec);
 
         this._populateDefaults();
 
@@ -518,6 +521,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
         if (spec.containsKey("normalBackgroundColor")){
             this.normalBackgroundColor = spec.valueForKey("normalBackgroundColor", JSColor);
         }
+        if (spec.containsKey("overBackgroundColor")){
+            this.overBackgroundColor = spec.valueForKey("overBackgroundColor", JSColor);
+        }
         if (spec.containsKey("disabledBackgroundColor")){
             this.disabledBackgroundColor = spec.valueForKey("disabledBackgroundColor", JSColor);
         }
@@ -527,6 +533,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
         if (spec.containsKey("normalBackgroundGradient")){
             this.normalBackgroundGradient = spec.valueForKey("normalBackgroundGradient", JSGradient);
         }
+        if (spec.containsKey("overBackgroundGradient")){
+            this.overBackgroundGradient = spec.valueForKey("overBackgroundGradient", JSGradient);
+        }
         if (spec.containsKey("disabledBackgroundGradient")){
             this.disabledBackgroundGradient = spec.valueForKey("disabledBackgroundGradient", JSGradient);
         }
@@ -536,6 +545,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
         if (spec.containsKey("normalBorderColor")){
             this.normalBorderColor = spec.valueForKey("normalBorderColor", JSColor);
         }
+        if (spec.containsKey("overBorderColor")){
+            this.overBorderColor = spec.valueForKey("overBorderColor", JSColor);
+        }
         if (spec.containsKey("disabledBorderColor")){
             this.disabledBorderColor = spec.valueForKey("disabledBorderColor", JSColor);
         }
@@ -545,6 +557,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
         if (spec.containsKey("normalTitleColor")){
             this.normalTitleColor = spec.valueForKey("normalTitleColor", JSColor);
         }
+        if (spec.containsKey("overTitleColor")){
+            this.overTitleColor = spec.valueForKey("overTitleColor", JSColor);
+        }
         if (spec.containsKey("disabledTitleColor")){
             this.disabledTitleColor = spec.valueForKey("disabledTitleColor", JSColor);
         }
@@ -595,6 +610,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
             if (this.activeBorderColor === null){
                 this.activeBorderColor = this.normalBorderColor.colorDarkenedByPercentage(0.2);
             }
+            if (this.overBorderColor === null){
+                this.overBorderColor = this.normalBorderColor.colorDarkenedByPercentage(0.2);
+            }
             if (this.disabledBorderColor === null){
                 this.disabledBorderColor = this.normalBorderColor.colorWithAlpha(0.5);
             }
@@ -602,6 +620,9 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
         if (this.normalTitleColor === null){
             this.normalTitleColor = JSColor.text;
         }
+        if (this.overTitleColor === null){
+            this.overTitleColor = this.normalTitleColor.colorDarkenedByPercentage(0.2);
+        }
         if (this.activeTitleColor === null){
             this.activeTitleColor = this.normalTitleColor.colorDarkenedByPercentage(0.2);
         }
@@ -628,6 +649,13 @@ JSClass("UIPopupButtonCustomStyler", UIPopupButtonStyler, {
             button._titleLabel.textColor = this.disabledTitleColor;
             button._imageView.templateColor = this.disabledTitleColor;
             button._indicatorView.templateColor = this.disabledTitleColor;
+        }else if (button.over){
+            button.layer.backgroundColor = this.overBackgroundColor;
+            button.layer.backgroundGradient = this.overBackgroundGradient;
+            button.layer.borderColor = this.overBorderColor;
+            button._titleLabel.textColor = this.overTitleColor;
+            button._imageView.templateColor = this.overTitleColor;
+            button._indicatorView.templateColor = this.overTitleColor;
         }else if (button.active){
             button.layer.backgroundColor = this.activeBackgroundColor;
             button.layer.backgroundGradient = this.activeBackgroundGradient;
@@ -766,7 +794,7 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
     },
 
     initWithSpec: function(spec){
-        UIPopupButtonCustomStyler.$super.initWithSpec(spec);
+        UIPopupButtonCustomStyler.$super.initWithSpec.call(this, spec);
         if (spec.containsKey("normalColor")){
             this.normalColor = spec.valueForKey("normalColor", JSColor);
         }

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -276,6 +276,8 @@ JSClass('UIScrollView', UIView, {
 
     _sanitizedOffset: function(offset){
         offset = JSPoint(offset);
+        offset.x = Math.round(offset.x);
+        offset.y = Math.round(offset.y);
         if (!this.scrollsHorizontally){
             offset.x = this._contentOffset.x;
         }else if (offset.x < this._minContentOffset.x){

package/Root/Frameworks/UIKit/UISplitViewController.js

@@ -148,22 +148,56 @@ JSClass("UISplitViewController", UIViewController, {
     },
 
     _setMainViewControllerCollapsed: function(mainViewController){
+        if (this._leadingViewController.isKindOfClass(UINavigationController)){
+            this._pushMainViewControllerOnNavigationController(mainViewController, this._leadingViewController);
+        }else{
+            this._presentMainViewControllerOnViewController(mainViewController, this._leadingViewController);
+        }
+    },
+
+    _pushMainViewControllerOnNavigationController: function(mainViewController, navigationController){
+        var i = navigationController.viewControllers.length - 1;
+        // 1. Pop off all view controllers up to and including our current mainViewController
         if (this._mainViewController !== null){
-            if (this._leadingViewController.isKindOfClass(UINavigationController)){
-                if (this._mainViewController === this._leadingViewController.topViewController){
-                    this._leadingViewController.popViewController(false);
-                }
-            }else{
-                if (this._mainViewController === this._leadingViewController.presentedViewController){
-                    this._leadingViewController.dismiss(false);
+            while (i >= 1 && navigationController.viewControllers[i] !== this._mainViewController){
+                --i;
+            }
+            if (i > 0){
+                if (mainViewController === this._mainViewController){
+                    // Bail if we're being asked to show the same view controller that's already shown
+                    // NOTE: this check only comes after finding that the view controller
+                    // is indeed part of the presentation tree becuase without a notification
+                    // from the navigation controller when views are popped by the user,
+                    // we may be in a situation where this._mainViewController is set, but
+                    // is not part of the navigation stack
+                    return;
                 }
+                navigationController.popToViewController(navigationController.viewControllers[i - 1], false);
             }
-            this._leadingViewController.view.layoutIfNeeded();
+        }
+        // 2. Push the new new mainViewController, animating if we're not currently changing traits
+        if (mainViewController !== null){
+            navigationController.pushViewController(mainViewController, !this.isChangingTraits);
         }
         this._mainViewController = mainViewController;
+    },
+
+    _presentMainViewControllerOnViewController: function(mainViewController, viewController){
+        // Bail if we're being asked to show the same view controller that's already shown
+        if (mainViewController === this._mainViewController){
+            return;
+        }
+        // 1. Dismiss the current mainViewController
         if (this._mainViewController !== null){
-            this._leadingViewController.show(this._mainViewController, this);
+            if (this._mainViewController === viewController.presentedViewController){
+                viewController.dismiss();
+            }
+        }
+        // 2. Present the new mainViewController
+        if (mainViewController !== null){
+            viewController.presentViewController(mainViewController);
         }
+        this._mainViewController = mainViewController;
     },
 
     getSplitView: function(){

package/Root/Frameworks/UIKit/UITextField.js

@@ -788,6 +788,9 @@ JSClass("UITextField", UIControl, {
             this.delegate.textFieldDidChange(this);
         }
         this._didChange = true;
+        if (this._textLayer.textAlignment !== JSTextAlignment.left){
+            this.setNeedsLayout();
+        }
     },
 
     _adjustCursorPositionToCenterIfNeeded: function(){

package/Root/Frameworks/UIKit/UIView.js

@@ -145,6 +145,9 @@ JSClass('UIView', UIResponder, {
                 this.addSubview(subview);
             }
         }
+        if (spec.containsKey("clipsToBounds")){
+            this.clipsToBounds = spec.valueForKey("clipsToBounds");
+        }
         // NOTE: constraints are still and work in progress, and aren't actually
         // used yet during layout
         if (spec.containsKey("constraints")){

package/Root/Frameworks/UIKit/UIViewController.js

@@ -162,6 +162,9 @@ JSClass("UIViewController", UIResponder, {
         this._isViewVisible = false;
     },
 
+    // -------------------------------------------------------------------------
+    // MARK: - Layout
+
     viewDidLayoutSubviews: function(){
     },
 
@@ -169,6 +172,11 @@ JSClass("UIViewController", UIResponder, {
         this.view.sizeToFitSize(size);
     },
 
+    contentSizeThatFitsSize: function(maxSize){
+        this.view.sizeToFitSize(maxSize);
+        return JSSize(this.view.bounds.size);
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Child View Controllers
 

package/Root/Frameworks/UIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKitTesting
-JSBundleVersion: 2021.52.0
+JSBundleVersion: 2022.3.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.52.0",
+  "version": "2022.3.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"