fix(axis): Fix axis.x.height=0 to be applied

Fix conditional to check given value is numeric Fix #3424
naver · Sep 15, 2023 · 0c562c3 · 0c562c3
1 parent 20fc229
commit 0c562c3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/src/ChartInternal/internals/domain.ts b/src/ChartInternal/internals/domain.ts
@@ -322,7 +322,7 @@ export default {
 			x.domain(domain || sortValue($$.getXDomain(targets), !config.axis_x_inverted));
 			org.xDomain = x.domain();
 
-			zoomEnabled && $$.zoom.updateScaleExtent();
+			// zoomEnabled && $$.zoom.updateScaleExtent();
 
 			subX.domain(x.domain());
 			$$.brush?.scale(subX);
@@ -333,6 +333,10 @@ export default {
 				org.xDomain : getBrushSelection($$).map(subX.invert);
 
 			x.domain(domainValue);
+			// zoomEnabled && $$.zoom.updateScaleExtent();
+		}
+
+		if (withUpdateOrgXDomain || withUpdateXDomain) {
 			zoomEnabled && $$.zoom.updateScaleExtent();
 		}
 

diff --git a/src/ChartInternal/internals/size.axis.ts b/src/ChartInternal/internals/size.axis.ts
@@ -2,6 +2,7 @@
  * Copyright (c) 2017 ~ present NAVER Corp.
  * billboard.js project is licensed under the MIT license
  */
+import {isNumber} from "../../module/util";
 import type {AxisType} from "../../../types/types";
 
 export default {
@@ -52,7 +53,7 @@ export default {
 			return 8;
 		}
 
-		if (id === "x" && config.axis_x_height) {
+		if (id === "x" && isNumber(config.axis_x_height)) {
 			return config.axis_x_height;
 		}
 

diff --git a/test/internals/axis-x-spec.ts b/test/internals/axis-x-spec.ts
@@ -228,7 +228,7 @@ describe("X AXIS", function() {
 			});
 		});
 
-		describe("", () => {
+		describe("x Axis dimension", () => {
 			before(() => {
 				args = {
 					data: {
@@ -243,9 +243,9 @@ describe("X AXIS", function() {
 						x: {
 							type: "category",
 							tick: {
-							rotate: 75,
-							multiline: false,
-							tooltip: true
+								rotate: 75,
+								multiline: false,
+								tooltip: true
 							},
 							height: 130
 						}
@@ -260,6 +260,33 @@ describe("X AXIS", function() {
 				expect(axisRect.height).to.be.below(+clipRect.attr("height"));		
 				expect(+clipRect.attr("y") > -50).to.be.be.ok;
 			});
+
+			it("set options", () => {
+				args = {
+					data: {
+						columns: [
+							["pv", 90, 100, 140]
+						],
+						type: "bar"
+					},
+					legend: {
+						show: false
+					},
+					axis: {
+						x: {
+							height: 0
+						}
+					}
+				};
+			});
+
+			it("x axis height option should be applied", () => {
+				const {$: {main}, internal: {state}} = chart;
+
+				expect(
+					main.select(`.${$AXIS.axisX}`).node().getBoundingClientRect().y
+				).to.be.above(state.height);
+			});
 		});
 	});
 });