@breakside/jskit 2023.13.0 → 2023.14.1

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -600,6 +600,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     touchend: function(e){
         e.preventDefault();
         this._createTouchEventFromDOMEvent(e, UIEvent.Type.touchesEnded);
+        this.textInputManager._ensureCorrectFocus();
     },
 
     touchcancel: function(e){

package/Root/Frameworks/UIKit/UIListView.js

@@ -1717,6 +1717,7 @@ JSClass("UIListView", UIScrollView, {
 
     windowDidChangeKeyStatus: function(){
         this._updateVisibleCellStyles();
+        UIListView.$super.windowDidChangeKeyStatus.call(this);
     },
 
     keyDown: function(event){

package/Root/Frameworks/UIKit/UITextEditor.js

@@ -436,6 +436,28 @@ JSClass("UITextEditor", JSObject, {
         this._toggleBooleanAttribute("underline", "Underline");
     },
 
+    strike: function(sender){
+        this._toggleBooleanAttribute("strike", "Strike");
+    },
+
+    setAttribute: function(name, value, undoName){
+        this.undoManager.beginUndoGrouping();
+        var i, l;
+        var selection;
+        var selections = this._selectionsCopy();
+        for (i = 0, l = selections.length; i < l; ++i){
+            selection = selections[i];
+            this._setAttributeValueForSelection(name, value, selection);
+        }
+        this._setSelectionsAllowingUndo(selections);
+        this.undoManager.endUndoGrouping();
+        this.undoManager.setActionName(undoName);
+    },
+
+    removeAttribute: function(name, undoName){
+        this.setAttribute(name, undefined, undoName);
+    },
+
     removeParagraphAttribute: function(name, undoName){
         this.setParagraphAttribute(name, undefined, undoName);
     },
@@ -535,7 +557,7 @@ JSClass("UITextEditor", JSObject, {
         var selections = this._selectionsCopy();
         for (i = 0, l = selections.length; i < l; ++i){
             selection = selections[i];
-            this._setBooleanAttributeForSelection(name, !currentValue, selection);
+            this._setAttributeValueForSelection(name, !currentValue, selection);
         }
         this._setSelectionsAllowingUndo(selections);
         this.undoManager.endUndoGrouping();
@@ -543,25 +565,26 @@ JSClass("UITextEditor", JSObject, {
         this._resetSelectionAffinity();
     },
 
-    _setBooleanAttributeForSelection: function(name, value, selection){
+    _setAttributeValueForSelection: function(name, value, selection){
         var textStorage = this.textLayoutManager.textStorage;
         var replacementString;
         if (selection.range.length > 0){
             replacementString = textStorage.attributedSubstringInRange(selection.range);
-            if (value){
-                replacementString.addAttributeInRange(name, true, JSRange(0, replacementString.string.length));
+            if (value !== null && value !== undefined){
+                replacementString.addAttributeInRange(name, value, JSRange(0, replacementString.string.length));
             }else{
                 replacementString.removeAttributeInRange(name, JSRange(0, replacementString.string.length));
             }
             this._replaceTextStorageRangeAllowingUndo(textStorage, selection.range, replacementString);
         }else{
             selection.attributes = this._insertAttributesForSelection(selection);
-            if (value){
-                selection.attributes[name] = true;
+            var currentValue = selection.attributes[name];
+            if (value !== null && value !== undefined){
+                selection.attributes[name] = value;
             }else{
                 delete selection.attributes[name];
             }
-            this.undoManager.registerUndo(this, this._setBooleanAttributeForSelection, name, !value, selection);
+            this.undoManager.registerUndo(this, this._setAttributeValueForSelection, name, currentValue, selection);
         }
     },
 
@@ -723,7 +746,7 @@ JSClass("UITextEditor", JSObject, {
         }
         var index = selection.range.location;
         var iterator;
-        if (index > 0){
+        if (selection.range.length === 0 && index > 0){
             iterator = this.textLayoutManager.textStorage.string.userPerceivedCharacterIterator(index);
             iterator.decrement();
             if (!iterator.isParagraphBreak){

package/Root/Frameworks/UIKit/UITextField.js

@@ -896,6 +896,7 @@ JSClass("UITextField", UIControl, {
 
     windowDidChangeKeyStatus: function(){
         this._localEditor.windowDidChangeKeyStatus(this.window);
+        UITextField.$super.windowDidChangeKeyStatus.call(this);
     },
 
     _isHandlingMouseDown: false,

package/Root/Frameworks/UIKit/UITokenField.js

@@ -201,7 +201,7 @@ JSClass("UITokenFieldTokenView", UIView, {
         this.tokenLabel.cornerRadius = 3.0;
         this.addSubview(this.tokenLabel);
         this._tokenInsets = JSInsets(0, 1.5);
-        this.tokenLabel.cursor = UICursor.arrow;
+        this.tokenLabel.cursor = UICursor.systemDefault;
         this.setNeedsLayout();
     },
 

package/Root/Frameworks/UIKit/UIToolbar.js

@@ -78,7 +78,7 @@ JSClass("UIToolbar", UIView, {
 
     setItems: function(items){
         var i, l;
-        for (i = this._items.length; i >= 0; --i){
+        for (i = this._items.length - 1; i >= 0; --i){
             this.removeItemAtIndex(i);
         }
         for (i = 0, l = items.length; i < l; ++i){
@@ -218,7 +218,7 @@ JSClass("UIToolbarItemView", UIView, {
         }else{
             switch (item.identifier){
                 case UIToolbarItem.Identifier.space:
-                    this.contentView = UIToolbarItemSpaceView.initWithWidth(item.minimumWidth ? item.minimumWidth.width : item.toolbar.imageSize);
+                    this.contentView = UIToolbarItemSpaceView.initWithWidth(item.minimumSize !== null ? item.minimumSize.width : item.toolbar.imageSize);
                     this._handlesEvents = false;
                     break;
                 case UIToolbarItem.Identifier.flexibleSpace:
@@ -267,10 +267,11 @@ JSClass("UIToolbarItemView", UIView, {
             }
             var width;
             var height;
-            if (!isNaN(this._item.minimumWidth) && this._item.minimumWidth > 0){
-                width = this._item.minimumWidth;
-            }else if (this._item.view !== null){
+            if (this._item.view !== null){
                 width = this._item.view.intrinsicSize.width;
+                if (width === UIView.noIntrinsicSize){
+                    width = bounds.size.width;
+                }
             }else{
                 width = this._item.image.size.width * toolbar._imageSize / this._item.image.size.height;
             }
@@ -292,10 +293,15 @@ JSClass("UIToolbarItemView", UIView, {
         var toolbar = this._item.toolbar;
         var width;
         if (this._item.identifier == UIToolbarItem.Identifier.custom){
-            if (!isNaN(this._item.minimumWidth) && this._item.minimumWidth > 0){
-                width = this._item.minimumWidth;
-            }else if (this._item.view !== null){
+            if (this._item.view !== null){
                 width = this._item.view.intrinsicSize.width;
+                if (width === UIView.noIntrinsicSize){
+                    if (this._item.minimumSize !== null){
+                        width = this._item.minimumSize.width;
+                    }else{
+                        width = toolbar._imageSize;
+                    }
+                }
             }else{
                 width = this._item.image.size.width * toolbar._imageSize / this._item.image.size.height;
             }
@@ -541,7 +547,7 @@ JSClass("UIToolbarCustomStyler", UIToolbarStyler, {
             itemView.index = i;
             itemView.item = item;
         }
-        for (var j = l - 1; j >= i; --j){
+        for (var j = props.itemViews.length - 1; j >= i; --j){
             itemView = props.itemViews.pop();
             itemView.removeFromSuperview();
         }
@@ -656,6 +662,8 @@ JSClass("UIToolbarCustomStyler", UIToolbarStyler, {
             itemsWidth += size.width;
             if (item.identifier === UIToolbarItem.Identifier.flexibleSpace){
                 flexibleItemSizes.push(size);
+            }else if (item.minimumSize !== null && item.maximumSize !== null && item.minimumSize.width < item.maximumSize.width){
+                flexibleItemSizes.push(size);
             }
         }
         itemsWidth += (props.itemViews.length - 1) * this.itemSpacing;

package/Root/Frameworks/UIKit/UIWindow.js

@@ -395,7 +395,7 @@ JSClass('UIWindow', UIView, {
 
     makeKeyAndOrderFront: function(){
         this.orderFront();
-        this.windowServer.makeWindowKey(this);
+        this.makeKey();
     },
 
     receivesAllEvents: false,
@@ -795,6 +795,9 @@ JSClass('UIWindow', UIView, {
         if (this.mouseTrackingViews === null || this.mouseTrackingViews.length === 0){
             return;
         }
+        if (this._modal !== null){
+            return;
+        }
         var view;
         var area;
         var viewIndex, viewCount;
@@ -818,9 +821,7 @@ JSClass('UIWindow', UIView, {
                             enters.push(area);
                         }
                     }
-                    if ((area.trackingType & UIMouseTrackingArea.TrackingType.move) !== 0){
-                        moves.push(area);
-                    }
+                    moves.push(area);
                 }else{
                     if (area._entered){
                         area._entered = false;
@@ -841,6 +842,12 @@ JSClass('UIWindow', UIView, {
                 area = exits[areaIndex];
                 area.mouseExited(event);
             }
+            for (areaIndex = 0, areaCount = moves.length; areaIndex < areaCount; ++areaIndex){
+                area = moves[areaIndex];
+                if (area.cursor !== null){
+                    area.cursor.set();
+                }
+            }
         }
         if (enters.length > 0){
             event = UIEvent.initMouseEventWithType(UIEvent.Type.mouseEntered, timestamp, this, locationInWindow, modifiers, 0);
@@ -852,8 +859,10 @@ JSClass('UIWindow', UIView, {
         if (moves.length > 0){
             event = UIEvent.initMouseEventWithType(UIEvent.Type.mouseMoved, timestamp, this, locationInWindow, modifiers, 0);
             for (areaIndex = 0, areaCount = moves.length; areaIndex < areaCount; ++areaIndex){
-                area = moves[areaIndex];
-                area.mouseMoved(event);
+                if ((area.trackingType & UIMouseTrackingArea.TrackingType.move) !== 0){
+                    area = moves[areaIndex];
+                    area.mouseMoved(event);
+                }
             }
         }
     },
@@ -901,6 +910,9 @@ JSClass('UIWindow', UIView, {
         while (modal !== null && modal._modal !== null){
             modal = modal._modal;
         }
+        if (this.mouseEventView !== null && this.mouseEventView.window !== this){
+            this.mouseEventView = null;
+        }
         if (modal !== null){
             this.mouseEventView = null;
             if (event.type == UIEvent.Type.mouseEntered || event.type == UIEvent.Type.mouseExited || event.type == UIEvent.mouseMoved){
@@ -925,7 +937,9 @@ JSClass('UIWindow', UIView, {
         }
         switch (event.type){
             case UIEvent.Type.leftMouseDown:
-                this.makeKeyAndOrderFront();
+                if (this._isOpen){
+                    this.makeKeyAndOrderFront();
+                }
                 eventTarget.mouseDown(event);
                 this._validateToolbar();
                 break;

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -726,7 +726,7 @@ JSClass("UIWindowServer", JSObject, {
         var event;
         for (windowIndex = this.windowStack.length - 1; windowIndex >= 0 && window === null; --windowIndex){
             location = this.windowStack[windowIndex].convertPointFromScreen(this.mouseLocation);
-            if (this.windowStack[windowIndex].userInteractionEnabled && this.windowStack[windowIndex].containsPoint(location)){
+            if (this.windowStack[windowIndex].userInteractionEnabled && (this.windowStack[windowIndex].containsPoint(location) || this.windowStack[windowIndex].receivesAllEvents)){
                 window = this.windowStack[windowIndex];
             }
         }

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/Root/Templates/html/${PROJECT_NAME}/conf/debug/nginx.conf

@@ -36,6 +36,8 @@ http {
     gzip  on;
     gzip_types text/css application/javascript application/json text/xml text/plain image/svg+xml text/cache-manifest application/x-font-ttf;
 
+    absolute_redirect off;
+
     server {
         listen *:{{HTTP_PORT}}{{SSL_LISTEN}};
         {{SSL_CERT}}

package/Root/Templates/html/${PROJECT_NAME}/conf/release/nginx.conf

@@ -36,6 +36,8 @@ http {
     gzip  on;
     gzip_types text/css application/javascript application/json text/xml text/plain image/svg+xml text/cache-manifest application/x-font-ttf;
 
+    absolute_redirect off;
+
     server {
         listen *:{{HTTP_PORT}};
         server_name "";

package/package.json

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