@coinbase/cds-mobile-visualization 3.4.0-beta.5 → 3.4.0-beta.7

package/esm/chart/Path.js

@@ -1,133 +1,216 @@
-const _excluded = ["clipRect", "clipOffset", "d", "fill", "stroke", "strokeWidth", "strokeOpacity", "fillOpacity", "strokeDasharray", "testID", "animate"];
-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; }
+const _excluded = ["d", "initialPath", "fill", "fillOpacity", "stroke", "strokeOpacity", "strokeWidth", "strokeCap", "strokeJoin", "children", "transition"],
+  _excluded2 = ["animate", "clipRect", "clipPath", "clipOffset", "d", "initialPath", "fill", "fillOpacity", "stroke", "strokeOpacity", "strokeWidth", "strokeCap", "strokeJoin", "children", "transition"];
 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 { memo, useCallback, useEffect, useId, useMemo, useRef } from 'react';
-import Reanimated, { runOnJS, useAnimatedProps, useAnimatedReaction, useSharedValue, withTiming } from 'react-native-reanimated';
-import { ClipPath, Defs, G, Path as SvgPath, Rect } from 'react-native-svg';
-import { usePreviousValue } from '@coinbase/cds-common/hooks/usePreviousValue';
-import * as interpolate from 'd3-interpolate-path';
+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, useEffect, useMemo } from 'react';
+import { useDerivedValue, useSharedValue, withTiming } from 'react-native-reanimated';
+import { Group, Path as SkiaPath, Skia, usePathInterpolation } from '@shopify/react-native-skia';
+import { usePathTransition } from './utils/transition';
 import { useCartesianChartContext } from './ChartProvider';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const AnimatedRect = Reanimated.createAnimatedComponent(Rect);
