@coinbase/cds-web 9.13.0 → 9.15.0

package/esm/visualizations/chart/axis/XAxis.js

@@ -1,4 +1,4 @@
-const _excluded = ["axisId", "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"];
+const _excluded = ["axisId", "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", "tickLabelOverflow"];
 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; }
@@ -19,6 +19,7 @@ import { lineToPath } from '../utils/path';
 import { getPointOnScale } from '../utils/point';
 import { isCategoricalScale } from '../utils/scale';
 import { axisLineStyles, axisTickMarkStyles, axisUpdateAnimationTransition } from './Axis';
+import { AxisTickLabelOverflowMask } from './AxisTickLabelOverflowMask';
 import { DefaultAxisTickLabel } from './DefaultAxisTickLabel';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const AXIS_HEIGHT = 32;
@@ -54,7 +55,8 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
       height = label ? AXIS_HEIGHT + LABEL_SIZE : AXIS_HEIGHT,
       testID = 'x-axis',
       bandGridLinePlacement = 'edges',
-      bandTickMarkPlacement = 'middle'
+      bandTickMarkPlacement = 'middle',
+      tickLabelOverflow = 'reposition'
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const registrationId = useId();
@@ -68,6 +70,7 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
     getAxisBounds,
     drawingArea
   } = useCartesianChartContext();
+  const fadeTickLabels = tickLabelOverflow === 'fade';
   const xScale = getXScale(axisId);
   const xAxis = getXAxis(axisId);
   const axisBounds = getAxisBounds(registrationId);
@@ -201,11 +204,12 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
           color: 'var(--color-fgMuted)',
           verticalAlignment: 'middle',
           style: styles === null || styles === void 0 ? void 0 : styles.tickLabel,
-          horizontalAlignment: 'center'
+          horizontalAlignment: 'center',
+          repositionAxes: tickLabelOverflow === 'visible' ? 'none' : fadeTickLabels ? 'y' : 'both'
         }
       };
     });
-  }, [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]);
+  }, [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, fadeTickLabels, tickLabelOverflow]);
   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;
@@ -251,12 +255,21 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
           style: styles === null || styles === void 0 ? void 0 : styles.gridLine
         }, key);
       })
