@breakside/jskit 2021.42.0 → 2021.46.1

package/Root/Frameworks/UIKit/UIHTMLDisplayServerCanvasContext.js

@@ -101,6 +101,7 @@ JSClass("UIHTMLDisplayServerCanvasContext", UIHTMLDisplayServerContext, {
     // MARK: - Display Lifecycle
 
     layerDidChangeProperty: function(layer, property){
+        var methodName = 'updateHTMLProperty_' + property;
         switch (property){
             case 'shadowColor':
             case 'shadowOffset':
@@ -120,7 +121,11 @@ JSClass("UIHTMLDisplayServerCanvasContext", UIHTMLDisplayServerContext, {
                 }
                 break;
             default:
-                this.propertiesNeedingUpdate[property] = true;
+                if (methodName in this){
+                    this.propertiesNeedingUpdate[property] = true;
+                }else{
+                    this.needsCustomDisplay = true;
+                }
                 break;
         }
     },

package/Root/Frameworks/UIKit/UIImageLayer.js

@@ -20,13 +20,13 @@ JSClass("UIImageLayer", UILayer, {
 
     image: JSDynamicProperty('_image', null),
     imageFrame: JSDynamicProperty('_imageFrame', null),
-    templateColor: JSDynamicProperty('_templateColor', null),
+    templateColor: UILayerAnimatedProperty(),
     automaticRenderMode: JSDynamicProperty('_automaticRenderMode', JSImage.RenderMode.original),
 
     init: function(){
         UIImageLayer.$super.init.call(this);
         this._imageFrame = JSRect.Zero;
-        this._templateColor = JSColor.black;
+        this.model.templateColor = JSColor.black;
     },
 
     getImage: function(){
@@ -49,7 +49,7 @@ JSClass("UIImageLayer", UILayer, {
     drawInContext: function(context){
         if (this._image !== null && this._imageFrame.size.width > 0 && this._imageFrame.size.height > 0){
             if (this._image.renderMode === JSImage.RenderMode.template || (this._image.renderMode === JSImage.RenderMode.automatic && this._automaticRenderMode === JSImage.RenderMode.template)){
-                context.setFillColor(this._templateColor);
+                context.setFillColor(this.presentation.templateColor);
                 context.fillMaskedRect(this._imageFrame, this._image);
             }else{
                 context.drawImage(this._image, this._imageFrame);
@@ -65,21 +65,19 @@ JSClass("UIImageLayer", UILayer, {
         this.setNeedsDisplay();
     },
 
-    setTemplateColor: function(templateColor){
-        if (templateColor === null && this._templateColor === null){
-            return;
-        }
-        if (templateColor !== null && this._templateColor !== null && templateColor.isEqual(this._templateColor)){
-            return;
-        }
-        this._templateColor = templateColor;
-        this.setNeedsDisplay();
-    },
-
     sizeToFit: function(){
         if (this._image !== null){
             this.bounds = JSRect(JSPoint.Zero, this._image.size);
         }
     }
 
+});
+
+UIImageLayer.Properties = Object.create(UILayer.Properties, {
+
+    templateColor: {
+        writable: true,
+        value: null
+    }
+
 });

package/Root/Frameworks/UIKit/UILayer.js

@@ -40,6 +40,9 @@ UILayerAnimatedProperty.prototype.define = function(C, key, extensions){
             if (value === this.model[key]){
                 return;
             }
+            if (value !== null && this.model[key] !== null && value.isEqual && value.isEqual(this.model[key])){
+                return;
+            }
             this._addImplicitAnimationForKey(key);
             this.model[key] = value;
             this.didChangeProperty(key);
@@ -145,6 +148,23 @@ JSClass("UILayer", JSObject, {
         this.didChangeProperty('position');
     },
 
+    untransformedFrame: JSDynamicProperty(),
+
+    getUntransformedFrame: function(){
+        var bounds = this.model.bounds;
+        var anchorPoint = this.model.anchorPoint;
+        var offset = JSPoint(anchorPoint.x * bounds.size.width, anchorPoint.y * bounds.size.height);
+        return JSRect(this.model.position.subtracting(offset), bounds.size);
+    },
+
+    setUntransformedFrame: function(frame){
+        var bounds = this.model.bounds;
+        var anchorPoint = this.model.anchorPoint;
+        var offset = JSPoint(anchorPoint.x * frame.size.width, anchorPoint.y * frame.size.height);
+        this.bounds = JSRect(bounds.origin, frame.size);
+        this.position = frame.origin.adding(offset);
+    },
+
     setBounds: function(bounds){
         // When the bounds origin changes, it's like a scrolling view, and we need to update the sublayers
         // When the bounds change size, the position and frame both need to be recalculated accordingly

package/Root/Frameworks/UIKit/UIListView.js

@@ -142,6 +142,12 @@ JSClass("UIListView", UIScrollView, {
         if (spec.containsKey("showsFocusRing")){
             this._showsFocusRing = spec.valueForKey("showsFocusRing");
         }
+        if (spec.containsKey("listHeaderView")){
+            this.listHeaderView = spec.valueForKey("listHeaderView", UIView);
+        }
+        if (spec.containsKey("listFooterView")){
+            this.listFooterView = spec.valueForKey("listFooterView", UIView);
+        }
     },
 
     _commonListInit: function(){
@@ -920,6 +926,17 @@ JSClass("UIListView", UIScrollView, {
         this._cellsContainerView.insertSubviewAtIndex(item.view, viewIndex);
     },
 
+    sizeToFitSize: function(maxSize){
+        var bounds = JSRect(this.bounds.origin, this.contentSize);
+        if (maxSize.width < Number.MAX_VALUE){
+            bounds.size.width = maxSize.width;
+        }
+        if (bounds.size.height > maxSize.height){
+            bounds.size.height = maxSize.height;
+        }
+        this.bounds = bounds;
+    },
+
     // --------------------------------------------------------------------
     // MARK: - List Header and Footer
 
@@ -1544,17 +1561,19 @@ JSClass("UIListView", UIScrollView, {
 
     _createCellAtIndexPath: function(indexPath, rect){
         indexPath = JSIndexPath(indexPath);
+        if (!this.delegate.cellForListViewAtIndexPath){
+            throw new Error("%s must implement cellForListViewAtIndexPath()".sprintf(this.delegate.$class.className));
+        }
         var cell = this.delegate.cellForListViewAtIndexPath(this, indexPath);
         if (cell === null || cell === undefined){
-            throw new Error("Got null/undefined cell for indexPath: %s".sprintf(indexPath));
+            throw new Error("%s.cellForListViewAtIndexPath() returned null/undefined cell for indexPath: %s".sprintf(this.delegate.$class.className, indexPath));
         }
         this._adoptCell(cell, indexPath);
         cell.bounds = JSRect(JSPoint.Zero, rect.size);
         cell.position = JSPoint(rect.origin.x + cell.bounds.size.width * cell.anchorPoint.x, rect.origin.y + cell.bounds.size.height * cell.anchorPoint.y);
         cell.active = false;
         this._updateCellState(cell);
-        var styler = cell._styler || this._styler;
-        styler.updateCell(cell, indexPath);
+        cell.update();
         cell.setNeedsLayout();
         return cell;
     },
@@ -1572,9 +1591,12 @@ JSClass("UIListView", UIScrollView, {
             header = this._stickyHeader;
             this._stickyHeader = null;
         }else{
+            if (!this.delegate.headerViewForListViewSection){
+                throw new Error("%s must implement headerViewForListViewSection() when headerHeight is non-zero".sprintf(this.delegate.$class.className));
+            }
             header = this.delegate.headerViewForListViewSection(this, section);
             if (header === null || header === undefined){
-                throw new Error("Got null/undefined header for section: %d".sprintf(section));
+                throw new Error("%s.headerViewForListViewSection() returned null/undefined header for section: %d".sprintf(this.delegate.$class.className, section));
             }
         }
         header.kind = UIListViewHeaderFooterView.Kind.header;
@@ -1582,19 +1604,24 @@ JSClass("UIListView", UIScrollView, {
         header.bounds = JSRect(JSPoint.Zero, rect.size);
         header.position = JSPoint(rect.origin.x + header.bounds.size.width * header.anchorPoint.x, rect.origin.y + header.bounds.size.height * header.anchorPoint.y);
         this._styler.updateHeader(header, section);
+        header.setNeedsLayout();
         return header;
     },
 
     _createFooterAtSection: function(section, rect){
+        if (!this.delegate.footerViewForListViewSection){
+            throw new Error("%s must implement footerViewForListViewSection() when footerHeight is non-zero".sprintf(this.delegate.$class.className));
+        }
         var footer = this.delegate.footerViewForListViewSection(this, section);
         if (footer === null || footer === undefined){
-            throw new Error("Got null/undefined footer for section: %d".sprintf(section));
+            throw new Error("%s.headerViewForListViewSection() returned null/undefined header for section: %d".sprintf(this.delegate.$class.className, section));
         }
         footer.kind = UIListViewHeaderFooterView.Kind.footer;
         footer.section = section;
         footer.bounds = JSRect(JSPoint.Zero, rect.size);
         footer.position = JSPoint(rect.origin.x + footer.bounds.size.width * footer.anchorPoint.x, rect.origin.y + footer.bounds.size.height * footer.anchorPoint.y);
         this._styler.updateFooter(footer, section);
+        footer.setNeedsLayout();
         return footer;
     },
 
@@ -1961,12 +1988,10 @@ JSClass("UIListView", UIScrollView, {
 
     _updateVisibleCellStyles: function(){
         var item;
-        var styler;
         for (var i = 0, l = this._visibleItems.length; i < l; ++i){
             item = this._visibleItems[i];
             if (item.kind === VisibleItem.Kind.cell){
-                styler = item.view._styler || this._styler;
-                styler.updateCell(item.view, item.view.indexPath);
+                item.view.update();
             }
         }
     },
@@ -2578,6 +2603,20 @@ JSClass("UIListView", UIScrollView, {
         return indexPaths;
     },
 
+    visibleCells: JSReadOnlyProperty(),
+
+    getVisibleCells: function(){
+        var cells = [];
+        var item;
+        for (var i = 0, l = this._visibleItems.length; i < l; ++i){
+            item = this._visibleItems[i];
+            if (item.kind === VisibleItem.Kind.cell){
+                cells.push(item.view);
+            }
+        }
+        return cells;
+    },
+
     // --------------------------------------------------------------------
     // MARK: - Scrolling
 
@@ -2766,7 +2805,7 @@ VisibleItemIterator.prototype = Object.create({}, {
         value: function(){
             var height;
             var item;
-            if (this.item !== null && this.item.Kind === VisibleItem.Kind.footer){
+            if (this.item !== null && this.item.kind === VisibleItem.Kind.footer){
                 ++this.section;
             }
             while (this.section < this.listView.__numberOfSections){
@@ -2787,7 +2826,7 @@ VisibleItemIterator.prototype = Object.create({}, {
                     item = new VisibleItem(VisibleItem.Kind.cell, JSRect(0, this.y, this.width, height), this.cellIterator.indexPath);
                     return item;
                 }
-                if (this.item === null || this.item.section <= this.section){
+                if (this.item === null || this.item.indexPath.section <= this.section){
                     height = this.listView._heightForFooterInSection(this.section);
                     if (height > 0){
                         item = new VisibleItem(VisibleItem.Kind.footer, JSRect(0, this.y, this.width, height), JSIndexPath([this.section]));
@@ -3130,7 +3169,8 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
         }
         if (cell.selected){
             cell.contentView.borderColor = this.contextSelectedCellBorderColor;
-            if (this.showsMutedState && !cell.listView.keyActive){
+            var showsMutedState = this.showsMutedState && UIDevice.shared && UIDevice.shared.primaryPointerType != UIUserInterface.PointerType.touch;
+            if (showsMutedState && !cell.listView.keyActive){
                 cell.contentView.backgroundColor = this.mutedSelectedCellBackgroundColor;
                 if (cell._titleLabel !== null){
                     cell._titleLabel.textColor = this.mutedSelectedCellTextColor;
@@ -3211,7 +3251,7 @@ JSClass("UIListViewDefaultStyler", UIListViewStyler, {
 
     layoutCell: function(cell){
         cell._contentView.frame = cell.bounds.rectWithInsets(this.cellContentInsets);
-        var size = JSSize(cell.bounds.size.width - cell._titleInsets.left - cell._titleInsets.right, 0);
+        var size = JSSize(cell._contentView.bounds.size.width - cell._titleInsets.width, 0);
         var origin = JSPoint(cell._titleInsets.left, 0);
         var indent = this._indentationForCell(cell);
         origin.x += indent;

package/Root/Frameworks/UIKit/UIListViewHeaderFooterView.js

@@ -41,10 +41,17 @@ JSClass("UIListViewHeaderFooterView", UIView, {
     initWithSpec: function(spec){
         UIListViewHeaderFooterView.$super.initWithSpec.call(this, spec);
         this._commonHeaderFooterInit();
+        if (spec.containsKey("accessorySize")){
+            this._accessorySize = spec.valueForKey("accessorySize", JSSize);
+        }
+        if (spec.containsKey("accessoryView")){
+            this.accessoryView = spec.valueForKey("accessoryView", UIView);
+        }
     },
 
     _commonHeaderFooterInit: function(){
         this.stylerProperties = {};
+        this._accessorySize = JSSize(20, 20);
         this._titleInsets = JSInsets(0, 10);
         this._contentView = UIView.init();
         this.addSubview(this._contentView);
@@ -66,12 +73,39 @@ JSClass("UIListViewHeaderFooterView", UIView, {
         this._titleInsets = JSInsets(titleInsets);
         this.setNeedsLayout();
     },
+    
+    accessoryView: JSDynamicProperty("_accessoryView", null),
+    accessorySize: JSDynamicProperty("_accessorySize", null),
+
+    setAccessoryView: function(accessoryView){
+        if (accessoryView === this._accessoryView){
+            return;
+        }
+        if (this._accessoryView !== null){
+            this._accessoryView.removeFromSuperview();
+        }
+        this._accessoryView = accessoryView;
+        if (this._accessoryView !== null){
+            this.contentView.addSubview(this._accessoryView);
+        }
+        this.setNeedsLayout();
+    },
+
+    setAccessorySize: function(size){
+        this._accessorySize = JSSize(size);
+        this.setNeedsLayout();
+    },
 
     layoutSubviews: function(){
         UIListViewHeaderFooterView.$super.layoutSubviews.call(this);
         this._contentView.frame = this.bounds;
         var size = JSSize(this.bounds.size.width - this._titleInsets.left - this._titleInsets.right, 0);
         var origin = JSPoint(this._titleInsets.left, 0);
+        if (this._accessoryView !== null){
+            this._accessoryView.bounds = JSRect(JSPoint.Zero, this._accessorySize);
+            this._accessoryView.position = JSPoint(origin.x + size.width - this._accessorySize.width / 2, this._contentView.bounds.center.y);
+            size.width -= this._accessorySize.width + this._titleInsets.right;
+        }
         if (this._titleLabel !== null){
             if (this._detailLabel !== null){
                 size.height = this._titleLabel.font.displayLineHeight + this._detailLabel.font.displayLineHeight;

package/Root/Frameworks/UIKit/UINavigationBar.js

@@ -90,11 +90,11 @@ JSClass("UINavigationBar", UIView, {
     pushAnimator: null,
 
     createPushAnimator: function(){
-        return UIViewPropertyAnimator.initWithDuration(0.2, UIAnimation.Timing.easeInOut);
+        return UIViewPropertyAnimator.initWithDuration(UIAnimation.Duration.transition, UIAnimation.Timing.easeInOut);
     },
 
     createPopAnimator: function(){
-        return UIViewPropertyAnimator.initWithDuration(0.2, UIAnimation.Timing.easeInOut);
+        return UIViewPropertyAnimator.initWithDuration(UIAnimation.Duration.transition, UIAnimation.Timing.easeInOut);
     },
 
     pushItem: function(item, animated){
@@ -776,6 +776,8 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             button._imageView.automaticRenderMode = JSImage.RenderMode.template;
         }
         button.addAction(barItem.action, barItem.target);
+        button.enabled = barItem.enabled;
+        barItem._barButton = button;
         return button;
     }
 

package/Root/Frameworks/UIKit/UINavigationBarItem.js

@@ -28,6 +28,14 @@ JSClass("UINavigationBarItem", JSObject, {
     action: JSDynamicProperty('_action', null),
     enabled: JSDynamicProperty('_enabled', true),
     view: JSDynamicProperty('_view', null),
+    _barButton: null,
+
+    initWithTitle: function(title, action, target){
+        this._title = title;
+        this._target = target;
+        this._action = action;
+        this._commonItemInit();
+    },
 
     initWithImage: function(image, action, target){
         this._image = image;
@@ -81,6 +89,9 @@ JSClass("UINavigationBarItem", JSObject, {
         if (this._view !== null && this._view.isKindOfClass(UIControl)){
             this._view.enabled = this.enabled;
         }
+        if (this._barButton !== null){
+            this._barButton.enabled = this.enabled;
+        }
     }
 
 });

package/Root/Frameworks/UIKit/UINavigationController.js

@@ -152,11 +152,11 @@ JSClass("UINavigationController", UIViewController, {
     pushAnimator: null,
 
     createPushAnimator: function(){
-        return UIViewPropertyAnimator.initWithDuration(0.3, UIAnimation.Timing.easeInOut);
+        return UIViewPropertyAnimator.initWithDuration(UIAnimation.Duration.transition, UIAnimation.Timing.easeInOut);
     },
 
     createPopAnimator: function(){
-        return UIViewPropertyAnimator.initWithDuration(0.3, UIAnimation.Timing.easeInOut);
+        return UIViewPropertyAnimator.initWithDuration(UIAnimation.Duration.transition, UIAnimation.Timing.easeInOut);
     },
 
     pushViewController: function(viewController, animated){

package/Root/Frameworks/UIKit/UISplitViewController.js

@@ -120,70 +120,18 @@ JSClass("UISplitViewController", UIViewController, {
     },
 
     setLeadingViewController: function(leadingViewController){
-        var callAppearanceMethods = this.isViewVisible && this.leadingViewOpen;
-        var disappearingViewController = null;
-        if (this._leadingViewController !== null){
-            if (callAppearanceMethods){
-                this._leadingViewController.viewWillDisappear(false);
-                disappearingViewController = this._leadingViewController;
-            }
-            this._leadingViewController.removeFromParentViewController();
-        }
+        this.replaceChildViewController(this._leadingViewController, leadingViewController);
         this._leadingViewController = leadingViewController;
-        if (this._leadingViewController){
-            if (callAppearanceMethods){
-                this._leadingViewController.viewWillAppear(false);
-            }
-            this.addChildViewController(this._leadingViewController);
-        }
-        if (this._view !== null){
-            var view = null;
-            if (this._leadingViewController !== null){
-                view = this._leadingViewController.view;
-            }
-            this._view.leadingView = view;
-        }
-        if (callAppearanceMethods){
-            if (disappearingViewController !== null){
-                disappearingViewController.enqueueDidDisappear();
-            }
-            if (this._leadingViewController !== null){
-                this._leadingViewController.enqueueDidAppear();
-            }
+        if (this.isViewLoaded){
+            this.view.leadingView  = leadingViewController !== null ? leadingViewController.view : null;
         }
     },
 
     setTrailingViewController: function(trailingViewController){
-        var callAppearanceMethods = this.isViewVisible && this.trailingViewOpen;
-        var disappearingViewController = null;
-        if (this._trailingViewController !== null){
-            if (callAppearanceMethods){
-                this._trailingViewController.viewWillDisappear(false);
-                disappearingViewController = this._trailingViewController;
-            }
-            this._trailingViewController.removeFromParentViewController();
-        }
+        this.replaceChildViewController(this._trailingViewController, trailingViewController);
         this._trailingViewController = trailingViewController;
-        if (this._trailingViewController){
-            if (callAppearanceMethods){
-                this._trailingViewController.viewWillAppear(false);
-            }
-            this.addChildViewController(this._trailingViewController);
-        }
-        if (this._view !== null){
-            var view = null;
-            if (this._trailingViewController !== null){
-                view = this._trailingViewController.view;
-            }
-            this._view.trailingView = view;
-        }
-        if (callAppearanceMethods){
-            if (disappearingViewController !== null){
-                disappearingViewController.enqueueDidDisappear();
-            }
-            if (this._trailingViewController !== null){
-                this._trailingViewController.enqueueDidAppear();
-            }
+        if (this.isViewLoaded){
+            this.view.trailingView = trailingViewController !== null ? trailingViewController.view : null;
         }
     },
 
@@ -192,36 +140,10 @@ JSClass("UISplitViewController", UIViewController, {
             this._setMainViewControllerCollapsed(mainViewController);
             return;
         }
-        var callAppearanceMethods = this.isViewVisible;
-        var disappearingViewController = null;
-        if (this._mainViewController !== null && this._mainViewController.parentViewController === this){
-            if (callAppearanceMethods){
-                this._mainViewController.viewWillDisappear(false);
-                disappearingViewController = this._mainViewController;
-            }
-            this._mainViewController.removeFromParentViewController();
-        }
+        this.replaceChildViewController(this._mainViewController, mainViewController);
         this._mainViewController = mainViewController;
-        if (this._mainViewController){
-            if (callAppearanceMethods){
-                this._mainViewController.viewWillAppear(false);
-            }
-            this.addChildViewController(this._mainViewController);
-        }
-        if (this._view !== null){
-            var view = null;
-            if (this._mainViewController !== null){
-                view = this._mainViewController.view;
-            }
-            this._view.mainView = view;
-        }
-        if (callAppearanceMethods){
-            if (disappearingViewController !== null){
-                disappearingViewController.enqueueDidDisappear();
-            }
-            if (this._mainViewController !== null){
-                this._mainViewController.enqueueDidAppear();
-            }
+        if (this.isViewLoaded){
+            this.view.mainView = mainViewController !== null ? mainViewController.view : null;
         }
     },
 

package/Root/Frameworks/UIKit/UITabView.js

@@ -790,10 +790,10 @@ JSClass("UITabViewDefaultStyler", UITabViewStyler, {
             this.activeSelectedTitleColor = this.selectedTitleColor;
         }
         if (this.normalItemColor === null){
-            this.normalItemColor = JSColor.highlight;
+            this.normalItemColor = JSColor.controlBackground;
         }
         if (this.selectedItemColor === null){
-            this.selectedItemColor = JSColor.highlight.colorDarkenedByPercentage(0.2);
+            this.selectedItemColor = JSColor.highlight;
         }
         if (this.activeItemColor === null){
             this.activeItemColor = this.normalItemColor.colorDarkenedByPercentage(0.1);

package/Root/Frameworks/UIKit/UITabViewController.js

@@ -30,11 +30,12 @@ JSClass("UITabViewController", UIViewController, {
     initWithViewControllers: function(viewControllers, styler){
         UITabViewController.$super.init.call(this);
         this._viewControllers = JSCopy(viewControllers);
-        this._styler = styler || null;
+        this._tabViewStyler = styler || null;
     },
 
     initWithSpec: function(spec){
         this._viewControllers = [];
+        this._tabViewStyler = null;
         var viewController;
         var i, l;
         if (spec.containsKey('viewControllers')){
@@ -51,7 +52,7 @@ JSClass("UITabViewController", UIViewController, {
     },
 
     loadView: function(){
-        this._view = UITabView.initWithStyler(this._styler);
+        this._view = UITabView.initWithStyler(this._tabViewStyler);
     },
 
     viewDidLoad: function(){
@@ -85,9 +86,9 @@ JSClass("UITabViewController", UIViewController, {
             selectedViewController.viewWillDisappear(animated);
         }
     },
-
-    viewDisDisappear: function(animated){
-        UITabViewController.$super.viewDisDisappear.call(this, animated);
+    
+    viewDidDisappear: function(animated){
+        UITabViewController.$super.viewDidDisappear.call(this, animated);
         var selectedViewController = this.selectedViewController;
         if (selectedViewController !== null){
             selectedViewController.viewDidDisappear(animated);

package/Root/Frameworks/UIKit/UITextLayer.js

@@ -45,7 +45,7 @@ JSClass("UITextLayer", UILayer, {
     text: JSDynamicProperty(),
     attributedText: JSDynamicProperty(),
     font: JSDynamicProperty(),
-    textColor: JSDynamicProperty(),
+    textColor: UILayerAnimatedProperty(),
     lineBreakMode: UITextLayerContainerProperty(),
     textAlignment: UITextLayerContainerProperty(),
     lineSpacing: UITextLayerContainerProperty(),
@@ -74,6 +74,7 @@ JSClass("UITextLayer", UILayer, {
         this._textStorage = JSTextStorage.init();
         this._textStorage.addLayoutManager(this._textLayoutManager);
         this._textLayoutManager.addTextContainer(this._textContainer);
+        this.model.textColor = JSColor.black;
         this.font = JSFont.systemFontOfSize(JSFont.Size.normal);
         this.setNeedsLayout();
     },
@@ -95,15 +96,6 @@ JSClass("UITextLayer", UILayer, {
         }
         this._textLayoutManager.defaultFont = font;
     },
-
-    getTextColor: function(){
-        return this._textLayoutManager.defaultTextColor;
-    },
-
-    setTextColor: function(color){
-        this._textLayoutManager.defaultTextColor = color;
-        this.setNeedsDisplay();
-    },
     
     setTextInsets: function(insets){
         this._textInsets = JSInsets(insets);
@@ -190,6 +182,7 @@ JSClass("UITextLayer", UILayer, {
 
     drawInContext: function(context){
         var textOrigin = JSPoint(this._textInsets.left, this._textInsets.top);
+        this._textLayoutManager.defaultTextColor = this.presentation.textColor;
         this._textLayoutManager.layoutIfNeeded();
         this._textLayoutManager.drawContainerInContextAtPoint(this._textContainer, context, textOrigin);
         this._displayQueued = false;
@@ -217,6 +210,7 @@ JSClass("UITextLayer", UILayer, {
     layoutSublayers: function(){
         UITextLayer.$super.layoutSublayers.call(this);
         this._textContainer.origin = JSPoint(this._textInsets.left, this._textInsets.top);
+        this._textLayoutManager.defaultTextColor = this.presentation.textColor;
         this._textLayoutManager.layoutIfNeeded();
         if ((this._widthTracksText || this._heightTracksText) && this._textContainer.textFrame !== null){
             var width = this.bounds.size.width;
@@ -268,4 +262,11 @@ JSClass("UITextLayer", UILayer, {
 
 });
 
+UITextLayer.Properties = Object.create(UILayer.Properties, {
+    textColor: {
+        writable: true,
+        value: null,
+    }
+});
+
 })();