@breakside/jskit 2023.1.0 → 2023.3.1

package/Root/Frameworks/UIKit/UICollectionViewCell.js

@@ -29,12 +29,18 @@ JSClass("UICollectionViewCell", UICollectionReusableView, {
         styler.layoutCell(this);
     },
 
+    prepareForReuse: function(){
+        this.active = false;
+        this.over = false;
+    },
+
     // --------------------------------------------------------------------
     // MARK: - State
 
     state: JSReadOnlyProperty('_state', null),
     active: JSDynamicProperty(null, null, 'isActive'),
     selected: JSDynamicProperty(null, null, 'isSelected'),
+    over: JSDynamicProperty(null, null, 'isOver'),
     contextSelected: JSDynamicProperty(null, null, 'isContextSelected'),
     dropTarget: JSDynamicProperty(null, null, 'isDropTarget'),
 
@@ -95,6 +101,14 @@ JSClass("UICollectionViewCell", UICollectionReusableView, {
         this._toggleState(UICollectionViewCell.State.contextSelected, isContextSelected);
     },
 
+    isOver: function(){
+        return (this._state & UICollectionViewCell.State.over) === UICollectionViewCell.State.over;
+    },
+
+    setOver: function(isOver){
+        this._toggleState(UICollectionViewCell.State.over, isOver);
+    },
+
     isDropTarget: function(){
         return (this._state & UICollectionViewCell.State.dropTarget) === UICollectionViewCell.State.dropTarget;
     },
@@ -103,6 +117,31 @@ JSClass("UICollectionViewCell", UICollectionReusableView, {
         this._toggleState(UICollectionViewCell.State.dropTarget, isDropTarget);
     },
 
+    // --------------------------------------------------------------------
+    // MARK: - Over State
+
+    hasOverState: JSDynamicProperty("_hasOverState", false),
+
+    setHasOverState: function(hasOverState){
+        this._hasOverState = hasOverState;
+        if (hasOverState){
+            this.contentView.startMouseTracking(UIView.MouseTracking.enterAndExit);
+        }else{
+            this.contentView.stopMouseTracking();
+        }
+    },
+
+    mouseEntered: function(event){
+        var shouldSelect = (!this.collectionView || !this.collectionView.delegate || !this.collectionView.delegate.collectionViewShouldSelectCellAtIndexPath || this.collectionView.delegate.collectionViewShouldSelectCellAtIndexPath(this.collectionView, this.collectionView.indexPathOfCell(this)));
+        if (shouldSelect){
+            this.over = true;
+        }
+    },
+
+    mouseExited: function(event){
+        this.over = false;
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Accessibility
 
@@ -126,6 +165,7 @@ UICollectionViewCell.State = {
     active:   1 << 1,
     selected: 1 << 2,
     contextSelected: 1 << 3,
-    dropTarget: 1 << 4,
-    firstUserState: 1 << 5
+    over: 1 << 4,
+    dropTarget: 1 << 5,
+    firstUserState: 1 << 6
 };

package/Root/Frameworks/UIKit/UICollectionViewLayout.js

@@ -32,6 +32,16 @@ JSClass("UICollectionViewLayout", JSObject, {
     layoutAttributesForElementsInRect: function(rect){
     },
 
+    layoutAttributesForElement: function(element){
+        if (element.attributes.elementCategory === UICollectionView.ElementCategory.cell){
+            return this.layoutAttributesForCellAtIndexPath(element.attributes.indexPath);
+        }
+        if (element.attributes.elementCategory === UICollectionView.ElementCategory.supplimentary){
+            return this.layoutAttributesForSupplimentaryViewAtIndexPath(element.attributes.indexPath, element.attributes.kind);
+        }
+        return element.attributes;
+    },
+
     layoutAttributesForCellAtIndexPath: function(indexPath){
     },
 
@@ -57,7 +67,6 @@ JSClass("UICollectionViewLayoutAttributes", JSObject, {
         this.elementCategory = UICollectionView.ElementCategory.cell;
         this.indexPath = JSIndexPath(indexPath);
         this.frame = JSRect(frame);
-        this.elementIdentifier = indexPath.toString();
         this.transform = JSAffineTransform.Identity;
     },
 
@@ -66,17 +75,39 @@ JSClass("UICollectionViewLayoutAttributes", JSObject, {
         this.kind = kind;
         this.indexPath = JSIndexPath(indexPath);
         this.frame = JSRect(frame);
-        this.elementIdentifier = "%s/%s".sprintf(indexPath.toString(), kind);
         this.transform = JSAffineTransform.Identity;
     },
 
+    copy: function(){
+        var copy = this.$class.init();
+        copy.elementCategory = this.elementCategory;
+        copy.kind = this.kind;
+        copy.indexPath = JSIndexPath(this.indexPath);
+        copy.frame = JSRect(this.frame);
+        copy.rowIndex = this.rowIndex;
+        copy.columnIndex = this.columnIndex;
+        copy.transform  = JSAffineTransform(this.transform);
+        return copy;
+    },
+
     elementCategory: 0,
     kind: null,
     indexPath: null,
     frame: null,
     rowIndex: 0,
     columnIndex: 0,
-    elementIdentifier: null,
     transform: null,
 
+    elementIdentifier: JSReadOnlyProperty(),
+
+    getElementIdentifier: function(){
+        if (this.elementCategory === UICollectionView.ElementCategory.cell){
+            return this.indexPath.toString();
+        }
+        if (this.elementCategory === UICollectionView.ElementCategory.supplimentary){
+            return "%s/%s".sprintf(this.kind, this.indexPath.toString());
+        }
+        return "%s/%s/%s".sprintf(this.elementCategory, this.kind, this.indexPath.toString());
+    },
+
 });

package/Root/Frameworks/UIKit/UIListView.js

@@ -1594,6 +1594,7 @@ JSClass("UIListView", UIScrollView, {
         cell.bounds = JSRect(JSPoint.Zero, rect.size);
         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;
+        cell.over = false;
         this._updateCellState(cell);
         cell.update();
         cell.setNeedsLayout();
@@ -2984,6 +2985,10 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
     activeCellDetailTextColor: null,
     activeCellBackgroundColor: null,
     activeCellSeparatorColor: null,
+    overCellTextColor: null,
+    overCellDetailTextColor: null,
+    overCellBackgroundColor: null,
+    overCellSeparatorColor: null,
     showsMutedState: true,
     mutedSelectedCellTextColor: null,
     mutedSelectedCellDetailTextColor: null,
@@ -3050,6 +3055,18 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
         if (spec.containsKey('activeCellSeparatorColor')){
             this.activeCellSeparatorColor = spec.valueForKey("activeCellSeparatorColor", JSColor);
         }
+        if (spec.containsKey('overCellTextColor')){
+            this.overCellTextColor = spec.valueForKey("overCellTextColor", JSColor);
+        }
+        if (spec.containsKey('overCellDetailTextColor')){
+            this.overCellDetailTextColor = spec.valueForKey("overCellDetailTextColor", JSColor);
+        }
+        if (spec.containsKey('overCellBackgroundColor')){
+            this.overCellBackgroundColor = spec.valueForKey("overCellBackgroundColor", JSColor);
+        }
+        if (spec.containsKey('overCellSeparatorColor')){
+            this.overCellSeparatorColor = spec.valueForKey("overCellSeparatorColor", JSColor);
+        }
         if (spec.containsKey('mutedSelectedCellTextColor')){
             this.mutedSelectedCellTextColor = spec.valueForKey("mutedSelectedCellTextColor", JSColor);
         }
@@ -3165,6 +3182,18 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
         if (this.activeCellSeparatorColor === null){
             this.activeCellSeparatorColor = this.cellSeparatorColor;
         }
+        if (this.overCellBackgroundColor === null){
+            this.overCellBackgroundColor = this.cellBackgroundColor;
+        }
+        if (this.overCellTextColor === null){
+            this.overCellTextColor = this.cellTextColor;
+        }
+        if (this.overCellDetailTextColor === null){
+            this.overCellDetailTextColor = this.cellDetailTextColor;
+        }
+        if (this.overCellSeparatorColor === null){
+            this.overCellSeparatorColor = this.cellSeparatorColor;
+        }
         if (this.mutedSelectedCellTextColor === null){
             this.mutedSelectedCellTextColor = this.cellTextColor;
         }
@@ -3261,6 +3290,23 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
             if (cell.stylerProperties.separatorLayer){
                 cell.stylerProperties.separatorLayer.backgroundColor = this.activeCellSeparatorColor;
             }
+        }else if (cell.over){
+            cell.contentView.backgroundColor = this.overCellBackgroundColor;
+            if (cell._titleLabel !== null){
+                cell._titleLabel.textColor = this.overCellTextColor;
+            }
+            if (cell._detailLabel !== null){
+                cell._detailLabel.textColor = this.overCellDetailTextColor;
+            }
+            if (cell._imageView !== null){
+                cell._imageView.templateColor = this.overCellTextColor;
+            }
+            if (cell._accessoryView !== null && cell._accessoryView.isKindOfClass(UIImageView)){
+                cell._accessoryView.templateColor = this.overCellTextColor;
+            }
+            if (cell.stylerProperties.separatorLayer){
+                cell.stylerProperties.separatorLayer.backgroundColor = this.overCellSeparatorColor;
+            }
         }else{
             cell.contentView.backgroundColor = this.cellBackgroundColor;
             if (cell._titleLabel !== null){

package/Root/Frameworks/UIKit/UIListViewCell.js

@@ -147,6 +147,7 @@ JSClass("UIListViewCell", UIView, {
     active: JSDynamicProperty(null, null, 'isActive'),
     selected: JSDynamicProperty(null, null, 'isSelected'),
     contextSelected: JSDynamicProperty(null, null, 'isContextSelected'),
+    over: JSDynamicProperty(null, null, 'isOver'),
 
     _updateState: function(newState){
         if (newState != this._state){
@@ -205,6 +206,39 @@ JSClass("UIListViewCell", UIView, {
         this._toggleState(UIListViewCell.State.contextSelected, isContextSelected);
     },
 
+    isOver: function(){
+        return (this._state & UIListViewCell.State.over) === UIListViewCell.State.over;
+    },
+
+    setOver: function(isOver){
+        this._toggleState(UIListViewCell.State.over, isOver);
+    },
+
+    // --------------------------------------------------------------------
+    // MARK: - Over State
+
+    hasOverState: JSDynamicProperty("_hasOverState", false),
+
+    setHasOverState: function(hasOverState){
+        this._hasOverState = hasOverState;
+        if (hasOverState){
+            this.contentView.startMouseTracking(UIView.MouseTracking.enterAndExit);
+        }else{
+            this.contentView.stopMouseTracking();
+        }
+    },
+
+    mouseEntered: function(event){
+        var shouldSelect = (!this.listView || !this.listView.delegate || !this.listView.delegate.listViewShouldSelectCellAtIndexPath || this.listView.delegate.listViewShouldSelectCellAtIndexPath(this.listView, this.listView.indexPathOfCell(this)));
+        if (shouldSelect){
+            this.over = true;
+        }
+    },
+
+    mouseExited: function(event){
+        this.over = false;
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Accessibility
 
@@ -239,5 +273,6 @@ UIListViewCell.State = {
     active:   1 << 1,
     selected: 1 << 2,
     contextSelected: 1 << 3,
-    firstUserState: 1 << 4
+    over: 1 << 4,
+    firstUserState: 1 << 5
 };

package/Root/Frameworks/UIKit/UIView.js

@@ -578,6 +578,21 @@ JSClass('UIView', UIResponder, {
         }
     },
 
+    userVisible: JSReadOnlyProperty(),
+
+    getUserVisible: function(){
+        if (this.hidden){
+            return false;
+        }
+        if (this.alpha === 0){
+            return false;
+        }
+        if (this.superview !== null){
+            return this.superview.userVisible;
+        }
+        return true;
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Constraints
 

package/Root/Frameworks/UIKit/UIWindow.js

@@ -794,6 +794,9 @@ JSClass('UIWindow', UIView, {
         var moves = [];
         for (viewIndex = 0, viewCount = this.mouseTrackingViews.length; viewIndex < viewCount; ++viewIndex){
             view = this.mouseTrackingViews[viewIndex];
+            if (!view.userVisible){
+                continue;
+            }
             location = this.convertPointToView(locationInWindow, view);
             for (areaIndex = 0, areaCount = view._mouseTrackingAreas.length; areaIndex < areaCount; ++areaIndex){
                 area = view._mouseTrackingAreas[areaIndex];

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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