-    }), chartTextData && /*#__PURE__*/_jsx(ChartTextGroup, {
+    }), chartTextData && (fadeTickLabels ? /*#__PURE__*/_jsx(AxisTickLabelOverflowMask, {
+      axis: "x",
+      testID: "".concat(testID, "-tick-label-overflow"),
+      children: /*#__PURE__*/_jsx(ChartTextGroup, {
+        prioritizeEndLabels: true,
+        LabelComponent: TickLabelComponent,
+        labels: chartTextData,
+        minGap: minTickLabelGap
+      })
+    }) : /*#__PURE__*/_jsx(ChartTextGroup, {
       prioritizeEndLabels: true,
       LabelComponent: TickLabelComponent,
       labels: chartTextData,
       minGap: minTickLabelGap
-    }), axisBounds && showTickMarks && /*#__PURE__*/_jsx("g", {
+    })), axisBounds && showTickMarks && /*#__PURE__*/_jsx("g", {
       "data-testid": "".concat(testID, "-tick-marks"),
       children: tickMarkPositions.map(_ref3 => {
         let {
@@ -303,9 +316,9 @@ export const XAxis = /*#__PURE__*/memo(_ref => {
       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",
+      repositionAxes: "none",
       style: styles === null || styles === void 0 ? void 0 : styles.label,
       testID: "".concat(testID, "-label"),
       verticalAlignment: "middle",

package/esm/visualizations/chart/axis/YAxis.js

@@ -1,4 +1,4 @@
-const _excluded = ["axisId", "position", "showGrid", "requestedTickCount", "ticks", "tickLabelFormatter", "TickLabelComponent", "style", "className", "styles", "classNames", "GridLineComponent", "LineComponent", "TickMarkLineComponent", "tickMarkLabelGap", "minTickLabelGap", "showTickMarks", "showLine", "tickMarkSize", "tickInterval", "label", "labelGap", "width", "testID", "bandGridLinePlacement", "bandTickMarkPlacement"];
+const _excluded = ["axisId", "position", "showGrid", "requestedTickCount", "ticks", "tickLabelFormatter", "TickLabelComponent", "style", "className", "styles", "classNames", "GridLineComponent", "LineComponent", "TickMarkLineComponent", "tickMarkLabelGap", "minTickLabelGap", "showTickMarks", "showLine", "tickMarkSize", "tickInterval", "label", "labelGap", "width", "testID", "bandGridLinePlacement", "bandTickMarkPlacement", "tickLabelOverflow"];
 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; }
@@ -19,6 +19,7 @@ import { lineToPath } from '../utils/path';
 import { getPointOnScale } from '../utils/point';
 import { isCategoricalScale } from '../utils/scale';
 import { axisLineStyles, axisTickMarkStyles, axisUpdateAnimationTransition } from './Axis';
+import { AxisTickLabelOverflowMask } from './AxisTickLabelOverflowMask';
 import { DefaultAxisTickLabel } from './DefaultAxisTickLabel';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const AXIS_WIDTH = 44;
@@ -52,7 +53,8 @@ export const YAxis = /*#__PURE__*/memo(_ref => {
       width = label ? AXIS_WIDTH + LABEL_SIZE : AXIS_WIDTH,
       testID = 'y-axis',
       bandGridLinePlacement = 'edges',
-      bandTickMarkPlacement = 'middle'
+      bandTickMarkPlacement = 'middle',
+      tickLabelOverflow = 'reposition'
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const registrationId = useId();
@@ -66,6 +68,7 @@ export const YAxis = /*#__PURE__*/memo(_ref => {
     getAxisBounds,
     drawingArea
   } = useCartesianChartContext();
+  const fadeTickLabels = tickLabelOverflow === 'fade';
   const yScale = getYScale(axisId);
   const yAxis = getYAxis(axisId);
   const axisBounds = getAxisBounds(registrationId);
@@ -195,11 +198,12 @@ export const YAxis = /*#__PURE__*/memo(_ref => {
           color: 'var(--color-fgMuted)',
           verticalAlignment: 'middle',
           style: styles === null || styles === void 0 ? void 0 : styles.tickLabel,
-          horizontalAlignment: position === 'left' ? 'right' : 'left'
+          horizontalAlignment: position === 'left' ? 'right' : 'left',
+          repositionAxes: tickLabelOverflow === 'visible' ? 'none' : fadeTickLabels ? 'x' : 'both'
         }
       };
     });
-  }, [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]);
+  }, [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, fadeTickLabels, tickLabelOverflow]);
   if (!yScale || !axisBounds || !drawingArea) return;
   const labelX = position === 'left' ? axisBounds.x + LABEL_SIZE / 2 : axisBounds.x + axisBounds.width - LABEL_SIZE / 2;
   const labelY = axisBounds.y + axisBounds.height / 2;
@@ -245,12 +249,21 @@ export const YAxis = /*#__PURE__*/memo(_ref => {
           style: styles === null || styles === void 0 ? void 0 : styles.gridLine
         }, key);
       })
-    }), chartTextData && /*#__PURE__*/_jsx(ChartTextGroup, {
+    }), chartTextData && (fadeTickLabels ? /*#__PURE__*/_jsx(AxisTickLabelOverflowMask, {
+      axis: "y",
+      testID: "".concat(testID, "-tick-label-overflow"),
+      children: /*#__PURE__*/_jsx(ChartTextGroup, {
+        prioritizeEndLabels: true,
+        LabelComponent: TickLabelComponent,
+        labels: chartTextData,
+        minGap: minTickLabelGap
+      })
+    }) : /*#__PURE__*/_jsx(ChartTextGroup, {
       prioritizeEndLabels: true,
       LabelComponent: TickLabelComponent,
       labels: chartTextData,
       minGap: minTickLabelGap
-    }), showTickMarks && /*#__PURE__*/_jsx("g", {
+    })), showTickMarks && /*#__PURE__*/_jsx("g", {
       "data-testid": "".concat(testID, "-tick-marks"),
       children: tickMarkPositions.map(_ref3 => {
         let {
@@ -303,9 +316,9 @@ export const YAxis = /*#__PURE__*/memo(_ref => {
         transform: "rotate(".concat(position === 'left' ? -90 : 90, "deg)")
       },
       children: /*#__PURE__*/_jsx(ChartText, {
-        disableRepositioning: true,
         className: classNames === null || classNames === void 0 ? void 0 : classNames.label,
         horizontalAlignment: "center",
+        repositionAxes: "none",
         style: styles === null || styles === void 0 ? void 0 : styles.label,
         testID: "".concat(testID, "-label-text"),
         verticalAlignment: "middle",

package/esm/visualizations/chart/axis/index.js

@@ -1,5 +1,6 @@
 // codegen:start {preset: barrel, include: ./*.tsx, exclude: ./__stories__/*.tsx}
 export * from './Axis';
+export * from './AxisTickLabelOverflowMask';
 export * from './DefaultAxisTickLabel';
 export * from './XAxis';
 export * from './YAxis';

package/esm/visualizations/chart/scrubber/DefaultScrubberBeaconLabel.js

@@ -41,13 +41,13 @@ export const DefaultScrubberBeaconLabel = /*#__PURE__*/memo(_ref => {
     initial: false,
     transition: transition,
     children: /*#__PURE__*/_jsx(ChartText, _objectSpread(_objectSpread({
-      disableRepositioning: true,
       background: background,
       borderRadius: borderRadius,
       color: color,
       elevated: elevated,
       font: font,
       inset: inset,
+      repositionAxes: "none",
       verticalAlignment: verticalAlignment,
       y: transition ? 0 : y
     }, chartTextProps), {}, {

package/esm/visualizations/chart/text/ChartText.js

@@ -23,6 +23,10 @@ import { accessoryFadeTransitionDuration } from '../utils/transition';
 /**
  * Vertical alignment options for chart text.
  */
+
+/**
+ * Which axes ChartText may nudge labels along to stay in bounds.
+ */
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Get text anchor based on horizontal alignment.
@@ -60,7 +64,8 @@ export const ChartText = /*#__PURE__*/memo(_ref => {
     verticalAlignment = 'middle',
     dx,
     dy,
-    disableRepositioning,
+    disableRepositioning = false,
+    repositionAxes = disableRepositioning ? 'none' : 'both',
     bounds,
     opacity,
     testID,
@@ -92,7 +97,7 @@ export const ChartText = /*#__PURE__*/memo(_ref => {
   }), [chartWidth, chartHeight]);
   const textRef = useRef(null);
   const [textBBox, setTextBBox] = useState(null);
-  const isDimensionsReady = disableRepositioning || textRef.current !== null;
+  const isDimensionsReady = repositionAxes === 'none' || textRef.current !== null;
   const backgroundRectDimensions = useMemo(() => {
     if (!textBBox) {
       return null;
@@ -106,12 +111,8 @@ export const ChartText = /*#__PURE__*/memo(_ref => {
     };
   }, [textBBox, insetInput]);
   const overflowAmount = useMemo(() => {
-    if (disableRepositioning) {
-      return {
-        x: 0,
-        y: 0
-      };
-    }
+    const repositionX = repositionAxes === 'both' || repositionAxes === 'x';
+    const repositionY = repositionAxes === 'both' || repositionAxes === 'y';
     const parentBounds = bounds !== null && bounds !== void 0 ? bounds : fullChartBounds;
     if (!backgroundRectDimensions || !parentBounds || parentBounds.width <= 0 || parentBounds.height <= 0) {
       return {
@@ -119,23 +120,27 @@ export const ChartText = /*#__PURE__*/memo(_ref => {
         y: 0
       };
     }
-    let x = 0;
-    let y = 0;
-    if (backgroundRectDimensions.x < parentBounds.x) {
-      x = parentBounds.x - backgroundRectDimensions.x; // positive = shift right
-    } else if (backgroundRectDimensions.x + backgroundRectDimensions.width > parentBounds.x + parentBounds.width) {
-      x = parentBounds.x + parentBounds.width - (backgroundRectDimensions.x + backgroundRectDimensions.width); // negative = shift left
+    let nextX = 0;
+    let nextY = 0;
+    if (repositionX) {
+      if (backgroundRectDimensions.x < parentBounds.x) {
+        nextX = parentBounds.x - backgroundRectDimensions.x;
+      } else if (backgroundRectDimensions.x + backgroundRectDimensions.width > parentBounds.x + parentBounds.width) {
+        nextX = parentBounds.x + parentBounds.width - (backgroundRectDimensions.x + backgroundRectDimensions.width);
+      }
     }
-    if (backgroundRectDimensions.y < parentBounds.y) {
-      y = parentBounds.y - backgroundRectDimensions.y; // positive = shift down
-    } else if (backgroundRectDimensions.y + backgroundRectDimensions.height > parentBounds.y + parentBounds.height) {
-      y = parentBounds.y + parentBounds.height - (backgroundRectDimensions.y + backgroundRectDimensions.height); // negative = shift up
+    if (repositionY) {
+      if (backgroundRectDimensions.y < parentBounds.y) {
+        nextY = parentBounds.y - backgroundRectDimensions.y;
+      } else if (backgroundRectDimensions.y + backgroundRectDimensions.height > parentBounds.y + parentBounds.height) {
+        nextY = parentBounds.y + parentBounds.height - (backgroundRectDimensions.y + backgroundRectDimensions.height);
+      }
     }
     return {
-      x,
-      y
+      x: nextX,
+      y: nextY
     };
-  }, [backgroundRectDimensions, fullChartBounds, bounds, disableRepositioning]);
+  }, [backgroundRectDimensions, fullChartBounds, bounds, repositionAxes]);
 
   // Compose the final reported rect including any overflow translation applied
   const reportedRect = useMemo(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coinbase/cds-web",
-  "version": "9.13.0",
+  "version": "9.15.0",
   "description": "Coinbase Design System - Web",
   "repository": {
     "type": "git",
@@ -227,7 +227,7 @@
     "react-dom": "^18.0.0 || ~19.1.2"
   },
   "dependencies": {
-    "@coinbase/cds-common": "^9.13.0",
+    "@coinbase/cds-common": "^9.15.0",
     "@coinbase/cds-icons": "^5.21.0",
     "@coinbase/cds-illustrations": "^4.47.0",
     "@coinbase/cds-lottie-files": "^3.3.4",