svelteplot 0.2.1 → 0.2.3

package/dist/helpers/resolve.d.ts

@@ -3,7 +3,7 @@ import type { ScaleName, ChannelName, ScaledChannelName, ChannelAccessor, DataRo
 type ChannelAlias = {
     channel: ScaledChannelName;
 };
-export declare function resolveProp<T>(accessor: ConstantAccessor<T>, datum: DataRecord | null, _defaultValue?: T | null): T | null;
+export declare function resolveProp<T>(accessor: ConstantAccessor<T>, datum: DataRecord | null, _defaultValue?: T | null): T | typeof _defaultValue;
 type ChannelOptions = {
     value: ChannelAccessor;
     scale?: ScaleName | null;

package/dist/index.d.ts

@@ -58,10 +58,12 @@ export { normalizeX, normalizeY } from './transforms/normalize.js';
 export { group, groupX, groupY, groupZ } from './transforms/group.js';
 export { intervalX, intervalY } from './transforms/interval.js';
 export { recordizeX, recordizeY } from './transforms/recordize.js';
-export { renameChannels } from './transforms/rename.js';
+export { renameChannels, replaceChannels } from './transforms/rename.js';
 export { select, selectFirst, selectLast, selectMaxX, selectMaxY, selectMinX, selectMinY } from './transforms/select.js';
 export { shiftX, shiftY } from './transforms/shift.js';
 export { sort, shuffle, reverse } from './transforms/sort.js';
 export { stackX, stackY } from './transforms/stack.js';
 export { windowX, windowY } from './transforms/window.js';
 export { formatMonth } from './helpers/formats.js';
+export { default as LinearGradientX } from './marks/helpers/LinearGradientX.svelte';
+export { default as LinearGradientY } from './marks/helpers/LinearGradientY.svelte';

package/dist/index.js

@@ -61,11 +61,13 @@ export { normalizeX, normalizeY } from './transforms/normalize.js';
 export { group, groupX, groupY, groupZ } from './transforms/group.js';
 export { intervalX, intervalY } from './transforms/interval.js';
 export { recordizeX, recordizeY } from './transforms/recordize.js';
-export { renameChannels } from './transforms/rename.js';
+export { renameChannels, replaceChannels } from './transforms/rename.js';
 export { select, selectFirst, selectLast, selectMaxX, selectMaxY, selectMinX, selectMinY } from './transforms/select.js';
 export { shiftX, shiftY } from './transforms/shift.js';
 export { sort, shuffle, reverse } from './transforms/sort.js';
 export { stackX, stackY } from './transforms/stack.js';
 export { windowX, windowY } from './transforms/window.js';
-// format helpers
+// helpers
 export { formatMonth } from './helpers/formats.js';
+export { default as LinearGradientX } from './marks/helpers/LinearGradientX.svelte';
+export { default as LinearGradientY } from './marks/helpers/LinearGradientY.svelte';

package/dist/marks/BarX.svelte

@@ -6,13 +6,11 @@
     import Mark from '../Mark.svelte';
     import { getContext } from 'svelte';
     import { stackX, recordizeX, intervalX, sort } from '../index.js';
-    import { resolveProp, resolveStyles } from '../helpers/resolve.js';
-    import { roundedRect } from '../helpers/roundedRect.js';
     import type { PlotContext, BaseMarkProps, RectMarkProps, ChannelAccessor } from '../types.js';
     import type { StackOptions } from '../transforms/stack.js';
     import type { DataRow } from '../types.js';
-    import { addEventHandlers } from './helpers/events.js';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
+    import RectPath from './helpers/RectPath.svelte';
 
     type BarXProps = BaseMarkProps & {
         data: DataRow[];
@@ -21,14 +19,6 @@
         x2?: ChannelAccessor;
         y?: ChannelAccessor;
         stack?: StackOptions;
-        borderRadius?:
-            | number
-            | {
-                  topLeft?: number;
-                  topRight?: number;
-                  bottomRight?: number;
-                  bottomLeft?: number;
-              };
     } & RectMarkProps;
 
     let { data = [{}], class: className = null, stack, ...options }: BarXProps = $props();
@@ -59,33 +49,17 @@
                 {@const bw = plot.scales.y.fn.bandwidth()}
                 {@const minx = Math.min(d.x1, d.x2)}
                 {@const maxx = Math.max(d.x1, d.x2)}
-                {@const insetLeft = resolveProp(args.insetLeft, d.datum, 0)}
-                {@const insetRight = resolveProp(args.insetRight, d.datum, 0)}
-                {@const insetTop = resolveProp(args.insetTop || args.inset, d.datum, 0)}
-                {@const insetBottom = resolveProp(args.insetBottom || args.inset, d.datum, 0)}
-                {@const dx = resolveProp(args.dx, d.datum, 0)}
-                {@const dy = resolveProp(args.dy, d.datum, 0)}
                 {#if d.valid}
-                    {@const [style, styleClass] = resolveStyles(plot, d, args, 'fill', usedScales)}
-                    <path
-                        d={roundedRect(
-                            0,
-                            0,
-                            maxx - minx - insetLeft - insetRight,
-                            bw - insetTop - insetBottom,
-                            options.borderRadius
-                        )}
-                        class={[styleClass, className]}
-                        {style}
-                        transform="translate({[
-                            minx + dx + insetLeft,
-                            d.y + insetTop + dy - bw * 0.5
-                        ]})"
-                        use:addEventHandlers={{
-                            getPlotState,
-                            options: args,
-                            datum: d.datum
-                        }} />
+                    <RectPath
+                        {usedScales}
+                        class={className}
+                        {options}
+                        datum={d}
+                        x={minx}
+                        useInsetAsFallbackHorizontally={false}
+                        y={d.y - bw * 0.5}
+                        width={maxx - minx}
+                        height={bw} />
                 {/if}
             {/each}
         </GroupMultiple>

