@coinbase/cds-mobile-visualization 3.4.0-beta.22 → 3.4.0-beta.24

package/esm/chart/utils/path.js

@@ -1,5 +1,5 @@
-import { area as d3Area, curveBumpX, curveCatmullRom, curveLinear, curveLinearClosed, curveMonotoneX, curveNatural, curveStep, curveStepAfter, curveStepBefore, line as d3Line } from 'd3-shape';
-import { projectPoint, projectPoints } from './point';
+import { area as d3Area, curveBumpX, curveBumpY, curveCatmullRom, curveLinear, curveLinearClosed, curveMonotoneX, curveMonotoneY, curveNatural, curveStep, curveStepAfter, curveStepBefore, line as d3Line } from 'd3-shape';
+import { getPointOnScale, projectPoints } from './point';
 import { isCategoricalScale } from './scale';
 /**
  * Default enter transition for path-based components (Line, Area).
@@ -13,18 +13,23 @@ export const defaultPathEnterTransition = {
  * Get the d3 curve function for a path.
  * See https://d3js.org/d3-shape/curve
  * @param curve - The curve type. Defaults to 'linear'.
+ * @param layout - The chart layout. Defaults to 'vertical'.
  * @returns The d3 curve function.
  */
-export const getPathCurveFunction = function (curve) {
+export const getPathCurveFunction = function (curve, layout) {
   if (curve === void 0) {
     curve = 'linear';
   }
+  if (layout === void 0) {
+    layout = 'vertical';
+  }
   switch (curve) {
     case 'catmullRom':
       return curveCatmullRom;
     case 'monotone':
-      // When we support layout="vertical" this should dynamically switch to curveMonotoneY
-      return curveMonotoneX;
+      // For vertical layout, X is the independent axis (category/index), so use MonotoneX.
+      // For horizontal layout, Y is the independent axis (category/index), so use MonotoneY.
+      return layout !== 'horizontal' ? curveMonotoneX : curveMonotoneY;
     case 'natural':
       return curveNatural;
     case 'step':
@@ -34,8 +39,9 @@ export const getPathCurveFunction = function (curve) {
     case 'stepAfter':
       return curveStepAfter;
     case 'bump':
-      // When we support layout="vertical" this should dynamically switch to curveBumpY
-      return curveBumpX;
+      // For vertical layout, X is the independent axis (category/index), so use BumpX.
+      // For horizontal layout, Y is the independent axis (category/index), so use BumpY.
+      return layout !== 'horizontal' ? curveBumpX : curveBumpY;
     case 'linearClosed':
       return curveLinearClosed;
     case 'linear':
@@ -61,17 +67,21 @@ export const getLinePath = _ref => {
     xScale,
     yScale,
     xData,
-    connectNulls = false
+    yData,
+    connectNulls = false,
+    layout = 'vertical'
   } = _ref;
   if (data.length === 0) {
     return '';
   }
-  const curveFunction = getPathCurveFunction(curve);
+  const curveFunction = getPathCurveFunction(curve, layout);
   const dataPoints = projectPoints({
     data,
     xScale,
     yScale,
-    xData
+    xData,
+    yData,
+    layout
   });
 
   // When connectNulls is true, filter out null values before rendering
@@ -110,14 +120,20 @@ export const getAreaPath = _ref2 => {
     xScale,
     yScale,
     xData,
-    connectNulls = false
+    yData,
+    connectNulls = false,
+    layout = 'vertical'
   } = _ref2;
   if (data.length === 0) {
     return '';
   }
-  const curveFunction = getPathCurveFunction(curve);
-  const yDomain = yScale.domain();
-  const yMin = Math.min(...yDomain);
+  const curveFunction = getPathCurveFunction(curve, layout);
+  const categoryAxisIsX = layout !== 'horizontal';
+
+  // Determine baseline from the value scale.
+  const valueScale = categoryAxisIsX ? yScale : xScale;
+  const domain = valueScale.domain();
+  const min = Math.min(...domain);
   const normalizedData = data.map((item, index) => {
     if (item === null) {
       return null;
@@ -129,7 +145,7 @@ export const getAreaPath = _ref2 => {
       return null;
     }
     if (typeof item === 'number') {
-      return [yMin, item];
+      return [min, item];
     }
     return null;
   });
@@ -137,37 +153,28 @@ export const getAreaPath = _ref2 => {
     if (range === null) {
       return {
         x: 0,
+        y: 0,
         low: null,
         high: null,
         isValid: false
       };
     }
-    let xValue = index;
-    if (!isCategoricalScale(xScale) && xData && xData[index] !== undefined) {
-      xValue = xData[index];
+
+    // Determine the position along the independent (index/category) axis.
+    let indexValue = index;
+    const indexScale = categoryAxisIsX ? xScale : yScale;
+    const indexData = categoryAxisIsX ? xData : yData;
+    if (!isCategoricalScale(indexScale) && indexData && indexData[index] !== undefined) {
+      indexValue = indexData[index];
     }
-    const xPoint = projectPoint({
-      x: xValue,
-      y: 0,
-      xScale,
-      yScale
-    });
-    const lowPoint = projectPoint({
-      x: xValue,
-      y: range[0],
-      xScale,
-      yScale
-    });
-    const highPoint = projectPoint({
-      x: xValue,
-      y: range[1],
-      xScale,
-      yScale
-    });
+    const position = getPointOnScale(indexValue, indexScale);
+    const low = getPointOnScale(range[0], valueScale);
+    const high = getPointOnScale(range[1], valueScale);
     return {
-      x: xPoint.x,
-      low: lowPoint.y,
-      high: highPoint.y,
+      x: categoryAxisIsX ? position : 0,
+      y: !categoryAxisIsX ? position : 0,
+      low,
+      high,
       isValid: true
     };
   });
@@ -175,16 +182,25 @@ export const getAreaPath = _ref2 => {
   // When connectNulls is true, filter out invalid points before rendering
   // When false, use defined() to create gaps in the area
   const filteredPoints = connectNulls ? dataPoints.filter(d => d.isValid) : dataPoints;
-  const areaGenerator = d3Area().x(d => d.x).y0(d => {
-    var _d$low;
-    return (_d$low = d.low) != null ? _d$low : 0;
-  }) // Bottom boundary (low values), fallback to 0
-  .y1(d => {
-    var _d$high;
-    return (_d$high = d.high) != null ? _d$high : 0;
-  }) // Top boundary (high values), fallback to 0
-  .curve(curveFunction).defined(d => connectNulls || d.isValid && d.low != null && d.high != null); // Only draw where both values exist
-
+  const areaGenerator = d3Area();
+  if (categoryAxisIsX) {
+    areaGenerator.x(d => d.x).y0(d => {
+      var _d$low;
+      return (_d$low = d.low) != null ? _d$low : 0;
+    }).y1(d => {
+      var _d$high;
+      return (_d$high = d.high) != null ? _d$high : 0;
+    });
+  } else {
+    areaGenerator.y(d => d.y).x0(d => {
+      var _d$low2;
+      return (_d$low2 = d.low) != null ? _d$low2 : 0;
+    }).x1(d => {
+      var _d$high2;
+      return (_d$high2 = d.high) != null ? _d$high2 : 0;
+    });
+  }
+  areaGenerator.curve(curveFunction).defined(d => connectNulls || d.isValid && d.low != null && d.high != null);
   const result = areaGenerator(filteredPoints);
   return result != null ? result : '';
 };
@@ -216,22 +232,35 @@ export const lineToPath = (x1, y1, x2, y2) => {
  * const roundedPath = getBarPath(10, 20, 50, 100, 8, true, false);
  * ```
  */
-export const getBarPath = (x, y, width, height, radius, roundTop, roundBottom) => {
+export const getBarPath = function (x, y, width, height, radius, roundTop, roundBottom, layout) {
+  if (layout === void 0) {
+    layout = 'vertical';
+  }
+  const barsGrowVertically = layout !== 'horizontal';
   const roundBothSides = roundTop && roundBottom;
   const r = Math.min(radius, width / 2, roundBothSides ? height / 2 : height);
-  const topR = roundTop ? r : 0;
-  const bottomR = roundBottom ? r : 0;
+
+  // In vertical layout (bars grow up/down):
+  // - roundTop rounds the top face (min Y)
+  // - roundBottom rounds the bottom face (max Y)
+  // In horizontal layout (bars grow left/right):
+  // - roundTop rounds the right face (max X)
+  // - roundBottom rounds the left face (min X)
+  const rTL = barsGrowVertically ? roundTop ? r : 0 : roundBottom ? r : 0;
+  const rTR = barsGrowVertically ? roundTop ? r : 0 : roundTop ? r : 0;
+  const rBR = barsGrowVertically ? roundBottom ? r : 0 : roundTop ? r : 0;
+  const rBL = barsGrowVertically ? roundBottom ? r : 0 : roundBottom ? r : 0;
 
   // Build path with selective rounding
-  let path = "M " + (x + (roundTop ? r : 0)) + " " + y;
-  path += " L " + (x + width - topR) + " " + y;
-  path += " A " + topR + " " + topR + " 0 0 1 " + (x + width) + " " + (y + topR);
-  path += " L " + (x + width) + " " + (y + height - bottomR);
-  path += " A " + bottomR + " " + bottomR + " 0 0 1 " + (x + width - bottomR) + " " + (y + height);
-  path += " L " + (x + bottomR) + " " + (y + height);
-  path += " A " + bottomR + " " + bottomR + " 0 0 1 " + x + " " + (y + height - bottomR);
-  path += " L " + x + " " + (y + topR);
-  path += " A " + topR + " " + topR + " 0 0 1 " + (x + topR) + " " + y;
+  let path = "M " + (x + rTL) + " " + y;
+  path += " L " + (x + width - rTR) + " " + y;
+  path += " A " + rTR + " " + rTR + " 0 0 1 " + (x + width) + " " + (y + rTR);
+  path += " L " + (x + width) + " " + (y + height - rBR);
+  path += " A " + rBR + " " + rBR + " 0 0 1 " + (x + width - rBR) + " " + (y + height);
+  path += " L " + (x + rBL) + " " + (y + height);
+  path += " A " + rBL + " " + rBL + " 0 0 1 " + x + " " + (y + height - rBL);
+  path += " L " + x + " " + (y + rTL);
+  path += " A " + rTL + " " + rTL + " 0 0 1 " + (x + rTL) + " " + y;
   path += ' Z';
   return path;
 };

package/esm/chart/utils/point.js

@@ -1,4 +1,4 @@
-import { applyBandScale, applySerializableScale, isCategoricalScale, isLogScale, isNumericScale } from './scale';
+import { applyBandScale, applySerializableScale, isCategoricalScale, isLogScale } from './scale';
 
 /**
  * Position a label should be placed relative to the point
@@ -164,7 +164,8 @@ export const projectPoints = _ref3 => {
     xScale,
     yScale,
     xData,
-    yData
+    yData,
+    layout = 'vertical'
   } = _ref3;
   if (data.length === 0) {
     return [];
@@ -182,28 +183,37 @@ export const projectPoints = _ref3 => {
       });
     }
 
-    // For scales with axis data, determine the correct x value
-    let xValue = index;
+    // Determine values/scales based on role (index vs value) and layout.
+    const categoryAxisIsX = layout !== 'horizontal';
+    const indexScale = categoryAxisIsX ? xScale : yScale;
+    const indexData = categoryAxisIsX ? xData : yData;
 
-    // For band scales, always use the index
-    if (!isCategoricalScale(xScale)) {
-      // For numeric scales with axis data, use the axis data values instead of indices
-      if (xData && Array.isArray(xData) && xData.length > 0) {
-        // Check if it's numeric data
-        if (typeof xData[0] === 'number') {
-          var _numericXData$index;
-          const numericXData = xData;
-          xValue = (_numericXData$index = numericXData[index]) != null ? _numericXData$index : index;
+    // 1. Calculate position along the index axis (categorical or numeric domain).
+    let indexValue = index;
+    if (!isCategoricalScale(indexScale)) {
+      if (indexData && Array.isArray(indexData) && indexData.length > 0) {
+        if (typeof indexData[0] === 'number') {
+          var _indexData$index;
+          indexValue = (_indexData$index = indexData[index]) != null ? _indexData$index : index;
         }
       }
     }
-    let yValue = value;
-    if (isNumericScale(yScale) && yData && Array.isArray(yData) && yData.length > 0 && typeof yData[0] === 'number' && typeof value === 'number') {
-      yValue = value;
+
+    // 2. Calculate position along the value axis (measured magnitude).
+    const valueAsNumber = value;
+
+    // 3. Project final coordinates based on layout.
+    if (categoryAxisIsX) {
+      return projectPoint({
+        x: indexValue,
+        y: valueAsNumber,
+        xScale,
+        yScale
+      });
     }
     return projectPoint({
-      x: xValue,
-      y: yValue,
+      x: valueAsNumber,
+      y: indexValue,
       xScale,
       yScale
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coinbase/cds-mobile-visualization",
-  "version": "3.4.0-beta.22",
+  "version": "3.4.0-beta.24",
   "description": "Coinbase Design System - Mobile Visualization Native",
   "repository": {
     "type": "git",
@@ -36,9 +36,9 @@
     "CHANGELOG"
   ],
   "peerDependencies": {
-    "@coinbase/cds-common": "^8.49.0",
+    "@coinbase/cds-common": "^8.52.2",
     "@coinbase/cds-lottie-files": "^3.3.4",
-    "@coinbase/cds-mobile": "^8.49.0",
+    "@coinbase/cds-mobile": "^8.52.2",
     "@coinbase/cds-utils": "^2.3.5",
     "@shopify/react-native-skia": "^1.12.4 || ^2.0.0",
     "react": "^18.3.1",
@@ -57,9 +57,9 @@
     "@babel/preset-env": "^7.28.0",
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
-    "@coinbase/cds-common": "^8.49.0",
+    "@coinbase/cds-common": "^8.52.2",
     "@coinbase/cds-lottie-files": "^3.3.4",
-    "@coinbase/cds-mobile": "^8.49.0",
+    "@coinbase/cds-mobile": "^8.52.2",
     "@coinbase/cds-utils": "^2.3.5",
     "@shopify/react-native-skia": "1.12.4",
     "@types/react": "^18.3.12",