svelteplot 0.13.0 → 0.14.0-pr-545.0

package/dist/helpers/group.d.ts

@@ -3,4 +3,4 @@ import type { Channels } from '../types/index.js';
  * Groups the data by the fx, fy and z channels and calls the reduce function
  * for each group. Returns the new channels to be added in the transform.
  */
-export declare function groupFacetsAndZ<T>(items: T[], channels: Channels<T>, reduce: (items: T[], groupProps?: Record<string, unknown>) => any): any;
+export declare function groupFacetsAndZ<T>(items: T[], channels: Channels<T>, reduce: (items: T[], groupProps?: Record<string, unknown>) => any, implicitColorZ?: boolean): any;

package/dist/helpers/group.js

@@ -4,15 +4,15 @@ import { groups as d3Groups } from 'd3-array';
  * Groups the data by the fx, fy and z channels and calls the reduce function
  * for each group. Returns the new channels to be added in the transform.
  */
-export function groupFacetsAndZ(items, channels, reduce) {
+export function groupFacetsAndZ(items, channels, reduce, implicitColorZ = true) {
     const groupBy = ['fx', 'fy', 'z'].map((groupChannel) => {
         let groupByChannel = null;
         if (groupChannel === 'z') {
             if (channels.z)
                 groupByChannel = 'z';
-            else if (channels.fill)
+            else if (channels.fill && implicitColorZ)
                 groupByChannel = 'fill';
-            else if (channels.stroke)
+            else if (channels.stroke && implicitColorZ)
                 groupByChannel = 'stroke';
         }
         else if (channels[groupChannel]) {

package/dist/marks/ColorLegend.svelte

@@ -19,8 +19,12 @@
 
     const DEFAULTS = getPlotDefaults();
 
-    const legendTitle = $derived(plot.options.color.label ?? plot.scales.color?.autoTitle);
     const scaleType = $derived(plot.scales.color.type);
+    const legendTitle = $derived(
+        scaleType === 'categorical'
+            ? (plot.options.color.label ?? '')
+            : (plot.options.color.label ?? plot.scales.color?.autoTitle)
+    );
     const tickFormat = $derived(
         typeof plot.options.color?.tickFormat === 'function'
             ? plot.options.color.tickFormat

package/dist/marks/Contour.svelte

@@ -117,6 +117,8 @@
         strokeMiterlimit?: number;
         clipPath?: string;
         class?: string;
+        /** Render using a canvas element instead of SVG paths. */
+        canvas?: boolean;
         /** the horizontal facet channel */
         fx?: ChannelAccessor<Datum>;
         /** the vertical facet channel */
@@ -136,6 +138,7 @@
     import { contours } from 'd3-contour';
     import { geoPath } from 'd3-geo';
     import Mark from '../Mark.svelte';
+    import GeoPathGroup from './helpers/GeoPathGroup.svelte';
     import { usePlot } from '../hooks/usePlot.svelte.js';
     import {
         interpolateNone,
@@ -195,6 +198,7 @@
         strokeMiterlimit = 1,
         clipPath,
         class: className = '',
+        canvas = false,
         ...options
     }: ContourMarkProps = $derived({ ...DEFAULTS, ...markProps });
 
@@ -491,27 +495,6 @@
         return tz;
     }
 
-    /** Resolve a fill or stroke prop for a given contour level. */
-    function resolveColor(prop: string | undefined, threshold: number): string {
-        if (prop === 'value') {
-            return (plot.scales.color?.fn(threshold) as string) ?? 'currentColor';
-        }
-        return prop ?? 'none';
-    }
-
-    /** Build the inline style string for a single contour path. */
-    function contourStyle(threshold: number): string {
-        const parts: string[] = [];
-        parts.push(`fill:${resolveColor(fill, threshold)}`);
-        parts.push(`stroke:${resolveColor(effectiveStroke, threshold)}`);
-        if (strokeWidth != null) parts.push(`stroke-width:${strokeWidth}`);
-        if (strokeOpacity != null) parts.push(`stroke-opacity:${strokeOpacity}`);
-        if (fillOpacity != null) parts.push(`fill-opacity:${fillOpacity}`);
-        if (opacity != null) parts.push(`opacity:${opacity}`);
-        if (strokeMiterlimit != null) parts.push(`stroke-miterlimit:${strokeMiterlimit}`);
-        return parts.join(';');
-    }
-
     const path = geoPath();
 
     /**
@@ -680,14 +663,22 @@
     {...options}
     {...markChannelProps}>
     {#snippet children({ scaledData }: { scaledData: ScaledDataRecord[] })}
-        <g clip-path={clipPath} class={className || null} aria-label="contour">
-            {#each scaledData as d, i (i)}
-                {#if d.datum[GEOM]}
-                    <path
-                        d={path(d.datum[GEOM] as any)}
-                        style={contourStyle(d.datum[RAW_VALUE] as number)} />
-                {/if}
-            {/each}
-        </g>
+        <GeoPathGroup
+            {scaledData}
+            {path}
+            geomKey={GEOM}
+            colorKeyword="value"
+            {fill}
+            stroke={effectiveStroke}
+            {strokeWidth}
+            {strokeOpacity}
+            {fillOpacity}
+            {opacity}
+            {strokeMiterlimit}
+            {clipPath}
+            className={className || undefined}
+            ariaLabel="contour"
+            {canvas}
+            {plot} />
     {/snippet}
 </Mark>

package/dist/marks/Contour.svelte.d.ts

@@ -100,6 +100,8 @@ declare function $$render<Datum extends DataRow>(): {
         strokeMiterlimit?: number;
         clipPath?: string;
         class?: string;
+        /** Render using a canvas element instead of SVG paths. */
+        canvas?: boolean;
         /** the horizontal facet channel */
         fx?: ChannelAccessor<Datum>;
         /** the vertical facet channel */

package/dist/marks/DelaunayLink.svelte

@@ -0,0 +1,127 @@
+<!-- @component
+    Renders individual Delaunay triangulation edges as separate paths,
+    allowing per-edge styling based on the source data point.
+-->
+<script lang="ts" generics="Datum = DataRecord">
+    interface DelaunayLinkMarkProps extends BaseMarkProps<Datum>, LinkableMarkProps<Datum> {
+        /** the input data array */
+        data?: Datum[];
+        /** the horizontal position channel */
+        x?: ChannelAccessor<Datum>;
+        /** the vertical position channel */
+        y?: ChannelAccessor<Datum>;
+        /** the grouping channel; separate triangulations per group */
+        z?: ChannelAccessor<Datum>;
+        /** Render using a canvas element instead of SVG paths. */
+        canvas?: boolean;
+    }
+
+    import { Delaunay } from 'd3-delaunay';
+    import type {
+        DataRecord,
+        BaseMarkProps,
+        ChannelAccessor,
+        LinkableMarkProps,
+        MarkType,
+        ScaledDataRecord
+    } from '../types/index.js';
+    import { groupFacetsAndZ } from '../helpers/group.js';
+    import { recordizeXY } from '../transforms/recordize.js';
+    import { sort } from '../index.js';
+    import Mark from '../Mark.svelte';
+    import PathItems from './helpers/PathItems.svelte';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
+    import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { SvelteSet } from 'svelte/reactivity';
+
+    const DEFAULTS = {
+        ...getPlotDefaults().delaunayLink
+    };
+
+    let markProps: DelaunayLinkMarkProps = $props();
+
+    const {
+        data = [] as Datum[],
+        class: className = 'delaunay-link',
+        canvas = false,
+        ...options
+    }: DelaunayLinkMarkProps = $derived({ ...DEFAULTS, ...markProps });
+
+    const args = $derived(
+        sort(
+            recordizeXY({
+                data: data as any[],
+                ...options
+            })
+        )
+    );
+
+    const plot = usePlot();
+
+    function computeEdges(scaledData: ScaledDataRecord[]) {
+        const scaledByDatum = new Map(scaledData.map((d) => [d.datum, d]));
+        const results: { path: string; datum: ScaledDataRecord }[] = [];
+
+        groupFacetsAndZ(
+            scaledData.map((d) => d.datum),
+            args,
+            (groupItems) => {
+                const groupScaled = groupItems
+                    .map((d) => scaledByDatum.get(d))
+                    .filter(
+                        (d): d is ScaledDataRecord =>
+                            d !== undefined &&
+                            d.valid &&
+                            Number.isFinite(d.x as number) &&
+                            Number.isFinite(d.y as number)
+                    );
+                if (groupScaled.length < 2) return;
+
+                const delaunay = Delaunay.from(
+                    groupScaled,
+                    (d) => d.x as number,
+                    (d) => d.y as number
+                );
+                const { halfedges, triangles } = delaunay;
+                const seen = new SvelteSet<string>();
+
+                for (let i = 0; i < halfedges.length; i++) {
+                    const j = halfedges[i];
+                    if (j < i && j !== -1) continue;
+                    const a = triangles[i];
+                    const b = triangles[i % 3 === 2 ? i - 2 : i + 1];
+                    const key = a < b ? `${a},${b}` : `${b},${a}`;
+                    if (seen.has(key)) continue;
+                    seen.add(key);
+
+                    const p = groupScaled[a];
+                    const q = groupScaled[b];
+                    results.push({
+                        datum: p,
+                        path: `M${p.x},${p.y}L${q.x},${q.y}`
+                    });
+                }
+            },
+            false
+        );
+
+        return results;
+    }
+</script>
+
+<Mark
+    type={'delaunayLink' as MarkType}
+    channels={['x', 'y', 'fill', 'opacity', 'stroke', 'fillOpacity', 'strokeOpacity']}
+    defaults={{ fill: 'none', stroke: 'currentColor' }}
+    {...args}>
+    {#snippet children({ mark, usedScales, scaledData })}
+        <PathItems
+            paths={computeEdges(scaledData)}
+            {args}
+            {options}
+            {className}
+            {usedScales}
+            {plot}
+            {canvas} />
+    {/snippet}
+</Mark>

package/dist/marks/DelaunayLink.svelte.d.ts

@@ -0,0 +1,175 @@
+import type { DataRecord, ChannelAccessor, LinkableMarkProps } from '../types/index.js';
+declare function $$render<Datum = DataRecord>(): {
+    props: Partial<{
+        filter: import("../types/index.js").ConstantAccessor<boolean, Datum>;
+        facet: "auto" | "include" | "exclude";
+        fx: ChannelAccessor<Datum>;
+        fy: ChannelAccessor<Datum>;
+        dx: import("../types/index.js").ConstantAccessor<number, Datum>;
+        dy: import("../types/index.js").ConstantAccessor<number, Datum>;
+        dodgeX: import("../transforms/dodge.js").DodgeXOptions;
+        dodgeY: import("../transforms/dodge.js").DodgeYOptions;
+        fill: ChannelAccessor<Datum>;
+        fillOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
+        fontFamily: import("../types/index.js").ConstantAccessor<import("csstype").Property.FontFamily, Datum>;
+        fontSize: import("../types/index.js").ConstantAccessor<import("csstype").Property.FontSize<number>, Datum>;
+        fontStyle: import("../types/index.js").ConstantAccessor<import("csstype").Property.FontStyle, Datum>;
+        fontVariant: import("../types/index.js").ConstantAccessor<import("csstype").Property.FontVariant, Datum>;
+        fontWeight: import("../types/index.js").ConstantAccessor<import("csstype").Property.FontWeight, Datum>;
+        letterSpacing: import("../types/index.js").ConstantAccessor<import("csstype").Property.LetterSpacing<0 | (string & {})>, Datum>;
+        wordSpacing: import("../types/index.js").ConstantAccessor<import("csstype").Property.WordSpacing<0 | (string & {})>, Datum>;
+        textAnchor: import("../types/index.js").ConstantAccessor<import("csstype").Property.TextAnchor, Datum>;
+        textTransform: import("../types/index.js").ConstantAccessor<import("csstype").Property.TextTransform, Datum>;
+        textDecoration: import("../types/index.js").ConstantAccessor<import("csstype").Property.TextDecoration<0 | (string & {})>, Datum>;
+        sort: ((a: import("../types/data.js").RawValue, b: import("../types/data.js").RawValue) => number) | {
+            channel: string;
+            order?: "ascending" | "descending";
+        } | import("../types/index.js").ConstantAccessor<import("../types/data.js").RawValue, Datum>;
+        stroke: ChannelAccessor<Datum>;
+        strokeWidth: import("../types/index.js").ConstantAccessor<number, Datum>;
+        strokeOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
+        strokeLinejoin: import("../types/index.js").ConstantAccessor<import("csstype").Property.StrokeLinejoin, Datum>;
+        strokeLinecap: import("../types/index.js").ConstantAccessor<import("csstype").Property.StrokeLinecap, Datum>;
+        strokeMiterlimit: import("../types/index.js").ConstantAccessor<number, Datum>;
+        opacity: ChannelAccessor<Datum>;
+        strokeDasharray: import("../types/index.js").ConstantAccessor<string, Datum>;
+        strokeDashoffset: import("../types/index.js").ConstantAccessor<number, Datum>;
+        blend: import("../types/index.js").ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
+        mixBlendMode: import("../types/index.js").ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
+        clipPath: string;
+        mask: string;
+        imageFilter: import("../types/index.js").ConstantAccessor<string, Datum>;
+        shapeRendering: import("../types/index.js").ConstantAccessor<import("csstype").Property.ShapeRendering, Datum>;
+        paintOrder: import("../types/index.js").ConstantAccessor<string, Datum>;
+        onclick: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondblclick: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmouseup: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmousedown: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmouseenter: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmousemove: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmouseleave: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmouseout: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onmouseover: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointercancel: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointerdown: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointerup: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointerenter: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointerleave: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointermove: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointerover: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onpointerout: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondrag: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondrop: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondragstart: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondragenter: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondragleave: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondragover: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ondragend: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ontouchstart: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ontouchmove: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ontouchend: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        ontouchcancel: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        oncontextmenu: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        onwheel: (event: Event & {
+            currentTarget: SVGPathElement;
+        }, datum: Datum, index: number) => void;
+        class: string;
+        style: string;
+        cursor: import("../types/index.js").ConstantAccessor<import("csstype").Property.Cursor, Datum>;
+        title: import("../types/index.js").ConstantAccessor<string, Datum>;
+    }> & LinkableMarkProps<Datum> & {
+        /** the input data array */
+        data?: Datum[];
+        /** the horizontal position channel */
+        x?: ChannelAccessor<Datum>;
+        /** the vertical position channel */
+        y?: ChannelAccessor<Datum>;
+        /** the grouping channel; separate triangulations per group */
+        z?: ChannelAccessor<Datum>;
+        /** Render using a canvas element instead of SVG paths. */
+        canvas?: boolean;
+    };
+    exports: {};
+    bindings: "";
+    slots: {};
+    events: {};
+};
+declare class __sveltets_Render<Datum = DataRecord> {
+    props(): ReturnType<typeof $$render<Datum>>['props'];
+    events(): ReturnType<typeof $$render<Datum>>['events'];
+    slots(): ReturnType<typeof $$render<Datum>>['slots'];
+    bindings(): "";
+    exports(): {};
+}
+interface $$IsomorphicComponent {
+    new <Datum = DataRecord>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<Datum>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<Datum>['props']>, ReturnType<__sveltets_Render<Datum>['events']>, ReturnType<__sveltets_Render<Datum>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<Datum>['bindings']>;
+    } & ReturnType<__sveltets_Render<Datum>['exports']>;
+    <Datum = DataRecord>(internal: unknown, props: ReturnType<__sveltets_Render<Datum>['props']> & {}): ReturnType<__sveltets_Render<Datum>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
+}
+/**
+ * Renders individual Delaunay triangulation edges as separate paths,
+ * allowing per-edge styling based on the source data point.
+ */
+declare const DelaunayLink: $$IsomorphicComponent;
+type DelaunayLink<Datum = DataRecord> = InstanceType<typeof DelaunayLink<Datum>>;
+export default DelaunayLink;

package/dist/marks/DelaunayMesh.svelte

@@ -0,0 +1,102 @@
+<!-- @component
+    Renders the full Delaunay triangulation as a single SVG path.
+-->
+<script lang="ts" generics="Datum = DataRecord">
+    interface DelaunayMeshMarkProps extends BaseMarkProps<Datum> {
+        /** the input data array */
+        data?: Datum[];
+        /** the horizontal position channel */
+        x?: ChannelAccessor<Datum>;
+        /** the vertical position channel */
+        y?: ChannelAccessor<Datum>;
+        /** the grouping channel; separate triangulations per group */
+        z?: ChannelAccessor<Datum>;
+        /** Render using a canvas element instead of SVG paths. */
+        canvas?: boolean;
+    }
+
+    import { Delaunay } from 'd3-delaunay';
+    import type {
+        DataRecord,
+        BaseMarkProps,
+        ChannelAccessor,
+        MarkType,
+        ScaledDataRecord
+    } from '../types/index.js';
+    import { groupFacetsAndZ } from '../helpers/group.js';
+    import { recordizeXY } from '../transforms/recordize.js';
+    import Mark from '../Mark.svelte';
+    import PathGroup from './helpers/PathGroup.svelte';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
+    import { getPlotDefaults } from '../hooks/plotDefaults.js';
+
+    const DEFAULTS = {
+        ...getPlotDefaults().delaunayMesh
+    };
+
+    let markProps: DelaunayMeshMarkProps = $props();
+
+    const {
+        data = [] as Datum[],
+        class: className = 'delaunay-mesh',
+        canvas = false,
+        ...options
+    }: DelaunayMeshMarkProps = $derived({ ...DEFAULTS, ...markProps });
+
+    const args = $derived(
+        recordizeXY({
+            data: data as any[],
+            ...options
+        })
+    );
+
+    const plot = usePlot();
+
+    function computeMeshPaths(scaledData: ScaledDataRecord[]) {
+        const scaledByDatum = new Map(scaledData.map((d) => [d.datum, d]));
+        const meshes: { path: string; datum: ScaledDataRecord }[] = [];
+
+        groupFacetsAndZ(
+            scaledData.map((d) => d.datum),
+            args,
+            (groupItems) => {
+                const groupScaled = groupItems
+                    .map((d) => scaledByDatum.get(d))
+                    .filter(
+                        (d): d is ScaledDataRecord =>
+                            d !== undefined &&
+                            d.valid &&
+                            Number.isFinite(d.x as number) &&
+                            Number.isFinite(d.y as number)
+                    );
+                if (groupScaled.length < 2) return;
+                const delaunay = Delaunay.from(
+                    groupScaled,
+                    (d) => d.x as number,
+                    (d) => d.y as number
+                );
+                const path = delaunay.render();
+                if (path) meshes.push({ path, datum: groupScaled[0] });
+            },
+            false
+        );
+
+        return meshes;
+    }
+</script>
+
+<Mark
+    type={'delaunayMesh' as MarkType}
+    channels={['x', 'y', 'fill', 'stroke', 'strokeOpacity', 'fillOpacity', 'opacity']}
+    defaults={{ fill: 'none', stroke: 'currentColor' }}
+    {...args}>
+    {#snippet children({ scaledData, usedScales })}
+        <PathGroup
+            paths={computeMeshPaths(scaledData)}
+            {args}
+            {className}
+            {usedScales}
+            {plot}
+            {canvas} />
+    {/snippet}
+</Mark>