@breakside/jskit 2022.22.0 → 2022.22.3

package/Node/Builder.js

@@ -174,20 +174,31 @@ JSClass("Builder", JSObject, {
                 if (!seen.has(name)){
                     seen.add(name);
                     // If the framework was pre-built, then it can only have
-                    // dependencies on standard frameworks, so that's the only
-                    // place we'll look.
-                    //
+                    // dependencies on other pre-built frameworks, which
+                    // are other .jsframework bundles or JSKit frameworks
+                    // 
                     // If we built the framework, then we already added its
                     // dependencies based on its build reuslts and won't get here.
-                    let candidateURL = this.fileManager.urlForPath(JSKitRootDirectoryPath).appendingPathComponents(["Frameworks", name], true);
-                    let exists = await this.fileManager.itemExistsAtURL(candidateURL);
-                    if (!exists){
-                        throw new Error("Cannot find framework %s, (required by %s)".sprintf(name, url.lastPathComponent));
+                    let includeDirectoryURLs = this.project.includeDirectoryURLs;
+                    let url = null;
+                    for (let i = 0, l = includeDirectoryURLs.length; i < l && url === null; ++i){
+                        let directoryURL = includeDirectoryURLs[i];
+                        let candidateURL = directoryURL.appendingPathComponent(name + '.jsframework', true);
+                        let found = await this.fileManager.itemExistsAtURL(candidateURL);
+                        if (found){
+                            url = candidateURL;
+                        }
+                    }
+                    if (url === null){
+                        url = this.fileManager.urlForPath(JSKitRootDirectoryPath).appendingPathComponents(["Frameworks", name], true);
+                        let found = await this.fileManager.itemExistsAtURL(url);
+                        if (!found){
+                            throw new Error("Cannot find framework %s, (required by %s)".sprintf(name, url.lastPathComponent));
+                        }
                     }
-                    this.printer.print("\nAdding dependency %s\n".sprintf(name));
                     imports.push({
                         name: name,
-                        url: candidateURL
+                        url: url
                     });
                 }
             }

package/Node/FrameworkBuilder.js

@@ -138,9 +138,10 @@ JSClass("FrameworkBuilder", Builder, {
         var genericFrameworks = new Set();
         var genericFiles = new Set();
         var genericFeatures = new Set();
+        var genericGlobals = new Set();
         var sources = {};
         for (let env in this.bundleEnvironments){
-            sources[env] = {frameworks: [], files: [], features: []};
+            sources[env] = {frameworks: [], files: [], features: [], globals: []};
             let imports = this.importsByEnvironment[env];
             for (let i = 0, l = imports.frameworks.length; i < l; ++i){
                 let framework = imports.frameworks[i];
@@ -176,6 +177,15 @@ JSClass("FrameworkBuilder", Builder, {
                     sources[env].features.push(feature);
                 }
             }
+            for (let i = 0, l = imports.globals.length; i < l; ++i){
+                let name = imports.globals[i];
+                if (env == 'generic'){
+                    genericGlobals.add(name);
+                }
+                if (env == 'generic' || !genericGlobals.has(name)){
+                    sources[env].globals.push(name);
+                }
+            }
         }
         return sources;
     },
@@ -185,6 +195,7 @@ JSClass("FrameworkBuilder", Builder, {
         var genericFrameworks = new Set();
         var genericFiles = new Set();
         var genericFeatures = new Set();
+        var genericGlobals = new Set();
         var sources = {};
         var copyright  = this.project.getInfoString("JSCopyright", this.resources);
         var licenseString = await this.project.licenseNoticeString();
@@ -195,7 +206,7 @@ JSClass("FrameworkBuilder", Builder, {
         }
         var header = "%s (%s)\n----\n%s%s".sprintf(this.project.info.JSBundleIdentifier, this.project.info.JSBundleVersion, copyright, licenseString);
         for (let env in this.bundleEnvironments){
-            sources[env] = {frameworks: [], files: [], features: []};
+            sources[env] = {frameworks: [], files: [], features: [], globals: []};
             let filename = this.bundleEnvironments[env];
             let compilation = JavascriptCompilation.initWithName(filename, this.sourcesURL, this.fileManager);
             var fullSourcesURL = this.sourcesURL.appendingPathComponent("_debug", true);
@@ -238,6 +249,15 @@ JSClass("FrameworkBuilder", Builder, {
                     sources[env].features.push(feature);
                 }
             }
+            for (let i = 0, l = imports.globals.length; i < l; ++i){
+                let name = imports.globals[i];
+                if (env == 'generic'){
+                    genericGlobals.add(name);
+                }
+                if (env == 'generic' || !genericGlobals.has(name)){
+                    sources[env].globals.push(name);
+                }
+            }
         }
         return sources;
     },

package/Node/Project.js

@@ -310,7 +310,8 @@ JSClass("Project", JSObject, {
         var result = {
             files: [],
             frameworks: [],
-            features: []
+            features: [],
+            globals: []
         };
         var visited = {
             paths: new Set(),
@@ -359,6 +360,11 @@ JSClass("Project", JSObject, {
                         result.features.push(feature);
                     }
                 }
+                let globals = js.globals();
+                for (let i = 0, l = globals.length; i < l; ++i){
+                    let name = globals[i];
+                    result.globals.push(name);
+                }
             }
         };
 
@@ -443,7 +449,21 @@ JSClass("Project", JSObject, {
                 let url = await this.urlForFrameworkName(name, includeDirectoryURLs);
                 if (url !== null){
                     if (url.fileExtension === '.jsframework'){
-                        // TODO: extract from built framework
+                        let sourcesURL = url.appendingPathComponent("sources.json");
+                        let data = await this.fileManager.contentsAtURL(sourcesURL);
+                        let sources = JSON.parse(data.stringByDecodingUTF8());
+                        if (sources.generic.globals){
+                            for (let name of sources.generic.globals){
+                                globals.push(name);
+                            }
+                        }
+                        for (let env of envs){
+                            if ((env in sources) && sources[env].globals){
+                                for (let name of sources[env].globals){
+                                    globals.push(name);
+                                }
+                            }
+                        }
                     }else{
                         let frameworkProject = Project.initWithURL(url);
                         try{

package/Node/io.breakside.jskit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2022.22.0",
+    "JSBundleVersion": "2022.22.3",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "cfd5b0d255ef23810da3f2137e769efc421ad676"
+    "GitRevision": "6f0b376edf61fbea02fd94b92f86de9e17d3b716"
   },
   "Resources": [
     {

package/Root/Frameworks/APIKit/Info.yaml

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

package/Root/Frameworks/APIKitTesting/Info.yaml

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

package/Root/Frameworks/AuthKit/Info.yaml

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

package/Root/Frameworks/CSSOM/Info.yaml

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

package/Root/Frameworks/ChartKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ChartKit
-JSBundleVersion: 2022.22.0
+JSBundleVersion: 2022.22.3
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 # JSBundleEnvironments:

package/Root/Frameworks/ConferenceKit/Info.yaml

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

package/Root/Frameworks/DBKit/Info.yaml

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

package/Root/Frameworks/DOM/Info.yaml

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

package/Root/Frameworks/Dispatch/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.Dispatch
-JSBundleVersion: 2022.22.0
+JSBundleVersion: 2022.22.3
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:
   html: Dispatch+HTML.js

package/Root/Frameworks/FontKit/Info.yaml

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

package/Root/Frameworks/Foundation/Info.yaml

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

package/Root/Frameworks/Foundation/JSAttributedString.js

@@ -294,6 +294,44 @@ JSClass("JSAttributedString", JSObject, {
         return new JSAttributedStringRunIterator(this, index);
     },
 
+    longestRangeOfAttributeAtIndex: function(attributeName, index){
+        return this.longestRangeOfAttributesAtIndex([attributeName], index);
+    },
+
+    longestRangeOfAttributesAtIndex: function(attributeNames, index){
+        var runIndex = this._runIndexForStringIndex(index);
+        var run = this._runs[runIndex];
+        var range = JSRange(run.range);
+        var attributes = {};
+        var i, l;
+        for (i = 0, l = attributeNames.length; i < l; ++i){
+            attributes[attributeNames[i]] = run.attributes[attributeNames[i]];
+        }
+        i = runIndex - 1;
+        while (i >= 0){
+            run = this._runs[i];
+            if (run.containsEqualAttributes(attributes)){
+                range.length = range.end - run.range.location;
+                range.location = run.range.location;
+            }else{
+                break;
+            }
+            --i;
+        }
+        i = runIndex + 1;
+        l = this._runs.length;
+        while (i < l){
+            run = this._runs[i];
+            if (run.containsEqualAttributes(attributes)){
+                range.length = run.range.end - range.location;
+            }else{
+                break;
+            }
+            ++i;
+        }
+        return range;
+    },
+
     // MARK: - Formatting
 
     replaceFormat: function(){
@@ -339,7 +377,7 @@ JSClass("JSAttributedString", JSObject, {
         var runA;
         for (var runIndex = lastRunIndex - 1; runIndex >= expandedRunRange.location; --runIndex){
             runA = this._runs[runIndex];
-            if (runA.hasIdenticalAttributes(runB)){
+            if (runA.onlyContainsEqualAttributes(runB.attributes)){
                 this._runs.splice(runIndex, 1);
                 runB.range.location = runA.range.location;
                 runB.range.length += runA.range.length;
@@ -358,7 +396,7 @@ JSClass("JSAttributedString", JSObject, {
         }
         var runA = this._runs[runIndex - 1];
         var runB = this._runs[runIndex];
-        if (runA.hasIdenticalAttributes(runB)){
+        if (runA.onlyContainsEqualAttributes(runB.attributes)){
             this._runs.splice(runIndex, 1);
             runA.range.length += runB.range.length;
         }
@@ -471,35 +509,46 @@ function JSAttributedStringRun(range, attributes){
 
 JSAttributedStringRun.prototype = {
 
-    hasIdenticalAttributes: function(other){
+    containsEqualAttributes: function(attributes){
         var attribute;
         var a, b;
-        for (attribute in this.attributes){
-            if (attribute in other.attributes){
-                a = this.attributes[attribute];
-                b = other.attributes[attribute];
-                if (a.isEqual){
-                    if (!a.isEqual(b)){
-                        return false;
-                    }
-                }else if (b.isEqual){
-                    if (!b.isEqual(a)){
-                        return false;
-                    }
-                }else if (a != b){
+        for (attribute in attributes){
+            a = attributes[attribute];
+            b = this.attributes[attribute];
+            if (a === undefined){
+                if (!!b){
                     return false;
                 }
-            }else{
+            }else if (a === null){
+                if (b !== null && b !== undefined){
+                    return false;
+                }
+            }else if (a.isEqual){
+                if (b === null || b === undefined){
+                    return false;
+                }
+                if (!a.isEqual(b)){
+                    return false;
+                }
+            }else if (a != b){
                 return false;
             }
         }
-        for (attribute in other.attributes){
-            if (!(attribute in this.attributes)){
+        return true;
+    },
+
+    onlyContainsEqualAttributes: function(attributes){
+        if (!this.containsEqualAttributes(attributes)){
+            return false;
+        }
+        var attribute;
+        for (attribute in this.attributes){
+            if (!(attribute in attributes)){
                 return false;
             }
         }
         return true;
-    }
+    },
 
 };
 

package/Root/Frameworks/Foundation/JSTextAttachment.js

@@ -55,7 +55,12 @@ JSClass("JSTextAttachment", JSObject, {
     },
 
     drawInContextAtPoint: function(context, point){
-        context.drawImage(this._image, JSRect(point, this._size));
+        var rect = JSRect(point, this._size);
+        if (this._image.renderMode === JSImage.RenderMode.template){
+            context.fillMaskedRect(rect, this._image);
+        }else{
+            context.drawImage(this._image, rect);
+        }
     }
 
 });

package/Root/Frameworks/Foundation/JSTextRun.js

@@ -61,7 +61,10 @@ JSClass("JSTextRun", JSObject, {
         // context.fillEllipseInRect(JSRect(this.origin.x - 2.5, this.origin.y - 2.5, 5, 5));
         // context.restore();
         if (this.attachment){
+            context.save();
+            context.setFillColor(this.attributes.textColor);
             this.attachment.drawInContextAtPoint(context, point);
+            context.restore();
         }else{
             context.save();
             context.translateBy(point.x, point.y + this.font.ascender);

package/Root/Frameworks/ImageKit/Info.yaml

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

package/Root/Frameworks/MediaKit/Info.yaml

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

package/Root/Frameworks/MediaKitUI/Info.yaml

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

package/Root/Frameworks/NotificationKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.NotificationKit
-JSBundleVersion: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 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: 2022.22.0
+JSBundleVersion: 2022.22.3
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/UIKit/UICollectionView.js

@@ -37,13 +37,13 @@ JSProtocol("UICollectionViewDelegate", JSProtocol, {
     // Dragging cells
     collectionViewShouldDragCellAtIndexPath: function(collectionView, indexPath){},
     pasteboardItemsForCollectionViewAtIndexPath: function(collectionView, indexPath){},
-    collectionViewWillBeginDraggingSession: function(collectionView, session){},
+    collectionViewWillBeginDraggingSession: function(collectionView, session, indexPath, location){},
 
     // Dragging destination
-    collectionViewDraggingSessionDidEnter: function(collectionView, sesssion){},
-    collectionViewDraggingSessionDidUpdate: function(collectionView, sesssion, indexPath){},
-    collectionViewDraggingSessionDidExit: function(collectionView, sesssion){},
-    collectionViewPerformDragOperation: function(collectionView, sesssion, operation, indexPath){}
+    collectionViewDraggingSessionDidEnter: function(collectionView, session){},
+    collectionViewDraggingSessionDidUpdate: function(collectionView, session, indexPath){},
+    collectionViewDraggingSessionDidExit: function(collectionView, session){},
+    collectionViewPerformDragOperation: function(collectionView, session, operation, indexPath){}
 
 });
 
@@ -1091,9 +1091,13 @@ JSClass("UICollectionView", UIScrollView, {
     performDragOperation: function(session, operation){
         var location = this.convertPointFromScreen(session.screenLocation);
         var cell = this._cellHitTest(location);
+        var indexPath = null;
+        if (cell !== null){
+            indexPath = cell.indexPath;
+        }
         this._updateDropTarget(null);
-        if (cell && this.delegate && this.delegate.collectionViewPerformDragOperation){
-            this.delegate.collectionViewPerformDragOperation(this, session, operation, cell.indexPath);
+        if (this.delegate && this.delegate.collectionViewPerformDragOperation){
+            this.delegate.collectionViewPerformDragOperation(this, session, operation, indexPath);
         }
     },
 

package/Root/Frameworks/UIKit/UIContainerView.js

@@ -104,7 +104,7 @@ JSClass("UIContainerView", UIView, {
                 maxSize.height < Number.MAX_VALUE ? maxSize.height - this._contentInsets.height : Number.MAX_VALUE
             );
             this._contentView.sizeToFitSize(maxContentSize);
-            this.bounds = JSRect(0, 0, this._contentView.bounds.size.width + this._contentInsets.width, this._contentView.bounds.size.height - this._contentInsets.height);
+            this.bounds = JSRect(0, 0, this._contentView.bounds.size.width + this._contentInsets.width, this._contentView.bounds.size.height + this._contentInsets.height);
         }
     },
 

package/Root/Frameworks/UIKit/UIHTMLTextFrame.js

@@ -151,7 +151,10 @@ JSClass("UIHTMLTextFrame", JSTextFrame, {
                 if (attachmentInfo.context.element.parentNode !== attachmentInfo.run.element){
                     attachmentInfo.run.element.appendChild(attachmentInfo.context.element);
                 }
+                attachmentInfo.context.save();
+                attachmentInfo.context.setFillColor(attachmentInfo.run.attributes.textColor);
                 attachmentInfo.attachment.drawInContextAtPoint(attachmentInfo.context, JSPoint.Zero);
+                attachmentInfo.context.restore();
             }
         }else{
             UIHTMLTextFrame.$super.drawInContextAtPoint.call(this, context, point);

package/Root/Frameworks/UIKit/UIHTMLTextRun.js

@@ -37,7 +37,9 @@ JSClass("UIHTMLTextRun", JSTextRun, {
         // not enough room for a line even when there really is.
         // NOTE: we do NOT want to measure the html element here and cause an expensive layout.
         // Only the UIHTMLTextFrame does the final measuring.
-        this._size.height = font.displayLineHeight;
+        if (!this.attachment){
+            this._size.height = font.displayLineHeight;
+        }
         if (element.childNodes.length > 0 && element.firstChild.nodeType === element.TEXT_NODE){
             this.textNode = element.firstChild;
         }

package/Root/Frameworks/UIKit/UIHTMLTextTypesetter.js

@@ -434,6 +434,20 @@ UIHTMLTextTypesetterRunDescriptor.prototype = {
             this.span.style.color = '';
             this.span.style.backgroundColor = '';
             this.span.style.pointerEvents = 'all';
+
+            // Cursor
+            var cursor = this.attributes[JSAttributedString.Attribute.cursor];
+            if (cursor){
+                var cssCursorStrings = cursor.cssStrings();
+                for (var i = 0, l = cssCursorStrings.length; i < l; ++i){
+                    this.span.style.cursor = cssCursorStrings[i];
+                    if (this.span.style.cursor !== ''){
+                        break;
+                    }
+                }
+            }else{
+                this.span.style.cursor = '';
+            }
         }else{
             this.span.style.display = '';
             this.span.style.width = '';

package/Root/Frameworks/UIKit/UIImageView.js

@@ -155,6 +155,10 @@ JSClass("UIImageView", UIView, {
         return JSSize(UIView.noIntrinsicSize, UIView.noIntrinsicSize);
     },
 
+    sizeToFit: function(){
+        this.layer.sizeToFit();
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Accessibility