@breakside/jskit 2022.26.0 → 2022.29.0

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -281,16 +281,12 @@ JSClass('UIScrollView', UIView, {
         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){
+        if (offset.x < this._minContentOffset.x){
             offset.x = this._minContentOffset.x;
         }else if (offset.x > this._maxContentOffset.x){
             offset.x = this._maxContentOffset.x;
         }
-        if (!this.scrollsVertically){
-            offset.y = this._contentOffset.y;
-        }else if (offset.y < this._minContentOffset.y){
+        if (offset.y < this._minContentOffset.y){
             offset.y = this._minContentOffset.y;
         }else if (offset.y > this._maxContentOffset.y){
             offset.y = this._maxContentOffset.y;
@@ -515,6 +511,12 @@ JSClass('UIScrollView', UIView, {
         }else{
             var d = JSPoint(event.scrollingDelta);
             var abs = JSPoint(Math.abs(d.x), Math.abs(d.y));
+            if (!this._scrollsVertically){
+                d.y = 0;
+            }
+            if (!this._scrollsHorizontally){
+                d.x = 0;
+            }
             if (abs.x > 2 * abs.y){
                 d.y = 0;
             }else if (abs.y > 2 * abs.x){
@@ -581,10 +583,16 @@ JSClass('UIScrollView', UIView, {
     },
 
     touchesBegan: function(touches, event){
+        if (!this._scrollsVertically && !this._scrollsHorizontally){
+            return UIScrollView.$super.touchesBegan.call(this, touches, event);
+        }
         this._beginTrackingTouches(touches, event);
     },
 
     touchesMoved: function(touches, event){
+        if (!this._scrollsVertically && !this._scrollsHorizontally){
+            return UIScrollView.$super.touchesMoved.call(this, touches, event);
+        }
         if (this._touchTracking === null){
             this._beginTrackingTouches(touches, event);
         }
@@ -594,6 +602,12 @@ JSClass('UIScrollView', UIView, {
         }
         var location = touch.locationInView(this);
         var delta = location.subtracting(this._touchTracking.startingLocation);
+        if (!this._scrollsVertically){
+            delta.y = 0;
+        }
+        if (!this._scrollsHorizontally){
+            delta.x = 0;
+        }
         var offset = this._touchTracking.contentOffset.subtracting(delta);
         delta = location.subtracting(this._touchTracking.location);
         var dt = event.timestamp - this._touchTracking.timestamp;
@@ -606,6 +620,9 @@ JSClass('UIScrollView', UIView, {
     },
 
     touchesEnded: function(touches, event){
+        if (!this._scrollsVertically && !this._scrollsHorizontally){
+            return UIScrollView.$super.touchesEnded.call(this, touches, event);
+        }
         var dt = event.timestamp - this._touchTracking.timestamp;
         if (dt < 0.05){
             this._beginCoasting(this._touchTracking.velocity);
@@ -614,6 +631,9 @@ JSClass('UIScrollView', UIView, {
     },
 
     touchesCanceled: function(touches, event){
+        if (!this._scrollsVertically && !this._scrollsHorizontally){
+            return UIScrollView.$super.touchesCanceled.call(this, touches, event);
+        }
         this._endTrackingTouches();
     },
 

package/Root/Frameworks/UIKit/UIState.js

@@ -170,16 +170,18 @@ JSClass("UIState", JSObject, {
         return this._path === other._path;
     },
 
-    beginsWithState: function(state){
+    startsWithState: function(state){
         if (state === null || state === undefined){
             return false;
         }
-        if (this._pathComponents.length < state._pathComponents.length){
+        var a = this.pathComponents;
+        var b = state.pathComponents;
+        if (a.length < b.length){
             return false;
         }
         var i, l;
-        for (i = 0, l = state._pathComponents.length; i < l; ++i){
-            if (this._pathComponents[i] != state._pathComponents[i]){
+        for (i = 0, l = b.length; i < l; ++i){
+            if (a[i] != b[i]){
                 return false;
             }
         }

package/Root/Frameworks/UIKit/UITextField.js

@@ -713,7 +713,14 @@ JSClass("UITextField", UIControl, {
             size = JSSize(this._placeholderLabel.bounds.size);
         }else{
             if (this._multiline){
-                this._textLayer.sizeToFitSize(maxSize);
+                var maxTextSize = JSSize(maxSize);
+                if (maxTextSize.width < Number.MAX_VALUE){
+                    maxTextSize.width -= this._textInsets.width;
+                }
+                if (maxTextSize.height < Number.MAX_VALUE){
+                    maxTextSize.height -= this._textInsets.height;
+                }
+                this._textLayer.sizeToFitSize(maxTextSize);
             }
             this._textLayer.layoutIfNeeded();
             size = JSSize(this._textLayer.bounds.size);

package/Root/Frameworks/UIKit/UIView.js

@@ -323,6 +323,17 @@ JSClass('UIView', UIResponder, {
         return null;
     },
 
+    isDescendantOfView: function(view){
+        if (view === null || view === undefined){
+            return false;
+        }
+        var superview = this.superview;
+        while (superview !== null && superview !== view){
+            superview = superview.superview;
+        }
+        return superview !== null && superview === view;
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Window
 

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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