@coinbase/cds-web-visualization 3.4.0-beta.2 → 3.4.0-beta.20

package/esm/chart/area/GradientArea.js

@@ -1,4 +1,4 @@
-const _excluded = ["d", "fill", "fillOpacity", "peakColor", "baselineColor", "peakOpacity", "baselineOpacity", "baseline", "yAxisId"];
+const _excluded = ["d", "fill", "fillOpacity", "peakOpacity", "baselineOpacity", "baseline", "yAxisId", "gradient", "animate", "transitions", "transition"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -6,106 +6,63 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-import { memo, useId } from 'react';
+import { memo, useId, useMemo } from 'react';
 import { useCartesianChartContext } from '../ChartProvider';
+import { Gradient } from '../gradient';
 import { Path } from '../Path';
+import { createGradient, getBaseline } from '../utils';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 /**
- * A customizable gradient area component which uses Path.
+ * A customizable gradient area component which uses Path with SVG linearGradient.
+ *
+ * When no gradient is provided, automatically creates an appropriate gradient:
+ * - For data crossing zero: Creates a diverging gradient with peak opacity at both extremes
+ *   and baseline opacity at zero (or the specified baseline).
+ * - For all-positive or all-negative data: Creates a simple gradient from baseline to peak.
  */
 export const GradientArea = /*#__PURE__*/memo(_ref => {
+  var _transitions$update;
   let {
       d,
       fill = 'var(--color-fgPrimary)',
       fillOpacity = 1,
-      peakColor,
-      baselineColor,
       peakOpacity = 0.3,
       baselineOpacity = 0,
       baseline,
-      yAxisId
+      yAxisId,
+      gradient: gradientProp,
+      animate,
+      transitions,
+      transition
     } = _ref,
     pathProps = _objectWithoutProperties(_ref, _excluded);
-  const context = useCartesianChartContext();
+  const {
+    getYAxis
+  } = useCartesianChartContext();
   const patternId = useId();
-
-  // Get the y-scale for the specified axis (or default)
-  const yScale = context.getYScale(yAxisId);
-  const yRange = yScale === null || yScale === void 0 ? void 0 : yScale.range();
-  const yDomain = yScale === null || yScale === void 0 ? void 0 : yScale.domain();
-
-  // Use chart range if available, otherwise fall back to percentage
-  const useUserSpaceUnits = yRange !== undefined;
-  const gradientY1 = useUserSpaceUnits ? yRange[1] : '0%';
-  const gradientY2 = useUserSpaceUnits ? yRange[0] : '100%';
-
-  // Auto-calculate baseline position based on domain
-  let baselinePosition;
-  let baselinePercentage;
-  if (yScale && yDomain) {
-    const [minValue, maxValue] = yDomain;
-    let dataBaseline;
-    if (minValue >= 0) {
-      // All positive: baseline at min
-      dataBaseline = minValue;
-    } else if (maxValue <= 0) {
-      // All negative: baseline at max
-      dataBaseline = maxValue;
-    } else {
-      // Crosses zero: baseline at 0
-      dataBaseline = 0;
-    }
-    if (useUserSpaceUnits) {
-      // Get the actual y coordinate for the baseline
-      const scaledValue = yScale(baseline !== null && baseline !== void 0 ? baseline : dataBaseline);
-      if (typeof scaledValue === 'number') {
-        baselinePosition = scaledValue;
-      }
-    } else {
-      // Calculate percentage position
-      baselinePercentage = "".concat((maxValue - (baseline !== null && baseline !== void 0 ? baseline : dataBaseline)) / (maxValue - minValue) * 100, "%");
-    }
-  }
-  const effectivePeakColor = peakColor !== null && peakColor !== void 0 ? peakColor : fill;
-  const effectiveBaselineColor = baselineColor !== null && baselineColor !== void 0 ? baselineColor : fill;
+  const yAxisConfig = getYAxis(yAxisId);
+  const gradient = useMemo(() => {
+    if (gradientProp) return gradientProp;
+    if (!yAxisConfig) return;
+    const baselineValue = getBaseline(yAxisConfig.domain, baseline);
+    return createGradient(yAxisConfig.domain, baselineValue, fill, peakOpacity, baselineOpacity);
+  }, [gradientProp, yAxisConfig, fill, baseline, peakOpacity, baselineOpacity]);
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx("defs", {
-      children: /*#__PURE__*/_jsx("linearGradient", {
-        gradientUnits: useUserSpaceUnits ? 'userSpaceOnUse' : 'objectBoundingBox',
+    children: [gradient && /*#__PURE__*/_jsx("defs", {
+      children: /*#__PURE__*/_jsx(Gradient, {
+        animate: animate,
+        gradient: gradient,
         id: patternId,
-        x1: useUserSpaceUnits ? 0 : '0%',
-        x2: useUserSpaceUnits ? 0 : '0%',
-        y1: gradientY1,
-        y2: gradientY2,
-        children: baselinePosition !== undefined || baselinePercentage !== undefined ? /*#__PURE__*/_jsxs(_Fragment, {
-          children: [/*#__PURE__*/_jsx("stop", {
-            offset: "0%",
-            stopColor: effectivePeakColor,
-            stopOpacity: peakOpacity
-          }), /*#__PURE__*/_jsx("stop", {
-            offset: baselinePercentage !== null && baselinePercentage !== void 0 ? baselinePercentage : "".concat((baselinePosition - yRange[1]) / (yRange[0] - yRange[1]) * 100, "%"),
-            stopColor: effectiveBaselineColor,
-            stopOpacity: baselineOpacity
-          }), /*#__PURE__*/_jsx("stop", {
-            offset: "100%",
-            stopColor: effectivePeakColor,
-            stopOpacity: peakOpacity
-          })]
-        }) : /*#__PURE__*/_jsxs(_Fragment, {
-          children: [/*#__PURE__*/_jsx("stop", {
-            offset: "0%",
-            stopColor: effectivePeakColor,
-            stopOpacity: peakOpacity
-          }), /*#__PURE__*/_jsx("stop", {
-            offset: "100%",
-            stopColor: effectiveBaselineColor,
-            stopOpacity: baselineOpacity
-          })]
-        })
+        transition: (_transitions$update = transitions === null || transitions === void 0 ? void 0 : transitions.update) !== null && _transitions$update !== void 0 ? _transitions$update : transition,
+        yAxisId: yAxisId
       })
     }), /*#__PURE__*/_jsx(Path, _objectSpread({
+      animate: animate,
       d: d,
-      fill: "url(#".concat(patternId, ")")
+      fill: gradient ? "url(#".concat(patternId, ")") : fill,
+      fillOpacity: fillOpacity,
+      transition: transition,
+      transitions: transitions
     }, pathProps))]
   });
 });

package/esm/chart/area/SolidArea.js

@@ -1,4 +1,4 @@
-const _excluded = ["d", "fill", "fillOpacity", "yAxisId", "baseline"];
+const _excluded = ["d", "fill", "fillOpacity", "yAxisId", "animate", "transitions", "transition", "gradient"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -6,24 +6,45 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-import { memo } from 'react';
+import { memo, useId } from 'react';
+import { Gradient } from '../gradient';
 import { Path } from '../Path';
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * A customizable solid area component which uses Path.
+ * When a gradient is provided, renders with gradient fill.
+ * Otherwise, renders with solid fill.
  */
 export const SolidArea = /*#__PURE__*/memo(_ref => {
+  var _transitions$update;
   let {
       d,
-      fill,
+      fill = 'var(--color-fgPrimary)',
       fillOpacity = 1,
       yAxisId,
-      baseline
+      animate,
+      transitions,
+      transition,
+      gradient
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
-  return /*#__PURE__*/_jsx(Path, _objectSpread({
-    d: d,
-    fill: fill,
-    fillOpacity: fillOpacity
-  }, props));
+    pathProps = _objectWithoutProperties(_ref, _excluded);
+  const patternId = useId();
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [gradient && /*#__PURE__*/_jsx("defs", {
+      children: /*#__PURE__*/_jsx(Gradient, {
+        animate: animate,
+        gradient: gradient,
+        id: patternId,
+        transition: (_transitions$update = transitions === null || transitions === void 0 ? void 0 : transitions.update) !== null && _transitions$update !== void 0 ? _transitions$update : transition,
+        yAxisId: yAxisId
+      })
+    }), /*#__PURE__*/_jsx(Path, _objectSpread({
+      animate: animate,
+      d: d,
+      fill: gradient ? "url(#".concat(patternId, ")") : fill,
+      fillOpacity: fillOpacity,
+      transition: transition,
+      transitions: transitions
+    }, pathProps))]
+  });
 });

package/esm/chart/axis/Axis.js

@@ -1,46 +1,11 @@
+import { accessoryFadeTransitionDuration } from '../utils';
 export const axisLineStyles = "\n  stroke: var(--color-fg);\n  stroke-linecap: square;\n  stroke-width: 1px;\n";
 export const axisTickMarkStyles = "\n  stroke: var(--color-fg);\n  stroke-linecap: square;\n  stroke-width: 1px;\n";
 
-/**
- * Animation variants for grouped axis tick labels - initial mount
- */
-export const axisTickLabelsInitialAnimationVariants = {
-  initial: {
-    opacity: 0
-  },
-  animate: {
-    opacity: 1,
-    transition: {
-      duration: 0.15,
-      delay: 0.85 // Initial animation: wait 850ms then fade in over 150ms
-    }
-  },
-  exit: {
-    opacity: 0,
-    transition: {
-      duration: 0.15
-    }
-  }
-};
-
 /**
  * Animation variants for axis elements - updates (used for both grid lines and tick labels)
  */
-export const axisUpdateAnimationVariants = {
-  initial: {
-    opacity: 0
-  },
-  animate: {
-    opacity: 1,
-    transition: {
-      duration: 0.15,
-      delay: 0.15 // For updates: fade out 150ms, then fade in 150ms
-    }
-  },
-  exit: {
-    opacity: 0,
-    transition: {
-      duration: 0.15
-    }
-  }
+export const axisUpdateAnimationTransition = {
+  duration: accessoryFadeTransitionDuration,
+  ease: 'easeOut'
 };

package/esm/chart/axis/DefaultAxisTickLabel.js

@@ -0,0 +1,15 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { memo } from 'react';
+import { ChartText } from '../text';
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * DefaultAxisTickLabel is the default label component for axis tick labels.
+ * Provides standard styling for both X and Y axis tick labels.
+ */
+export const DefaultAxisTickLabel = /*#__PURE__*/memo(props => {
+  return /*#__PURE__*/_jsx(ChartText, _objectSpread({}, props));
+});

package/esm/chart/axis/XAxis.js

@@ -1,4 +1,4 @@
-const _excluded = ["position", "showGrid", "requestedTickCount", "ticks", "tickLabelFormatter", "style", "className", "styles", "classNames", "GridLineComponent", "tickMarkLabelGap", "height", "minTickLabelGap", "showTickMarks", "showLine", "tickMarkSize", "tickInterval", "tickMinStep", "tickMaxStep"];
+const _excluded = ["position", "showGrid", "requestedTickCount", "ticks", "tickLabelFormatter", "TickLabelComponent", "style", "className", "styles", "classNames", "GridLineComponent", "LineComponent", "TickMarkLineComponent", "tickMarkLabelGap", "minTickLabelGap", "showTickMarks", "showLine", "tickMarkSize", "tickInterval", "tickMinStep", "tickMaxStep", "label", "labelGap", "height", "testID", "bandGridLinePlacement", "bandTickMarkPlacement"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -8,14 +8,18 @@ function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import { memo, useCallback, useEffect, useId, useMemo } from 'react';
 import { cx } from '@coinbase/cds-web';
-import { AnimatePresence, m as motion } from 'framer-motion';
+import { m as motion } from 'framer-motion';
 import { useCartesianChartContext } from '../ChartProvider';
 import { DottedLine } from '../line/DottedLine';
-import { ReferenceLine } from '../line/ReferenceLine';
-import { SmartChartTextGroup } from '../text/SmartChartTextGroup';
-import { getAxisTicksData, isCategoricalScale } from '../utils';
-import { axisLineStyles, axisTickLabelsInitialAnimationVariants, axisTickMarkStyles, axisUpdateAnimationVariants } from './Axis';
+import { SolidLine } from '../line/SolidLine';
+import { ChartText } from '../text/ChartText';
+import { ChartTextGroup } from '../text/ChartTextGroup';
+import { getAxisTicksData, getPointOnScale, isCategoricalScale, lineToPath, toPointAnchor } from '../utils';
+import { axisLineStyles, axisTickMarkStyles, axisUpdateAnimationTransition } from './Axis';
+import { DefaultAxisTickLabel } from './DefaultAxisTickLabel';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const AXIS_HEIGHT = 32;
+const LABEL_SIZE = 20;
 const axisTickMarkCss = "cds-axisTickMarkCss-a6j4s2q";
 const axisLineCss = "cds-axisLineCss-a12llxjj";
 export const XAxis = /*#__PURE__*/memo(_ref => {
@@ -25,20 +29,28 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
       requestedTickCount,
       ticks,
       tickLabelFormatter,
+      TickLabelComponent = DefaultAxisTickLabel,
       style,
       className,
       styles,
       classNames,
       GridLineComponent = DottedLine,
+      LineComponent = SolidLine,
+      TickMarkLineComponent = SolidLine,
       tickMarkLabelGap = 2,
-      height = 32,
       minTickLabelGap = 4,
       showTickMarks,
       showLine,
       tickMarkSize = 4,
       tickInterval = 32,
       tickMinStep = 1,
-      tickMaxStep
+      tickMaxStep,
+      label,
+      labelGap = 4,
+      height = label ? AXIS_HEIGHT + LABEL_SIZE : AXIS_HEIGHT,
+      testID = 'x-axis',
+      bandGridLinePlacement = 'edges',
+      bandTickMarkPlacement = 'middle'
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const registrationId = useId();
@@ -48,7 +60,8 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
     getXAxis,
     registerAxis,
     unregisterAxis,
-    getAxisBounds
+    getAxisBounds,
+    drawingArea
   } = useCartesianChartContext();
   const xScale = getXScale();
   const xAxis = getXAxis();
@@ -89,12 +102,6 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
       const domain = xScale.domain();
       categories = domain.map(String);
     }
-    let possibleTickValues;
-
-    // If we have discrete data, we can use the indices as possible tick values
-    if (axisData && Array.isArray(axisData) && (typeof axisData[0] === 'string' || typeof axisData[0] === 'number' && isCategoricalScale(xScale))) possibleTickValues = Array.from({
-      length: axisData.length
-    }, (_, i) => i);
     return getAxisTicksData({
       scaleFunction: xScale,
       ticks,
@@ -110,13 +117,79 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
       }
     });
   }, [ticks, xScale, requestedTickCount, tickInterval, tickMinStep, tickMaxStep, xAxis === null || xAxis === void 0 ? void 0 : xAxis.data]);
+  const isBandScale = useMemo(() => {
+    if (!xScale) return false;
+    return isCategoricalScale(xScale);
+  }, [xScale]);
+
+  // Compute grid line positions (including bounds closing line for band scales)
+  const gridLinePositions = useMemo(() => {
+    if (!xScale) return [];
+    return ticksData.flatMap((tick, index) => {
+      if (!isBandScale) {
+        return [{
+          x: tick.position,
+          key: "grid-".concat(tick.tick, "-").concat(index)
+        }];
+      }
+      const bandScale = xScale;
+      const isLastTick = index === ticksData.length - 1;
+      const isEdges = bandGridLinePlacement === 'edges';
+      const startX = getPointOnScale(tick.tick, bandScale, toPointAnchor(bandGridLinePlacement));
+      const positions = [{
+        x: startX,
+        key: "grid-".concat(tick.tick, "-").concat(index)
+      }];
+
+      // For edges on last tick, add the closing line at stepEnd
+      if (isLastTick && isEdges) {
+        const endX = getPointOnScale(tick.tick, bandScale, 'stepEnd');
+        positions.push({
+          x: endX,
+          key: "grid-".concat(tick.tick, "-").concat(index, "-end")
+        });
+      }
+      return positions;
+    });
+  }, [ticksData, xScale, isBandScale, bandGridLinePlacement]);
+
+  // Compute tick mark positions (including bounds closing tick mark for band scales)
+  const tickMarkPositions = useMemo(() => {
+    if (!xScale) return [];
+    return ticksData.flatMap((tick, index) => {
+      if (!isBandScale) {
+        return [{
+          x: tick.position,
+          key: "tick-mark-".concat(tick.tick, "-").concat(index)
+        }];
+      }
+      const bandScale = xScale;
+      const isLastTick = index === ticksData.length - 1;
+      const isEdges = bandTickMarkPlacement === 'edges';
+      const startX = getPointOnScale(tick.tick, bandScale, toPointAnchor(bandTickMarkPlacement));
+      const positions = [{
+        x: startX,
+        key: "tick-mark-".concat(tick.tick, "-").concat(index)
+      }];
+
+      // For edges on last tick, add the closing tick mark at stepEnd
+      if (isLastTick && isEdges) {
+        const endX = getPointOnScale(tick.tick, bandScale, 'stepEnd');
+        positions.push({
+          x: endX,
+          key: "tick-mark-".concat(tick.tick, "-").concat(index, "-end")
+        });
+      }
+      return positions;
+    });
+  }, [ticksData, xScale, isBandScale, bandTickMarkPlacement]);
   const chartTextData = useMemo(() => {
     if (!axisBounds) return null;
     return ticksData.map(tick => {
       const tickOffset = tickMarkLabelGap + (showTickMarks ? tickMarkSize : 0);
-      const availableSpace = axisBounds.height - tickOffset;
+      const availableSpace = AXIS_HEIGHT - tickOffset;
       const labelOffset = availableSpace / 2;
-      const labelY = position === 'top' ? axisBounds.y + labelOffset - tickOffset : axisBounds.y + labelOffset + tickOffset;
+      const labelY = position === 'top' ? axisBounds.y + axisBounds.height - tickOffset - labelOffset : axisBounds.y + labelOffset + tickOffset;
       return {
         x: tick.position,
         y: labelY,
@@ -131,64 +204,112 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
       };
     });
   }, [axisBounds, ticksData, tickMarkLabelGap, showTickMarks, tickMarkSize, position, formatTick, classNames === null || classNames === void 0 ? void 0 : classNames.tickLabel, styles === null || styles === void 0 ? void 0 : styles.tickLabel]);
-  if (!xScale) return;
+  if (!xScale || !axisBounds || !drawingArea) return;
+  const labelX = axisBounds.x + axisBounds.width / 2;
+  const labelY = position === 'bottom' ? axisBounds.y + axisBounds.height - LABEL_SIZE / 2 : axisBounds.y + LABEL_SIZE / 2;
+  const tickYTop = axisBounds.y;
+  const tickYBottom = axisBounds.y + axisBounds.height;
+  const tickYStart = position === 'bottom' ? tickYTop : tickYBottom;
+  const tickYEnd = position === 'bottom' ? tickYTop + tickMarkSize : tickYBottom - tickMarkSize;
   return /*#__PURE__*/_jsxs("g", _objectSpread(_objectSpread({
     className: cx(className, classNames === null || classNames === void 0 ? void 0 : classNames.root),
     "data-axis": "x",
     "data-position": position,
     style: _objectSpread(_objectSpread({}, style), styles === null || styles === void 0 ? void 0 : styles.root)
   }, props), {}, {
-    children: [showGrid && /*#__PURE__*/_jsx(AnimatePresence, {
-      initial: false,
-      children: ticksData.map((tick, index) => {
-        const verticalLine = /*#__PURE__*/_jsx(ReferenceLine, {
-          LineComponent: GridLineComponent,
-          dataX: tick.tick
-        });
+    children: [showGrid && /*#__PURE__*/_jsx("g", {
+      "data-testid": "".concat(testID, "-grid"),
+      children: gridLinePositions.map(_ref2 => {
+        let {
+          x,
+          key
+        } = _ref2;
         return animate ? /*#__PURE__*/_jsx(motion.g, {
-          animate: "animate",
-          exit: "exit",
-          initial: "initial",
-          variants: axisUpdateAnimationVariants,
-          children: verticalLine
-        }, "grid-".concat(tick.tick, "-").concat(index)) : /*#__PURE__*/_jsx("g", {
-          children: verticalLine
-        }, "grid-".concat(tick.tick, "-").concat(index));
-      })
-    }), chartTextData && /*#__PURE__*/_jsx(AnimatePresence, {
-      children: /*#__PURE__*/_jsx(motion.g, {
-        animate: "animate",
-        exit: "exit",
-        initial: "initial",
-        variants: animate ? axisTickLabelsInitialAnimationVariants : undefined,
-        children: /*#__PURE__*/_jsx(SmartChartTextGroup, {
-          prioritizeEndLabels: true,
-          labels: chartTextData,
-          minGap: minTickLabelGap
-        })
+          animate: {
+            opacity: 1
+          },
+          initial: {
+            opacity: 0
+          },
+          transition: axisUpdateAnimationTransition,
+          children: /*#__PURE__*/_jsx(GridLineComponent, {
+            animate: false,
+            className: classNames === null || classNames === void 0 ? void 0 : classNames.gridLine,
+            clipRect: null,
+            d: lineToPath(x, drawingArea.y, x, drawingArea.y + drawingArea.height),
+            stroke: "var(--color-bgLine)",
+            style: styles === null || styles === void 0 ? void 0 : styles.gridLine
+          })
+        }, key) : /*#__PURE__*/_jsx(GridLineComponent, {
+          animate: false,
+          className: classNames === null || classNames === void 0 ? void 0 : classNames.gridLine,
+          clipRect: null,
+          d: lineToPath(x, drawingArea.y, x, drawingArea.y + drawingArea.height),
+          stroke: "var(--color-bgLine)",
+          style: styles === null || styles === void 0 ? void 0 : styles.gridLine
+        }, key);
       })
+    }), chartTextData && /*#__PURE__*/_jsx(ChartTextGroup, {
+      prioritizeEndLabels: true,
+      LabelComponent: TickLabelComponent,
+      labels: chartTextData,
+      minGap: minTickLabelGap
     }), axisBounds && showTickMarks && /*#__PURE__*/_jsx("g", {
-      "data-testid": "tick-marks",
-      children: ticksData.map((tick, index) => {
-        const tickY = position === 'bottom' ? axisBounds.y : axisBounds.y + axisBounds.height;
-        const tickMarkSizePixels = tickMarkSize;
-        const tickY2 = position === 'bottom' ? axisBounds.y + tickMarkSizePixels : axisBounds.y + axisBounds.height - tickMarkSizePixels;
-        return /*#__PURE__*/_jsx("line", {
+      "data-testid": "".concat(testID, "-tick-marks"),
+      children: tickMarkPositions.map(_ref3 => {
+        let {
+          x,
+          key
+        } = _ref3;
+        return animate ? /*#__PURE__*/_jsx(motion.g, {
+          animate: {
+            opacity: 1
+          },
+          initial: {
+            opacity: 0
+          },
+          transition: axisUpdateAnimationTransition,
+          children: /*#__PURE__*/_jsx(TickMarkLineComponent, {
+            animate: false,
+            className: cx(axisTickMarkCss, classNames === null || classNames === void 0 ? void 0 : classNames.tickMark),
+            clipRect: null,
+            d: lineToPath(x, tickYEnd, x, tickYStart),
+            stroke: "var(--color-fg)",
+            strokeLinecap: "square",
+            strokeWidth: 1,
+            style: styles === null || styles === void 0 ? void 0 : styles.tickMark
+          })
+        }, key) : /*#__PURE__*/_jsx(TickMarkLineComponent, {
+          animate: false,
           className: cx(axisTickMarkCss, classNames === null || classNames === void 0 ? void 0 : classNames.tickMark),
-          style: styles === null || styles === void 0 ? void 0 : styles.tickMark,
-          x1: tick.position,
-          x2: tick.position,
-          y1: tickY,
-          y2: tickY2
-        }, "tick-mark-".concat(tick.tick, "-").concat(index));
+          clipRect: null,
+          d: lineToPath(x, tickYEnd, x, tickYStart),
+          stroke: "var(--color-fg)",
+          strokeLinecap: "square",
+          strokeWidth: 1,
+          style: styles === null || styles === void 0 ? void 0 : styles.tickMark
+        }, key);
       })
-    }), axisBounds && showLine && /*#__PURE__*/_jsx("line", {
+    }), showLine && /*#__PURE__*/_jsx(LineComponent, {
+      animate: false,
       className: cx(axisLineCss, classNames === null || classNames === void 0 ? void 0 : classNames.line),
-      style: styles === null || styles === void 0 ? void 0 : styles.line,
-      x1: axisBounds.x,
-      x2: axisBounds.x + axisBounds.width,
-      y1: position === 'bottom' ? axisBounds.y : axisBounds.y + axisBounds.height,
-      y2: position === 'bottom' ? axisBounds.y : axisBounds.y + axisBounds.height
+      clipRect: null,
+      d: lineToPath(axisBounds.x, position === 'bottom' ? axisBounds.y : axisBounds.y + axisBounds.height, axisBounds.x + axisBounds.width, position === 'bottom' ? axisBounds.y : axisBounds.y + axisBounds.height),
+      "data-testid": "".concat(testID, "-line"),
+      stroke: "var(--color-fg)",
+      strokeLinecap: "square",
+      strokeWidth: 1,
+      style: styles === null || styles === void 0 ? void 0 : styles.line
+    }), label && /*#__PURE__*/_jsx(ChartText, {
+      disableRepositioning: true,
+      className: classNames === null || classNames === void 0 ? void 0 : classNames.label,
+      horizontalAlignment: "center",
+      style: styles === null || styles === void 0 ? void 0 : styles.label,
+      testID: "".concat(testID, "-label"),
+      verticalAlignment: "middle",
+      x: labelX,
+      y: labelY,
+      children: label
     })]
   }));
 });