layerchart 2.0.0-next.51 → 2.0.0-next.53

package/dist/components/Arc.svelte

@@ -149,6 +149,10 @@
           centroid: [number, number];
           boundingBox: DOMRect;
           value: number;
+          startAngle: number;
+          endAngle: number;
+          innerRadius: number;
+          outerRadius: number;
           getTrackTextProps: GetArcTextProps;
           getArcTextProps: GetArcTextProps;
         },
@@ -370,8 +374,8 @@
       {
         startAngle: () => trackStartAngle,
         endAngle: () => trackEndAngle,
-        outerRadius: () => trackOuterRadius + (opts.outerPadding ? opts.outerPadding : 0),
-        innerRadius: () => trackInnerRadius,
+        outerRadius: () => trackOuterRadius + (opts.outerPadding ?? 0),
+        innerRadius: () => trackInnerRadius - (opts.innerPadding ?? 0),
         cornerRadius: () => trackCornerRadius,
         centroid: () => trackArcCentroid,
       },
@@ -385,8 +389,8 @@
       {
         startAngle: () => startAngle,
         endAngle: () => arcEndAngle,
-        outerRadius: () => outerRadius + (opts.outerPadding ? opts.outerPadding : 0),
-        innerRadius: () => innerRadius,
+        outerRadius: () => outerRadius + (opts.outerPadding ?? 0),
+        innerRadius: () => innerRadius - (opts.innerPadding ?? 0),
         cornerRadius: () => cornerRadius,
         centroid: () => trackArcCentroid,
       },
@@ -432,6 +436,10 @@
   centroid: trackArcCentroid,
   boundingBox,
   value: motionEndAngle.current,
+  startAngle,
+  endAngle: arcEndAngle,
+  innerRadius,
+  outerRadius,
   getTrackTextProps: getTrackTextProps,
   getArcTextProps: getArcTextProps,
 })}

package/dist/components/Arc.svelte.d.ts

@@ -124,6 +124,10 @@ export type ArcPropsWithoutHTML = {
             centroid: [number, number];
             boundingBox: DOMRect;
             value: number;
+            startAngle: number;
+            endAngle: number;
+            innerRadius: number;
+            outerRadius: number;
             getTrackTextProps: GetArcTextProps;
             getArcTextProps: GetArcTextProps;
         }

package/dist/components/ArcLabel.svelte

