@breakside/jskit 2022.23.0 → 2022.24.0

package/Root/Frameworks/UIKit/UITextField.js

@@ -126,6 +126,7 @@ JSClass("UITextField", UIControl, {
         this._textLayer.widthTracksText = true;
         this._textLayer.heightTracksText = true;
         this._textLayer.maximumNumberOfLines = 1;
+        this._textLayer.textContainer.framesetter.typesetter.delegate = this;
         this._localEditor = UITextEditor.initWithTextLayer(this._textLayer);
         this._localEditor.delegate = this;
         this._clipView.layer.addSublayer(this._textLayer);
@@ -654,22 +655,6 @@ JSClass("UITextField", UIControl, {
     layoutSubviews: function(){
         UITextField.$super.layoutSubviews.call(this);
         var textInsets = JSInsets(this._textInsets);
-        if (this._placeholderLabel !== null){
-            if (!this._multiline){
-                this._placeholderLabel.layoutIfNeeded();
-            }
-            var clipSize = this._clipView.bounds.size;
-            var placeholderSize = this._placeholderLabel.bounds.size;
-            if (this._multiline){
-                this._placeholderLabel.frame = JSRect(0, 0, clipSize.width, placeholderSize.height);
-            }else if (this._placeholderLabel.textAlignment == JSTextAlignment.center){
-                this._placeholderLabel.frame = JSRect((clipSize.width - placeholderSize.width) / 2, 0, placeholderSize.width, placeholderSize.height);
-            }else if (this._placeholderLabel.textAlignment == JSTextAlignment.right){
-                this._placeholderLabel.frame = JSRect(clipSize.width - placeholderSize.width, 0, placeholderSize.width, placeholderSize.height);
-            }else{
-                this._placeholderLabel.frame = JSRect(JSPoint.Zero, placeholderSize);
-            }
-        }
         if (this._leftAccessoryView !== null){
             textInsets.left += this._leftAccessoryInsets.width + this._leftAccessorySize.width;
             this._leftAccessoryView.frame = JSRect(
@@ -687,8 +672,24 @@ JSClass("UITextField", UIControl, {
                 this._rightAccessorySize.width,
                 this._rightAccessorySize.height
             );
-        }
+        } 
         this._clipView.frame = this.bounds.rectWithInsets(textInsets);
+        if (this._placeholderLabel !== null){
+            if (!this._multiline){
+                this._placeholderLabel.layoutIfNeeded();
+            }
+            var clipSize = this._clipView.bounds.size;
+            var placeholderSize = this._placeholderLabel.bounds.size;
+            if (this._multiline){
+                this._placeholderLabel.frame = JSRect(0, 0, clipSize.width, placeholderSize.height);
+            }else if (this._placeholderLabel.textAlignment == JSTextAlignment.center){
+                this._placeholderLabel.frame = JSRect((clipSize.width - placeholderSize.width) / 2, 0, placeholderSize.width, placeholderSize.height);
+            }else if (this._placeholderLabel.textAlignment == JSTextAlignment.right){
+                this._placeholderLabel.frame = JSRect(clipSize.width - placeholderSize.width, 0, placeholderSize.width, placeholderSize.height);
+            }else{
+                this._placeholderLabel.frame = JSRect(JSPoint.Zero, placeholderSize);
+            }
+        }
     },
 
     layerDidChangeSize: function(layer){
@@ -703,11 +704,19 @@ JSClass("UITextField", UIControl, {
     },
 
     sizeToFitText: function(maxSize){
-        this._textLayer.layoutIfNeeded();
-        var size = JSSize(this._textLayer.bounds.size);
+        var size;
         if (this._isShowingPlaceholder){
+            if (this._multiline){
+                this._placeholderLabel.sizeToFitSize(maxSize);
+            }
             this._placeholderLabel.layoutIfNeeded();
             size = JSSize(this._placeholderLabel.bounds.size);
+        }else{
+            if (this._multiline){
+                this._textLayer.sizeToFitSize(maxSize);
+            }
+            this._textLayer.layoutIfNeeded();
+            size = JSSize(this._textLayer.bounds.size);
         }
         if (size.width > maxSize.width){
             size.width = maxSize.width;
@@ -937,25 +946,32 @@ JSClass("UITextField", UIControl, {
         UITextField.$super.mouseUp.call(this, event);
     },
 
+    _touchOrigin: null,
+
     touchesBegan: function(touches, event){
         if (this.enabled){
-            // Always try to set window.firstResponder to force the keyboard
-            // open if it didn't open when we became first responder.  Happens
-            // when mobile safari ignores focus() calls that aren't tied to
-            // user interaction
-            this.window.firstResponder = this;
             var location = touches[0].locationInView(this);
-            this._localEditor.handleTouchesBeganAtLocation(this.layer.convertPointToLayer(location, this._textLayer), touches, event);
-            return;
+            this._touchOrigin = this.convertPointToView(this.bounds.origin, this.window);
+            if (this.isFirstResponder()){
+                // Always try to set window.firstResponder to force the keyboard
+                // open if it didn't open when we became first responder.  Happens
+                // when mobile safari ignores focus() calls that aren't tied to
+                // user interaction
+                this.window.firstResponder = this;
+                this._localEditor.handleTouchesBeganAtLocation(this.layer.convertPointToLayer(location, this._textLayer), touches, event);
+                return;
+            }
         }
         UITextField.$super.touchesBegan.call(this, touches, event);
     },
 
     touchesMoved: function(touches, event){
         if (this.enabled){
-            var location = touches[0].locationInView(this);
-            this._localEditor.handleTouchesMovedAtLocation(this.layer.convertPointToLayer(location, this._textLayer), touches, event);
-            return;
+            if (this.isFirstResponder()){
+                var location = touches[0].locationInView(this);
+                this._localEditor.handleTouchesMovedAtLocation(this.layer.convertPointToLayer(location, this._textLayer), touches, event);
+                return;
+            }
         }
         UITextField.$super.touchesMoved.call(this, touches, event);
     },
@@ -963,8 +979,15 @@ JSClass("UITextField", UIControl, {
     touchesEnded: function(touches, event){
         if (this.enabled){
             var location = touches[0].locationInView(this);
-            this._localEditor.handleTouchesEnded(touches, event);
-            return;
+            if (this.isFirstResponder()){
+                this._localEditor.handleTouchesEnded(touches, event);
+                return;
+            }
+            var origin = this.convertPointToView(this.bounds.origin, this.window);
+            if (this.containsPoint(location) && this._touchOrigin.distanceToPoint(origin) < 2){
+                this.window.firstResponder = this;
+                this._localEditor.handleTouchesEndedAtLocation(this.layer.convertPointToLayer(location, this._textLayer), touches, event);
+            }
         }
         UITextField.$super.touchesEnded.call(this, touches, event);
     },
@@ -1456,6 +1479,10 @@ JSClass("UITextFieldCustomStyler", UITextFieldStyler, {
             return UITextFieldCustomStyler.$super.focusRingPathForControl.call(this, textField);
         }
         return null;
+    },
+
+    updateSelectionWithAttributes: function(attributes){
+        this._textEditor.updateSelectionWithAttributes(attributes);
     }
 
 });

package/Root/Frameworks/UIKit/UITextInput.js

@@ -86,7 +86,7 @@ UITextInput.SelectionAffinity = {
 UITextInput.TextContentType = {
     none: 0,
     url: 1,
-    email: 0,
+    email: 2,
     phone: 3,
     username: 4,
     password: 5,
@@ -138,6 +138,7 @@ JSGlobalObject.UITextInputSelection = function(range, insertionPoint, affinity){
             this.range = JSRange(range.range);
             this.insertionPoint = range.insertionPoint;
             this.affinity = range.affinity;
+            this.attributes = JSCopy(range.attributes);
         }else{
             if (insertionPoint === undefined){
                 insertionPoint = UITextInput.SelectionInsertionPoint.end;
@@ -157,6 +158,7 @@ UITextInputSelection.prototype = {
     range: null,
     insertionPoint: null,
     affinity: null,
+    attributes: null,
 
     containsIndex: function(index){
         return this.range.length > 0 && this.range.contains(index);

package/Root/Frameworks/UIKit/UITextInputManager.js

@@ -110,7 +110,7 @@ keyBindingsByPlatform[UIPlatform.Identifier.mac] = [
     {action: "moveForwardAndModifySelection",               key: UIEvent.Key.right,     modifiers: UIEvent.Modifier.shift},
     {action: "moveWordForwardAndModifySelection",           key: UIEvent.Key.right,     modifiers: UIEvent.Modifier.shift | UIEvent.Modifier.option},
     {action: "moveToEndOfLineAndModifySelection",           key: UIEvent.Key.right,     modifiers: UIEvent.Modifier.shift | UIEvent.Modifier.command},
-    {action: "moveUpAndModifySelection",                    key: UIEvent.Key.down,      modifiers: UIEvent.Modifier.shift},
+    {action: "moveDownAndModifySelection",                  key: UIEvent.Key.down,      modifiers: UIEvent.Modifier.shift},
     {action: "moveToEndOfDocumentAndModifySelection",       key: UIEvent.Key.down,      modifiers: UIEvent.Modifier.shift | UIEvent.Modifier.command},
     {action: "moveToEndOfDocumentAndModifySelection",       key: UIEvent.Key.end,       modifiers: UIEvent.Modifier.shift},
 
@@ -165,7 +165,7 @@ keyBindingsByPlatform[UIPlatform.Identifier.win] = [
     {action: "moveForwardAndModifySelection",               key: UIEvent.Key.right,     modifiers: UIEvent.Modifier.shift},
     {action: "moveWordForwardAndModifySelection",           key: UIEvent.Key.right,     modifiers: UIEvent.Modifier.shift | UIEvent.Modifier.control},
     {action: "moveToEndOfLineAndModifySelection",           key: UIEvent.Key.end,       modifiers: UIEvent.Modifier.shift},
-    {action: "moveUpAndModifySelection",                    key: UIEvent.Key.down,      modifiers: UIEvent.Modifier.shift},
+    {action: "moveDownAndModifySelection",                  key: UIEvent.Key.down,      modifiers: UIEvent.Modifier.shift},
     {action: "moveToEndOfDocumentAndModifySelection",       key: UIEvent.Key.end,       modifiers: UIEvent.Modifier.shift | UIEvent.Modifier.control},
 
     {action: "selectAll",                                   key: "a",                   modifiers: UIEvent.Modifier.control},

package/Root/Frameworks/UIKit/UITextLayer.js

@@ -19,37 +19,16 @@
 
 (function(){
 
-var UITextLayerContainerProperty = function(){
-    if (this === undefined){
-        return new UITextLayerContainerProperty();
-    }
-};
-
-UITextLayerContainerProperty.prototype = Object.create(JSCustomProperty.prototype);
-
-UITextLayerContainerProperty.prototype.define = function(C, key, extensions){
-    Object.defineProperty(C.prototype, key, {
-        configurable: false,
-        enumerable: false,
-        set: function UITextLayer_setContainerProperty(value){
-            this.textContainer[key] = value;
-        },
-        get: function UITextLayer_getContainerProperty(){
-            return this.textContainer[key];
-        }
-    });
-};
-
 JSClass("UITextLayer", UILayer, {
 
     text: JSDynamicProperty(),
     attributedText: JSDynamicProperty(),
     font: JSDynamicProperty(),
     textColor: UILayerAnimatedProperty(),
-    lineBreakMode: UITextLayerContainerProperty(),
-    textAlignment: UITextLayerContainerProperty(),
-    lineSpacing: UITextLayerContainerProperty(),
-    minimumLineHeight: UITextLayerContainerProperty(),
+    lineBreakMode: JSDynamicProperty(),
+    textAlignment: JSDynamicProperty(),
+    lineSpacing: JSDynamicProperty(),
+    minimumLineHeight: JSDynamicProperty(),
     textInsets: JSDynamicProperty('_textInsets', JSInsets.Zero),
     maximumNumberOfLines: JSDynamicProperty(),
     widthTracksText: JSDynamicProperty('_widthTracksText', false),
@@ -129,6 +108,40 @@ JSClass("UITextLayer", UILayer, {
         this._textContainer.size = this._availableTextSize();
     },
 
+    // MARK: - Paragraph Styling
+
+    getLineBreakMode: function(){
+        return this._textLayoutManager.defaultParagraphStyle.lineBreakMode;
+    },
+
+    setLineBreakMode: function(lineBreakMode){
+        this._textLayoutManager.defaultParagraphStyle = this._textLayoutManager.defaultParagraphStyle.styleWithAttributes({lineBreakMode: lineBreakMode});
+    },
+
+    getTextAlignment: function(){
+        return this._textLayoutManager.defaultParagraphStyle.textAlignment;
+    },
+
+    setTextAlignment: function(textAlignment){
+        this._textLayoutManager.defaultParagraphStyle = this._textLayoutManager.defaultParagraphStyle.styleWithAttributes({textAlignment: textAlignment});
+    },
+
+    getLineSpacing: function(){
+        return this._textLayoutManager.defaultParagraphStyle.lineSpacing;
+    },
+
+    setLineSpacing: function(lineSpacing){
+        this._textLayoutManager.defaultParagraphStyle = this._textLayoutManager.defaultParagraphStyle.styleWithAttributes({lineSpacing: lineSpacing});
+    },
+
+    getMinimumLineHeight: function(){
+        return this._textLayoutManager.defaultParagraphStyle.minimumLineHeight;
+    },
+
+    setMinimumLineHeight: function(minimumLineHeight){
+        this._textLayoutManager.defaultParagraphStyle = this._textLayoutManager.defaultParagraphStyle.styleWithAttributes({minimumLineHeight: minimumLineHeight});
+    },
+
     // MARK: - Fetching & Updating Text
 
     hasText: function(){
@@ -203,7 +216,7 @@ JSClass("UITextLayer", UILayer, {
             size.width += this._textInsets.width;
             size.height += this._textInsets.height;
             this.bounds = JSRect(JSPoint.Zero, size);
-            this._textContainer.size = this._textContainer.textFrame.usedSize;
+            this._textContainer.size = this._availableTextSize();
         }
     },
 

package/Root/Frameworks/UIKit/UITokenField.js

@@ -40,25 +40,25 @@ JSClass("UITokenField", UITextField, {
         UITokenField.$super.commonUIControlInit.call(this);
         this.tokensView = UIView.initWithFrame(JSRect.Zero);
         this._clipView.addSubview(this.tokensView);
-        this._updateLineSpacing();
+        this._updateLineHeightMultiple();
         this.setNeedsLayout();
     },
 
     setFont: function(font){
         UITokenField.$super.setFont.call(this, font);
-        this._updateLineSpacing();
+        this._updateLineHeightMultiple();
     },
 
     getFont: function(){
         return this._textLayer.font;
     },
 
-    _updateLineSpacing: function(){
+    _updateLineHeightMultiple: function(){
         if (this.font === null){
             return;
         }
         var lineHeight = this.font.displayLineHeight;
-        this._textLayer.lineSpacing = (lineHeight + 4) / lineHeight;
+        this._textLayer.lineHeightMultiple = (lineHeight + 4) / lineHeight;
         this.setNeedsLayout();
     },
 

package/Root/Frameworks/UIKit/UIView.js

@@ -545,7 +545,9 @@ JSClass('UIView', UIResponder, {
     },
 
     layerDidChangeSize: function(layer){
-        this.invalidateFocusRingPath();
+        if (layer === this.layer){
+            this.invalidateFocusRingPath();
+        }
     },
 
     // -------------------------------------------------------------------------

package/Root/Frameworks/UIKit/UIWindow.js

@@ -283,14 +283,27 @@ JSClass('UIWindow', UIView, {
         }
     },
 
+    setNeedsLayout: function(){
+        UIWindow.$super.setNeedsLayout.call(this);
+    },
+
     layoutSubviews: function(){
         UIWindow.$super.layoutSubviews.call(this);
         this._styler.layoutWindow(this);
-        this._styler.updateFocusRingInWindow(this, true);
+        this._updatingFocusRing = true;
+        this._styler.updateFocusRingInWindow(this, this._focusRingAnimated);
+        this._updatingFocusRing = false;
+        this._focusRingAnimated = true;
     },
 
+    _updatingFocusRing: false,
+    _focusRingAnimated: true,
+
     invalidateFocusRing: function(animated){
-        this._styler.updateFocusRingInWindow(this, animated);
+        if (!this._updatingFocusRing){
+            this._focusRingAnimated = animated;
+            this.setNeedsLayout();
+        }
     },
 
     // -------------------------------------------------------------------------
@@ -1184,7 +1197,7 @@ JSClass("UIWindowStyler", JSObject, {
         }
         view = responder;
         var i;
-        for (i = views.length - 1; i >= 0; --i){
+        for (i = views.length - 2; i >= 0; --i){
             views[i].layoutIfNeeded();
         }
         var path = view.focusRingPath;

package/Root/Frameworks/UIKitTesting/Info.yaml

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