@breakside/jskit 2026.10.0 → 2026.26.0

package/Root/Frameworks/UIKit/UIMenu.js

@@ -477,6 +477,7 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
     borderWidth: JSDynamicProperty('_borderWidth', 0.5),
     itemContentInsets: JSDynamicProperty('_itemContentInsets', JSInsets(2, 3, 2, 7)),
     indentationSize: JSDynamicProperty('_indentationSize', 10),
+    submenuIndicatorIcon: null,
     separatorSize: 10,
     separatorLineWidth: 1,
     separatorColor: null,
@@ -490,6 +491,7 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
         this.shadowColor = JSColor.menuShadow;
         this.shadowOffset = JSPoint.Zero;
         this.separatorColor = this.disabledTextColor;
+        this.submenuIndicatorIcon = JSImage.initWithResourceName("UIMenuItemSubmenu", this.bundle).imageWithRenderMode(JSImage.RenderMode.template);
     },
 
     initWithSpec: function(spec){
@@ -552,8 +554,17 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
         if (spec.containsKey('indentationSize')){
             this.indentationSize = spec.valueForKey("indentationSize", Number);
         }
+        if (spec.containsKey('submenuIndicatorIcon')){
+            this.submenuIndicatorIcon = spec.valueForKey("submenuIndicatorIcon", Number);
+        }else{
+            this.submenuIndicatorIcon = JSImage.initWithResourceName("UIMenuItemSubmenu", this.bundle).imageWithRenderMode(JSImage.RenderMode.template);
+        }
     },
 
