svelteplot 0.2.1 → 0.2.3

package/dist/marks/helpers/DotCanvas.svelte

@@ -14,6 +14,7 @@
     import CanvasLayer from './CanvasLayer.svelte';
     import { getContext } from 'svelte';
     import { devicePixelRatio } from 'svelte/reactivity/window';
+    import { resolveColor } from './canvas';
 
     const { getPlotState } = getContext<PlotContext>('svelteplot');
     const plot = $derived(getPlotState());
@@ -46,19 +47,8 @@
                     if (datum.valid) {
                         let { fill, stroke } = datum;
 
-                        if (`${fill}`.toLowerCase() === 'currentcolor')
-                            fill = getComputedStyle(
-                                canvas?.parentElement?.parentElement
-                            ).getPropertyValue('color');
-                        if (`${stroke}`.toLowerCase() === 'currentcolor')
-                            stroke = getComputedStyle(
-                                canvas?.parentElement?.parentElement
-                            ).getPropertyValue('color');
-
-                        if (CSS_VAR.test(fill))
-                            fill = getComputedStyle(canvas).getPropertyValue(fill.slice(4, -1));
-                        if (CSS_VAR.test(stroke))
-                            stroke = getComputedStyle(canvas).getPropertyValue(stroke.slice(4, -1));
+                        fill = resolveColor(fill, canvas);
+                        stroke = resolveColor(stroke, canvas);
 
                         if (stroke && stroke !== 'none') {
                             const strokeWidth = resolveProp(

package/dist/marks/helpers/LineCanvas.svelte

@@ -0,0 +1,116 @@
+<script lang="ts">
+    import type {
+        Mark,
+        BaseMarkProps,
+        PlotContext,
+        ScaledDataRecord,
+        UsedScales
+    } from '../../types.js';
+    import { resolveProp, resolveScaledStyleProps } from '../../helpers/resolve.js';
+    import { getContext } from 'svelte';
+    import { type Line } from 'd3-shape';
+    import CanvasLayer from './CanvasLayer.svelte';
+    import type { Attachment } from 'svelte/attachments';
+    import { devicePixelRatio } from 'svelte/reactivity/window';
+    import { resolveColor } from './canvas';
+
+    let {
+        mark,
+        groupedLineData,
+        usedScales,
+        linePath
+    }: {
+        mark: Mark<BaseMarkProps>;
+        groupedLineData: ScaledDataRecord[][];
+        usedScales: UsedScales;
+        linePath: Line<ScaledDataRecord>;
+        groupByKey?: unknown;
+    } = $props();
+
+    const { getPlotState } = getContext<PlotContext>('svelteplot');
+    const plot = $derived(getPlotState());
+
+    function maybeOpacity(value: unknown) {
+        return value == null ? 1 : +value;
+    }
+
+    const render = ((canvas: HTMLCanvasElement) => {
+        const context = canvas.getContext('2d');
+
+        $effect(() => {
+            if (context) {
+                linePath.context(context);
+                context.resetTransform();
+                context.scale(devicePixelRatio.current ?? 1, devicePixelRatio.current ?? 1);
+                context.lineJoin = 'round';
+                context.lineCap = 'round';
+
+                for (const group of groupedLineData) {
+                    if (group.length < 2) continue;
+
+                    // Get the first point to determine line styles
+                    const firstPoint = group[0];
+                    if (!firstPoint || !firstPoint.valid) continue;
+
+                    let { stroke, ...restStyles } = resolveScaledStyleProps(
+                        firstPoint.datum,
+                        mark.options,
+                        usedScales,
+                        plot,
+                        'stroke'
+                    );
+
+                    const opacity = maybeOpacity(restStyles['opacity']);
+                    const strokeOpacity = maybeOpacity(restStyles['stroke-opacity']);
+
+                    const strokeWidth = resolveProp(
+                        mark.options.strokeWidth,
+                        firstPoint.datum,
+                        1.4
+                    ) as number;
+
+                    if (mark.options.outlineStroke) {
+                        // draw stroke outline first
+                        const outlineStroke = resolveColor(mark.options.outlineStroke, canvas);
+                        const outlineStrokeWidth =
+                            mark.options.outlineStrokeWidth ?? strokeWidth + 2;
+                        const outlineStrokeOpacity = mark.options.outlineStrokeOpacity ?? 1;
+
+                        context.lineWidth = outlineStrokeWidth;
+                        context.strokeStyle = outlineStroke;
+                        context.globalAlpha = opacity * outlineStrokeOpacity;
+                        context.beginPath();
+                        linePath(group);
+                        context.stroke();
+                    }
+
+                    stroke = resolveColor(stroke, canvas);
+
+                    if (stroke && stroke !== 'none') {
+                        context.lineWidth = strokeWidth ?? 1.4;
+                    }
+
+                    context.strokeStyle = stroke ? stroke : 'currentColor';
+                    context.globalAlpha = opacity * strokeOpacity;
+
+                    // Start drawing the line
+                    context.beginPath();
+                    linePath(group);
+                    context.stroke();
+                }
+                linePath.context(null);
+            }
+
+            return () => {
+                context?.clearRect(
+                    0,
+                    0,
+                    plot.width * (devicePixelRatio.current ?? 1),
+                    plot.height * (devicePixelRatio.current ?? 1)
+                );
+            };
+        });
+    }) as Attachment;
+</script>
+
+<CanvasLayer {@attach render} />

package/dist/marks/helpers/LineCanvas.svelte.d.ts

@@ -0,0 +1,12 @@
+import type { Mark, BaseMarkProps, ScaledDataRecord, UsedScales } from '../../types.js';
+import { type Line } from 'd3-shape';
+type $$ComponentProps = {
+    mark: Mark<BaseMarkProps>;
+    groupedLineData: ScaledDataRecord[][];
+    usedScales: UsedScales;
+    linePath: Line<ScaledDataRecord>;
+    groupByKey?: unknown;
+};
+declare const LineCanvas: import("svelte").Component<$$ComponentProps, {}, "">;
+type LineCanvas = ReturnType<typeof LineCanvas>;
+export default LineCanvas;

package/dist/marks/helpers/LinearGradientX.svelte

@@ -0,0 +1,27 @@
+<script lang="ts">
+    import { getContext } from 'svelte';
+    import type { PlotContext, RawValue } from '../../types';
+
+    let {
+        id,
+        stops
+    }: {
+        id: string;
+        stops: { x: RawValue; color: string }[];
+    } = $props();
+
+    const { getPlotState } = getContext<PlotContext>('svelteplot');
+    const plot = $derived(getPlotState());
+
+    const projectedStops = $derived(
+        stops
+            .map((d) => ({ ...d, px: plot.scales.x.fn(d.x) / plot.width }))
+            .sort((a, b) => a.px - b.px)
+    );
+</script>
+
+<linearGradient {id} gradientUnits="userSpaceOnUse" x1={0} y2={0} y1={0} x2={plot.width}>
+    {#each projectedStops as { px, color }}
+        <stop stop-color={color} offset={px} />
+    {/each}
+</linearGradient>

package/dist/marks/helpers/LinearGradientX.svelte.d.ts

@@ -0,0 +1,11 @@
+import type { RawValue } from '../../types';
+type $$ComponentProps = {
+    id: string;
+    stops: {
+        x: RawValue;
+        color: string;
+    }[];
+};
+declare const LinearGradientX: import("svelte").Component<$$ComponentProps, {}, "">;
+type LinearGradientX = ReturnType<typeof LinearGradientX>;
+export default LinearGradientX;

package/dist/marks/helpers/LinearGradientY.svelte

@@ -0,0 +1,27 @@
+<script lang="ts">
+    import { getContext } from 'svelte';
+    import type { PlotContext, RawValue } from '../../types';
+
+    let {
+        id,
+        stops
+    }: {
+        id: string;
+        stops: { y: RawValue; color: string }[];
+    } = $props();
+
+    const { getPlotState } = getContext<PlotContext>('svelteplot');
+    const plot = $derived(getPlotState());
+
+    const projectedStops = $derived(
+        stops
+            .map((d) => ({ ...d, py: plot.scales.y.fn(d.y) / plot.height }))
+            .sort((a, b) => a.py - b.py)
+    );
+</script>
+
+<linearGradient {id} gradientUnits="userSpaceOnUse" x1={0} x2={0} y1={0} y2={plot.height}>
+    {#each projectedStops as { py, color }}
+        <stop stop-color={color} offset={py} />
+    {/each}
+</linearGradient>

package/dist/marks/helpers/LinearGradientY.svelte.d.ts

@@ -0,0 +1,11 @@
+import type { RawValue } from '../../types';
+type $$ComponentProps = {
+    id: string;
+    stops: {
+        y: RawValue;
+        color: string;
+    }[];
+};
+declare const LinearGradientY: import("svelte").Component<$$ComponentProps, {}, "">;
+type LinearGradientY = ReturnType<typeof LinearGradientY>;
+export default LinearGradientY;

package/dist/marks/helpers/RectPath.svelte

@@ -0,0 +1,129 @@
+<!-- @component
+Helper component for rendering rectangular marks in SVG
+-->
+<script lang="ts">
+    import { resolveProp, resolveStyles } from '../../helpers/resolve';
+    import { roundedRect } from '../../helpers/roundedRect';
+    import type {
+        BaseMarkProps,
+        BaseRectMarkProps,
+        BorderRadius,
+        ScaledDataRecord,
+        UsedScales,
+        PlotContext
+    } from '../../types';
+    import { addEventHandlers } from './events';
+    import { getContext } from 'svelte';
+
+    let {
+        datum,
+        options,
+        class: className = null,
+        x,
+        y,
+        width,
+        height,
+        useInsetAsFallbackVertically = true,
+        useInsetAsFallbackHorizontally = true,
+        usedScales
+    }: {
+        datum: ScaledDataRecord;
+        class: string | null;
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        options: BaseRectMarkProps & BaseMarkProps;
+        /**
+         * By default, the `inset` property is applied to all four insets. Mark components
+         * can tweak this behavior for insetTop and insetBottom by setting the
+         * useInsetAsFallbackVertically prop to false.
+         */
+        useInsetAsFallbackVertically?: boolean;
+        /**
+         * By default, the `inset` property is applied to all four insets. Mark components
+         * can tweak this behavior for insetLeft and insetRight by setting the
+         * useInsetAsFallbackHorizontally prop to false.
+         */
+        useInsetAsFallbackHorizontally?: boolean;
+        usedScales: UsedScales;
+    } = $props();
+
+    const { getPlotState } = getContext<PlotContext>('svelteplot');
+    const plot = $derived(getPlotState());
+
+    const dx = $derived(+(resolveProp(options.dx, datum.datum, 0) as number));
+    const dy = $derived(+(resolveProp(options.dy, datum.datum, 0) as number));
+    const inset = $derived(+(resolveProp(options.inset, datum.datum, 0) as number));
+    const insetLeft = $derived(
+        +(resolveProp(
+            options.insetLeft,
+            datum.datum,
+            useInsetAsFallbackHorizontally ? inset : 0
+        ) as number)
+    );
+    const insetRight = $derived(
+        +(resolveProp(
+            options.insetRight,
+            datum.datum,
+            useInsetAsFallbackHorizontally ? inset : 0
+        ) as number)
+    );
+    const insetTop = $derived(
+        +(resolveProp(
+            options.insetTop,
+            datum.datum,
+            useInsetAsFallbackVertically ? inset : 0
+        ) as number)
+    );
+    const insetBottom = $derived(
+        +(resolveProp(
+            options.insetBottom,
+            datum.datum,
+            useInsetAsFallbackVertically ? inset : 0
+        ) as number)
+    );
+    const borderRadius = $derived((options.borderRadius ?? 0) as BorderRadius);
+    const hasBorderRadius = $derived(
+        (typeof borderRadius === 'number' && borderRadius > 0) ||
+            (typeof borderRadius === 'object' &&
+                Math.max(
+                    borderRadius.topRight ?? 0,
+                    borderRadius.bottomRight ?? 0,
+                    borderRadius.topLeft ?? 0,
+                    borderRadius.bottomLeft ?? 0
+                ) > 0)
+    );
+    const [style, styleClass] = $derived(resolveStyles(plot, datum, options, 'fill', usedScales));
+</script>
+
+{#if hasBorderRadius}
+    <path
+        transform="translate({[x + dx + insetLeft, y + insetBottom + dy]})"
+        d={roundedRect(
+            0,
+            0,
+            width - insetLeft - insetRight,
+            height - insetTop - insetBottom,
+            borderRadius
+        )}
+        class={[styleClass, className]}
+        {style}
+        use:addEventHandlers={{
+            getPlotState,
+            options,
+            datum: datum.datum
+        }} />
+{:else}
+    <rect
+        transform="translate({[x + dx + insetLeft, y + insetBottom + dy]})"
+        width={width - insetLeft - insetRight}
+        height={height - insetTop - insetBottom}
+        class={[styleClass, className]}
+        {style}
+        use:addEventHandlers={{
+            getPlotState,
+            options,
+            datum: datum.datum
+        }} />
+{/if}

package/dist/marks/helpers/RectPath.svelte.d.ts

@@ -0,0 +1,27 @@
+import type { BaseMarkProps, BaseRectMarkProps, ScaledDataRecord, UsedScales } from '../../types';
+type $$ComponentProps = {
+    datum: ScaledDataRecord;
+    class: string | null;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    options: BaseRectMarkProps & BaseMarkProps;
+    /**
+     * By default, the `inset` property is applied to all four insets. Mark components
+     * can tweak this behavior for insetTop and insetBottom by setting the
+     * useInsetAsFallbackVertically prop to false.
+     */
+    useInsetAsFallbackVertically?: boolean;
+    /**
+     * By default, the `inset` property is applied to all four insets. Mark components
+     * can tweak this behavior for insetLeft and insetRight by setting the
+     * useInsetAsFallbackHorizontally prop to false.
+     */
+    useInsetAsFallbackHorizontally?: boolean;
+    usedScales: UsedScales;
+};
+/** Helper component for rendering rectangular marks in SVG */
+declare const RectPath: import("svelte").Component<$$ComponentProps, {}, "">;
+type RectPath = ReturnType<typeof RectPath>;
+export default RectPath;

package/dist/marks/helpers/canvas.d.ts

@@ -0,0 +1 @@
+export declare function resolveColor(color: string, canvas: HTMLCanvasElement): string | CanvasGradient;

package/dist/marks/helpers/canvas.js

@@ -0,0 +1,32 @@
+import { CSS_URL, CSS_VAR } from '../../constants';
+export function resolveColor(color, canvas) {
+    if (`${color}`.toLowerCase() === 'currentcolor') {
+        color = getComputedStyle(canvas?.parentElement?.parentElement).getPropertyValue('color');
+    }
+    if (CSS_VAR.test(color)) {
+        color = getComputedStyle(canvas).getPropertyValue(color.slice(4, -1));
+    }
+    if (CSS_URL.test(color)) {
+        // might be a gradient we can parse!
+        const m = color.match(/^url\((#[^\)]+)\)/);
+        const gradientId = m[1];
+        const gradient = canvas.ownerDocument.querySelector(gradientId);
+        if (gradient) {
+            // parse gradient
+            if (gradient.nodeName.toLowerCase() === 'lineargradient') {
+                const x0 = +gradient.getAttribute('x1');
+                const x1 = +gradient.getAttribute('x2');
+                const y0 = +gradient.getAttribute('y1');
+                const y1 = +gradient.getAttribute('y2');
+                const ctxGradient = canvas.getContext('2d').createLinearGradient(x0, y0, x1, y1);
+                for (const stop of gradient.querySelectorAll('stop')) {
+                    const offset = +stop.getAttribute('offset');
+                    const color = resolveColor(stop.getAttribute('stop-color'), canvas);
+                    ctxGradient.addColorStop(Math.min(1, Math.max(0, offset)), color);
+                }
+                return ctxGradient;
+            }
+        }
+    }
+    return color;
+}

package/dist/types.d.ts

@@ -555,14 +555,19 @@ export type BaseMarkProps = Partial<{
     class: string;
     cursor: ConstantAccessor<CSS.Property.Cursor>;
 }>;
+export type BorderRadius = number | {
+    topLeft?: number;
+    topRight?: number;
+    bottomRight?: number;
+    bottomLeft?: number;
+};
 export type BaseRectMarkProps = {
-    rx?: ConstantAccessor<number>;
-    ry?: ConstantAccessor<number>;
     inset?: ConstantAccessor<number>;
     insetLeft?: ConstantAccessor<number>;
     insetTop?: ConstantAccessor<number>;
     insetRight?: ConstantAccessor<number>;
     insetBottom?: ConstantAccessor<number>;
+    borderRadius?: BorderRadius;
 };
 export type Channels = Record<string, ChannelAccessor | ConstantAccessor<string | number | boolean | symbol>>;
 export type TransformArg<K> = Channels & {