@breakside/jskit 2023.35.0 → 2023.44.0

package/Root/Frameworks/MediaKitUI/MKVideoView+HTML.js

@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// #import MediaKit
 // #import "MKVideoView.js"
 'use strict';
 
@@ -25,6 +26,12 @@ MKVideoView.definePropertiesFromExtensions({
     asset: JSDynamicProperty('_asset', null),
 
     setAsset: function(asset){
+        if (this._asset === null && asset === null){
+            return;
+        }
+        if (this._asset !== null && this._asset.isEqual(asset)){
+            return;
+        }
         this._asset = asset;
         this._updateVideoSource();
     },
@@ -72,10 +79,16 @@ MKVideoView.definePropertiesFromExtensions({
         }
         if (this._asset === null){
             this.videoElement.srcObject = null;
+            this.videoElement.src = null;
         }else if (this._asset.isKindOfClass(MKHTMLStream)){
             this.videoElement.srcObject = this._asset.htmlMediaStream;
+            this.videoElement.src = null;
+        }else if (this._asset.isKindOfClass(MKRemoteAsset)){
+            this.videoElement.srcObject = null;
+            this.videoElement.src = this._asset.url.encodedString;
         }else{
             this.videoElement.srcObject = null;
+            this.videoElement.src = null;
         }
     },
 
@@ -94,10 +107,22 @@ MKVideoView.definePropertiesFromExtensions({
                     this._isWaitingForPlay = true;
                     this.videoElement.play().then(function(){
                         view._isWaitingForPlay = false;
+                        if (view.delegate && view.delegate.videoViewPlaybackStarted){
+                            view.delegate.videoViewPlaybackStarted(view);
+                        }
+                        if (view._playbackState === MKVideoView.PlaybackState.paused){
+                            view.videoElement.pause();
+                            if (view.delegate && view.delegate.videoViewPlaybackPaused){
+                                view.delegate.videoViewPlaybackPaused(view);
+                            }
+                        }
                     }, function(error){
                         logger.error("play() failed: %{error}", error);
                         view._isWaitingForPlay = false;
                         view._playbackState = MKVideoView.PlaybackState.notPlaying;
+                        if (view.delegate && view.delegate.videoViewPlaybackFailed){
+                            view.delegate.videoViewPlaybackFailed(view);
+                        }
                     });
                 }else{
                     logger.warn("play() requested while still waiting for an earlier play()");
@@ -106,6 +131,9 @@ MKVideoView.definePropertiesFromExtensions({
             case MKVideoView.PlaybackState.paused:
                 if (!this._isWaitingForPlay){
                     this.videoElement.pause();
+                    if (view.delegate && view.delegate.videoViewPlaybackPaused){
+                        view.delegate.videoViewPlaybackPaused(view);
+                    }
                 }else{
                     logger.warn("pause() requested while still waiting for play()");
                 }
@@ -120,6 +148,30 @@ MKVideoView.definePropertiesFromExtensions({
         this.videoElement.muted = this.muted;
     },
 
+    playbackTime: JSDynamicProperty(),
+    duration: JSReadOnlyProperty(),
+
+    getPlaybackTime: function(){
+        if (this.videoElement !== null){
+            return this.videoElement.currentTime;
+        }
+        return 0;
+    },
+
+    setPlaybackTime: function(playbackTime){
+        if (this.videoElement === null){
+            return;
+        }
+        this.videoElement.currentTime = playbackTime;
+    },
+
+    getDuration: function(){
+        if (this.videoElement !== null){
+            return this.videoElement.duration;
+        }
+        return 0;
+    },
+
     // MARK: - Events
 
     handleEvent: function(e){
@@ -129,11 +181,17 @@ MKVideoView.definePropertiesFromExtensions({
     addEventListeners: function(){
         this.videoElement.addEventListener("loadmetadata", this);
         this.videoElement.addEventListener("resize", this);
+        this.videoElement.addEventListener("canplaythrough", this);
+        this.videoElement.addEventListener("ended", this);
+        this.videoElement.addEventListener("timeupdate", this);
     },
 
     removeEventListeners: function(){
         this.videoElement.removeEventListener("loadmetadata", this);
         this.videoElement.removeEventListener("resize", this);
+        this.videoElement.removeEventListener("canplaythrough", this);
+        this.videoElement.removeEventListener("ended", this);
+        this.videoElement.removeEventListener("timeupdate", this);
     },
 
     _event_loadmetadata: function(){
@@ -150,6 +208,25 @@ MKVideoView.definePropertiesFromExtensions({
         }
     },
 
+    _event_canplaythrough: function(e){
+        if (this.delegate && this.delegate.videoViewCanStartPlayback){
+            this.delegate.videoViewCanStartPlayback(this);
+        }
+    },
+
+    _event_ended: function(e){
+        if (this.delegate && this.delegate.videoViewPlaybackPaused){
+            this.delegate.videoViewPlaybackPaused(this);
+        }
+        this._playbackState = MKVideoView.PlaybackState.paused;
+    },
+
+    _event_timeupdate: function(e){
+        if (this.delegate && this.delegate.videoViewPlaybackTimeUpdated){
+            this.delegate.videoViewPlaybackTimeUpdated(this);
+        }
+    },
+
 });
 
 MKVideoView.layerClass = UIHTMLElementLayer;

package/Root/Frameworks/MediaKitUI/MKVideoView.js

@@ -17,12 +17,30 @@
 'use strict';
 
 JSProtocol("MKVideoViewDelegate", JSProtocol, {
-    videoViewDidChangeResolution: function(videoView){}
+    videoViewCanStartPlayback: function(videoView){},
+    videoViewDidChangeResolution: function(videoView){},
+    videoViewPlaybackStarted: function(videoView){},
+    videoViewPlaybackTimeUpdated: function(videoView){},
+    videoViewPlaybackPaused: function(videoView){},
+    videoViewPlaybackFailed: function(videoView){},
 });
 
 JSClass("MKVideoView", UIView, {
 
     playbackState: JSReadOnlyProperty('_playbackState', 0),
+    playbackTime: JSDynamicProperty(),
+    duration: JSReadOnlyProperty(),
+
+    getPlaybackTime: function(){
+        return 0;
+    },
+
+    setPlaybackTime: function(){
+    },
+
+    getDuration: function(){
+        return 0;
+    },
 
     delegate: null,
 

package/Root/Frameworks/NotificationKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.NotificationKit
-JSBundleVersion: 2023.35.0
+JSBundleVersion: 2023.44.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/PDFKit/Info.yaml

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

package/Root/Frameworks/QRKit/Info.yaml

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

package/Root/Frameworks/SearchKit/Info.yaml

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

package/Root/Frameworks/SecurityKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.SecurityKit
-JSBundleVersion: 2023.35.0
+JSBundleVersion: 2023.44.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKit
-JSBundleVersion: 2023.35.0
+JSBundleVersion: 2023.44.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKitTesting/Info.yaml

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

package/Root/Frameworks/TestKit/Info.yaml

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

package/Root/Frameworks/UIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKit
-JSBundleVersion: 2023.35.0
+JSBundleVersion: 2023.44.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/UIKit/UIButton.js

@@ -350,10 +350,16 @@ UIButton.Styler = Object.create({}, {
     }
 });
 
+UIButton.ImagePlacement = {
+    leading: 0,
+    trailing: 1,
+};
+
 JSClass("UIButtonStyler", UIControlStyler, {
 
     titleInsets: null,
     titleImageSpacing: 4,
+    imagePlacement: UIButton.ImagePlacement.leading,
     font: null,
 
     init: function(){
@@ -369,6 +375,9 @@ JSClass("UIButtonStyler", UIControlStyler, {
         if (spec.containsKey('titleImageSpacing')){
             this.titleImageSpacing = spec.valueForKey("titleImageSpacing", Number);
         }
+        if (spec.containsKey('imagePlacement')){
+            this.imagePlacement = spec.valueForKey("imagePlacement", UIButton.ImagePlacement);
+        }
         if (spec.containsKey('font')){
             this.font = spec.valueForKey("font", JSFont);
         }else{
@@ -441,19 +450,29 @@ JSClass("UIButtonStyler", UIControlStyler, {
         var contentRect = button.bounds.rectWithInsets(button._titleInsets);
         if (button._titleLabel !== null){
             var titleSize = button._titleLabel.intrinsicSize;
-            var x, y;
+            var titleFrame = JSRect(
+                contentRect.origin.x,
+                contentRect.origin.y + (contentRect.size.height - titleSize.height) / 2,
+                contentRect.size.width,
+                titleSize.height
+            );
             if (image !== null){
                 var imageScale = contentRect.size.height / image.size.height;
-                var imageSize = JSSize(image.size.width * imageScale, contentRect.size.height);
-                button._imageView.frame = JSRect(contentRect.origin, imageSize);
-                x = contentRect.origin.x + imageSize.width + this.titleImageSpacing;
-                y = (contentRect.size.height - titleSize.height) / 2;
-            }else{
-                x = contentRect.origin.x;
-                y = (contentRect.size.height - titleSize.height) / 2;
+                var imageFrame = JSRect(
+                    contentRect.origin.x,
+                    contentRect.origin.y,
+                    image.size.width * imageScale,
+                    contentRect.size.height
+                );
+                titleFrame.size.width = Math.max(0, titleFrame.size.width - imageFrame.size.width - this.titleImageSpacing);
+                if (this.imagePlacement === UIButton.ImagePlacement.leading){
+                    titleFrame.origin.x += imageFrame.size.width + this.titleImageSpacing;
+                }else{
+                    imageFrame.origin.x = Math.max(0, contentRect.origin.x + contentRect.size.width - imageFrame.size.width);
+                }
+                button._imageView.frame = imageFrame;
             }
-            var w = Math.max(0, contentRect.origin.x + contentRect.size.width - x);
-            button._titleLabel.frame = JSRect(x, contentRect.origin.y + y, w, titleSize.height);
+            button._titleLabel.frame = titleFrame;
         }else if (image !== null){
             button._imageView.frame = contentRect;
         }

package/Root/Frameworks/UIKit/UIListView.js

@@ -3389,8 +3389,8 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
             cell._accessoryView.frame = JSRect(cell._contentView.bounds.size.width - cell._accessoryInsets.right - accessorySize.width, (cell._contentView.bounds.size.height - accessorySize.height) / 2, accessorySize.width, accessorySize.height);
             size.width -= accessorySize.width + cell._accessoryInsets.width;
         }
-        if (cell._titleLabel !== null){
-            if (cell._detailLabel !== null){
+        if (cell._titleLabel !== null && !cell._titleLabel.hidden){
+            if (cell._detailLabel !== null && !cell._detailLabel.hidden){
                 size.height = cell._titleLabel.font.displayLineHeight * (cell._titleLabel.maximumNumberOfLines || 1) + cell._detailLabel.font.displayLineHeight * (cell._detailLabel.maximumNumberOfLines || 1);
                 origin.y =  Math.floor((cell._contentView.bounds.size.height - size.height) / 2.0);
                 size.height = cell._titleLabel.font.displayLineHeight * (cell._titleLabel.maximumNumberOfLines || 1);
@@ -3403,7 +3403,7 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
                 origin.y =  Math.floor((cell._contentView.bounds.size.height - size.height) / 2.0);
                 cell._titleLabel.frame = JSRect(origin, size);
             }
-        }else if (cell._detailLabel !== null){
+        }else if (cell._detailLabel !== null && !cell._detailLabel.hidden){
             size.height = cell._detailLabel.font.displayLineHeight * (cell._detailLabel.maximumNumberOfLines || 1);
             cell._detailLabel.frame = JSRect(JSPoint(cell._titleInsets.left, Math.floor((cell._contentView.bounds.size.height - size.height) / 2.0)), size);
         }

package/Root/Frameworks/UIKit/UIMenuView.js

@@ -877,6 +877,7 @@ JSClass("UIMenuItemView", UIView, {
 
     _createImageView: function(){
         this._imageView = UIImageView.init();
+        this._imageView.scaleMode = UIImageView.ScaleMode.aspectFit;
         this.insertSubviewBelowSibling(this._imageView, this.titleLabel);
         return this._imageView;
     },
@@ -952,6 +953,11 @@ JSClass("UIMenuItemView", UIView, {
         this.titleLabel.textColor = textColor;
         if (this._imageView !== null){
             this._imageView.templateColor = textColor;
+            if (!item.enabled && this._imageView.image !== null && this._imageView.image.renderMode === JSImage.RenderMode.original){
+                this._imageView.alpha = 0.4;
+            }else{
+                this._imageView.alpha = 1;
+            }
         }
         if (this._submenuImageView !== null){
             this.submenuImageView.templateColor = textColor;

package/Root/Frameworks/UIKit/UIPopupButton.js

@@ -74,6 +74,7 @@ JSClass("UIPopupButton", UIControl, {
         UIPopupButton.$super.commonUIControlInit.call(this);
         this._imageView = UIImageView.init();
         this._imageView.hidden = true;
+        this._imageView.scaleMode = UIImageView.ScaleMode.aspectFit;
         this._titleLabel = UILabel.init();
         this._titleLabel.backgroundColor = JSColor.clear;
         this._titleLabel.font = JSFont.systemFontOfSize(JSFont.Size.normal).fontWithWeight(JSFont.Weight.regular);
@@ -779,6 +780,7 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
     normalColor: null,
     disabledColor: null,
     activeColor: null,
+    normalBackgroundColor: null,
     activeBackgroundColor: null,
     overBackgroundColor: null,
     cornerRadius: 0,
@@ -794,6 +796,13 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
         this._fillInMissingColors();
     },
 
+    initWithBackgroundColor: function(backgroundColor, color){
+        UIPopupButtonCustomStyler.$super.init.call(this);
+        this.normalBackgroundColor = backgroundColor;
+        this.normalColor = color;
+        this._fillInMissingColors();
+    },
+
     initWithSpec: function(spec){
         UIPopupButtonCustomStyler.$super.initWithSpec.call(this, spec);
         if (spec.containsKey("normalColor")){
@@ -805,6 +814,9 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
         if (spec.containsKey("activeColor")){
             this.activeColor = spec.valueForKey("activeColor", JSColor);
         }
+        if (spec.containsKey('normalBackgroundColor')){
+            this.normalBackgroundColor = spec.valueForKey("normalBackgroundColor", JSColor);
+        }
         if (spec.containsKey("activeBackgroundColor")){
             this.activeBackgroundColor = spec.valueForKey("activeBackgroundColor", JSColor);
         }
@@ -831,11 +843,18 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
         if (this.titleInsets === null){
             this.titleInsets = JSInsets.Zero;
         }
+        if (this.normalBackgroundColor !== null){
+            if (this.activeBackgroundColor === null){
+                this.activeBackgroundColor = this.normalBackgroundColor.colorDarkenedByPercentage(0.2);
+            }
+            if (this.disabledBackgroundColor === null){
+                this.disabledBackgroundColor = this.normalBackgroundColor.colorWithAlpha(0.5);
+            }
+        }
     },
 
     initializeControl: function(button){
         button._imageView.automaticRenderMode = JSImage.RenderMode.template;
-        button._imageView.scaleMode = UIImageView.ScaleMode.center;
         button._titleLabel.hidden = true;
         button._indicatorView.hidden = true;
         button._titleLabel.frame = JSRect.Zero;
@@ -849,7 +868,7 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
     updateControl: function(button){
         if (!button.enabled){
             button._imageView.templateColor = this.disabledColor;
-            button.backgroundColor = null;
+            button.backgroundColor = this.normalBackgroundColor;
         }else if (button.active){
             button._imageView.templateColor = this.activeColor;
             button.backgroundColor = this.activeBackgroundColor;
@@ -858,7 +877,7 @@ JSClass("UIPopupButtonImageStyler", UIPopupButtonStyler, {
             if (this.showsOverState && button.over){
                 button.backgroundColor = this.overBackgroundColor;
             }else{
-                button.backgroundColor = null;
+                button.backgroundColor = this.normalBackgroundColor;
             }
         }
     },

package/Root/Frameworks/UIKit/UISlider.js

@@ -87,10 +87,11 @@ JSClass("UISlider", UIControl, {
             initialOffset: JSPoint.Zero,
         };
         this.active = true;
+        this.sendActionsForEvents(UIControl.Event.editingDidBegin, event);
         if (!isOnKnob){
             this.value = this.valueForPoint(location);
             this.didChangeValueForBinding('value');
-            this.sendActionsForEvents(UIControl.Event.valueChanged | UIControl.Event.primaryAction, event);
+            this.sendActionsForEvents(UIControl.Event.valueChanged | UIControl.Event.primaryAction | UIControl.Event.editingChanged, event);
         }else{
             var valueLocation = this.pointForValue(this._value);
             this._drag.initialOffset = location.subtracting(valueLocation);
@@ -103,13 +104,14 @@ JSClass("UISlider", UIControl, {
         if (value !== this._value){
             this.value = value;
             this.didChangeValueForBinding('value');
-            this.sendActionsForEvents(UIControl.Event.valueChanged | UIControl.Event.primaryAction, event);
+            this.sendActionsForEvents(UIControl.Event.valueChanged | UIControl.Event.editingChanged | UIControl.Event.primaryAction, event);
         }
     },
 
     _endSlide: function(event){
         if (this.active){
             this.active = false;
+            this.sendActionsForEvents(UIControl.Event.editingDidEnd, event);
         }
         this._drag = null;
     },

package/Root/Frameworks/UIKit/UIStackView.js

@@ -502,18 +502,57 @@ JSClass("UIStackViewHorizontalLayoutManager", UIStackViewLayoutManager, {
 
 JSClass("UIStackViewHorizontalNoDistributionLayoutManager", UIStackViewHorizontalLayoutManager, {
 
+    sizeView: function(view, maxSize, shrinkToIntrinsicHeight){
+        if (view.isKindOfClass(UIStackViewFlexibleSpace)){
+            return JSSize(0, 0);
+        }
+        return UIStackViewHorizontalNoDistributionLayoutManager.$super.sizeView.call(this, view, maxSize, shrinkToIntrinsicHeight);
+    },
+
     layoutStackView: function(stackView){
         var origin = JSPoint(stackView._contentInsets.left, stackView._contentInsets.top);
         var size;
         var i, l;
         var view;
         var maxViewSize = JSSize(Number.MAX_VALUE, stackView.bounds.size.height - stackView._contentInsets.height);
+        var numberOfFlexibleViews = 0;
         for (i = 0, l = stackView._arrangedSubviews.length; i < l; ++i){
             view = stackView._arrangedSubviews[i];
             size = this.sizeView(view, maxViewSize, stackView._alignment !== UIStackView.Alignment.full);
             view.frame = JSRect(origin, size);
             if (!view.hidden){
                 origin.x += size.width + stackView._viewSpacing;
+                if (view.isKindOfClass(UIStackViewFlexibleSpace)){
+                    ++numberOfFlexibleViews;
+                }
+            }
+        }
+        if (numberOfFlexibleViews > 0){
+            var flexibleWidth = stackView.bounds.origin.x + stackView.bounds.size.width - stackView._contentInsets.right - origin.x + stackView._viewSpacing;
+            if (flexibleWidth > 0){
+                var flexibleViewWidth = Math.floor(flexibleWidth / numberOfFlexibleViews);
+                var finalFlexibleViewWidth = flexibleWidth - flexibleViewWidth * (numberOfFlexibleViews - 1);
+                var offset = 0;
+                var frame;
+                var flexibleViewIndex = 0;
+                for (i = 0, l = stackView._arrangedSubviews.length; i < l; ++i){
+                    view = stackView._arrangedSubviews[i];
+                    frame = JSRect(view.frame);
+                    frame.origin.x += offset;
+                    if (!view.hidden){
+                        if (view.isKindOfClass(UIStackViewFlexibleSpace)){
+                            ++flexibleViewIndex;
+                            if (flexibleViewIndex === numberOfFlexibleViews){
+                                offset += finalFlexibleViewWidth;
+                                frame.size.width = finalFlexibleViewWidth;
+                            }else{
+                                offset += flexibleViewWidth;
+                                frame.size.width = flexibleViewWidth;
+                            }
+                        }
+                    }
+                    view.frame = frame;
+                }
             }
         }
         this.alignStackView(stackView);
@@ -604,4 +643,8 @@ JSClass("UIStackViewHorizontalEqualDistributionLayoutManager", UIStackViewHorizo
         stackView.bounds = JSRect(JSPoint.Zero, stackSize);
     }
 
+});
+
+JSClass("UIStackViewFlexibleSpace", UIView, {
+
 });

package/Root/Frameworks/UIKitTesting/Info.yaml

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