package/dist/marks/BarY.svelte

@@ -6,40 +6,25 @@
     import Mark from '../Mark.svelte';
     import { getContext } from 'svelte';
     import { intervalY, stackY, recordizeY, sort } from '../index.js';
-    import { resolveProp, resolveStyles } from '../helpers/resolve.js';
-    import { roundedRect } from '../helpers/roundedRect.js';
-    import {
-        type PlotContext,
-        type BaseMarkProps,
-        type ChannelAccessor,
-        type DataRow
-    } from '../types.js';
+    import type { PlotContext, BaseMarkProps, BaseRectMarkProps } from '../types.js';
     import type { StackOptions } from '../transforms/stack.js';
-    import { maybeData } from '../helpers/index.js';
-    import { addEventHandlers } from './helpers/events.js';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
+    import RectPath from './helpers/RectPath.svelte';
 
-    type BarYProps = BaseMarkProps & {
-        data: DataRow[];
-        x?: ChannelAccessor;
-        y?: ChannelAccessor;
-        y1?: ChannelAccessor;
-        y2?: ChannelAccessor;
-        stack?: StackOptions;
-        /**
-         * Converts y into y1/y2 ranges based on the provided interval. Disables the
-         * implicit stacking
-         */
-        interval?: number | string;
-        borderRadius?:
-            | number
-            | {
-                  topLeft?: number;
-                  topRight?: number;
-                  bottomRight?: number;
-                  bottomLeft?: number;
-              };
-    };
+    type BarYProps = BaseMarkProps &
+        BaseRectMarkProps & {
+            data: DataRow[];
+            x?: ChannelAccessor;
+            y?: ChannelAccessor;
+            y1?: ChannelAccessor;
+            y2?: ChannelAccessor;
+            stack?: StackOptions;
+            /**
+             * Converts y into y1/y2 ranges based on the provided interval. Disables the
+             * implicit stacking
+             */
+            interval?: number | string;
+        };
 
     let { data = [{}], class: className = null, stack, ...options }: BarYProps = $props();
 
@@ -63,39 +48,23 @@
     requiredScales={{ x: ['band'] }}
     channels={['x', 'y1', 'y2', 'fill', 'stroke', 'opacity', 'fillOpacity', 'strokeOpacity']}
     {...args}>
