Merge branch 'master' into nightly

naver · Jan 12, 2024 · 6fe35eb · 6fe35eb
2 parents 3f25e8c + d5b5d09
commit 6fe35eb
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/ChartInternal/internals/size.axis.ts b/src/ChartInternal/internals/size.axis.ts
@@ -71,7 +71,11 @@ export default {
 
 		const maxtickSize = $$.axis.getMaxTickSize(id);
 
-		if (maxtickSize.height > defaultHeight) {
+		const isXAxisTickRotated = config.axis_x_tick_rotate > 0 && (
+			!config.axis_x_tick_autorotate || $$.needToRotateXAxisTickTexts()
+		);
+
+		if ((config.axis_x_tick_multiline || isXAxisTickRotated) && maxtickSize.height > defaultHeight) {
 			h += maxtickSize.height - defaultHeight;
 		}
 

diff --git a/test/internals/axis-spec.ts b/test/internals/axis-spec.ts
@@ -1349,7 +1349,21 @@ describe("AXIS", function() {
 						expect(tspan.attr("dx")).to.be.equal("0");
 					});
 
-				compare(0, 18.8125, 48, 0);
+				compare(0, 18.8125, 30, 0);
+			});
+
+			it("should not use the height of the longest tick text when ticks are not rotated", () => {
+				chart.$.main.selectAll(`.${$AXIS.axisX} g.tick`).each(function() {
+					const tick = d3Select(this);
+					const text = tick.select("text");
+					const tspan = text.select("tspan");
+
+					expect(text.attr("transform")).to.be.null;
+					expect(text.attr("y")).to.be.equal("9");
+					expect(tspan.attr("dx")).to.be.equal("0");
+				});
+
+				compare(0, 18.8125, 30, 0);
 			});
 
 			it("update args", () => {
@@ -1535,7 +1549,21 @@ describe("AXIS", function() {
 					expect(tspan.attr("dx")).to.be.equal("0");
 				});
 
-				compare(0, 18.8125, 55, 0);
+				compare(0, 18.8125, 30, 0);
+			});
+
+			it("should not use the height of the longest tick text when ticks are not rotated", () => {
+				chart.$.main.selectAll(`.${$AXIS.axisX} g.tick`).each(function() {
+					const tick = d3Select(this);
+					const text = tick.select("text");
+					const tspan = text.select("tspan");
+
+					expect(text.attr("transform")).to.be.null;
+					expect(text.attr("y")).to.be.equal("9");
+					expect(tspan.attr("dx")).to.be.equal("0");
+				});
+
+				compare(0, 18.8125, 30, 0);
 			});
 
 			it("update args", () => {