@@ -0,0 +1,259 @@
+<script lang="ts" module>
+  import type { PathProps } from './Path.svelte';
+  import type { TextProps } from './Text.svelte';
+  import type { GetArcTextProps, ArcTextOptions } from '../utils/arcText.svelte.js';
+
+  /**
+   * Placement options for `ArcLabel`.
+   * - `centroid`: at the arc centroid (horizontal text)
+   * - `centroid-rotated`: at the arc centroid, rotated to follow the arc tangent
+   * - `centroid-radial`: at the arc centroid, rotated to read radially (center → outside)
+   * - `inner` / `middle` / `outer`: along the inner / middle / outer arc path
+   * - `callout`: outside the arc connected by a polyline with a bend
+   */
+  export type ArcLabelPlacement =
+    | 'centroid'
+    | 'centroid-rotated'
+    | 'centroid-radial'
+    | 'inner'
+    | 'middle'
+    | 'outer'
+    | 'callout';
+
+  export type ArcLabelConfig = {
+    /**
+     * The placement of the label.
+     * @default 'centroid'
+     */
+    placement?: ArcLabelPlacement;
+
+    /**
+     * Length of the radial portion of the callout leader line (from the outer
+     * arc edge outward to the bend point).
+     * @default 16
+     */
+    calloutLineLength?: number;
+
+    /**
+     * Length of the horizontal portion of the callout leader line after the
+     * bend before the label text.
+     * @default 12
+     */
+    calloutLabelOffset?: number;
+
+    /**
+     * Padding between the bend point on the leader line and the label text.
+     * @default 4
+     */
+    calloutPadding?: number;
+
+    /**
+     * Props applied to the leader line `<Path>` when using `callout` placement.
+     * Because `<Path>` is used (instead of a raw `<polyline>`), the leader line
+     * renders in SVG and Canvas chart layers alike.
+     */
+    line?: Omit<PathProps, 'pathData'>;
+
+    /**
+     * Radial offset for the label, interpreted per-placement:
+     * - `centroid` / `centroid-rotated` / `centroid-radial`: shifts the label
+     *   radially from the arc centroid (positive = outward).
+     * - `inner` / `middle` / `outer`: added to `outerPadding` (padding of the
+     *   arc path the text runs along).
+     * - `callout`: added to `calloutLineLength` (radial portion of the leader
+     *   line).
+     * @default 0
+     */
+    offset?: number;
+  } & ArcTextOptions &
+    Omit<TextProps, 'path'>;
+
+  export type ArcLabelProps = {
+    /**
+     * Function returned from the `Arc` children snippet used to position the
+     * label for `inner`, `middle`, `outer`, and `outer-radial` placements.
+     */
+    getArcTextProps?: GetArcTextProps;
+
+    /** Centroid `[x, y]` of the arc (from `Arc` children snippet) */
+    centroid?: [number, number];
+
+    /** Arc start angle in radians (from `Arc` children snippet) */
+    startAngle?: number;
+
+    /** Arc end angle in radians (from `Arc` children snippet) */
+    endAngle?: number;
+
+    /** Arc inner radius (from `Arc` children snippet) */
+    innerRadius?: number;
+
+    /** Arc outer radius (from `Arc` children snippet) */
+    outerRadius?: number;
+  } & ArcLabelConfig;
+</script>
+
+<script lang="ts">
+  import Path from './Path.svelte';
+  import Text from './Text.svelte';
+  import { radiansToDegrees } from '../utils/math.js';
+
+  let {
+    getArcTextProps,
+    centroid,
+    startAngle,
+    endAngle,
+    innerRadius,
+    outerRadius,
+    placement = 'centroid',
+    startOffset,
+    outerPadding,
+    calloutLineLength = 16,
+    calloutLabelOffset = 12,
+    calloutPadding = 4,
+    line,
+    offset = 0,
+    ...restProps
+  }: ArcLabelProps = $props();
+
+  const midAngle = $derived(
+    startAngle != null && endAngle != null ? (startAngle + endAngle) / 2 : 0
+  );
+
+  // Offset the centroid radially along the mid-angle direction.
+  // Used by the `centroid` / `centroid-rotated` / `centroid-radial` placements.
+  const offsetCentroid = $derived.by(() => {
+    if (!centroid) return centroid;
+    if (!offset || startAngle == null || endAngle == null) return centroid;
+    const angle = midAngle - Math.PI / 2;
+    return [centroid[0] + Math.cos(angle) * offset, centroid[1] + Math.sin(angle) * offset] as [
+      number,
+      number,
+    ];
+  });
+
+  // Route the shared `offset` to the placement-appropriate radial padding:
+  // - `outer`: outward from the outer edge (`outerPadding`)
+  // - `inner`: inward from the inner edge (`innerPadding`)
+  // - `middle`: both, so the middle path shifts by half in each direction
+  const effectiveOuterPadding = $derived.by(() => {
+    const base = outerPadding ?? 0;
+    if (placement === 'outer') return base + offset;
+    if (placement === 'middle') return base + offset;
+    return base;
+  });
+  const effectiveInnerPadding = $derived.by(() => {
+    if (placement === 'inner') return offset;
+    if (placement === 'middle') return offset;
+    return 0;
+  });
+  // `calloutLineLength` for `callout` placement gets the shared `offset` added
+  // on top of the default/explicit length.
+  const effectiveCalloutLineLength = $derived(calloutLineLength + offset);
+
+  // Rotation in degrees to apply to the text at the centroid.
+  // - `centroid-rotated`: follow the arc tangent direction
+  // - `centroid-radial`: read radially outward (center → outer edge)
+  const centroidRotation = $derived.by(() => {
+    if (startAngle == null || endAngle == null) return 0;
+    let deg = radiansToDegrees(midAngle);
+    if (placement === 'centroid-radial') {
+      // Rotate so text reads along the radial direction
+      deg = deg - 90;
+    } else if (placement !== 'centroid-rotated') {
+      return 0;
+    }
+    // Normalize to [-180, 180]
+    deg = ((deg + 180) % 360) - 180;
+    // Flip text on the side where it would be upside-down so it remains readable
+    if (deg > 90) deg -= 180;
+    else if (deg < -90) deg += 180;
+    return deg;
+  });
+
+  const calloutGeometry = $derived.by(() => {
+    if (placement !== 'callout' || startAngle == null || endAngle == null || outerRadius == null) {
+      return null;
+    }
+
+    // Match d3-shape arc convention: 0 radians = 12 o'clock, increasing clockwise.
+    const angle = midAngle - Math.PI / 2;
+    const cos = Math.cos(angle);
+    const sin = Math.sin(angle);
+
+    // Point on the outer arc edge at the mid-angle
+    const x0 = cos * outerRadius;
+    const y0 = sin * outerRadius;
+
+    // Bend point: extend radially outward from the edge
+    const bendRadius = outerRadius + effectiveCalloutLineLength;
+    const x1 = cos * bendRadius;
+    const y1 = sin * bendRadius;
+
+    // Label point: extend horizontally toward the chart side the arc lives on
+    const onRightSide = cos >= 0;
+    const x2 = x1 + (onRightSide ? calloutLabelOffset : -calloutLabelOffset);
+    const y2 = y1;
+
+    return {
+      pathData: `M${x0},${y0}L${x1},${y1}L${x2},${y2}`,
+      labelX: x2 + (onRightSide ? calloutPadding : -calloutPadding),
+      labelY: y2,
+      textAnchor: (onRightSide ? 'start' : 'end') as 'start' | 'end',
+    };
+  });
+
+  const arcTextProps = $derived.by(() => {
+    if (placement === 'centroid') {
+      if (offsetCentroid) {
+        return {
+          x: offsetCentroid[0],
+          y: offsetCentroid[1],
+          textAnchor: 'middle' as const,
+          verticalAnchor: 'middle' as const,
+        };
+      }
+      return getArcTextProps?.('centroid', { startOffset, outerPadding }) ?? {};
+    }
+
+    if (placement === 'centroid-rotated' || placement === 'centroid-radial') {
+      if (offsetCentroid) {
+        return {
+          x: offsetCentroid[0],
+          y: offsetCentroid[1],
+          textAnchor: 'middle' as const,
+          verticalAnchor: 'middle' as const,
+          transform: `rotate(${centroidRotation}, ${offsetCentroid[0]}, ${offsetCentroid[1]})`,
+        };
+      }
+      return getArcTextProps?.('centroid', { startOffset, outerPadding }) ?? {};
+    }
+
+    if (placement === 'callout') {
+      const g = calloutGeometry;
+      if (g) {
+        return {
+          x: g.labelX,
+          y: g.labelY,
+          textAnchor: g.textAnchor,
+          verticalAnchor: 'middle' as const,
+        };
+      }
+      return {};
+    }
+
+    // inner / middle / outer
+    return (
+      getArcTextProps?.(placement, {
+        startOffset,
+        outerPadding: effectiveOuterPadding,
+        innerPadding: effectiveInnerPadding,
+      }) ?? {}
+    );
+  });
+</script>
+
+{#if placement === 'callout' && calloutGeometry}
+  <Path pathData={calloutGeometry.pathData} {...line} />
+{/if}
+
+<Text {...arcTextProps} {...restProps} />

package/dist/components/ArcLabel.svelte.d.ts

@@ -0,0 +1,73 @@
+import type { PathProps } from './Path.svelte';
+import type { TextProps } from './Text.svelte';
+import type { GetArcTextProps, ArcTextOptions } from '../utils/arcText.svelte.js';
+/**
+ * Placement options for `ArcLabel`.
+ * - `centroid`: at the arc centroid (horizontal text)
+ * - `centroid-rotated`: at the arc centroid, rotated to follow the arc tangent
+ * - `centroid-radial`: at the arc centroid, rotated to read radially (center → outside)
+ * - `inner` / `middle` / `outer`: along the inner / middle / outer arc path
+ * - `callout`: outside the arc connected by a polyline with a bend
+ */
+export type ArcLabelPlacement = 'centroid' | 'centroid-rotated' | 'centroid-radial' | 'inner' | 'middle' | 'outer' | 'callout';
+export type ArcLabelConfig = {
+    /**
+     * The placement of the label.
+     * @default 'centroid'
+     */
+    placement?: ArcLabelPlacement;
+    /**
+     * Length of the radial portion of the callout leader line (from the outer
+     * arc edge outward to the bend point).
+     * @default 16
+     */
+    calloutLineLength?: number;
+    /**
+     * Length of the horizontal portion of the callout leader line after the
+     * bend before the label text.
+     * @default 12
+     */
+    calloutLabelOffset?: number;
+    /**
+     * Padding between the bend point on the leader line and the label text.
+     * @default 4
+     */
+    calloutPadding?: number;
+    /**
+     * Props applied to the leader line `<Path>` when using `callout` placement.
+     * Because `<Path>` is used (instead of a raw `<polyline>`), the leader line
+     * renders in SVG and Canvas chart layers alike.
+     */
+    line?: Omit<PathProps, 'pathData'>;
+    /**
+     * Radial offset for the label, interpreted per-placement:
+     * - `centroid` / `centroid-rotated` / `centroid-radial`: shifts the label
+     *   radially from the arc centroid (positive = outward).
+     * - `inner` / `middle` / `outer`: added to `outerPadding` (padding of the
+     *   arc path the text runs along).
+     * - `callout`: added to `calloutLineLength` (radial portion of the leader
+     *   line).
+     * @default 0
+     */
+    offset?: number;
+} & ArcTextOptions & Omit<TextProps, 'path'>;
+export type ArcLabelProps = {
+    /**
+     * Function returned from the `Arc` children snippet used to position the
+     * label for `inner`, `middle`, `outer`, and `outer-radial` placements.
+     */
+    getArcTextProps?: GetArcTextProps;
+    /** Centroid `[x, y]` of the arc (from `Arc` children snippet) */
+    centroid?: [number, number];
+    /** Arc start angle in radians (from `Arc` children snippet) */
+    startAngle?: number;
+    /** Arc end angle in radians (from `Arc` children snippet) */
+    endAngle?: number;
+    /** Arc inner radius (from `Arc` children snippet) */
+    innerRadius?: number;
+    /** Arc outer radius (from `Arc` children snippet) */
+    outerRadius?: number;
+} & ArcLabelConfig;
+declare const ArcLabel: import("svelte").Component<ArcLabelProps, {}, "">;
+type ArcLabel = ReturnType<typeof ArcLabel>;
+export default ArcLabel;

package/dist/components/ArcLabel.svelte.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/components/ArcLabel.svelte.test.js

@@ -0,0 +1,235 @@
+import { describe, expect, it } from 'vitest';
+import { render } from 'vitest-browser-svelte';
+import { page } from 'vitest/browser';
+import TestHarness, { componentTestId } from './tests/TestHarness.svelte';
+import Arc from './Arc.svelte';
+import ArcLabel from './ArcLabel.svelte';
+const defaultArcProps = {
+    fill: 'currentColor',
+    value: 50,
+    innerRadius: 70,
+    outerRadius: 140,
+};
+describe('ArcLabel', () => {
+    it('renders a text element with the supplied value at the centroid', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: defaultArcProps,
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        value: 'hello',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        const arc = page.getByTestId(componentTestId);
+        await expect.element(arc).toBeInTheDocument();
+        const label = page.getByTestId('arc-label');
+        await expect.element(label).toBeInTheDocument();
+        await expect.element(label).toHaveTextContent('hello');
+    });
+    it('does not render a polyline for non-callout placements', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: defaultArcProps,
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        value: 'Centroid',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        const text = page.getByTestId('arc-label');
+        await expect.element(text).toBeInTheDocument();
+        const chart = page.getByTestId('test-lc-chart');
+        expect(chart.element().querySelector('polyline')).toBeNull();
+    });
+    it('applies a rotation transform for centroid-rotated placement', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: {
+                ...defaultArcProps,
+                // 90° slice on the right side so midAngle = 45°
+                startAngle: 0,
+                endAngle: Math.PI / 2,
+            },
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        placement: 'centroid-rotated',
+                        value: 'Rotated',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        const el = page.getByTestId('arc-label');
+        await expect.element(el).toBeInTheDocument();
+        const transform = el.element().getAttribute('transform') ?? '';
+        // midAngle = 45°, tangent rotation → 45°
+        expect(transform).toMatch(/rotate\(45/);
+    });
+    it('applies a rotation transform for centroid-radial placement', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: {
+                ...defaultArcProps,
+                startAngle: 0,
+                endAngle: Math.PI / 2,
+            },
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        placement: 'centroid-radial',
+                        value: 'Radial',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        const el = page.getByTestId('arc-label');
+        await expect.element(el).toBeInTheDocument();
+        const transform = el.element().getAttribute('transform') ?? '';
+        // midAngle = 45°, radial rotation = midAngle - 90 = -45°
+        expect(transform).toMatch(/rotate\(-45/);
+    });
+    it('renders a polyline leader line for callout placement', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: {
+                ...defaultArcProps,
+                startAngle: 0,
+                endAngle: Math.PI / 2,
+            },
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        placement: 'callout',
+                        value: 'Callout',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        const label = page.getByTestId('arc-label');
+        await expect.element(label).toBeInTheDocument();
+        // The leader line is a <path> with two line segments (edge → bend → label)
+        const chart = page.getByTestId('test-lc-chart');
+        const paths = Array.from(chart.element().querySelectorAll('path'));
+        const leader = paths.find((p) => {
+            const d = p.getAttribute('d') ?? '';
+            // Leader-line pathData has the form `M${x0},${y0}L${x1},${y1}L${x2},${y2}`
+            // with two `L` segments. The arc `<path>` has `A` arc commands.
+            return /^M[^A]*L[^A]*L[^A]*$/.test(d);
+        });
+        expect(leader).toBeDefined();
+    });
+    it('does not render a polyline element for callout placement', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: {
+                ...defaultArcProps,
+                startAngle: 0,
+                endAngle: Math.PI / 2,
+            },
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        placement: 'callout',
+                        value: 'NoPolyline',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        await expect.element(page.getByTestId('arc-label')).toBeInTheDocument();
+        const chart = page.getByTestId('test-lc-chart');
+        expect(chart.element().querySelector('polyline')).toBeNull();
+    });
+    it('delegates inner/middle/outer placements to getArcTextProps (text on path)', async () => {
+        render(TestHarness, {
+            chartProps: { height: 400, padding: '50' },
+            component: Arc,
+            componentProps: {
+                ...defaultArcProps,
+                startAngle: 0,
+                endAngle: Math.PI / 2,
+            },
+            childComponents: [
+                {
+                    component: ArcLabel,
+                    props: ({ centroid, startAngle, endAngle, innerRadius, outerRadius, getArcTextProps }) => ({
+                        centroid,
+                        startAngle,
+                        endAngle,
+                        innerRadius,
+                        outerRadius,
+                        getArcTextProps,
+                        placement: 'middle',
+                        value: 'Middle',
+                        'data-testid': 'arc-label',
+                    }),
+                },
+            ],
+        });
+        const label = page.getByTestId('arc-label');
+        await expect.element(label).toBeInTheDocument();
+        // Text along a path is rendered via <textPath href="#..."> inside the text element
+        const textPath = label.element().querySelector('textPath');
+        expect(textPath).not.toBeNull();
+        // Default startOffset should be 50% (centered along the arc)
+        expect(textPath?.getAttribute('startOffset')).toBe('50%');
+    });
+});