@breakside/jskit 2022.22.0 → 2022.22.3

package/Root/Frameworks/UIKit/UILabel.js

@@ -174,11 +174,14 @@ JSClass('UILabel', UIView, {
         var attributes = this.attributedText.attributesAtIndex(index);
         this._didDrag = false;
         if (attributes.link){
-            var range = this.attributedText.rangeOfRunAtIndex(index);
-            var layer = UILayer.init();
-            layer.frame = this.layer.textLayoutManager.rectsForCharacterRange(range)[0].rectWithInsets(JSInsets(-1, -2));
-            layer.cornerRadius = 2;
-            layer.backgroundColor = JSColor.black.colorWithAlpha(0.2);
+            var range = this.attributedText.longestRangeOfAttributeAtIndex("link", index);
+            var layer = UILabelLinkLayer.init();
+            layer.pathColor = (attributes.textColor || this.textColor).colorWithAlpha(0.2);
+            var rects = this.layer.textLayoutManager.rectsForCharacterRange(range);
+            var i, l;
+            for (i = 0, l = rects.length; i < l; ++i){
+                layer.addRect(rects[i]);
+            }
             this.layer.addSublayer(layer);
             this._mouseDownAction = {
                 link: attributes.link,
@@ -271,11 +274,14 @@ JSClass('UILabel', UIView, {
         var index = this.layer.textLayoutManager.characterIndexAtPoint(location);
         var attributes = this.attributedText.attributesAtIndex(index);
         if (attributes.link){
-            var range = this.attributedText.rangeOfRunAtIndex(index);
-            var layer = UILayer.init();
-            layer.frame = this.layer.textLayoutManager.rectsForCharacterRange(range)[0].rectWithInsets(JSInsets(-1, -2));
-            layer.cornerRadius = 2;
-            layer.backgroundColor = JSColor.black.colorWithAlpha(0.2);
+            var range = this.attributedText.longestRangeOfAttributeAtIndex("link", index);
+            var layer = UILabelLinkLayer.init();
+            layer.pathColor = (attributes.textColor || this.textColor).colorWithAlpha(0.2);
+            var rects = this.layer.textLayoutManager.rectsForCharacterRange(range);
+            var i, l;
+            for (i = 0, l = rects.length; i < l; ++i){
+                layer.addRect(rects[i]);
+            }
             this.layer.addSublayer(layer);
             this._touchAction = {
                 link: attributes.link,
@@ -379,4 +385,31 @@ JSClass('UILabel', UIView, {
 
 });
 
+JSClass("UILabelLinkLayer", UILayer, {
+
+    pathColor: null,
+
+    init: function(){
+        UILabelLinkLayer.$super.init.call(this);
+        this.path = JSPath.init();
+        this.pathColor = JSColor.black;
+        this.setNeedsDisplay();
+    },
+
+    addRect: function(rect){
+        this.path.addRoundedRect(rect.rectWithInsets(JSInsets(-1, -2)), 2);
+        this.frame = this.path.boundingRect;
+    },
+
+    drawInContext: function(context){
+        context.save();
+        context.translateBy(-this.path.boundingRect.origin.x, -this.path.boundingRect.origin.y);
+        context.setFillColor(this.pathColor);
+        context.addPath(this.path);
+        context.fillPath();
+        context.restore();
+    },
+
+});
+
 UILabel.layerClass = UITextLayer;

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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