+    bundle: JSLazyInitProperty(function(){
+        return JSBundle.initWithIdentifier("io.breakside.JSKit.UIKit");
+    }),
+
     presentMenuAdjacentToView: function(menu, view, preferredPlacement, spacing){
         if (preferredPlacement === undefined){
             preferredPlacement = UIMenu.Placement.below;
@@ -857,46 +868,47 @@ JSClass("UIMenuWindowStyler", UIMenuStyler, {
     invalidateMenuPresentation: function(menu){
         var window = menu.stylerProperties.window || null;
         if (window !== null && window.screen !== null){
-            menu.updateEnabled();
-            window.update();
-
-            var screenMetrics = this.metricsForScreen(window.screen);
-            var size = JSSize(window.frame.size);
+            window.invalidate();
+        }
+    },
 
-            // Ensure we're at least the minimum width
-            // (although max width will take precedence)
-            if (size.width < menu._minimumWidth){
-                size.width = menu._minimumWidth;
-            }
+    repositionWindow: function(window){
+        var menu = window._menu;
+        var screenMetrics = this.metricsForScreen(window.screen);
+        var size = JSSize(window.frame.size);
 
-            // Limit width to the max screen width
-            if (size.width > screenMetrics.maximumWidth){
-                size.width = screenMetrics.maximumWidth;
-            }
+        // Ensure we're at least the minimum width
+        // (although max width will take precedence)
+        if (size.width < menu._minimumWidth){
+            size.width = menu._minimumWidth;
+        }
 
-            // Set our origin so the origin of the target item matches the given location
-            var origin = JSPoint(window.frame.origin);
+        // Limit width to the max screen width
+        if (size.width > screenMetrics.maximumWidth){
+            size.width = screenMetrics.maximumWidth;
+        }
 
-            // Adjust our x position if we've overflowed
-            var over = origin.x + size.width - screenMetrics.safeFrame.origin.x - screenMetrics.safeFrame.size.width;
-            if (over > 0){
-                origin.x -= over;
-            }
-            if (origin.x < screenMetrics.safeFrame.origin.x){
-                origin.x = screenMetrics.safeFrame.origin.x;
-            }
+        // Set our origin so the origin of the target item matches the given location
+        var origin = JSPoint(window.frame.origin);
 
-            var offset = JSPoint.Zero;
+        // Adjust our x position if we've overflowed
+        var over = origin.x + size.width - screenMetrics.safeFrame.origin.x - screenMetrics.safeFrame.size.width;
+        if (over > 0){
+            origin.x -= over;
+        }
+        if (origin.x < screenMetrics.safeFrame.origin.x){
+            origin.x = screenMetrics.safeFrame.origin.x;
+        }
 
-            // If we extend beyond the bottom, adjust our height
-            over = origin.y + size.height - screenMetrics.safeFrame.origin.y - screenMetrics.safeFrame.size.height;
-            if (over > 0){
-                size.height -= over;
-            }
+        var offset = JSPoint.Zero;
 
-            window.frame = JSRect(origin, size);
-            window.layoutIfNeeded();
+        // If we extend beyond the bottom, adjust our height
+        over = origin.y + size.height - screenMetrics.safeFrame.origin.y - screenMetrics.safeFrame.size.height;
+        if (over > 0){
+            size.height -= over;
         }
+
+        window.frame = JSRect(origin, size);
     },
 
     metricsForScreen: function(screen){
@@ -1009,6 +1021,12 @@ UIMenu.keyEquivalentCodeForKeyCode = function(keyCode){
             case 0xBD:
                 characterCode = 0x2D; // -
                 break;
+            case 0xDB:
+                characterCode = 0x5B; // [
+                break;
+            case 0xDD:
+                characterCode = 0x5D; // [
+                break;
         }
     }
     return UIMenu.keyEquivalentCodeForCharacterCode(characterCode);

package/Root/Frameworks/UIKit/UIMenuItem.js

@@ -25,6 +25,7 @@ JSClass("UIMenuItem", JSObject, {
     index: 0,
     title: JSDynamicProperty('_title', null),
     keyEquivalent: JSDynamicProperty('_keyEquivalent', null),
+    unmodifiedKeyEquivalent: JSDynamicProperty('_unmodifiedKeyEquivalent', null),
     _keyEquivalentCode: 0,
     keyModifiers: JSDynamicProperty('_keyModifiers', 0),
     image: JSDynamicProperty('_image', null),
@@ -132,11 +133,21 @@ JSClass("UIMenuItem", JSObject, {
         }
     },
 
+    setState: function(state){
+        this._state = state;
+        if (this.menu !== null){
+            this.menu._styler.invalidateMenuPresentation(this.menu);
+        }
+    },
+
     setEnabled: function(isEnabled){
         if (this._isSeparator){
             return;
         }
         this._isEnabled = isEnabled;
+        if (this.menu !== null){
+            this.menu._styler.invalidateMenuPresentation(this.menu);
+        }
     },
 
     setTag: function(tag){
@@ -160,6 +171,7 @@ JSClass("UIMenuItem", JSObject, {
         this._submenu = submenu;
         if (this._submenu !== null){
             this._submenu.supermenu = this.menu;
+            this._isEnabled = true;
         }
     },
 

package/Root/Frameworks/UIKit/UIMenuView.js

@@ -127,6 +127,13 @@ JSClass("UIMenuWindow", UIWindow, {
     // -----------------------------------------------------------------------
     // MARK: - Upating the Window Contents
 
+    invalidate: function(){
+        this.needsUpdate = true;
+        this.setNeedsLayout();
+    },
+
+    needsUpdate: false,
+
     update: function(){
         var item;
         var itemView;
@@ -208,6 +215,12 @@ JSClass("UIMenuWindow", UIWindow, {
     // MARK: - Layout
 
     layoutSubviews: function(){
+        if (this.needsUpdate){
+            this._menu.updateEnabled();
+            this.update();
+            this.needsUpdate = false;
+            this._menu.styler.repositionWindow(this);
+        }
         UIMenuWindow.$super.layoutSubviews.call(this);
         var contentView = this.contentView;
         this.clipView.frame = contentView.bounds.rectWithInsets(this._capSize, 0);
@@ -928,7 +941,7 @@ JSClass("UIMenuItemView", UIView, {
     },
 
     _createSubmenuImageView: function(){
-        this._submenuImageView = UIImageView.initWithImage(images.submenu);
+        this._submenuImageView = UIImageView.init();
         this.insertSubviewAboveSibling(this._submenuImageView, this.titleLabel);
         return this._submenuImageView;
     },
@@ -968,6 +981,7 @@ JSClass("UIMenuItemView", UIView, {
         }
         if (item.submenu){
             this.submenuImageView.hidden = false;
+            this.submenuImageView.image = item.menu.styler.submenuIndicatorIcon;
         }else if (this._submenuImageView !== null){
             this._submenuImageView.hidden = true;
         }
@@ -976,6 +990,10 @@ JSClass("UIMenuItemView", UIView, {
             this.keyLabel.text = item.keyEquivalent.toUpperCase();
             var modifierText = UIPlatform.shared.stringForKeyModifiers(item.keyModifiers);
             this.keyModifierLabel.text = modifierText;
+        }else if (item.unmodifiedKeyEquivalent !== null){
+            this.keyLabel.hidden = false;
+            this.keyLabel.text = item.unmodifiedKeyEquivalent.toUpperCase();
+            this.keyModifierLabel.text = "";
         }else if (this._keyLabel !== null){
             this._keyLabel.hidden = true;
             this._keyModifierLabel.hidden = true;
@@ -1018,7 +1036,7 @@ JSClass("UIMenuItemView", UIView, {
         if (this._submenuImageView !== null){
             this.submenuImageView.templateColor = textColor;
         }
-        if (item.keyEquivalent){
+        if (item.keyEquivalent || item.unmodifiedKeyEquivalent){
             this.keyLabel.font = item.menu.font;
             this.keyLabel.textColor = textColor;
             this.keyModifierLabel.font = item.menu.font;
@@ -1042,6 +1060,10 @@ JSClass("UIMenuItemView", UIView, {
                     this.addSubview(this._accessoryView);
                 }
             }
+        }else{
+            if (this._accessoryView !== null){
+                this._accessoryView.removeFromSuperview();
+            }
         }
         this._accessorySize = item.accessorySize;
         this.setNeedsLayout();
@@ -1121,7 +1143,7 @@ JSClass("UIMenuItemView", UIView, {
             right -= this._submenuImageView.frame.size.width + this.contentInsets.right;
         }else if (this._keyLabel !== null && !this._keyLabel.hidden){
             this._keyLabel.frame = JSRect(right - this.keyWidth, this.contentInsets.top, this.keyWidth, this._keyLabel.font.displayLineHeight);
-            right -= this.keyWidth;
+            right -= this.keyWidth + 2;
             this._keyModifierLabel.frame = JSRect(right - this._keyModifierLabel.frame.size.width, this.contentInsets.top, this._keyModifierLabel.frame.size.width, this._keyModifierLabel.font.displayLineHeight);
             right -= this._keyModifierLabel.frame.size.width + this.contentInsets.right;
         }else if (this._accessoryView !== null){
@@ -1157,9 +1179,9 @@ JSClass("UIMenuItemView", UIView, {
         size.width += this.titleLabel.frame.size.width;
         if (item.submenu !== null){
             size.width += this._submenuImageView.frame.size.width + this.contentInsets.right;
-        }else if (item.keyEquivalent){
+        }else if (item.keyEquivalent || item.unmodifiedKeyEquivalent){
             this._keyModifierLabel.sizeToFit();
-            size.width += this.keyWidth + this._keyModifierLabel.frame.size.width + this.contentInsets.right;
+            size.width += this.keyWidth + this._keyModifierLabel.frame.size.width + this.contentInsets.right + 2;
         }else{
             // make sure the right padding is as much as the left
             size.width += this.contentInsets.left - this.contentInsets.right;

package/Root/Frameworks/UIKit/UIPlatform.js

@@ -23,11 +23,13 @@ JSClass("UIPlatform", JSObject, {
 
     identifier: null,
     commandModifier: UIEvent.Modifier.command,
+    commandKey: UIEvent.Key.command,
 
     initWithIdentifier: function(identifier){
         this.identifier = identifier;
         if (this.identifier in CommandModifiers){
             this.commandModifier = CommandModifiers[this.identifier];
+            this.commandKey = CommandKeys[this.identifier];
         }
         this._cachedModifierStrings = {};
     },
@@ -66,6 +68,11 @@ var CommandModifiers = {
     mac: UIEvent.Modifier.command
 };
 
+var CommandKeys = {
+    win: UIEvent.Key.control,
+    mac: UIEvent.Key.command
+};
+
 var OrderedModifiers = {
     win: [UIEvent.Modifier.option, UIEvent.Modifier.shift, UIEvent.Modifier.command, UIEvent.Modifier.control],
     mac: [UIEvent.Modifier.option, UIEvent.Modifier.control, UIEvent.Modifier.shift, UIEvent.Modifier.command]

package/Root/Frameworks/UIKit/UIPopupButton.js

@@ -28,7 +28,7 @@ JSClass("UIPopupButton", UIControl, {
     titleInsets: JSDynamicProperty('_titleInsets', null),
     imageView: JSReadOnlyProperty('_imageView', null),
     indicatorView: JSReadOnlyProperty('_indicatorView', null),
-    menu: JSReadOnlyProperty('_menu', null),
+    menu: JSDynamicProperty('_menu', null),
     selectedIndex: JSDynamicProperty('_selectedIndex', -1),
     selectedTag: JSDynamicProperty(),
     _selectedItem: null,
@@ -280,6 +280,12 @@ JSClass("UIPopupButton", UIControl, {
 
     menuAdoptsTitleFont: true,
 
+    setMenu: function(menu){
+        this._menu = menu;
+        this.menuAdoptsTitleFont = false;
+        this.invalidateIntrinsicSize();
+    },
+
     openMenu: function(){
         if (this.menu.items.length > 0){
             if (this.menuAdoptsTitleFont){

package/Root/Frameworks/UIKit/UIResponder.js

@@ -211,4 +211,12 @@ JSClass("UIResponder", JSObject, {
         }
     },
 
+    getShortcutMenu: function(){
+        var next = this.getNextResponder();
+        if (next !== null){
+            return next.getShortcutMenu();
+        }
+        return null;
+    },
+
 });

package/Root/Frameworks/UIKit/UITextEditor.js

@@ -43,6 +43,7 @@ JSClass("UITextEditor", JSObject, {
     _selectionHighlightLayers: null,
     _selectionHighlightColor: null,
     _draggingSelectionIndex: null,
+    _showsSelectionWhenNotFirstResponder: false,
 
     initWithTextLayer: function(textLayer){
         this.layoutLayer = textLayer;
@@ -318,8 +319,10 @@ JSClass("UITextEditor", JSObject, {
     },
 
     didResignFirstResponder: function(){
-        this._hideCursors();
-        this._hideSelections();
+        if (!this._showsSelectionWhenNotFirstResponder){
+            this._hideCursors();
+            this._hideSelections();
+        }
         this._isFirstResponder = false;
         this.undoManager.clear();
     },
@@ -362,8 +365,10 @@ JSClass("UITextEditor", JSObject, {
     },
 
     _positionCursors: function(){
-        if (!this._isFirstResponder || !this._isWindowKey){
-            return;
+        if (!this._showsSelectionWhenNotFirstResponder){
+            if (!this._isFirstResponder || !this._isWindowKey){
+                return;
+            }
         }
         var i, l;
         for (i = this._cursorLayers.length, l = this.selections.length; i < l; ++i){
@@ -452,8 +457,10 @@ JSClass("UITextEditor", JSObject, {
     // MARK: - Selection Highlights
 
     _positionSelectionHighlights: function(){
-        if (!this._isFirstResponder || !this._isWindowKey){
-            return;
+        if (!this._showsSelectionWhenNotFirstResponder){
+            if (!this._isFirstResponder || !this._isWindowKey){
+                return;
+            }
         }
         // TODO: show paragraph marks when highlighting
         var selectionsWithLengths = [];
@@ -883,7 +890,7 @@ JSClass("UITextEditor", JSObject, {
                 if (selection.range.location >= range.end){
                     selection.range = JSRange(selection.range.location + locationAdjustment, selection.range.length);
                 }else if (selection.range.location >= range.location){
-                    selection.range = JSRange(range.location, Math.max(0, selection.range.length + locationAdjustment));
+                    selection.range = JSRange(selection.range.location, Math.max(0, selection.range.length + locationAdjustment));
                 }else{
                     break;
                 }

package/Root/Frameworks/UIKit/UITokenField.js

@@ -99,6 +99,71 @@ JSClass("UITokenField", UITextField, {
         }
     },
 
+    deleteBackward: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteBackward.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteWordBackward: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteWordBackward.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteToBeginningOfLine: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteToBeginningOfLine.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteToBeginningOfDocument: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteToBeginningOfDocument.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteForward: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteForward.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteWordForward: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteWordForward.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteToEndOfLine: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteToEndOfLine.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+    deleteToEndOfDocument: function(){
+        var l = this.representedObjects.length;
+        UITokenField.$super.deleteToEndOfDocument.call(this);
+        if (this.representedObjects.length !== l){
+            this.sendActionsForEvents(UIControl.Event.valueChanged);
+        }
+    },
+
+
     resignFirstResponder: function(){
         UITokenField.$super.resignFirstResponder.call(this);
         this._tokenize();

package/Root/Frameworks/UIKit/UIToolbar.js

@@ -524,7 +524,7 @@ JSClass("UIToolbarCustomStyler", UIToolbarStyler, {
 
     _fillInMissingStyles: function(){
         if (this.itemFont === null){
-            this.itemFont = JSFont.systemFontOfSize(JSFont.Size.detail).fontWithWeight(JSFont.Weight.normal);
+            this.itemFont = JSFont.systemFontOfSize(JSFont.Size.detail).fontWithWeight(JSFont.Weight.regular);
         }
         if (this.itemColor === null){
             this.itemColor = JSColor.initWithUIStyles(JSColor.black.colorWithAlpha(0.7), JSColor.white.colorWithAlpha(0.7));

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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