fix tick position for vertical facet

TargetProcess · May 16, 2018 · eb4fad4 · eb4fad4
1 parent 871a108
commit eb4fad4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/elements/coords.cartesian.axis.ts b/src/elements/coords.cartesian.axis.ts
@@ -382,10 +382,11 @@ function createAxis(config: AxisConfig) {
 
                     rotateText(text);
                     fixTextPosForVerticalFacets(text);
-
-                    if (isOrdinalScale && scaleGuide.avoidCollisions) {
+                    if (isOrdinalScale && scaleGuide.avoidCollisions && !scaleGuide.facetAxis) {
                         if (transition) {
-                            transition.on('end.fixTickTextCollision', () => fixTickTextCollision(ticks.tick));
+                            transition.on('end.fixTickTextCollision', () => {
+                                return fixTickTextCollision(ticks.tick);
+                            });
                         } else {
                             fixTickTextCollision(ticks.tick);
                         }

diff --git a/src/utils/d3-decorators.js b/src/utils/d3-decorators.js
@@ -196,7 +196,7 @@ export function avoidTickTextCollision(ticks, isHorizontal) {
             }
 
             var dy = (curr.l * textOffsetStep); // -1 | 0 | +1
-            var newY = parseFloat(curr.textRef.attr('y')) + dy;
+            var newY = isHorizontal ? (parseFloat(curr.textRef.attr('y')) + dy) : 0;
             let tx = isHorizontal ? 0 : dy;
             let ty = isHorizontal ? dy : 0;
             var tr = (function (transform) {