@coinbase/cds-mobile-visualization 3.4.0-beta.8 → 3.4.0

package/esm/chart/bar/BarStack.js

@@ -1,13 +1,16 @@
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import React, { memo, useMemo } from 'react';
 import { useTheme } from '@coinbase/cds-mobile/hooks/useTheme';
 import { useCartesianChartContext } from '../ChartProvider';
-import { evaluateGradientAtValue, getGradientStops } from '../utils/gradient';
+import { EPSILON, getBars, getStackBaseline, getStackOrigin } from '../utils/bar';
+import { getGradientStops } from '../utils/gradient';
 import { convertToSerializableScale } from '../utils/scale';
 import { Bar } from './Bar';
 import { DefaultBarStack } from './DefaultBarStack';
+
+/**
+ * Extended series type that includes bar-specific properties.
+ */
 import { jsx as _jsx } from "react/jsx-runtime";
-const EPSILON = 1e-4;
 /**
  * BarStack component that renders a single stack of bars at a specific category index.
  * Handles the stacking logic for bars within a single category.
@@ -16,10 +19,13 @@ export const BarStack = /*#__PURE__*/memo(_ref => {
   let {
     series,
     categoryIndex,
-    x,
-    width,
-    yScale,
+    indexPos,
+    thickness,
+    indexScale,
+    valueScale,
     rect,
+    xAxisId,
+    yAxisId,
     BarComponent: defaultBarComponent,
     fillOpacity: defaultFillOpacity,
     stroke: defaultStroke,
@@ -30,28 +36,23 @@ export const BarStack = /*#__PURE__*/memo(_ref => {
     barMinSize,
     stackMinSize,
     roundBaseline,
+    transitions,
     transition
   } = _ref;
   const theme = useTheme();
   const {
+    layout,
     getSeriesData,
     getXAxis,
-    getXScale
+    getYAxis
   } = useCartesianChartContext();
-  const xAxis = getXAxis();
-  const xScale = getXScale();
-  const baseline = useMemo(() => {
-    var _yScale;
-    const domain = yScale.domain();
-    const [domainMin, domainMax] = domain;
-    const baselineValue = domainMin >= 0 ? domainMin : domainMax <= 0 ? domainMax : 0;
-    const baseline = (_yScale = yScale(baselineValue)) != null ? _yScale : rect.y + rect.height;
-    return Math.max(rect.y, Math.min(baseline, rect.y + rect.height));
-  }, [rect.height, rect.y, yScale]);
+  const xAxis = getXAxis(xAxisId);
+  const yAxis = getYAxis(yAxisId);
+  const baseline = useMemo(() => getStackBaseline(valueScale, rect, layout), [rect, valueScale, layout]);
   const seriesGradients = useMemo(() => {
     return series.map(s => {
-      if (!s.gradient || !xScale || !yScale) return;
-      const gradientScale = s.gradient.axis === 'x' ? xScale : yScale;
+      if (!s.gradient) return;
+      const gradientScale = s.gradient.axis === 'x' ? layout === 'vertical' ? indexScale : valueScale : layout === 'vertical' ? valueScale : indexScale;
       const serializableScale = convertToSerializableScale(gradientScale);
       if (!serializableScale) return;
       const domain = {
@@ -66,486 +67,102 @@ export const BarStack = /*#__PURE__*/memo(_ref => {
         stops
       };
     });
-  }, [series, xScale, yScale]);
-
-  // Calculate bars for this specific category
-  const {
-    bars,
-    stackRect
-  } = useMemo(() => {
-    let allBars = [];
-
-    // Track how many bars we've stacked in each direction for gap calculation
-    let positiveBarCount = 0;
-    let negativeBarCount = 0;
-
-    // Track stack bounds for clipping
-    let minY = Infinity;
-    let maxY = -Infinity;
-
-    // Process each series in the stack
-    series.forEach(s => {
-      var _yScale2, _yScale3;
-      const data = getSeriesData(s.id);
-      if (!data) return;
-      const value = data[categoryIndex];
-      if (value === null || value === undefined) return;
-      const originalData = s.data;
-      const originalValue = originalData == null ? void 0 : originalData[categoryIndex];
-      // Only apply gap logic if the original data wasn't tuple format
-      const shouldApplyGap = !Array.isArray(originalValue);
-
-      // Sort to be in ascending order
-      const [bottom, top] = value.sort((a, b) => a - b);
-      const isAboveBaseline = bottom >= 0 && top !== bottom;
-      const isBelowBaseline = bottom <= 0 && bottom !== top;
-      const barBottom = (_yScale2 = yScale(bottom)) != null ? _yScale2 : baseline;
-      const barTop = (_yScale3 = yScale(top)) != null ? _yScale3 : baseline;
-
-      // Track bar counts for later gap calculations
-      if (shouldApplyGap) {
-        if (isAboveBaseline) {
-          positiveBarCount++;
-        } else if (isBelowBaseline) {
-          negativeBarCount++;
-        }
-      }
-
-      // Calculate height (remember SVG y coordinates are inverted)
-      const height = Math.abs(barBottom - barTop);
-      const y = Math.min(barBottom, barTop);
-
-      // Skip bars that would have zero or negative height
-      if (height <= 0) {
-        return;
-      }
-
-      // Update stack bounds
-      minY = Math.min(minY, y);
-      maxY = Math.max(maxY, y + height);
-
-      // Determine fill color, respecting gradient if present
-      let barFill = s.color || theme.color.fgPrimary;
-
-      // Evaluate gradient if provided (using precomputed stops)
-      const seriesGradientConfig = seriesGradients.find(g => (g == null ? void 0 : g.seriesId) === s.id);
-      if (seriesGradientConfig) {
-        var _seriesGradientConfig;
-        const axis = (_seriesGradientConfig = seriesGradientConfig.gradient.axis) != null ? _seriesGradientConfig : 'y';
-        // For x-axis gradient, use the categoryIndex
-        // For y-axis gradient, use the actual data value
-        const dataValue = axis === 'x' ? categoryIndex : top;
-        const evaluatedColor = evaluateGradientAtValue(seriesGradientConfig.stops, dataValue, seriesGradientConfig.scale);
-        if (evaluatedColor) {
-          // Only apply gradient color if fill is not explicitly set
-          barFill = evaluatedColor;
-        }
-      }
-      allBars.push({
-        seriesId: s.id,
-        x,
-        y,
-        width,
-        height,
-        dataY: value,
-        // Store the actual data value
-        fill: barFill,
-        // Check if the bar should be rounded based on the baseline, with an epsilon to handle floating-point rounding
-        roundTop: roundBaseline || Math.abs(barTop - baseline) >= EPSILON,
-        roundBottom: roundBaseline || Math.abs(barBottom - baseline) >= EPSILON,
-        shouldApplyGap
-      });
-    });
-
-    // Apply proportional gap distribution to maintain total stack height
-    if (stackGap && allBars.length > 1) {
-      // Separate bars by baseline side
-      const barsAboveBaseline = allBars.filter(bar => {
-        const [bottom, top] = bar.dataY.sort((a, b) => a - b);
-        return bottom >= 0 && top !== bottom && bar.shouldApplyGap;
-      });
-      const barsBelowBaseline = allBars.filter(bar => {
-        const [bottom, top] = bar.dataY.sort((a, b) => a - b);
-        return bottom <= 0 && bottom !== top && bar.shouldApplyGap;
-      });
-
-      // Apply proportional gaps to bars above baseline
-      if (barsAboveBaseline.length > 1) {
-        const totalGapSpace = stackGap * (barsAboveBaseline.length - 1);
-        const totalDataHeight = barsAboveBaseline.reduce((sum, bar) => sum + bar.height, 0);
-        const heightReduction = totalGapSpace / totalDataHeight;
-
-        // Sort bars by position (from baseline upward)
-        const sortedBars = barsAboveBaseline.sort((a, b) => b.y - a.y);
-        let currentY = baseline;
-        sortedBars.forEach((bar, index) => {
-          // Reduce bar height proportionally
-          const newHeight = bar.height * (1 - heightReduction);
-          const newY = currentY - newHeight;
-
-          // Update the bar in allBars array
-          const barIndex = allBars.findIndex(b => b.seriesId === bar.seriesId);
-          if (barIndex !== -1) {
-            allBars[barIndex] = _extends({}, allBars[barIndex], {
-              height: newHeight,
-              y: newY
-            });
-          }
-
-          // Move to next position (include gap for next bar)
-          currentY = newY - (index < sortedBars.length - 1 ? stackGap : 0);
-        });
-      }
-
-      // Apply proportional gaps to bars below baseline
-      if (barsBelowBaseline.length > 1) {
-        const totalGapSpace = stackGap * (barsBelowBaseline.length - 1);
-        const totalDataHeight = barsBelowBaseline.reduce((sum, bar) => sum + bar.height, 0);
-        const heightReduction = totalGapSpace / totalDataHeight;
-
-        // Sort bars by position (from baseline downward)
-        const sortedBars = barsBelowBaseline.sort((a, b) => a.y - b.y);
-        let currentY = baseline;
-        sortedBars.forEach((bar, index) => {
-          // Reduce bar height proportionally
-          const newHeight = bar.height * (1 - heightReduction);
-
-          // Update the bar in allBars array
-          const barIndex = allBars.findIndex(b => b.seriesId === bar.seriesId);
-          if (barIndex !== -1) {
-            allBars[barIndex] = _extends({}, allBars[barIndex], {
-              height: newHeight,
-              y: currentY
-            });
-          }
-
-          // Move to next position (include gap for next bar)
-          currentY = currentY + newHeight + (index < sortedBars.length - 1 ? stackGap : 0);
-        });
-      }
-
-      // Recalculate stack bounds after gap adjustments
-      if (allBars.length > 0) {
-        minY = Math.min(...allBars.map(bar => bar.y));
-        maxY = Math.max(...allBars.map(bar => bar.y + bar.height));
-      }
-    }
-
-    // Apply barMinSize constraints
-    if (barMinSize) {
-      // First, expand bars that need it and track the expansion
-      const expandedBars = allBars.map((bar, index) => {
-        if (bar.height < barMinSize) {
-          var _yScale4, _yScale5, _yScale6, _yScale7;
-          const heightIncrease = barMinSize - bar.height;
-          const [bottom, top] = bar.dataY.sort((a, b) => a - b);
-
-          // Determine how to expand the bar
-          let newBottom = bottom;
-          let newTop = top;
-          const scaleUnit = Math.abs(((_yScale4 = yScale(1)) != null ? _yScale4 : 0) - ((_yScale5 = yScale(0)) != null ? _yScale5 : 0));
-          if (bottom === 0) {
-            // Expand away from baseline (upward for positive)
-            newTop = top + heightIncrease / scaleUnit;
-          } else if (top === 0) {
-            // Expand away from baseline (downward for negative)
-            newBottom = bottom - heightIncrease / scaleUnit;
-          } else {
-            // Expand in both directions
-            const halfIncrease = heightIncrease / scaleUnit / 2;
-            newBottom = bottom - halfIncrease;
-            newTop = top + halfIncrease;
-          }
-
-          // Recalculate bar position with new data values
-          const newBarBottom = (_yScale6 = yScale(newBottom)) != null ? _yScale6 : baseline;
-          const newBarTop = (_yScale7 = yScale(newTop)) != null ? _yScale7 : baseline;
-          const newHeight = Math.abs(newBarBottom - newBarTop);
-          const newY = Math.min(newBarBottom, newBarTop);
-          return _extends({}, bar, {
-            height: newHeight,
-            y: newY,
-            wasExpanded: true
-          });
-        }
-        return _extends({}, bar, {
-          wasExpanded: false
-        });
-      });
-
-      // Now reposition all bars to avoid overlaps, similar to stackMinSize logic
-
-      // Sort bars by position to maintain order
-      const sortedExpandedBars = [...expandedBars].sort((a, b) => a.y - b.y);
-
-      // Determine if we have bars above and below baseline
-      const barsAboveBaseline = sortedExpandedBars.filter(bar => bar.y + bar.height <= baseline);
-      const barsBelowBaseline = sortedExpandedBars.filter(bar => bar.y >= baseline);
-
-      // Create a map of new positions
-      const newPositions = new Map();
-
-      // Start positioning from the baseline and work outward
-      let currentYAbove = baseline; // Start at baseline, work upward (decreasing Y)
-      let currentYBelow = baseline; // Start at baseline, work downward (increasing Y)
-
-      // Position bars above baseline (positive values, decreasing Y)
-      for (let i = barsAboveBaseline.length - 1; i >= 0; i--) {
-        const bar = barsAboveBaseline[i];
-        const newY = currentYAbove - bar.height;
-        newPositions.set(bar.seriesId, {
-          y: newY,
-          height: bar.height
-        });
-
-        // Update currentYAbove for next bar (preserve gaps)
-        if (i > 0) {
-          const currentBar = barsAboveBaseline[i];
-          const nextBar = barsAboveBaseline[i - 1];
-          // Find original bars to get original gap
-          const originalCurrent = allBars.find(b => b.seriesId === currentBar.seriesId);
-          const originalNext = allBars.find(b => b.seriesId === nextBar.seriesId);
-          const originalGap = originalCurrent.y - (originalNext.y + originalNext.height);
-          currentYAbove = newY - originalGap;
-        }
-      }
-
-      // Position bars below baseline (negative values, increasing Y)
-      for (let i = 0; i < barsBelowBaseline.length; i++) {
-        const bar = barsBelowBaseline[i];
-        const newY = currentYBelow;
-        newPositions.set(bar.seriesId, {
-          y: newY,
-          height: bar.height
-        });
-
-        // Update currentYBelow for next bar (preserve gaps)
-        if (i < barsBelowBaseline.length - 1) {
-          const currentBar = barsBelowBaseline[i];
-          const nextBar = barsBelowBaseline[i + 1];
-          // Find original bars to get original gap
-          const originalCurrent = allBars.find(b => b.seriesId === currentBar.seriesId);
-          const originalNext = allBars.find(b => b.seriesId === nextBar.seriesId);
-          const originalGap = originalNext.y - (originalCurrent.y + originalCurrent.height);
-          currentYBelow = newY + bar.height + originalGap;
-        }
-      }
-
-      // Apply new positions to all bars
-      allBars = expandedBars.map(bar => {
-        const newPos = newPositions.get(bar.seriesId);
-        if (newPos) {
-          return _extends({}, bar, {
-            y: newPos.y,
-            height: newPos.height
-          });
-        }
-        return bar;
-      });
-
-      // Recalculate stack bounds after barMinSize expansion and repositioning
-      if (allBars.length > 0) {
-        minY = Math.min(...allBars.map(bar => bar.y));
-        maxY = Math.max(...allBars.map(bar => bar.y + bar.height));
-      }
-    }
-
-    // Apply border radius logic (will be reapplied after stackMinSize if needed)
-    const applyBorderRadiusLogic = bars => {
-      return bars.sort((a, b) => b.y - a.y).map((a, index) => {
-        const barBefore = index > 0 ? bars[index - 1] : null;
-        const barAfter = index < bars.length - 1 ? bars[index + 1] : null;
-        const shouldRoundTop = index === bars.length - 1 || a.shouldApplyGap && stackGap || !a.shouldApplyGap && barAfter && barAfter.y + barAfter.height !== a.y;
-        const shouldRoundBottom = index === 0 || a.shouldApplyGap && stackGap || !a.shouldApplyGap && barBefore && barBefore.y !== a.y + a.height;
-        return _extends({}, a, {
-          roundTop: Boolean(a.roundTop && shouldRoundTop),
-          roundBottom: Boolean(a.roundBottom && shouldRoundBottom)
-        });
-      });
-    };
-    allBars = applyBorderRadiusLogic(allBars);
-
-    // Calculate the bounding rect for the entire stack
-    let stackBounds = {
-      x,
-      y: minY === Infinity ? baseline : minY,
-      width,
-      height: maxY === -Infinity ? 0 : maxY - minY
-    };
-
-    // Apply stackMinSize constraints
-    if (stackMinSize) {
-      if (allBars.length === 1 && stackBounds.height < stackMinSize) {
-        var _yScale8, _yScale9, _yScale0, _yScale1;
-        // For single bars (non-stacked), treat stackMinSize like barMinSize
-
-        const bar = allBars[0];
-        const heightIncrease = stackMinSize - bar.height;
-        const [bottom, top] = bar.dataY.sort((a, b) => a - b);
-
-        // Determine how to expand the bar (same logic as barMinSize)
-        let newBottom = bottom;
-        let newTop = top;
-        const scaleUnit = Math.abs(((_yScale8 = yScale(1)) != null ? _yScale8 : 0) - ((_yScale9 = yScale(0)) != null ? _yScale9 : 0));
-        if (bottom === 0) {
-          // Expand away from baseline (upward for positive)
-          newTop = top + heightIncrease / scaleUnit;
-        } else if (top === 0) {
-          // Expand away from baseline (downward for negative)
-          newBottom = bottom - heightIncrease / scaleUnit;
-        } else {
-          // Expand in both directions
-          const halfIncrease = heightIncrease / scaleUnit / 2;
-          newBottom = bottom - halfIncrease;
-          newTop = top + halfIncrease;
-        }
-
-        // Recalculate bar position with new data values
-        const newBarBottom = (_yScale0 = yScale(newBottom)) != null ? _yScale0 : baseline;
-        const newBarTop = (_yScale1 = yScale(newTop)) != null ? _yScale1 : baseline;
-        const newHeight = Math.abs(newBarBottom - newBarTop);
-        const newY = Math.min(newBarBottom, newBarTop);
-        allBars[0] = _extends({}, bar, {
-          height: newHeight,
-          y: newY
-        });
-
-        // Recalculate stack bounds
-        stackBounds = {
-          x,
-          y: newY,
-          width,
-          height: newHeight
-        };
-      } else if (allBars.length > 1 && stackBounds.height < stackMinSize) {
-        // For multiple bars (stacked), scale heights while preserving gaps
-
-        // Calculate total bar height (excluding gaps)
-        const totalBarHeight = allBars.reduce((sum, bar) => sum + bar.height, 0);
-        const totalGapHeight = stackBounds.height - totalBarHeight;
-
-        // Calculate how much we need to increase bar heights
-        const requiredBarHeight = stackMinSize - totalGapHeight;
-        const barScaleFactor = requiredBarHeight / totalBarHeight;
-
-        // Sort bars by position to maintain order
-        const sortedBars = [...allBars].sort((a, b) => a.y - b.y);
-
-        // Determine if we have bars above and below baseline
-        const barsAboveBaseline = sortedBars.filter(bar => bar.y + bar.height <= baseline);
-        const barsBelowBaseline = sortedBars.filter(bar => bar.y >= baseline);
-
-        // Create a map of new positions
-        const newPositions = new Map();
-
-        // Start positioning from the baseline and work outward
-        let currentYAbove = baseline; // Start at baseline, work upward (decreasing Y)
-        let currentYBelow = baseline; // Start at baseline, work downward (increasing Y)
-
-        // Position bars above baseline (positive values, decreasing Y)
-        for (let i = barsAboveBaseline.length - 1; i >= 0; i--) {
-          const bar = barsAboveBaseline[i];
-          const newHeight = bar.height * barScaleFactor;
-          const newY = currentYAbove - newHeight;
-          newPositions.set(bar.seriesId, {
-            y: newY,
-            height: newHeight
-          });
-
-          // Update currentYAbove for next bar (preserve gaps)
-          if (i > 0) {
-            const currentBar = barsAboveBaseline[i];
-            const nextBar = barsAboveBaseline[i - 1];
-            const originalGap = currentBar.y - (nextBar.y + nextBar.height);
-            currentYAbove = newY - originalGap;
-          }
-        }
-
-        // Position bars below baseline (negative values, increasing Y)
-        for (let i = 0; i < barsBelowBaseline.length; i++) {
-          const bar = barsBelowBaseline[i];
-          const newHeight = bar.height * barScaleFactor;
-          const newY = currentYBelow;
-          newPositions.set(bar.seriesId, {
-            y: newY,
-            height: newHeight
-          });
-
-          // Update currentYBelow for next bar (preserve gaps)
-          if (i < barsBelowBaseline.length - 1) {
-            const currentBar = barsBelowBaseline[i];
-            const nextBar = barsBelowBaseline[i + 1];
-            const originalGap = nextBar.y - (currentBar.y + currentBar.height);
-            currentYBelow = newY + newHeight + originalGap;
-          }
-        }
-
-        // Apply new positions to all bars
-        allBars = allBars.map(bar => {
-          const newPos = newPositions.get(bar.seriesId);
-          if (!newPos) return bar;
-          return _extends({}, bar, {
-            height: newPos.height,
-            y: newPos.y
-          });
-        });
-
-        // Recalculate stack bounds
-        const newMinY = Math.min(...allBars.map(bar => bar.y));
-        const newMaxY = Math.max(...allBars.map(bar => bar.y + bar.height));
-        stackBounds = {
-          x,
-          y: newMinY,
-          width,
-          height: newMaxY - newMinY
-        };
-      }
-
-      // Reapply border radius logic only if we actually scaled
-      if (stackBounds.height < stackMinSize) {
-        allBars = applyBorderRadiusLogic(allBars);
-      }
+  }, [series, indexScale, valueScale, layout]);
+  const categoryAxis = layout === 'vertical' ? xAxis : yAxis;
+  const categoryData = categoryAxis != null && categoryAxis.data && Array.isArray(categoryAxis.data) && typeof categoryAxis.data[0] === 'number' ? categoryAxis.data : undefined;
+  const categoryValue = categoryData ? categoryData[categoryIndex] : categoryIndex;
+  const seriesData = useMemo(() => Object.fromEntries(series.map(s => {
+    var _getSeriesData;
+    return [s.id, (_getSeriesData = getSeriesData(s.id)) != null ? _getSeriesData : []];
+  })), [series, getSeriesData]);
+  const bars = useMemo(() => getBars({
+    series,
+    seriesData,
+    categoryIndex,
+    categoryValue,
+    indexPos,
+    thickness,
+    valueScale,
+    seriesGradients,
+    roundBaseline,
+    layout,
+    baseline,
+    stackGap,
+    barMinSize,
+    stackMinSize,
+    defaultFill: theme.color.fgPrimary,
+    borderRadius,
+    defaultFillOpacity,
+    defaultStroke,
+    defaultStrokeWidth,
+    defaultBarComponent
+  }), [series, seriesData, indexPos, thickness, categoryIndex, categoryValue, roundBaseline, baseline, stackGap, barMinSize, stackMinSize, valueScale, seriesGradients, theme.color.fgPrimary, layout, borderRadius, defaultFillOpacity, defaultStroke, defaultStrokeWidth, defaultBarComponent]);
+  const stackRect = useMemo(() => {
+    if (bars.length === 0) {
+      return {
+        x: layout === 'vertical' ? indexPos : baseline,
+        y: layout === 'vertical' ? baseline : indexPos,
+        width: layout === 'vertical' ? thickness : 0,
+        height: layout === 'vertical' ? 0 : thickness
+      };
     }
+    const minX = Math.min(...bars.map(b => b.x));
+    const minY = Math.min(...bars.map(b => b.y));
+    const maxX = Math.max(...bars.map(b => b.x + b.width));
+    const maxY = Math.max(...bars.map(b => b.y + b.height));
     return {
-      bars: allBars,
-      stackRect: stackBounds
+      x: minX,
+      y: minY,
+      width: maxX - minX,
+      height: maxY - minY
     };
-  }, [series, x, width, getSeriesData, categoryIndex, roundBaseline, baseline, stackGap, barMinSize, stackMinSize, yScale, seriesGradients, theme.color.fgPrimary]);
-  const xData = xAxis != null && xAxis.data && Array.isArray(xAxis.data) && typeof xAxis.data[0] === 'number' ? xAxis.data : undefined;
-  const dataX = xData ? xData[categoryIndex] : categoryIndex;
+  }, [bars, baseline, indexPos, layout, thickness]);
+  const stackOrigin = useMemo(() => {
+    var _getStackOrigin;
+    return (_getStackOrigin = getStackOrigin(bars.map(b => b.origin), bars.map(b => {
+      var _b$minSize;
+      return (_b$minSize = b.minSize) != null ? _b$minSize : 0;
+    }))) != null ? _getStackOrigin : baseline;
+  }, [bars, baseline]);
   const barElements = bars.map((bar, index) => /*#__PURE__*/_jsx(Bar, {
-    BarComponent: defaultBarComponent,
-    borderRadius: borderRadius,
-    dataX: dataX,
+    BarComponent: bar.BarComponent,
+    borderRadius: bar.borderRadius,
+    dataX: bar.dataX,
     dataY: bar.dataY,
     fill: bar.fill,
-    fillOpacity: defaultFillOpacity,
+    fillOpacity: bar.fillOpacity,
     height: bar.height,
-    originY: baseline,
+    minSize: bar.minSize,
+    origin: bar.origin,
     roundBottom: bar.roundBottom,
     roundTop: bar.roundTop,
-    stroke: defaultStroke,
-    strokeWidth: defaultStrokeWidth,
+    seriesId: bar.seriesId,
+    stroke: bar.stroke,
+    strokeWidth: bar.strokeWidth,
     transition: transition,
+    transitions: transitions,
     width: bar.width,
     x: bar.x,
     y: bar.y
   }, bar.seriesId + "-" + categoryIndex + "-" + index));
-
-  // Check if the bar should be rounded based on the baseline, with an epsilon to handle floating-point rounding
-  const stackRoundBottom = roundBaseline || Math.abs(stackRect.y + stackRect.height - baseline) >= EPSILON;
-  const stackRoundTop = roundBaseline || Math.abs(stackRect.y - baseline) >= EPSILON;
+  const edge = layout === 'vertical' ? stackRect.y : stackRect.x;
+  const size = layout === 'vertical' ? stackRect.height : stackRect.width;
+  const stackRoundLower = roundBaseline || Math.abs(edge - baseline) >= EPSILON;
+  const stackRoundHigher = roundBaseline || Math.abs(edge + size - baseline) >= EPSILON;
+  const stackRoundTop = layout === 'vertical' ? stackRoundLower : stackRoundHigher;
+  const stackRoundBottom = layout === 'vertical' ? stackRoundHigher : stackRoundLower;
   return /*#__PURE__*/_jsx(BarStackComponent, {
     borderRadius: borderRadius,
     categoryIndex: categoryIndex,
     height: stackRect.height,
+    origin: stackOrigin,
     roundBottom: stackRoundBottom,
     roundTop: stackRoundTop,
     transition: transition,
+    transitions: transitions,
     width: stackRect.width,
     x: stackRect.x,
     y: stackRect.y,
-    yOrigin: baseline,
     children: barElements
   });
 });