-    {#snippet children({ mark, scaledData, usedScales })}
+    {#snippet children({ scaledData, usedScales })}
         <GroupMultiple class="bar-y" length={scaledData.length}>
             {#each scaledData as d}
                 {@const bw = plot.scales.x.fn.bandwidth()}
                 {@const miny = Math.min(d.y1, d.y2)}
                 {@const maxy = Math.max(d.y1, d.y2)}
-                {@const insetLeft = resolveProp(args.insetLeft || args.inset, d.datum, 0)}
-                {@const insetRight = resolveProp(args.insetRight || args.inset, d.datum, 0)}
-                {@const insetTop = resolveProp(args.insetTop, d.datum, 0)}
-                {@const insetBottom = resolveProp(args.insetBottom, d.datum, 0)}
-                {@const dx = resolveProp(args.dx, d.datum, 0)}
-                {@const dy = resolveProp(args.dy, d.datum, 0)}
                 {#if d.valid}
-                    {@const [style, styleClass] = resolveStyles(plot, d, args, 'fill', usedScales)}
-                    <path
-                        d={roundedRect(
-                            0,
-                            0,
-                            bw - insetLeft - insetRight,
-                            maxy - miny - insetTop - insetBottom,
-                            options.borderRadius
-                        )}
-                        class={[styleClass, className]}
-                        {style}
-                        transform="translate({[
-                            d.x + insetLeft + dx - bw * 0.5,
-                            miny + dy + insetTop
-                        ]})"
-                        use:addEventHandlers={{
-                            getPlotState,
-                            options: args,
-                            datum: d.datum
-                        }} />
+                    <RectPath
+                        x={d.x - bw * 0.5}
+                        y={miny}
+                        options={args}
+                        class={className}
+                        width={bw}
+                        height={maxy - miny}
+                        datum={d}
+                        {usedScales}
+                        useInsetAsFallbackVertically={false} />
                 {/if}
             {/each}
         </GroupMultiple>

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

@@ -1,6 +1,6 @@
-import { type BaseMarkProps, type ChannelAccessor, type DataRow } from '../types.js';
+import type { BaseMarkProps, BaseRectMarkProps } from '../types.js';
 import type { StackOptions } from '../transforms/stack.js';
-type BarYProps = BaseMarkProps & {
+type BarYProps = BaseMarkProps & BaseRectMarkProps & {
     data: DataRow[];
     x?: ChannelAccessor;
     y?: ChannelAccessor;
@@ -12,12 +12,6 @@ type BarYProps = BaseMarkProps & {
      * implicit stacking
      */
     interval?: number | string;
-    borderRadius?: number | {
-        topLeft?: number;
-        topRight?: number;
-        bottomRight?: number;
-        bottomLeft?: number;
-    };
 };
 /** For vertical column charts using a band scale as x axis */
 declare const BarY: import("svelte").Component<BarYProps, {}, "">;

package/dist/marks/Cell.svelte

@@ -6,9 +6,7 @@
     import Mark from '../Mark.svelte';
     import { getContext } from 'svelte';
     import { recordizeY, sort } from '../index.js';
-    import { roundedRect } from '../helpers/roundedRect.js';
-    import { resolveChannel, resolveProp, resolveStyles } from '../helpers/resolve.js';
-    import { coalesce, maybeNumber } from '../helpers/index.js';
+    import { resolveChannel } from '../helpers/resolve.js';
     import type {
         PlotContext,
         DataRecord,
@@ -17,7 +15,7 @@
         ChannelAccessor
     } from '../types.js';
     import { isValid } from '../helpers/isValid.js';
-    import { addEventHandlers } from './helpers/events.js';
+    import RectPath from './helpers/RectPath.svelte';
 
     type CellProps = BaseMarkProps & {
         data: DataRecord[];
@@ -59,43 +57,21 @@
     requiredScales={{ x: ['band'], y: ['band'] }}
     channels={['x', 'y', 'fill', 'stroke', 'opacity', 'fillOpacity', 'strokeOpacity']}
     {...args}>
-    {#snippet children({ mark, scaledData, usedScales })}
+    {#snippet children({ scaledData, usedScales })}
         {@const bwx = plot.scales.x.fn.bandwidth()}
         {@const bwy = plot.scales.y.fn.bandwidth()}
         <g class="cell {className || ''}" data-fill={usedScales.fillOpacity}>
             {#each scaledData as d}
-                {@const inset = resolveProp(args.inset, d.datum, 0)}
-                {@const insetLeft = resolveProp(args.insetLeft, d.datum)}
-                {@const insetRight = resolveProp(args.insetRight, d.datum)}
-                {@const insetTop = resolveProp(args.insetTop, d.datum)}
-                {@const insetBottom = resolveProp(args.insetBottom, d.datum)}
-                {@const dx = resolveProp(args.dx, d.datum, 0)}
-                {@const dy = resolveProp(args.dy, d.datum, 0)}
-                {@const insetL = maybeNumber(coalesce(insetLeft, inset, 0))}
-                {@const insetT = maybeNumber(coalesce(insetTop, inset, 0))}
-                {@const insetR = maybeNumber(coalesce(insetRight, inset, 0))}
-                {@const insetB = maybeNumber(coalesce(insetBottom, inset, 0))}
                 {#if d.valid && (args.fill == null || isValid(resolveChannel('fill', d.datum, args)))}
-                    {@const [style, styleClass] = resolveStyles(plot, d, args, 'fill', usedScales)}
-                    <path
-                        d={roundedRect(
-                            0,
-                            0,
-                            bwx - insetL - insetR,
-                            bwy - insetT - insetB,
-                            options.borderRadius
-                        )}
-                        class={[styleClass]}
-                        {style}
-                        transform="translate({[
-                            d.x + insetL + dx - bwx * 0.5,
-                            d.y + insetT + dy - bwy * 0.5
-                        ]})"
-                        use:addEventHandlers={{
-                            getPlotState,
-                            options: args,
-                            datum: d.datum
-                        }} />
+                    <RectPath
+                        datum={d}
+                        class={className}
+                        {usedScales}
+                        options={args}
+                        x={d.x - bwx * 0.5}
+                        y={d.y - bwy * 0.5}
+                        width={bwx}
+                        height={bwy} />
                 {/if}
             {/each}
         </g>

package/dist/marks/Line.svelte

@@ -18,8 +18,9 @@
         data: DataRecord[];
         z?: ChannelAccessor;
         stroke?: ChannelAccessor;
-        outlineStroke?: ConstantAccessor<string>;
-        outlineStrokeWidth?: ConstantAccessor<number>;
+        outlineStroke?: string;
+        outlineStrokeWidth?: number;
+        outlineStrokeOpacity?: number;
         dx?: ConstantAccessor<number>;
         dy?: ConstantAccessor<number>;
         curve?: CurveName | CurveFactory;
@@ -31,6 +32,7 @@
         textStartOffset?: ConstantAccessor<string>;
         textStrokeWidth?: ConstantAccessor<number>;
         lineClass?: ConstantAccessor<string>;
+        canvas?: boolean;
     } & MarkerOptions;
 </script>
 
@@ -39,11 +41,12 @@
     import MarkerPath from './helpers/MarkerPath.svelte';
     import { getContext } from 'svelte';
     import { resolveProp, resolveStyles } from '../helpers/resolve.js';
-    import { line, type CurveFactory } from 'd3-shape';
+    import { line, type CurveFactory, type Line } from 'd3-shape';
     import { geoPath } from 'd3-geo';
     import callWithProps from '../helpers/callWithProps.js';
     import { maybeCurve } from '../helpers/curves.js';
     import { pick } from 'es-toolkit';
+    import LineCanvas from './helpers/LineCanvas.svelte';
 
     type LineMarkProps = BaseMarkProps & {
         x?: ChannelAccessor;
@@ -61,6 +64,7 @@
         curve = 'auto',
         tension = 0,
         text,
+        canvas = false,
         class: className = null,
         lineClass = null,
         ...options
@@ -96,9 +100,7 @@
     const { getPlotState } = getContext<PlotContext>('svelteplot');
     const plot = $derived(getPlotState());
 
-    type LinePath = (dr: DataRecord[]) => string;
-
-    const linePath: LinePath = $derived(
+    const linePath: Line<ScaledDataRecord> = $derived(
         plot.scales.projection && curve === 'auto'
             ? sphereLine(plot.scales.projection)
             : callWithProps(line, [], {
@@ -111,7 +113,7 @@
 
     function sphereLine(projection) {
         const path = geoPath(projection);
-        return (lineData: ScaledDataRecord[]) => {
+        const fn = (lineData: ScaledDataRecord[]) => {
             let line = [];
             const lines = [line];
             for (const { x, y } of lineData) {
@@ -125,6 +127,8 @@
             }
             return path({ type: 'MultiLineString', coordinates: lines });
         };
+        fn.context = path.context;
+        return fn;
     }
 </script>
 
@@ -135,88 +139,102 @@
     {...args}>
     {#snippet children({ mark, usedScales, scaledData })}
         {#if scaledData.length > 0}
-            <g class={['lines', className]}>
-                {#each groupIndex(scaledData, groupByKey) as lineData, i}
-                    {@const pathString = linePath(lineData)}
-                    {#if pathString}
-                        <GroupMultiple class={resolveProp(lineClass, lineData[0])}>
-                            {#if options.outlineStroke}
-                                {@const [outlineStyle, outlineStyleClass] = resolveStyles(
+            {@const groupedLineData = groupIndex(scaledData, groupByKey)};
+            {#if canvas}
+                <LineCanvas {groupedLineData} {mark} {usedScales} {linePath} {groupByKey} />
+            {:else}
+                <g class={['lines', className]}>
+                    {#each groupedLineData as lineData, i}
+                        {@const pathString = linePath(lineData)}
+                        {#if pathString}
+                            <GroupMultiple class={resolveProp(lineClass, lineData[0])}>
+                                {#if options.outlineStroke}
+                                    {@const [outlineStyle, outlineStyleClass] = resolveStyles(
+                                        plot,
+                                        { ...lineData[0], stroke: options.outlineStroke },
+                                        {
+                                            strokeLinejoin: 'round',
+                                            ...args,
+                                            stroke: options.outlineStroke,
+                                            strokeOpacity: options.outlineStrokeOpacity ?? 1,
+                                            strokeWidth:
+                                                options.outlineStrokeWidth ||
+                                                resolveProp(
+                                                    options.strokeWidth,
+                                                    lineData[0].datum,
+                                                    1.4
+                                                ) + 2
+                                        },
+                                        'stroke',
+                                        usedScales
+                                    )}
+                                    <path
+                                        d={pathString}
+                                        style={outlineStyle}
+                                        class={['is-outline', outlineStyleClass]} />
+                                {/if}
+                                {@const [style, styleClass] = resolveStyles(
                                     plot,
-                                    { ...lineData[0], stroke: options.outlineStroke },
+                                    lineData[0],
                                     {
+                                        strokeWidth: 1.4,
                                         strokeLinejoin: 'round',
                                         ...args,
-                                        stroke: options.outlineStroke,
-                                        strokeWidth:
-                                            options.outlineStrokeWidth ||
-                                            (+options.strokeWidth || 1.4) + 2
+                                        stroke: lineData[0].stroke
                                     },
                                     'stroke',
                                     usedScales
                                 )}
-                                <path
+                                {@const [textStyle, textStyleClass] = resolveStyles(
+                                    plot,
+                                    lineData[0],
+                                    {
+                                        textAnchor: 'middle',
+                                        ...pick(args, [
+                                            'fontSize',
+                                            'fontWeight',
+                                            'fontStyle',
+                                            'textAnchor'
+                                        ]),
+                                        strokeWidth: args.textStrokeWidth
+                                            ? args.textStrokeWidth
+                                            : args.textStroke
+                                              ? 2
+                                              : 0,
+                                        fill: args.textFill || args.stroke,
+                                        stroke: args.textStroke
+                                    },
+                                    'fill',
+                                    usedScales,
+                                    true
+                                )}
+                                <MarkerPath
+                                    {mark}
+                                    scales={plot.scales}
+                                    markerStart={args.markerStart}
+                                    markerMid={args.markerMid}
+                                    markerEnd={args.markerEnd}
+                                    marker={args.marker}
+                                    strokeWidth={args.strokeWidth}
+                                    datum={lineData[0]}
                                     d={pathString}
-                                    style={outlineStyle}
-                                    class={['is-outline', outlineStyleClass]} />
-                            {/if}
-                            {@const [style, styleClass] = resolveStyles(
-                                plot,
-                                lineData[0],
-                                {
-                                    strokeWidth: 1.4,
-                                    strokeLinejoin: 'round',
-                                    ...args,
-                                    stroke: lineData[0].stroke
-                                },
-                                'stroke',
-                                usedScales
-                            )}
-                            {@const [textStyle, textStyleClass] = resolveStyles(
-                                plot,
-                                lineData[0],
-                                {
-                                    textAnchor: 'middle',
-                                    ...pick(args, [
-                                        'fontSize',
-                                        'fontWeight',
-                                        'fontStyle',
-                                        'textAnchor'
-                                    ]),
-                                    strokeWidth: args.textStrokeWidth
-                                        ? args.textStrokeWidth
-                                        : args.textStroke
-                                          ? 2
-                                          : 0,
-                                    fill: args.textFill || args.stroke,
-                                    stroke: args.textStroke
-                                },
-                                'fill',
-                                usedScales,
-                                true
-                            )}
-                            <MarkerPath
-                                {mark}
-                                scales={plot.scales}
-                                markerStart={args.markerStart}
-                                markerMid={args.markerMid}
-                                markerEnd={args.markerEnd}
-                                marker={args.marker}
-                                strokeWidth={args.strokeWidth}
-                                datum={lineData[0]}
-                                d={pathString}
-                                dInv={text ? linePath(lineData.toReversed()) : null}
-                                color={lineData[0].stroke || 'currentColor'}
-                                {style}
-                                class={styleClass}
-                                text={text ? resolveProp(text, lineData[0]) : null}
-                                startOffset={resolveProp(args.textStartOffset, lineData[0], '50%')}
-                                {textStyle}
-                                {textStyleClass} />
-                        </GroupMultiple>
-                    {/if}
-                {/each}
-            </g>
+                                    dInv={text ? linePath(lineData.toReversed()) : null}
+                                    color={lineData[0].stroke || 'currentColor'}
+                                    {style}
+                                    class={styleClass}
+                                    text={text ? resolveProp(text, lineData[0]) : null}
+                                    startOffset={resolveProp(
+                                        args.textStartOffset,
+                                        lineData[0],
+                                        '50%'
+                                    )}
+                                    {textStyle}
+                                    {textStyleClass} />
+                            </GroupMultiple>
+                        {/if}
+                    {/each}
+                </g>
+            {/if}
         {/if}
     {/snippet}
 </Mark>

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

@@ -3,8 +3,9 @@ export type BaseLineMarkProps = {
     data: DataRecord[];
     z?: ChannelAccessor;
     stroke?: ChannelAccessor;
-    outlineStroke?: ConstantAccessor<string>;
-    outlineStrokeWidth?: ConstantAccessor<number>;
+    outlineStroke?: string;
+    outlineStrokeWidth?: number;
+    outlineStrokeOpacity?: number;
     dx?: ConstantAccessor<number>;
     dy?: ConstantAccessor<number>;
     curve?: CurveName | CurveFactory;
@@ -18,8 +19,9 @@ export type BaseLineMarkProps = {
     textStartOffset?: ConstantAccessor<string>;
     textStrokeWidth?: ConstantAccessor<number>;
     lineClass?: ConstantAccessor<string>;
+    canvas?: boolean;
 } & MarkerOptions;
-import { type CurveFactory } from 'd3-shape';
+import { type CurveFactory, type Line } from 'd3-shape';
 import type { RawValue } from '../types.js';
 type LineMarkProps = BaseMarkProps & {
     x?: ChannelAccessor;

package/dist/marks/Rect.svelte

@@ -17,6 +17,7 @@
     } from '../types.js';
     import { addEventHandlers } from './helpers/events.js';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
+    import RectPath from './helpers/RectPath.svelte';
 
     type RectMarkProps = BaseMarkProps & {
         data: DataRecord[];
@@ -57,31 +58,16 @@
                     {@const maxy = Math.max(y1, y2)}
                     {@const minx = Math.min(x1, x2)}
                     {@const maxx = Math.max(x1, x2)}
-                    {@const inset = resolveProp(args.inset, d.datum, 0)}
-                    {@const insetLeft = resolveProp(args.insetLeft, d.datum)}
-                    {@const insetRight = resolveProp(args.insetRight, d.datum)}
-                    {@const insetTop = resolveProp(args.insetTop, d.datum)}
-                    {@const insetBottom = resolveProp(args.insetBottom, d.datum)}
-                    {@const insetL = maybeNumber(coalesce(insetLeft, inset, 0)) ?? 0}
-                    {@const insetT = maybeNumber(coalesce(insetTop, inset, 0)) ?? 0}
-                    {@const insetR = maybeNumber(coalesce(insetRight, inset, 0)) ?? 0}
-                    {@const insetB = maybeNumber(coalesce(insetBottom, inset, 0)) ?? 0}
 
-                    {@const [style, styleClass] = resolveStyles(plot, d, args, 'fill', usedScales)}
-                    <rect
-                        class={[scaledData.length === 1 && className, styleClass]}
-                        {style}
-                        x={minx + insetL}
-                        y={miny + insetT}
-                        width={maxx - minx - insetL - insetR}
-                        height={maxy - miny - insetT - insetB}
-                        rx={resolveProp(args.rx, d.datum, null)}
-                        ry={resolveProp(args.ry, d.datum, null)}
-                        use:addEventHandlers={{
-                            getPlotState,
-                            options: args,
-                            datum: d.datum
-                        }} />
+                    <RectPath
+                        datum={d}
+                        class={scaledData.length === 1 ? className : null}
+                        x={minx}
+                        y={miny}
+                        width={maxx - minx}
+                        height={maxy - miny}
+                        options={args}
+                        {usedScales} />
                 {/if}
             {/each}
         </GroupMultiple>