-const AnimatedSvgRect = /*#__PURE__*/memo(_ref => {
+import { unwrapAnimatedValue } from './utils';
+
+/**
+ * Duration in milliseconds for path enter transition.
+ */
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+export const pathEnterTransitionDuration = 500;
+const AnimatedPath = /*#__PURE__*/memo(_ref => {
+  var _d$value;
   let {
-    width,
-    totalOffset,
-    rectProps
-  } = _ref;
-  const animatedWidth = useSharedValue(width + totalOffset);
-  const animatedProps = useAnimatedProps(() => {
-    return {
-      width: animatedWidth.value
-    };
+      d = '',
+      initialPath,
+      fill,
+      fillOpacity,
+      stroke,
+      strokeOpacity,
+      strokeWidth,
+      strokeCap,
+      strokeJoin,
+      children,
+      transition
+    } = _ref,
+    pathProps = _objectWithoutPropertiesLoose(_ref, _excluded);
+  const isDAnimated = typeof d !== 'string';
+  const animatedPath = usePathTransition({
+    currentPath: isDAnimated ? (_d$value = d.value) != null ? _d$value : '' : d,
+    initialPath,
+    transition
+  });
+  const isFilled = fill !== undefined && fill !== 'none';
+  const isStroked = stroke !== undefined && stroke !== 'none';
+  const activePath = useDerivedValue(() => {
+    if (isDAnimated) {
+      var _d$value2;
+      return (_d$value2 = d.value) != null ? _d$value2 : Skia.Path.Make();
+    }
+    return animatedPath.value;
+  });
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [isFilled && /*#__PURE__*/_jsx(SkiaPath, _extends({
+      color: fill,
+      opacity: fillOpacity,
+      path: activePath,
+      style: "fill"
+    }, pathProps, {
+      children: children
+    })), isStroked && /*#__PURE__*/_jsx(SkiaPath, _extends({
+      color: stroke,
+      opacity: strokeOpacity,
+      path: activePath,
+      strokeCap: strokeCap,
+      strokeJoin: strokeJoin,
+      strokeWidth: strokeWidth,
+      style: "stroke"
+    }, pathProps, {
+      children: children
+    }))]
   });
-  useEffect(() => {
-    animatedWidth.value = withTiming(width + totalOffset, {
-      duration: 1000
-    });
-  }, [animatedWidth, width, totalOffset]);
-  return /*#__PURE__*/_jsx(AnimatedRect, _extends({
-    animatedProps: animatedProps
-  }, rectProps));
 });
-export const Path = /*#__PURE__*/memo(_ref2 => {
-  let {
+export const Path = /*#__PURE__*/memo(props => {
+  const {
+      animate: animateProp,
       clipRect,
-      clipOffset,
+      clipPath: clipPathProp,
+      clipOffset = 0,
       d = '',
+      initialPath,
       fill,
+      fillOpacity,
       stroke,
-      strokeWidth,
       strokeOpacity,
-      fillOpacity,
-      strokeDasharray,
-      testID,
-      animate: animateProp
-    } = _ref2,
-    pathProps = _objectWithoutPropertiesLoose(_ref2, _excluded);
-  const pathRef = useRef(null);
-  const {
-    animate: animateContext,
-    drawingArea: contextRect
-  } = useCartesianChartContext();
-  const rect = clipRect != null ? clipRect : contextRect;
-  const animate = animateProp != null ? animateProp : animateContext;
-  const clipPathId = useId();
-  const animationProgress = useSharedValue(0);
-  const targetPath = useMemo(() => d, [d]);
-  const previousPath = usePreviousValue(targetPath);
-  const fromPath = useMemo(() => {
-    if (!animate) return targetPath;
-    return previousPath != null ? previousPath : targetPath;
-  }, [animate, previousPath, targetPath]);
-  const pathInterpolator = useMemo(() => interpolate.interpolatePath(fromPath, targetPath), [fromPath, targetPath]);
-  const updatePath = useCallback(progress => {
-    var _pathRef$current;
-    if (!pathInterpolator) return;
-    const val = Number(progress.toFixed(4));
-    (_pathRef$current = pathRef.current) == null || _pathRef$current.setNativeProps({
-      d: pathInterpolator(val)
-    });
-  }, [pathInterpolator]);
-  useAnimatedReaction(() => animationProgress.value, progress => {
-    'worklet';
+      strokeWidth,
+      strokeCap,
+      strokeJoin,
+      children,
+      transition
+    } = props,
+    pathProps = _objectWithoutPropertiesLoose(props, _excluded2);
+  const context = useCartesianChartContext();
+  const rect = clipRect != null ? clipRect : context.drawingArea;
+  const animate = animateProp != null ? animateProp : context.animate;
+
+  // The clip offset provides extra padding to prevent path from being cut off
+  // Area charts typically use offset=0 for exact clipping, while lines use offset=2 for breathing room
+  const totalOffset = clipOffset * 2; // Applied on both sides
+
+  // Animation progress for clip path reveal
+  const clipProgress = useSharedValue(animate ? 0 : 1);
 
-    runOnJS(updatePath)(progress);
-  }, [updatePath]);
+  // Trigger clip path animation when component mounts and animate is true
   useEffect(() => {
-    if (!pathRef.current) return;
-    if (!animate || !pathInterpolator) {
-      pathRef.current.setNativeProps({
-        d: targetPath
+    if (animate) {
+      clipProgress.value = withTiming(1, {
+        duration: pathEnterTransitionDuration
       });
-      animationProgress.value = 1;
-      return;
     }
-    animationProgress.value = 0;
-    animationProgress.value = withTiming(1, {
-      duration: 200
+  }, [animate, clipProgress]);
+
+  // Create initial and target clip paths for animation
+  const {
+    initialClipPath,
+    targetClipPath
+  } = useMemo(() => {
+    if (!rect) return {
+      initialClipPath: null,
+      targetClipPath: null
+    };
+
+    // Initial clip path (width = 0)
+    const initial = Skia.Path.Make();
+    initial.addRect({
+      x: rect.x - clipOffset,
+      y: rect.y - clipOffset,
+      width: 0,
+      height: rect.height + totalOffset
     });
-  }, [animate, animationProgress, targetPath, pathInterpolator]);
-  if (!d || !rect) return;
 
-  // The clip offset provides extra padding to prevent path from being cut off
-  // Area charts typically use offset=0 for exact clipping, while lines use offset=2 for breathing room
-  const totalOffset = (clipOffset != null ? clipOffset : 0) * 2; // Applied on both sides
+    // Target clip path (full width)
+    const target = Skia.Path.Make();
+    target.addRect({
+      x: rect.x - clipOffset,
+      y: rect.y - clipOffset,
+      width: rect.width + totalOffset,
+      height: rect.height + totalOffset
+    });
+    return {
+      initialClipPath: initial,
+      targetClipPath: target
+    };
+  }, [rect, clipOffset, totalOffset]);
+
+  // Use usePathInterpolation for animated clip path
+  const animatedClipPath = usePathInterpolation(clipProgress, [0, 1], animate && initialClipPath && targetClipPath ? [initialClipPath, targetClipPath] : targetClipPath ? [targetClipPath, targetClipPath] : [Skia.Path.Make(), Skia.Path.Make()]);
 
-  return /*#__PURE__*/_jsxs(G, {
-    children: [/*#__PURE__*/_jsx(Defs, {
-      children: animate ? /*#__PURE__*/_jsx(ClipPath, {
-        id: clipPathId,
-        children: /*#__PURE__*/_jsx(AnimatedSvgRect, {
-          rectProps: {
-            height: rect.height + totalOffset,
-            x: rect.x - (clipOffset != null ? clipOffset : 0),
-            y: rect.y - (clipOffset != null ? clipOffset : 0)
-          },
-          totalOffset: totalOffset,
-          width: rect.width
-        })
-      }) : /*#__PURE__*/_jsx(ClipPath, {
-        id: clipPathId,
-        children: /*#__PURE__*/_jsx(Rect, {
-          height: contextRect.height + totalOffset,
-          width: contextRect.width + totalOffset,
-          x: contextRect.x - (clipOffset != null ? clipOffset : 0),
-          y: contextRect.y - (clipOffset != null ? clipOffset : 0)
-        })
-      })
-    }), /*#__PURE__*/_jsx(SvgPath, _extends({
-      ref: pathRef,
-      clipPath: "url(#" + clipPathId + ")",
-      clipRule: "nonzero",
-      d: fromPath,
-      fill: fill,
-      fillOpacity: fillOpacity,
-      stroke: stroke,
-      strokeDasharray: strokeDasharray,
-      strokeOpacity: strokeOpacity,
+  // Resolve the final clip path:
+  // 1. If clipPath prop was explicitly provided, use it (even if null = no clipping)
+  // 2. If animating, use the interpolated clip path
+  // 3. Otherwise, use static target clip path
+  const resolvedClipPath = useMemo(() => {
+    // If clipPath was explicitly provided (null or string), use it directly
+    if (clipPathProp !== undefined) {
+      return clipPathProp;
+    }
+
+    // If not animating or paths are null, return target clip path
+    if (!animate || !targetClipPath) {
+      return targetClipPath;
+    }
+
+    // Return undefined here since we'll use animatedClipPath directly
+    return undefined;
+  }, [clipPathProp, animate, targetClipPath]);
+
+  // Convert SVG path string to SkPath for static rendering
+  const staticPath = useDerivedValue(() => {
+    var _Skia$Path$MakeFromSV;
+    const dValue = unwrapAnimatedValue(d);
+    if (!dValue) return Skia.Path.Make();
+    return (_Skia$Path$MakeFromSV = Skia.Path.MakeFromSVGString(dValue)) != null ? _Skia$Path$MakeFromSV : Skia.Path.Make();
+  }, [d]);
+  const isFilled = fill !== undefined && fill !== 'none';
+  const isStroked = stroke !== undefined && stroke !== 'none';
+  const content = !animate ? /*#__PURE__*/_jsxs(_Fragment, {
+    children: [isFilled && /*#__PURE__*/_jsx(SkiaPath, _extends({
+      color: fill,
+      opacity: fillOpacity,
+      path: staticPath,
+      style: "fill"
+    }, pathProps, {
+      children: children
+    })), isStroked && /*#__PURE__*/_jsx(SkiaPath, _extends({
+      color: stroke,
+      opacity: strokeOpacity,
+      path: staticPath,
+      strokeCap: strokeCap,
+      strokeJoin: strokeJoin,
       strokeWidth: strokeWidth,
-      testID: testID
-    }, pathProps))]
+      style: "stroke"
+    }, pathProps, {
+      children: children
+    }))]
+  }) : /*#__PURE__*/_jsx(AnimatedPath, {
+    d: d,
+    fill: fill,
+    fillOpacity: fillOpacity,
+    initialPath: initialPath,
+    stroke: stroke,
+    strokeCap: strokeCap,
+    strokeJoin: strokeJoin,
+    strokeOpacity: strokeOpacity,
+    strokeWidth: strokeWidth,
+    transition: transition,
+    children: children
+  });
+
+  // Determine which clip path to use
+  const finalClipPath = animate && resolvedClipPath === undefined ? animatedClipPath : resolvedClipPath;
+
+  // If finalClipPath is null, render without clipping
+  if (finalClipPath === null) {
+    return content;
+  }
+  return /*#__PURE__*/_jsx(Group, {
+    clip: finalClipPath,
+    children: content
   });
 });

package/esm/chart/PeriodSelector.js

@@ -55,7 +55,7 @@ export const PeriodSelectorActiveIndicator = _ref => {
     width: animatedValues.value.width,
     backgroundColor: animatedValues.value.backgroundColor
   }), [animatedValues]);
-  if (!width) return null;
+  if (!width) return;
   return /*#__PURE__*/_jsx(Animated.View, {
     style: [{
       position: position,