@breakside/jskit 2022.7.1 → 2022.20.0

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -562,7 +562,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     dragend: function(e){
         // dragend is not cancelable, so no need for preventDefault()
         if (this._dragImageElement !== null){
-            if (this._dragImageElement.parentNode !== null){
+            if (this._dragImageElement.parentNode !== null && this._createdDragImageElement){
                 this._dragImageElement.parentNode.removeChild(this._dragImageElement);
             }
             this._dragImageElement = null;
@@ -839,6 +839,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     // MARK: - Drag & Drop Support
 
     _dragImageElement: null,
+    _createdDragImageElement: false,
 
     prerenderDragImage: function(image){
         // Safari is picky here and requires that the image element be in the document and
@@ -852,6 +853,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
         imageElement.src = image.htmlURLString();
         this.rootElement.appendChild(imageElement);
         this._dragImageElement = imageElement;
+        this._createdDragImageElement = true;
     },
 
     createDraggingSessionWithItems: function(items, event, view){
@@ -863,6 +865,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
             context.element.draggable = true;
             // Could use a subclass here, but this seems to work too
             var originalSetImage = session.setImage;
+            var originalSetImageFromView = session.setImageFromView;
             var windowServer = this;
             Object.defineProperties(session, {
                 setImage: {
@@ -871,6 +874,15 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
                         originalSetImage.call(this, image, imageOffset);
                         windowServer.prerenderDragImage(image);
                     }
+                },
+                setImageFromView: {
+                    configurable: true,
+                    value: function UIHTMLWindowServer_UIDragSession_setImageFromView(view, imageOffset){
+                        originalSetImageFromView.call(this, view, imageOffset);
+                        var context = windowServer.displayServer.contextForLayer(view.layer);
+                        windowServer._dragImageElement = context.element;
+                        windowServer._createdDragImageElement = false;
+                    }
                 }
             });
         }

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -37,16 +37,19 @@ JSClass('UIScrollView', UIView, {
     initWithSpec: function(spec){
         UIScrollView.$super.initWithSpec.call(this, spec);
 
-        // 1. If any subviews were added directly to this view, we'll move them
-        //    to the contentView once it's ready
-        var contentSubviews = JSCopy(this.subviews);
-
-        // 2. If the content view and scrollers are specified in the spec, create them
-        //    before doing the _commonScrollViewInit, so it won't try to create them itself.
-        //    These properties are optional in the spec, and are typically only provided if
-        //    the user wants to provide specialized customization
+        var contentSubviews = [];
+
+        // If the content view and scrollers are specified in the spec, create them
+        // before doing the _commonScrollViewInit, so it won't try to create them itself.
+        // These properties are optional in the spec, and are typically only provided if
+        // the user wants to provide specialized customization
         if (spec.containsKey('contentView')){
             this._contentView = spec.valueForKey("contentView", UIView);
+        }else{
+            // If any subviews were added directly to this view, and a 
+            // contentView was not provided, treat the subviews as children
+            // of the contentView
+            contentSubviews = JSCopy(this.subviews);
         }
         if (spec.containsKey('verticalScroller')){
             this._verticalScroller = spec.valueForKey("verticalScroller", UIScroller);
@@ -59,13 +62,13 @@ JSClass('UIScrollView', UIView, {
         }
         this._commonScrollViewInit();
 
-        // 3. Finish the work from step #1 after _commonScrollViewInit, when we can be sure that
-        //    a contentView has been created
+        // Finish the contentSubvies work after _commonScrollViewInit,
+        // when we can be sure that a contentView has been created
         for (var i = 0, l = contentSubviews.length; i < l; ++i){
             this._contentView.addSubview(contentSubviews[i]);
         }
 
-        // 4. Handle all the other properties
+        // Handle all the other properties
         if (spec.containsKey('contentInsets')){
             this.contentInsets = spec.valueForKey("contentInsets", JSInsets);
         }
@@ -105,7 +108,7 @@ JSClass('UIScrollView', UIView, {
         this._maxContentOffset = JSPoint.Zero;
         this._horizontalScroller.addAction("_horizontalScrollerValueChanged", this, UIControl.Event.valueChanged);
         this._verticalScroller.addAction("_verticalScrollerValueChanged", this, UIControl.Event.valueChanged);
-        this.addSubview(this._contentView);
+        this.insertSubviewAtIndex(this._contentView, 0);
         this.addSubview(this._verticalScroller);
         this.addSubview(this._horizontalScroller);
         this._updateScrollers();

package/Root/Frameworks/UIKit/UISegmentedControl.js

@@ -769,6 +769,21 @@ JSClass("UISegmentedControlDefaultStyler", UISegmentedControlStyler, {
         }
     },
 
+    sizeControlToFitSize: function(control, maxSize){
+        var intrinsicSize = this.intrinsicSizeOfControl(control);
+        var size = JSSize(control.bounds.size);
+        if (maxSize.width < Number.MAX_VALUE){
+            size.width = maxSize.width;
+        }
+        if (intrinsicSize.width < maxSize.width){
+            size.width = intrinsicSize.width;
+        }
+        if (intrinsicSize.height < maxSize.height){
+            size.height = intrinsicSize.height;
+        }
+        control.bounds = JSRect(JSPoint.Zero, size);
+    },
+
     intrinsicSizeOfControl: function(control){
         var itemView;
         var size = JSSize.Zero;

package/Root/Frameworks/UIKit/UITabView.js

@@ -59,16 +59,14 @@ JSClass("UITabView", UIView, {
         if (spec.containsKey('delegate')){
             this.delegate = spec.valueForKey("delegate");
         }
+        if (spec.containsKey("font")){
+            this.font = spec.valueForKey("font", JSFont);
+        }
         if (spec.containsKey('items')){
-            var items = [];
             var specItems = spec.valueForKey('items');
             for (var i = 0, l = specItems.length; i < l; ++i){
-                items.push(specItems.valueForKey(i, UITabViewItem));
+                this.insertItemAtIndex(specItems.valueForKey(i, UITabViewItem), i);
             }
-            this.items = items;
-        }
-        if (spec.containsKey("font")){
-            this.font = spec.valueForKey("font", JSFont);
         }
     },
 
@@ -1067,6 +1065,7 @@ JSClass("UITabViewTablessStyler", UITabViewStyler, {
     showContentViewInTabView: function(contentView, tabView){
         tabView.addSubview(contentView);
         tabView.stylerProperties.contentView = contentView;
+        this.layoutTabView(tabView);
     },
 
     removeContentViewFromTabView: function(contentView, tabView){

package/Root/Frameworks/UIKit/UIWindow.js

@@ -1148,7 +1148,18 @@ JSClass("UIWindowStyler", JSObject, {
         window.layer.addSublayer(window.stylerProperties.focusRingLayer);
     },
 
+    _isUpdatingFocusRing: false,
+
     updateFocusRingInWindow: function(window, animated){
+        if (this._isUpdatingFocusRing){
+            return;
+        }
+        this._isUpdatingFocusRing = true;
+        this._updateFocusRingInWindow(window, animated);
+        this._isUpdatingFocusRing = false;
+    },
+
+    _updateFocusRingInWindow: function(window, animated){
         var responder = window.firstResponder;
         var focusRingLayer = window.stylerProperties.focusRingLayer;
         if (!window.isKeyWindow || responder === null || !responder.isKindOfClass(UIView)){
@@ -1156,6 +1167,16 @@ JSClass("UIWindowStyler", JSObject, {
             return;
         }
         var view = responder;
+        var views = [];
+        while (view !== window){
+            views.push(view);
+            view = view.superview;
+        }
+        view = responder;
+        var i;
+        for (i = views.length - 1; i >= 0; --i){
+            views[i].layoutIfNeeded();
+        }
         var path = view.focusRingPath;
         if (path === null){
             focusRingLayer.hidden = true;

package/Root/Frameworks/UIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKitTesting
-JSBundleVersion: 2022.7.1
+JSBundleVersion: 2022.20.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.7.1",
+  "version": "2022.20.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"