@breakside/jskit 2022.26.0 → 2022.29.0

package/Root/Frameworks/UIKit/UIApplication.js

@@ -400,31 +400,49 @@ JSClass('UIApplication', UIResponder, {
 
     // MARK: - Touch Event Conversion
 
+    convertsTouchesToMouseEvents: false,
+
     touchesBegan: function(touches, event){
-        // The application should be the final responder, so if a touch gets
-        // all the way here, it means nothing handled it, and we should try
-        // to re-send it as a mouse event to see if something handles that
-        var touch = touches[0];
-        var location = touch.window.convertPointToScreen(touch.locationInWindow);
-        this.windowServer.createMouseEvent(UIEvent.Type.leftMouseDown, event.timestamp, location);
+        if (this.convertsTouchesToMouseEvents){
+            // The application should be the final responder, so if a touch gets
+            // all the way here, it means nothing handled it, and we should try
+            // to re-send it as a mouse event to see if something handles that
+            var touch = touches[0];
+            var location = touch.window.convertPointToScreen(touch.locationInWindow);
+            this.windowServer.createMouseEvent(UIEvent.Type.leftMouseDown, event.timestamp, location);
+        }else{
+            UIApplication.$super.touchesBegan.call(this, touches, event);
+        }
     },
 
     touchesMoved: function(touches, event){
-        var touch = touches[0];
-        var location = touch.window.convertPointToScreen(touch.locationInWindow);
-        this.windowServer.createMouseEvent(UIEvent.Type.leftMouseDragged, event.timestamp, location);
+        if (this.convertsTouchesToMouseEvents){
+            var touch = touches[0];
+            var location = touch.window.convertPointToScreen(touch.locationInWindow);
+            this.windowServer.createMouseEvent(UIEvent.Type.leftMouseDragged, event.timestamp, location);
+        }else{
+            UIApplication.$super.touchesMoved.call(this, touches, event);
+        }
     },
 
     touchesEnded: function(touches, event){
-        var touch = touches[0];
-        var location = touch.window.convertPointToScreen(touch.locationInWindow);
-        this.windowServer.createMouseEvent(UIEvent.Type.leftMouseUp, event.timestamp, location);
+        if (this.convertsTouchesToMouseEvents){
+            var touch = touches[0];
+            var location = touch.window.convertPointToScreen(touch.locationInWindow);
+            this.windowServer.createMouseEvent(UIEvent.Type.leftMouseUp, event.timestamp, location);
+        }else{
+            UIApplication.$super.touchesEnded.call(this, touches, event);
+        }
     },
 
     touchesCanceled: function(touches, event){
-        var touch = touches[0];
-        var location = touch.window.convertPointToScreen(touch.locationInWindow);
-        this.windowServer.createMouseEvent(UIEvent.Type.leftMouseUp, event.timestamp, location);
+        if (this.convertsTouchesToMouseEvents){
+            var touch = touches[0];
+            var location = touch.window.convertPointToScreen(touch.locationInWindow);
+            this.windowServer.createMouseEvent(UIEvent.Type.leftMouseUp, event.timestamp, location);
+        }else{
+            UIApplication.$super.touchesCanceled.call(this, touches, event);
+        }
     },
 
     // MARK: - Fonts

package/Root/Frameworks/UIKit/UICheckbox.js

@@ -323,17 +323,24 @@ JSClass("UICheckboxDefaultStyler", UICheckboxStyler, {
 
     sizeControlToFitSize: function(checkbox, maxSize){
         var height = checkbox._titleLabel.font.displayLineHeight;
-        var maxTitleSize = JSSize(maxSize);
-        var boxWidth = height + this.titleSpacing;
-        maxTitleSize.width -= boxWidth;
-        checkbox._titleLabel.sizeToFitSize(maxTitleSize);
-        checkbox.bounds = JSRect(0, 0, boxWidth + checkbox._titleLabel.frame.size.width, height);
+        if (checkbox._titleLabel.text !== ""){
+            var maxTitleSize = JSSize(maxSize);
+            var boxWidth = height + this.titleSpacing;
+            maxTitleSize.width -= boxWidth;
+            checkbox._titleLabel.sizeToFitSize(maxTitleSize);
+            checkbox.bounds = JSRect(0, 0, boxWidth + checkbox._titleLabel.frame.size.width, height);
+        }
+        checkbox.bounds = JSRect(0, 0, height, height);
     },
 
     intrinsicSizeOfControl: function(checkbox){
-        var size = JSSize(checkbox._titleLabel.intrinsicSize);
-        size.width += size.height + this.titleSpacing;
-        return size;
+        if (checkbox._titleLabel.text !== ""){
+            var size = JSSize(checkbox._titleLabel.intrinsicSize);
+            size.width += size.height + this.titleSpacing;
+            return size;
+        }
+        var height = checkbox._titleLabel.font.displayLineHeight;
+        return JSSize(height, height);
     },
 
     focusRingPathForControl: function(checkbox){

package/Root/Frameworks/UIKit/UICollectionView.js

@@ -1009,7 +1009,7 @@ JSClass("UICollectionView", UIScrollView, {
             return;
         }
         this._touch = {
-            location0: touches[0].locationInView(this),
+            location0: touches[0].locationInWindow,
             cell: null,
             timer: JSTimer.scheduledTimerWithInterval(0.05, function(){
                 this._touch.timer = null;
@@ -1021,7 +1021,7 @@ JSClass("UICollectionView", UIScrollView, {
     touchesMoved: function(touches, event){
         UICollectionView.$super.touchesMoved.call(this, touches, event);
         if (this._touch !== null){
-            var location = touches[0].locationInView(this);
+            var location = touches[0].locationInWindow;
             var diff = location.subtracting(this._touch.location0);
             if ((diff.x * diff.x + diff.y * diff.y) > 2){
                 this._cancelTouchSelection();

package/Root/Frameworks/UIKit/UIDisplayServer.js

@@ -39,6 +39,7 @@ JSClass("UIDisplayServer", JSObject, {
         this.layerAnimationQueue = {};
         this._scheduleQueue = [];
         this._scheduled = [];
+        this._completedAnimations = [];
     },
 
     // -------------------------------------------------------------------------
@@ -100,7 +101,7 @@ JSClass("UIDisplayServer", JSObject, {
         this._scheduled = this._scheduleQueue;
         this._scheduleQueue = [];
         this._isUpdating = true;
-        var completedAnimations = this._updateAnimations(t);
+        this._updateAnimations(t);
         this._flushLayerLayoutQueue();
         this._flushLayerDisplayQueue();
         this._flushLayerRepositionQueue();
@@ -110,9 +111,7 @@ JSClass("UIDisplayServer", JSObject, {
         this._isUpdating = false;
 
         // Call any animation callbacks
-        for (var i = 0, l = completedAnimations.length; i < l; ++i){
-            completedAnimations[i].completionFunction(completedAnimations[i]);
-        }
+        this._flushCompletedAnimations();
 
         // Call any window insert/remove callbacks
         var window;
@@ -228,8 +227,22 @@ JSClass("UIDisplayServer", JSObject, {
         if (this.layerDisplayQueue.remove(layer)){
             layer._needsDisplay = true;
         }
+        var key;
+        var animation;
+        var completedAnimationKeys;
+        var i, l;
         this.layerRepositionQueue.remove(layer);
         if (layer.objectID in this.layerAnimationQueue){
+            completedAnimationKeys = [];
+            for (key in layer.animationsByKey){
+                animation = layer.animationsByKey[key];
+                this.completeAnimation(animation);
+                completedAnimationKeys.push(key);
+            }
+            for (i = 0, l = completedAnimationKeys.length; i < l; ++i){
+                key = completedAnimationKeys[i];
+                layer.removeAnimationForKey(key);
+            }
             delete this.layerAnimationQueue[layer.objectID];
             --this._animationCount;
         }
@@ -246,24 +259,53 @@ JSClass("UIDisplayServer", JSObject, {
         this.setUpdateNeeded();
     },
 
+    _completedAnimations: null,
+
+    completeAnimation: function(animation){
+        this._completedAnimations.push(animation);
+    },
+
+    _flushCompletedAnimations: function(){
+        var i, l;
+        var animation;
+        for (i = 0, l = this._completedAnimations.length; i < l; ++i){
+            animation = this._completedAnimations[i];
+            if (animation.completionFunction){
+                animation.completionFunction(animation);
+            }
+        }
+        this._completedAnimations = [];
+    },
+
     _updateAnimations: function(t){
         t /= this._animationScale;
         var animation;
-        var completedAnimations = [];
         var id, key;
         var layer;
+        var completedAnimationKeys;
+        var i, l;
+        var parts;
         for (id in this.layerAnimationQueue){
             layer = this.layerAnimationQueue[id];
+            completedAnimationKeys = [];
             for (key in layer.animationsByKey){
                 animation = layer.animationsByKey[key];
                 animation.updateForTime(t);
                 if (this.reducedMotionEnabled || animation.isComplete){
-                    layer.removeAnimationForKey(key);
-                    if (animation.completionFunction){
-                        completedAnimations.push(animation);
+                    completedAnimationKeys.push(key);
+                }else{
+                    parts = key.split('.');
+                    if (parts[0] in layer.presentation){
+                        this.layerDidChangeProperty(layer, key);
                     }
                 }
-                var parts = key.split('.');
+            }
+            for (i = 0, l = completedAnimationKeys.length; i < l; ++i){
+                key = completedAnimationKeys[i];
+                animation = layer.animationsByKey[key];
+                layer.removeAnimationForKey(key);
+                this.completeAnimation(animation);
+                parts = key.split('.');
                 if (parts[0] in layer.presentation){
                     this.layerDidChangeProperty(layer, key);
                 }
@@ -273,7 +315,6 @@ JSClass("UIDisplayServer", JSObject, {
                 --this._animationCount;
             }
         }
-        return completedAnimations;
     },
 
     // -------------------------------------------------------------------------

package/Root/Frameworks/UIKit/UIKit.js

@@ -28,6 +28,7 @@
 // #import "UIPlatform.js"
 // #import "JSColor+UIKit.js"
 // #import "UIColorSpace.js"
+// #import "UIState.js"
 
 // Layers & Views
 // #import "UIResponder.js"

package/Root/Frameworks/UIKit/UILayer.js

@@ -608,6 +608,9 @@ JSClass("UILayer", JSObject, {
     },
 
     removeAnimationForKey: function(key){
+        if (!(key in this.animationsByKey)){
+            return;
+        }
         --this.animationCount;
         if (this.animationCount === 0){
             // If we're all done with animations, reset our presentation to be identical to our model

package/Root/Frameworks/UIKit/UIListView.js

@@ -355,6 +355,7 @@ JSClass("UIListView", UIScrollView, {
         var y;
         var diff;
         var height;
+        var newHeight;
         var item;
         var y0 = firstVisibleItem.view.position.y - firstVisibleItem.view.anchorPoint.y * firstVisibleItem.view.bounds.size.height;
 
@@ -372,9 +373,10 @@ JSClass("UIListView", UIScrollView, {
                         cell = item.view;
                         height = cell.bounds.size.height;
                         y = cell.position.y - cell.anchorPoint.y * height;
+                        newHeight = this._heightForCellAtIndexPath(indexPath);
                         this._enqueueReusableCell(cell);
-                        cell = this._createCellAtIndexPath(indexPath, JSRect(0, y, cell.bounds.size.width, height));
-                        diff = cell.bounds.size.height - height;
+                        cell = this._createCellAtIndexPath(indexPath, JSRect(0, y, cell.bounds.size.width, newHeight));
+                        diff = newHeight - height;
                         if (cell !== item.view){
                             this._cellsContainerView.insertSubviewBelowSibling(cell, item.view);
                             item.view.removeFromSuperview();
@@ -382,6 +384,7 @@ JSClass("UIListView", UIScrollView, {
                         }
                         if (diff !== 0){
                             visibleSizeChanged = true;
+                            contentSize.height += diff;
                         }
                     }
                 }
@@ -397,6 +400,7 @@ JSClass("UIListView", UIScrollView, {
         }else{
             this.contentSize = contentSize;
             this.contentOffset = contentOffset;
+            this._layoutVisibleItems(this._visibleItems, y0);
         }
 
     },
@@ -489,7 +493,7 @@ JSClass("UIListView", UIScrollView, {
     _approximateHeightForSection: function(section, stopRow){
         var height = this._approximateYForSectionFooter(section);
         if (this.delegate && this.delegate.heightForListViewFooterInSection && !this.delegate.estimatedHeightForListViewFooters){
-            height = this.delegate.heightForListViewFooterInSection(section);
+            height += this.delegate.heightForListViewFooterInSection(this, section);
         }else{
             height += this._approximateFooterHeight;
         }
@@ -1635,7 +1639,7 @@ JSClass("UIListView", UIScrollView, {
     _heightForFooterInSection: function(section){
         var height = this._approximateFooterHeight;
         if (this.delegate.heightForListViewFooterInSection){
-            height = this.delegate.heightForListViewFooterInSection(section);
+            height = this.delegate.heightForListViewFooterInSection(this, section);
         }
         return height;
     },
@@ -2347,7 +2351,7 @@ JSClass("UIListView", UIScrollView, {
             return;
         }
         this._touch = {
-            location0: touches[0].locationInView(this),
+            location0: touches[0].locationInWindow,
             cell: null,
             timer: JSTimer.scheduledTimerWithInterval(0.05, function(){
                 this._touch.timer = null;
@@ -2359,7 +2363,7 @@ JSClass("UIListView", UIScrollView, {
     touchesMoved: function(touches, event){
         UIListView.$super.touchesMoved.call(this, touches, event);
         if (this._touch !== null){
-            var location = touches[0].locationInView(this);
+            var location = touches[0].locationInWindow;
             var diff = location.subtracting(this._touch.location0);
             if ((diff.x * diff.x + diff.y * diff.y) > 2){
                 this._cancelTouchSelection();

package/Root/Frameworks/UIKit/UIMenuView.js

@@ -309,20 +309,6 @@ JSClass("UIMenuWindow", UIWindow, {
         this._adjustHighlightForLocation(this._lastMoveLocation);
     },
 
-    mouseDragged: function(event){
-        if (this._isClosing){
-            return;
-        }
-        var location = event.locationInView(this);
-        this._lastMoveLocation = event.locationInView(this);
-        this._adjustHighlightForLocation(this._lastMoveLocation);
-        if (!this.containsPoint(location)){
-            if (this._menu.supermenu !== null && this._menu.supermenu.stylerProperties.window){
-                this._menu.supermenu.stylerProperties.window.mouseDragged(event);
-            }
-        }
-    },
-
     mouseExited: function(event){
         if (this._isClosing){
             return;
@@ -350,6 +336,37 @@ JSClass("UIMenuWindow", UIWindow, {
 
     _itemDownTimestamp: UIEvent.minimumTimestamp,
 
+    mouseDown: function(event){
+        if (this._isClosing){
+            return;
+        }
+        var location = event.locationInView(this);
+        if (!this.containsPoint(location)){
+            if (this._menu.supermenu && this._menu.supermenu.stylerProperties.window){
+                this._menu.supermenu.stylerProperties.window.mouseDown(event);
+            }else{
+                this.closeAll(true);
+            }
+        }else{
+            this._lastMoveLocation = event.locationInView(this);
+            this._adjustHighlightForLocation(this._lastMoveLocation);
+        }
+    },
+
+    mouseDragged: function(event){
+        if (this._isClosing){
+            return;
+        }
+        var location = event.locationInView(this);
+        this._lastMoveLocation = event.locationInView(this);
+        this._adjustHighlightForLocation(this._lastMoveLocation);
+        if (!this.containsPoint(location)){
+            if (this._menu.supermenu !== null && this._menu.supermenu.stylerProperties.window){
+                this._menu.supermenu.stylerProperties.window.mouseDragged(event);
+            }
+        }
+    },
+
     mouseUp: function(event){
         if (event.timestamp - this._itemDownTimestamp < 0.2){
             return;
@@ -369,23 +386,65 @@ JSClass("UIMenuWindow", UIWindow, {
         }
     },
 
-    mouseDown: function(event){
+    // -----------------------------------------------------------------------
+    // MARK: - Touch Events
+
+    touchesBegan: function(touches, event){
         if (this._isClosing){
             return;
         }
-        var location = event.locationInView(this);
+        if (touches.length > 1){
+            return;
+        }
+        var location = touches[0].locationInView(this);
         if (!this.containsPoint(location)){
             if (this._menu.supermenu && this._menu.supermenu.stylerProperties.window){
-                this._menu.supermenu.stylerProperties.window.mouseDown(event);
+                this._menu.supermenu.stylerProperties.window.touchesBegan(touches, event);
             }else{
                 this.closeAll(true);
             }
         }else{
-            this._lastMoveLocation = event.locationInView(this);
+            this._lastMoveLocation = location;
             this._adjustHighlightForLocation(this._lastMoveLocation);
         }
     },
 
+    touchesMoved: function(touches, event){
+        if (this._isClosing){
+            return;
+        }
+        var location = touches[0].locationInView(this);
+        this._lastMoveLocation = location;
+        this._adjustHighlightForLocation(this._lastMoveLocation);
+        if (!this.containsPoint(location)){
+            if (this._menu.supermenu !== null && this._menu.supermenu.stylerProperties.window){
+                this._menu.supermenu.stylerProperties.window.touchesMoved(touches, event);
+            }
+        }
+    },
+
+    touchesEnded: function(touches, event){
+        if (event.timestamp - this._itemDownTimestamp < 0.2){
+            return;
+        }
+        if (this._isClosing){
+            return;
+        }
+        var location = touches[0].locationInView(this);
+        if (this.containsPoint(location)){
+            this._performActionForHighlightedItem();
+        }else{
+            if (this._menu.supermenu && this._menu.supermenu.stylerProperties.window){
+                this._menu.supermenu.stylerProperties.window.touchesEnded(touches, event);
+            }else{
+                this.closeAll(true);
+            }
+        }
+    },
+
+    touchesCanceled: function(touches, event){
+    },
+
     // -----------------------------------------------------------------------
     // MARK: - Key Events
 

package/Root/Frameworks/UIKit/UINavigationBar.js

@@ -428,6 +428,8 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         navigationBar.maskedBorders = UIView.Sides.maxY;
 
         var props = navigationBar.stylerProperties;
+        props.isAnimating = false;
+        props.needsUpdate = false;
         props.titleLabel = this.createTitleLabel();
         props.customView = null;
         navigationBar.addSubview(props.titleLabel);
@@ -468,6 +470,8 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         var removingRightBarItemViews = props.rightBarItemViews;
         var removingTitleLabel = props.titleLabel;
         var removingCustomView = props.customView;
+        var removingCustomViewTransform = removingCustomView ? removingCustomView.transform : JSAffineTransform.Identity;
+        var customViewTransform = JSAffineTransform.Identity;
         var backToTitleScale = this.titleFont.displayLineHeight / this.itemFont.displayLineHeight;
         props.titleLabel = this.createTitleLabel();
         navigationBar.addSubview(props.titleLabel);
@@ -488,15 +492,16 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         props.titleLabel.alpha = 0;
         props.titleLabel.transform = JSAffineTransform.Translated(navigationBar.bounds.size.width, 0);
         if (props.customView){
+            customViewTransform = props.customView.transform;
             props.customView.alpha = 0;
-            props.customView.transform = JSAffineTransform.Translated(navigationBar.bounds.size.width, 0);
+            props.customView.transform = JSAffineTransform.Translated(navigationBar.bounds.size.width + customViewTransform.tx, customViewTransform.ty);
         }
         props.backBarItemView.alpha = 0;
         var backTitleFrame = props.backBarItemView.titleLabel.convertRectToView(props.backBarItemView.titleLabel.bounds, props.backBarItemView.superview);
         if (removingCustomView){
-            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(Math.max(0, removingCustomView.frame.origin.x - backTitleFrame.origin.x), 0).scaledBy(backToTitleScale);
+            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(Math.max(0, removingCustomView.untransformedFrame.origin.x - backTitleFrame.origin.x), 0).scaledBy(backToTitleScale);
         }else{
-            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(Math.max(0, removingTitleLabel.frame.origin.x - backTitleFrame.origin.x), 0).scaledBy(backToTitleScale);
+            props.backBarItemView.titleLabel.transform = JSAffineTransform.Translated(Math.max(0, removingTitleLabel.untransformedFrame.origin.x - backTitleFrame.origin.x), 0).scaledBy(backToTitleScale);
         }
         animator.addAnimations(function(){
             var i, l;
@@ -514,20 +519,20 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             }
             removingBackBarItemView.alpha = 0;
             removingTitleLabel.alpha = 0;
-            removingTitleLabel.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - removingTitleLabel.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
+            removingTitleLabel.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - removingTitleLabel.untransformedFrame.origin.x), 0).scaledBy(1 / backToTitleScale);
             if (removingCustomView){
                 removingCustomView.alpha = 0;
-                removingCustomView.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - removingCustomView.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
+                removingCustomView.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - removingCustomView.untransformedFrame.origin.x) + removingCustomViewTransform.tx, removingCustomViewTransform.ty).scaledBy(1 / backToTitleScale);
             }
             props.titleLabel.alpha = 1;
             props.titleLabel.transform = JSAffineTransform.Identity;
             if (props.customView){
                 props.customView.alpha = 1;
-                props.customView.transform = JSAffineTransform.Identity;
+                props.customView.transform = customViewTransform;
             }
             props.backBarItemView.alpha = 1;
             props.backBarItemView.titleLabel.transform = JSAffineTransform.Identity;
-        });
+        }, this);
         animator.addCompletion(function(){
             var i, l;
             for (i = 0, l = removingLeftBarItemViews.length; i < l; ++i){
@@ -540,9 +545,14 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             removingBackBarItemView.removeFromSuperview();
             if (removingCustomView !== null){
                 removingCustomView.removeFromSuperview();
-                removingCustomView.transform = JSAffineTransform.Identity;
+                removingCustomView.transform = removingCustomViewTransform;
             }
-        });
+            props.isAnimating = false;
+            if (props.needsUpdate){
+                this.updateBar(navigationBar);
+            }
+        }, this);
+        props.isAnimating = true;
     },
 
     popToItem: function(navigationBar, item, animator){
@@ -553,6 +563,8 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         var removingRightBarItemViews = props.rightBarItemViews;
         var removingTitleLabel = props.titleLabel;
         var removingCustomView = props.customView;
+        var removingCustomViewTransform = removingCustomView ? removingCustomView.transform : JSAffineTransform.Identity;
+        var customViewTransform = JSAffineTransform.Identity;
         var backToTitleScale = this.titleFont.displayLineHeight / this.itemFont.displayLineHeight;
         props.titleLabel = this.createTitleLabel();
         navigationBar.addSubview(props.titleLabel);
@@ -574,10 +586,11 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         props.backBarItemView.alpha = 0;
         var backTitleFrame = removingBackBarItemView.titleLabel.convertRectToView(removingBackBarItemView.titleLabel.bounds, props.backBarItemView.superview);
         if (props.customView){
-            props.customView.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - props.customView.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
+            customViewTransform = props.customView.transform;
+            props.customView.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - props.customView.untransformedFrame.origin.x) + customViewTransform.tx, customViewTransform.ty).scaledBy(1 / backToTitleScale);
             props.customView.alpha = 0;
         }else{
-            props.titleLabel.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - props.titleLabel.frame.origin.x), 0).scaledBy(1 / backToTitleScale);
+            props.titleLabel.transform = JSAffineTransform.Translated(Math.min(0, backTitleFrame.origin.x - props.titleLabel.untransformedFrame.origin.x), 0).scaledBy(1 / backToTitleScale);
         }
         animator.addAnimations(function(){
             var i, l;
@@ -598,7 +611,7 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             removingTitleLabel.transform = JSAffineTransform.Translated(navigationBar.bounds.size.width, 0);
             if (removingCustomView){
                 removingCustomView.alpha = 0;
-                removingCustomView.transform = JSAffineTransform.Translated(navigationBar.bounds.size.width, 0);
+                removingCustomView.transform = JSAffineTransform.Translated(navigationBar.bounds.size.width + removingCustomViewTransform.tx, removingCustomViewTransform.ty);
             }
             props.titleLabel.alpha = 1;
             props.titleLabel.transform = JSAffineTransform.Identity;
@@ -606,9 +619,9 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             props.backBarItemView.titleLabel.transform = JSAffineTransform.Identity;
             if (props.customView){
                 props.customView.alpha = 1;
-                props.customView.transform = JSAffineTransform.Identity;
+                props.customView.transform = customViewTransform;
             }
-        });
+        }, this);
         animator.addCompletion(function(){
             var i, l;
             for (i = 0, l = removingLeftBarItemViews.length; i < l; ++i){
@@ -621,14 +634,24 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             removingBackBarItemView.removeFromSuperview();
             if (removingCustomView !== null){
                 removingCustomView.removeFromSuperview();
-                removingCustomView.transform = JSAffineTransform.Identity;
+                removingCustomView.transform = removingCustomViewTransform;
+            }
+            props.isAnimating = false;
+            if (props.needsUpdate){
+                this.updateBar(navigationBar);
             }
-        });
+        }, this);
+        props.isAnimating = true;
     },
 
     updateBar: function(navigationBar){
         var item = navigationBar.topItem;
         var props = navigationBar.stylerProperties;
+        if (props.isAnimating){
+            props.needsUpdate = true;
+            return;
+        }
+        props.needsUpdate = false;
 
         var i, l;
         for (i = 0, l = props.leftBarItemViews.length; i < l; ++i){
@@ -708,7 +731,7 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         var barItemView = props.backBarItemView;
         var titleTextAlignment = item ? item.titleTextAlignment || this.titleTextAlignment : this.titleTextAlignment;
         barItemView.sizeToFitSize(JSSize(xRight - xLeft, itemHeight));
-        barItemView.frame = JSRect(JSPoint(xLeft, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
+        barItemView.untransformedFrame = JSRect(JSPoint(xLeft, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
         if (!barItemView.hidden){
             xLeft += barItemView.bounds.size.width;
         }else if (props.leftBarItemViews.length === 0 && titleTextAlignment === JSTextAlignment.left && this.titleInsets !== null){
@@ -717,14 +740,14 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         for (i = 0, l = props.leftBarItemViews.length; i < l; ++i){
             barItemView = props.leftBarItemViews[i];
             barItemView.sizeToFitSize(JSSize(xRight - xLeft, itemHeight));
-            barItemView.frame = JSRect(JSPoint(xLeft, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
+            barItemView.untransformedFrame = JSRect(JSPoint(xLeft, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
             xLeft += barItemView.bounds.size.width;
         }
         for (i = props.rightBarItemViews.length - 1; i >= 0; --i){
             barItemView = props.rightBarItemViews[i];
             barItemView.sizeToFitSize(JSSize(xRight - xLeft, itemHeight));
             xRight -= barItemView.bounds.size.width;
-            barItemView.frame = JSRect(JSPoint(xRight, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
+            barItemView.untransformedFrame = JSRect(JSPoint(xRight, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
             barItemView.hidden = xRight < xLeft;
         }
 
@@ -746,11 +769,11 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             var centeredX = (size.width - viewSize.width) / 2;
             var centeredY = (size.height - viewSize.height) / 2;
             if (titleTextAlignment === JSTextAlignment.center){
-                titleView.frame = JSRect(JSPoint(Math.min(Math.max(minX, centeredX), maxX), centeredY), viewSize);
+                titleView.untransformedFrame = JSRect(JSPoint(Math.min(Math.max(minX, centeredX), maxX), centeredY), viewSize);
             }else if (titleTextAlignment === JSTextAlignment.right){
-                titleView.frame = JSRect(JSPoint(maxX - viewSize.width, centeredY), viewSize);
+                titleView.untransformedFrame = JSRect(JSPoint(maxX - viewSize.width, centeredY), viewSize);
             }else{
-                titleView.frame = JSRect(JSPoint(minX, centeredY), viewSize);
+                titleView.untransformedFrame = JSRect(JSPoint(minX, centeredY), viewSize);
             }
         }else{
             props.titleLabel.hidden = true;