@breakside/jskit 2023.10.0 → 2023.12.0

package/Root/Frameworks/UIKit/UICollectionReusableView.js

@@ -58,6 +58,7 @@ JSClass("UICollectionReusableView", UIView, {
     applyAttributes: function(attributes){
         this.untransformedFrame = attributes.frame;
         this.transform = attributes.transform;
+        this.zIndex = attributes.zIndex;
         if (!attributes.indexPath.isEqual(this.indexPath)){
             this.indexPath = JSIndexPath(attributes.indexPath);
         }

package/Root/Frameworks/UIKit/UICollectionViewGridLayout.js

@@ -345,17 +345,6 @@ JSClass("UICollectionViewGridLayout", UICollectionViewLayout, {
         if (this._cachedLayout.footerFrame.size.height > 0 && rect.intersectsRect(this._cachedLayout.footerFrame)){
             attributes.push(this.layoutAttributesForSupplimentaryViewAtIndexPath(JSIndexPath([]), UICollectionViewGridLayout.SupplimentaryKind.footer));
         }
-        if (this._headersStickToTop){
-            var i = attributes.length - 1;
-            var j = i;
-            for (; i >= 0; --i){
-                attrs = attributes[i];
-                if (attrs.elementCategory === UICollectionView.ElementCategory.supplimentary && attrs.kind === UICollectionViewGridLayout.SupplimentaryKind.header){
-                    attributes.splice(i, 1);
-                    attributes.splice(j, 0, attrs);
-                }
-            }
-        }
         return attributes;
     },
 
@@ -387,6 +376,7 @@ JSClass("UICollectionViewGridLayout", UICollectionViewLayout, {
                 if (this._headersStickToTop){
                     ty = Math.max(0, this.collectionView.contentView.bounds.origin.y - attributes.frame.origin.y);
                     attributes.transform = JSAffineTransform.Translated(0, ty);
+                    attributes.zIndex = 2;
                 }
                 return attributes;
             }
@@ -405,6 +395,7 @@ JSClass("UICollectionViewGridLayout", UICollectionViewLayout, {
                 if (this._headersStickToTop){
                     ty = Math.min(Math.max(0, this.collectionView.contentView.bounds.origin.y - attributes.frame.origin.y + this._cachedLayout.headerFrame.size.height), (sectionLayout.frame.origin.y + sectionLayout.frame.size.height) - (sectionLayout.headerFrame.origin.y + sectionLayout.headerFrame.size.height));
                     attributes.transform = JSAffineTransform.Translated(0, ty);
+                    attributes.zIndex = 1;
                 }
                 return attributes;
             }

package/Root/Frameworks/UIKit/UICollectionViewLayout.js

@@ -97,6 +97,7 @@ JSClass("UICollectionViewLayoutAttributes", JSObject, {
     rowIndex: 0,
     columnIndex: 0,
     transform: null,
+    zIndex: 0,
 
     elementIdentifier: JSReadOnlyProperty(),
 

package/Root/Frameworks/UIKit/UIHTMLDisplayServerCanvasContext.js

@@ -56,7 +56,8 @@ JSClass("UIHTMLDisplayServerCanvasContext", UIHTMLDisplayServerContext, {
             cornerRadius: true,
             shadow: true,
             contentVisualEffect: true,
-            backgroundVisualEffect: true
+            backgroundVisualEffect: true,
+            zIndex: true,
         };
         this._imageElements = [];
         this._canvasElements = [];
@@ -377,6 +378,10 @@ JSClass("UIHTMLDisplayServerCanvasContext", UIHTMLDisplayServerContext, {
         this.style.filter = layer.presentation.contentVisualEffect ? layer.presentation.contentVisualEffect.cssFilterString() : '';
     },
 
+    updateHTMLProperty_zIndex: function(layer){
+        this.style.zIndex = layer.zIndex;
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Managing Canvas Elements & Context
 

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -857,6 +857,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         UIHTMLWindowServer.$super.orderWindowFront.call(this, window);
         if (window.subviewIndex === 0){
             this.updateThemeColorElement();
+            this.updateDocumentTitle();
         }
     },
 
@@ -868,6 +869,9 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         this.updateThemeColorElement();
     },
 
+    // --------------------------------------------------------------------
+    // MARK: - HTML Document/Window
+
     updateThemeColorElement: function(){
         if (this.themeColorElement === null){
             return;
@@ -896,6 +900,15 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         this.themeColorElement.setAttribute("content", color.cssString());
     },
 
+    updateDocumentTitle: function(){
+        var window = this.windowStack[0];
+        if (window instanceof UIRootWindow){
+            if (this.rootElement === this.domDocument.body){
+                this.domDocument.title = window.title;
+            }
+        }
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Screen Updates
 
@@ -921,7 +934,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         this.accessibilityObservers = {};
         this.accessibilityObservers.elementCreated = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.elementCreated, null, this.handleAccessibilityElementCreated, this);
         this.accessibilityObservers.elementChanged = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.elementChanged, null, this.handleAccessibilityElementChanged, this);
-        this.accessibilityObservers.titleChanged = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.titleChanged, null, this.handleAccessibilityTitleChanged, this);
+        this.accessibilityObservers.labelChanged = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.labelChanged, null, this.handleAccessibilityLabelChanged, this);
         this.accessibilityObservers.valueChanged = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.valueChanged, null, this.handleAccessibilityValueChanged, this);
         this.accessibilityObservers.visibilityChanged = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.visibilityChanged, null, this.handleAccessibilityVisibilityChanged, this);
         this.accessibilityObservers.enabledChanged = this.accessibilityNotificationCenter.addObserver(UIAccessibility.Notification.enabledChanged, null, this.handleAccessibilityEnabledChanged, this);
@@ -977,12 +990,15 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         }
     },
 
-    handleAccessibilityTitleChanged: function(notification){
+    handleAccessibilityLabelChanged: function(notification){
         var element = notification.sender;
         var context = this.contextForAccessibilityElement(element);
         if (context !== null){
             context.updateAccessibilityLabel(element);
         }
+        if (element instanceof UIRootWindow){
+            this.updateDocumentTitle();
+        }
     },
 
     handleAccessibilityValueChanged: function(notification){

package/Root/Frameworks/UIKit/UILayer.js

@@ -80,6 +80,7 @@ JSClass("UILayer", JSObject, {
     shadowOffset:       UILayerAnimatedProperty(),
     shadowRadius:       UILayerAnimatedProperty(),
     clipsToBounds:      JSDynamicProperty('_clipsToBounds', false),
+    zIndex:             JSDynamicProperty("_zIndex", 0),
     model:              null,
     presentation:       null,
     superlayer:         null,
@@ -300,6 +301,34 @@ JSClass("UILayer", JSObject, {
         return path;
     },
 
+    setZIndex: function(zIndex){
+        if (zIndex !== this._zIndex){
+            var previousZIndex = this._zIndex;
+            this._zIndex = zIndex;
+            this.didChangeProperty('zIndex');
+            if (this.superlayer !== null){
+                if (previousZIndex === 0){
+                    this.superlayer.numberOfSublayersWithNonZeroZIndex += 1;
+                }else{
+                    if (zIndex === 0){
+                        this.superlayer.numberOfSublayersWithNonZeroZIndex -= 1;
+                    }
+                }
+                this.superlayer.setNeedsZIndexOrderedSublayers();
+            }
+        }
+    },
+
+    numberOfSublayersWithNonZeroZIndex: 0,
+    zIndexOrderedSublayers: null,
+
+    setNeedsZIndexOrderedSublayers: function(){
+        this.zIndexOrderedSublayers = null;
+        if (this.delegate && this.delegate.layerDidChangeZIndexSublayers){
+            this.delegate.layerDidChangeZIndexSublayers(this);
+        }
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Shadows
 
@@ -340,6 +369,12 @@ JSClass("UILayer", JSObject, {
             }
         }
         this.sublayers.splice(index, 0, sublayer);
+        if (sublayer.zIndex !== 0){
+            this.numberOfSublayersWithNonZeroZIndex += 1;
+            this.setNeedsZIndexOrderedSublayers();
+        }else if (this.numberOfSublayersWithNonZeroZIndex > 0){
+            this.setNeedsZIndexOrderedSublayers();
+        }
         sublayer.sublayerIndex = index;
         for (i = sublayer.sublayerIndex + 1, l = this.sublayers.length; i < l; ++i){
             this.sublayers[i].sublayerIndex += 1;
@@ -374,6 +409,12 @@ JSClass("UILayer", JSObject, {
             for (var i = sublayer.sublayerIndex + 1, l = this.sublayers.length; i < l; ++i){
                 this.sublayers[i].sublayerIndex -= 1;
             }
+            if (this.numberOfSublayersWithNonZeroZIndex > 0){
+                this.setNeedsZIndexOrderedSublayers();
+            }
+            if (sublayer.zIndex !== 0){
+                this.numberOfSublayersWithNonZeroZIndex -= 1;
+            }
             this.sublayers.splice(sublayer.sublayerIndex,1);
             sublayer.superlayer = null;
             sublayer.sublayerIndex = null;
@@ -540,8 +581,16 @@ JSClass("UILayer", JSObject, {
         var sublayer;
         var locationInSublayer;
         var hit = null;
-        for (var i = this.sublayers.length - 1; i >= 0 && hit === null; --i){
-            sublayer = this.sublayers[i];
+        var sublayers = this.sublayers;
+        if (this.numberOfSublayersWithNonZeroZIndex > 0){
+            if (this.zIndexOrderedSublayers === null){
+                this.zIndexOrderedSublayers = JSCopy(sublayers);
+                this.zIndexOrderedSublayers.sort(UILayer.compareZIndex);
+            }
+            sublayers = this.zIndexOrderedSublayers;
+        }
+        for (var i = sublayers.length - 1; i >= 0 && hit === null; --i){
+            sublayer = sublayers[i];
             locationInSublayer = this.convertPointToLayer(locationInLayer, sublayer);
             if (!sublayer.hidden && sublayer.presentation.alpha > 0 && (!sublayer.clipsToBounds || sublayer.containsPoint(locationInSublayer))){
                 hit = sublayer.hitTest(locationInSublayer);
@@ -796,8 +845,17 @@ JSClass("UILayer", JSObject, {
         if (includeSublayers && !hidden){
             var sublayer;
             var transform;
-            for (var i = 0, l = this.sublayers.length; i < l; ++i){
-                sublayer = this.sublayers[i];
+            var sublayers = this.sublayers;
+            if (this.numberOfSublayersWithNonZeroZIndex > 0){
+                if (this.zIndexOrderedSublayers === null){
+                    this.zIndexOrderedSublayers = JSCopy(sublayers);
+                    this.zIndexOrderedSublayers.sort(UILayer.compareZIndex);
+                }
+                sublayers = this.zIndexOrderedSublayers;
+            }
+            sublayers.sort(function(a, b){ return a._zIndex - b._zIndex; });
+            for (var i = 0, l = sublayers.length; i < l; ++i){
+                sublayer = sublayers[i];
                 if (!sublayer.hidden){
                     context.save();
                     transform = sublayer._presentationTransformFromSuperlayer();
@@ -842,6 +900,10 @@ UILayer.Path = {
     shadow: 2
 };
 
+UILayer.compareZIndex = function(a, b){
+    return a._zIndex - b._zIndex;
+};
+
 JSContext.definePropertiesFromExtensions({
 
     drawsHiddenLayers: false,

package/Root/Frameworks/UIKit/UIScreen.js

@@ -57,4 +57,8 @@ JSClass("UIScreen", JSObject, {
     traitCollectionDidChange: function(){
     }
 
-});
+});
+
+UIScreen.Notification = {
+    frameChanged: "UIScreenFrameChanged"
+};

package/Root/Frameworks/UIKit/UITextLayer.js

@@ -201,7 +201,7 @@ JSClass("UITextLayer", UILayer, {
         this._displayQueued = false;
     },
 
-    integerSizeRequired: false,
+    integerSizeRequired: true,
 
     sizeToFitSize: function(maxSize){
         var size = JSSize(maxSize);

package/Root/Frameworks/UIKit/UIView.js

@@ -138,6 +138,9 @@ JSClass('UIView', UIResponder, {
         if (spec.containsKey("tag")){
             this.tag = spec.valueForKey("tag");
         }
+        if (spec.containsKey("zIndex")){
+            this.zIndex = spec.valueForKey("zIndex", Number);
+        }
         var i, l;
         if (spec.containsKey("gestureRecognizers")){
             var recognizers = spec.valueForKey("gestureRecognizers");
@@ -193,6 +196,7 @@ JSClass('UIView', UIResponder, {
     shadowOffset: UIViewLayerProperty(),
     shadowRadius: UIViewLayerProperty(),
     contentVisualEffect: UIViewLayerProperty(),
+    zIndex: UIViewLayerProperty(),
     cursor: JSDynamicProperty(),
     tooltip: null,
 
@@ -207,6 +211,10 @@ JSClass('UIView', UIResponder, {
         }
     },
 
+    layerDidChangeZIndexSublayers: function(layer){
+        this.zIndexOrderedSubviews = null;
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Superview
 
@@ -967,6 +975,8 @@ JSClass('UIView', UIResponder, {
 
     userInteractionEnabled: true,
 
+    zIndexOrderedSubviews: null,
+
     containsPoint: function(point){
         return this.layer.containsPoint(point);
     },
@@ -975,11 +985,19 @@ JSClass('UIView', UIResponder, {
         var subview;
         var locationInSubview;
         var hit = null;
-        for (var i = this.subviews.length - 1; i >= 0 && hit === null; --i){
-            subview = this.subviews[i];
+        var subviews = this.subviews;
+        if (this.layer.numberOfSublayersWithNonZeroZIndex > 0){
+            if (this.zIndexOrderedSubviews === null){
+                this.zIndexOrderedSubviews = JSCopy(subviews);
+                this.zIndexOrderedSubviews.sort(UIView.compareZIndex);
+            }
+            subviews = this.zIndexOrderedSubviews;
+        }
+        for (var i = subviews.length - 1; i >= 0 && hit === null; --i){
+            subview = subviews[i];
             locationInSubview = this.layer.convertPointToLayer(locationInView, subview.layer);
             if (!subview.hidden && subview.layer.presentation.alpha > 0 && (!subview.clipsToBounds || subview.containsPoint(locationInSubview))){
-                hit  = subview.hitTest(locationInSubview);
+                hit = subview.hitTest(locationInSubview);
             }
         }
         if (hit === null && this.userInteractionEnabled && this.containsPoint(locationInView)){
@@ -1143,6 +1161,7 @@ JSClass('UIView', UIResponder, {
 
     setAccessibilityLabel: function(accessibilityLabel){
         this._accessibilityLabel = accessibilityLabel;
+        this.postAccessibilityNotification(UIAccessibility.Notification.labelChanged);
     },
 
     setAccessibilityHidden: function(accessibilityHidden){
@@ -1204,4 +1223,8 @@ UIView.animateWithOptions = function(options, animations, callback){
 UIView.noIntrinsicSize = -1;
 
 UIView.Corners = UILayer.Corners;
-UIView.Sides = UILayer.Sides;
+UIView.Sides = UILayer.Sides;
+
+UIView.compareZIndex = function(a, b){
+    return a.layer._zIndex - b.layer._zIndex;
+};

package/Root/Frameworks/UIKit/UIWindow.js

@@ -157,6 +157,7 @@ JSClass('UIWindow', UIView, {
         this._title = title;
         this.setNeedsLayout();
         this._styler.updateWindow(this);
+        this.postAccessibilityNotification(UIAccessibility.Notification.labelChanged);
     },
 
     setIcon: function(icon){
@@ -306,6 +307,16 @@ JSClass('UIWindow', UIView, {
         }
     },
 
+    zIndex: JSDynamicProperty(),
+
+    setZIndex: function(zIndex){
+        logger.warn("setting zIndex on UIWindow has no effect");
+    },
+
+    getZIndex: function(){
+        return 0;
+    },
+
     // -------------------------------------------------------------------------
     // MARK: Traits
 
@@ -1225,13 +1236,10 @@ JSClass("UIRootWindow", UIWindow, {
 
     level: UIWindow.Level.back,
 
-    getAccessibilityLabel: function(){
-        return this.application.accessibilityLabel;
-    },
-
     _commonWindowInit: function(){
         UIRootWindow.$super._commonWindowInit.call(this);
         this.frame = this.application.windowServer.screen.frame;
+        this.title = this.application.bundle.localizedStringForInfoKey("UIApplicationTitle");
     },
 
     isAccessibilityElement: false,

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -22,6 +22,7 @@
 // #import "UIDraggingSession.js"
 // #import "UIUserInterface.js"
 // #import "UIColorSpace.js"
+// #import "UIScreen.js"
 'use strict';
 
 (function(){
@@ -273,6 +274,7 @@ JSClass("UIWindowServer", JSObject, {
             window = this.windowStack[i];
             this.layoutWindow(window);
         }
+        JSNotificationCenter.shared.post(UIScreen.Notification.frameChanged, this, {screen: this.screen});
     },
 
     layoutWindow: function(window){

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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