svelteplot 0.8.1 → 0.9.0

package/dist/marks/BoxX.svelte

@@ -4,159 +4,25 @@
 
 <script lang="ts">
     interface BoxXMarkProps extends ComponentProps<typeof BoxY> {}
-    import GroupMultiple from './helpers/GroupMultiple.svelte';
-    import { BarX, TickX, RuleY, Dot, groupY } from '../index.js';
-    import { resolveChannel } from '../helpers/resolve.js';
     import { type ComponentProps } from 'svelte';
+    import Box from './helpers/Box.svelte';
     import type BoxY from './BoxY.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
-    import { IS_SORTED } from '../transforms/sort';
-    import { sort } from 'd3-array';
 
     let markProps: BoxXMarkProps = $props();
 
     const DEFAULTS = {
         tickMedian: true,
         tickMinMax: false,
+        sort: 'median',
         ...getPlotDefaults().box,
         ...getPlotDefaults().boxX
     };
 
-    const {
-        data = [{}],
-        bar,
-        rule,
-        tickMedian,
-        tickMinMax,
-        dot,
-        x,
-        y,
-        fx,
-        fy,
-        fill,
-        stroke,
-        class: className = ''
-    }: BoxXMarkProps = $derived({
+    const props: BoxXMarkProps & { class?: string } = $derived({
         ...DEFAULTS,
         ...markProps
     });
-
-    const { data: grouped, ...groupChannels } = $derived(
-        groupY(
-            {
-                data: data.filter((d) => resolveChannel('x', d, { x, y }) != null),
-                x,
-                y,
-                x1: x,
-                x2: x,
-                fx,
-                fy
-            },
-            { x: 'median', x1: 'p25', x2: 'p75', fill: (rows) => rows }
-        )
-    );
-
-    const X = Symbol('x'),
-        Y = Symbol('y'),
-        FX = Symbol('fx'),
-        FY = Symbol('fy'),
-        P25 = Symbol('p25'),
-        P75 = Symbol('p75'),
-        MEDIAN = Symbol('median'),
-        MIN = Symbol('min'),
-        MAX = Symbol('max'),
-        OUTLIERS = Symbol('outliers');
-
-    const facets = $derived({
-        ...(fx != null && { fx: FX }),
-        ...(fy != null && { fy: FY })
-    });
-
-    const sortProps = { [IS_SORTED]: true };
-
-    const boxData = $derived(
-        grouped
-            .map((row) => {
-                const { x: median, x1: p25, x2: p75, fill: fill, y: ry } = groupChannels;
-
-                const iqr = row[p75] - row[p25];
-                const whisker = iqr * 1.5;
-                const lower = row[p25] - whisker;
-                const upper = row[p75] + whisker;
-                const data = row[fill].map((d) => ({
-                    ...d,
-                    [X]: resolveChannel('x', d, { x, y })
-                }));
-                const outliers = data.filter((d) => d[X] < lower || d[X] > upper);
-                const inside = data
-                    .filter((d) => d[X] >= lower && d[X] <= upper)
-                    .sort((a, b) => a[X] - b[X]);
-
-                // if (inside.length === 0) console.log('No data inside boxplot', data, row, lower, upper);
-                return {
-                    ...data[0],
-                    [Y]: row[ry],
-                    [P25]: row[p25],
-                    [MEDIAN]: row[median],
-                    [P75]: row[p75],
-                    [MIN]: inside[0][X],
-                    [MAX]: inside.at(-1)[X],
-                    [FX]: resolveChannel('fx', data[0], { fx }, null),
-                    [FY]: resolveChannel('fy', data[0], { fy }, null),
-                    [OUTLIERS]: outliers
-                };
-            })
-            .sort((a, b) => b[MEDIAN] - a[MEDIAN])
-    );
 </script>
 
-<GroupMultiple class="box-x {className || ''}" length={className ? 2 : grouped.length}>
-    <RuleY
-        data={boxData}
-        y={Y}
-        x1={MIN}
-        x2={P25}
-        {stroke}
-        {...rule || {}}
-        {...facets}
-        {...sortProps} />
-    <RuleY data={boxData} y={Y} x1={P75} x2={MAX} {stroke} {...rule || {}} {...facets} />
-    <BarX data={boxData} y={Y} x1={P25} x2={P75} {fill} {stroke} {...facets} {...bar || {}} />
-    {#if tickMedian}
-        <TickX
-            data={boxData}
-            y={Y}
-            x={MEDIAN}
-            {...facets}
-            {stroke}
-            strokeWidth={2}
-            {...typeof tickMedian === 'object' ? tickMedian : {}} />
-    {/if}
-    {#if tickMinMax}
-        <TickX
-            data={boxData}
-            x={MIN}
-            y={Y}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-        <TickX
-            data={boxData}
-            x={MAX}
-            y={Y}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-    {/if}
-    <Dot
-        data={boxData.map((d) => d[OUTLIERS]).flat()}
-        {x}
-        {y}
-        {fx}
-        {fy}
-        {fill}
-        {stroke}
-        {...dot || {}} />
-</GroupMultiple>
+<Box {...props} orientation="x" />

package/dist/marks/BoxY.svelte

@@ -9,6 +9,21 @@
         data: Datum[];
         x: ChannelAccessor;
         y: ChannelAccessor;
+        /**
+         * Custom sort order for grouped box plot data
+         */
+        sort?:
+            | 'min'
+            | 'max'
+            | 'median'
+            | 'p25'
+            | 'p75'
+            | '-min'
+            | '-max'
+            | '-median'
+            | '-p25'
+            | '-p75'
+            | ((d: Datum) => RawValue);
         /**
          * Options for the rule marks that represent the min/max range
          */
@@ -30,156 +45,24 @@
          */
         dot: Record<string, ChannelAccessor<Datum>>;
     }
-    import GroupMultiple from './helpers/GroupMultiple.svelte';
-    import { groupX, BarY, TickY, RuleX, Dot } from '../index.js';
-    import { resolveChannel } from '../helpers/resolve.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
-    import type { BaseMarkProps, ChannelAccessor, DataRecord } from '../types';
-    import { IS_SORTED } from '../transforms/sort';
+    import Box from './helpers/Box.svelte';
+    import type { BaseMarkProps, ChannelAccessor, DataRecord, RawValue } from '../types';
 
     let markProps: BoxYMarkProps = $props();
 
     const DEFAULTS = {
         tickMedian: true,
         tickMinMax: false,
+        sort: 'median',
         ...getPlotDefaults().box,
         ...getPlotDefaults().boxY
     };
 
-    const {
-        data = [{}],
-        bar,
-        rule,
-        tickMedian,
-        tickMinMax,
-        dot,
-        x,
-        y,
-        fx,
-        fy,
-        fill,
-        stroke,
-        class: className = ''
-    }: BoxYMarkProps = $derived({
+    const props: BoxYMarkProps & { class?: string } = $derived({
         ...DEFAULTS,
         ...markProps
     });
-
-    const { data: grouped, ...groupChannels } = $derived(
-        groupX(
-            {
-                data: data.filter((d) => resolveChannel('x', d, { x, y }) != null),
-                x,
-                y,
-                y1: y,
-                y2: y,
-                fx,
-                fy
-            },
-            { y: 'median', y1: 'p25', y2: 'p75', fill: (rows) => rows }
-        )
-    );
-
-    const X = Symbol('x'),
-        Y = Symbol('y'),
-        FX = Symbol('fx'),
-        FY = Symbol('fy'),
-        P25 = Symbol('p25'),
-        P75 = Symbol('p75'),
-        MEDIAN = Symbol('median'),
-        MIN = Symbol('min'),
-        MAX = Symbol('max'),
-        OUTLIERS = Symbol('outliers');
-
-    const facets = $derived({
-        ...(fx != null && { fx: FX }),
-        ...(fy != null && { fy: FY })
-    });
-
-    const sortProps = { [IS_SORTED]: true };
-
-    const boxData = $derived(
-        grouped
-            .map((row) => {
-                const { y: median, y1: p25, y2: p75, fill: fill, x: rx } = groupChannels;
-
-                const iqr = row[p75] - row[p25];
-                const whisker = iqr * 1.5;
-                const lower = row[p25] - whisker;
-                const upper = row[p75] + whisker;
-                const data = row[fill].map((d) => ({
-                    ...d,
-                    [Y]: resolveChannel('y', d, { x, y })
-                }));
-                const outliers = data.filter((d) => d[Y] < lower || d[Y] > upper);
-                const inside = data
-                    .filter((d) => d[Y] >= lower && d[Y] <= upper)
-                    .sort((a, b) => a[Y] - b[Y]);
-
-                return {
-                    ...data[0],
-                    [X]: row[rx],
-                    [P25]: row[p25],
-                    [MEDIAN]: row[median],
-                    [P75]: row[p75],
-                    [MIN]: inside[0][Y],
-                    [MAX]: inside.at(-1)[Y],
-                    [FX]: resolveChannel('fx', data[0], { fx }, null),
-                    [FY]: resolveChannel('fy', data[0], { fy }, null),
-                    [OUTLIERS]: outliers
-                };
-            })
-            .sort((a, b) => b[MEDIAN] - a[MEDIAN])
-    );
 </script>
 
-<GroupMultiple class="box-y {className || ''}" length={className ? 2 : grouped.length}>
-    <RuleX
-        data={boxData}
-        x={X}
-        y1={MIN}
-        y2={P25}
-        {stroke}
-        {...sortProps}
-        {...rule || {}}
-        {...facets} />
-    <RuleX data={boxData} x={X} y1={P75} y2={MAX} {stroke} {...rule || {}} {...facets} />
-    <BarY data={boxData} x={X} y1={P25} y2={P75} {fill} {stroke} {...facets} {...bar || {}} />
-    {#if tickMedian}
-        <TickY
-            data={boxData}
-            x={X}
-            y={MEDIAN}
-            {...facets}
-            {stroke}
-            strokeWidth={2}
-            {...typeof tickMedian === 'object' ? tickMedian : {}} />
-    {/if}
-    {#if tickMinMax}
-        <TickY
-            data={boxData}
-            x={X}
-            y={MIN}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-        <TickY
-            data={boxData}
-            x={X}
-            y={MAX}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-    {/if}
-    <Dot
-        data={boxData.map((d) => d[OUTLIERS]).flat()}
-        {x}
-        {y}
-        {fx}
-        {fy}
-        {fill}
-        {stroke}
-        {...dot || {}} />
-</GroupMultiple>
+<Box {...props} orientation="y" />

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

@@ -1,4 +1,4 @@
-import type { ChannelAccessor, DataRecord } from '../types';
+import type { ChannelAccessor, DataRecord, RawValue } from '../types';
 declare function $$render<Datum extends DataRecord>(): {
     props: Pick<Partial<{
         filter: import("../types").ConstantAccessor<boolean, Datum>;
@@ -11,10 +11,10 @@ declare function $$render<Datum extends DataRecord>(): {
         dodgeY: import("../transforms/dodge").DodgeYOptions;
         fill: ChannelAccessor<Datum>;
         fillOpacity: import("../types").ConstantAccessor<number, Datum>;
-        sort: ((a: import("../types").RawValue, b: import("../types").RawValue) => number) | {
+        sort: ((a: RawValue, b: RawValue) => number) | {
             channel: string;
             order?: "ascending" | "descending";
-        } | import("../types").ConstantAccessor<import("../types").RawValue, Datum>;
+        } | import("../types").ConstantAccessor<RawValue, Datum>;
         stroke: ChannelAccessor<Datum>;
         strokeWidth: import("../types").ConstantAccessor<number, Datum>;
         strokeOpacity: import("../types").ConstantAccessor<number, Datum>;
@@ -26,6 +26,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: import("../types").ConstantAccessor<number, Datum>;
         mixBlendMode: import("../types").ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
         clipPath: string;
+        mask: string;
         imageFilter: import("../types").ConstantAccessor<string, Datum>;
         shapeRendering: import("../types").ConstantAccessor<import("csstype").Property.ShapeRendering, Datum>;
         paintOrder: import("../types").ConstantAccessor<string, Datum>;
@@ -66,6 +67,10 @@ declare function $$render<Datum extends DataRecord>(): {
         data: Datum[];
         x: ChannelAccessor;
         y: ChannelAccessor;
+        /**
+         * Custom sort order for grouped box plot data
+         */
+        sort?: "min" | "max" | "median" | "p25" | "p75" | "-min" | "-max" | "-median" | "-p25" | "-p75" | ((d: Datum) => RawValue);
         /**
          * Options for the rule marks that represent the min/max range
          */

package/dist/marks/Brush.svelte

@@ -34,10 +34,11 @@
     }
     import { getContext, untrack } from 'svelte';
     import Rect from './Rect.svelte';
-    import type { BaseMarkProps, DataRecord, PlotContext } from '../types/index.js';
+    import type { BaseMarkProps, DataRecord } from '../types/index.js';
     import { clientToLayerCoordinates } from './helpers/events.js';
     import Frame from './Frame.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let { brush: brushExternal = $bindable({ enabled: false }), ...markProps }: BrushMarkProps =
         $props();
@@ -85,8 +86,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const xScaleFn = $derived(plot.scales.x.fn);
     const yScaleFn = $derived(plot.scales.y.fn);

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

@@ -26,6 +26,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, 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>;

package/dist/marks/Cell.svelte

@@ -10,7 +10,6 @@
         y?: ChannelAccessor<Datum>;
     }
     import type {
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         BaseRectMarkProps,
@@ -18,13 +17,13 @@
         LinkableMarkProps
     } from '../types/index.js';
     import Mark from '../Mark.svelte';
-    import { getContext } from 'svelte';
     import { recordizeY, sort } from '../index.js';
     import { resolveChannel } from '../helpers/resolve.js';
 
     import { isValid } from '../helpers/index.js';
     import RectPath from './helpers/RectPath.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: CellMarkProps = $props();
 
@@ -41,8 +40,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const args = $derived(
         options.sort !== undefined

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

@@ -26,6 +26,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, 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>;

package/dist/marks/ColorLegend.svelte

@@ -2,7 +2,6 @@
     interface ColorLegendMarkProps {
         class: string | null;
     }
-    import { getContext } from 'svelte';
     import Plot from '../Plot.svelte';
     import AxisX from './AxisX.svelte';
     import Frame from './Frame.svelte';
@@ -10,13 +9,12 @@
     import { range as d3Range, extent } from 'd3-array';
     import { maybeSymbol } from '../helpers/symbols.js';
 
-    import type { PlotContext } from '../types/plot.js';
     import { getPlotDefaults } from '../hooks/plotDefaults';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let { class: className = null }: ColorLegendMarkProps = $props();
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const DEFAULTS = getPlotDefaults();
 

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

@@ -27,6 +27,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, 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>;

package/dist/marks/CustomMarkHTML.svelte

@@ -23,21 +23,16 @@
         class: string | null;
         children: Snippet<{ datum: Datum; x: number; y: number }>;
     }
-    import { getContext, type Snippet } from 'svelte';
-    import type {
-        ChannelAccessor,
-        ConstantAccessor,
-        DataRecord,
-        PlotContext
-    } from '../types/index.js';
-
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    import { type Snippet } from 'svelte';
+    import type { ChannelAccessor, ConstantAccessor, DataRecord } from '../types/index.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     import { resolveChannel } from '../helpers/resolve.js';
     import { projectX, projectY, projectXY } from '../helpers/scales.js';
     import { isValid } from '../helpers/index.js';
 
+    const plot = usePlot();
+
     let {
         data = [{} as Datum],
         x,

package/dist/marks/DifferenceY.svelte

@@ -49,19 +49,17 @@
         BaseMarkProps,
         ChannelAccessor,
         CurveName,
-        DataRecord,
-        PlotContext
+        DataRecord
     } from '../types/index.js';
     import { Line, Area } from './index.js';
     import { randomId, coalesce } from '../helpers/index.js';
-    import { getContext } from 'svelte';
     import { extent, max, min } from 'd3-array';
     import { resolveChannel } from '../helpers/resolve.js';
     import type { CurveFactory } from 'd3-shape';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    let plot = $derived(getPlotState());
+    const plot = usePlot();
 
     let markProps: DifferenceYMarkProps = $props();
 

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

@@ -27,6 +27,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, 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>;

package/dist/marks/Dot.svelte

@@ -12,9 +12,8 @@
         dotClass?: ConstantAccessor<string, Datum>;
     }
 
-    import { getContext, type Snippet } from 'svelte';
+    import { type Snippet } from 'svelte';
     import type {
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         ConstantAccessor,
@@ -33,6 +32,7 @@
     import Anchor from './helpers/Anchor.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
     import { isOrdinalScale } from '../helpers/scales.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     const DEFAULTS = {
         ...getPlotDefaults().dot
@@ -48,8 +48,7 @@
         ...options
     }: DotMarkProps = $derived({ ...DEFAULTS, ...markProps });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     function getSymbolPath(symbolType, size) {
         return d3Symbol(maybeSymbol(symbolType), size)();
@@ -113,7 +112,7 @@
                                 ]}
                                 {style}
                                 {@attach addEventHandlers({
-                                    getPlotState,
+                                    plot,
                                     options: args,
                                     datum: d?.datum
                                 })} />

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

@@ -27,6 +27,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: ConstantAccessor<number, Datum>;
         mixBlendMode: ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
         clipPath: string;
+        mask: string;
         imageFilter: ConstantAccessor<string, Datum>;
         shapeRendering: ConstantAccessor<import("csstype").Property.ShapeRendering, Datum>;
         paintOrder: ConstantAccessor<string, Datum>;

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

@@ -26,6 +26,7 @@ declare function $$render<Datum extends DataRow>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, Record<string | symbol, import("../types/data").RawValue>>;
         mixBlendMode: import("../types/index.js").ConstantAccessor<import("csstype").Property.MixBlendMode, Record<string | symbol, import("../types/data").RawValue>>;
         clipPath: string;
+        mask: string;
         imageFilter: import("../types/index.js").ConstantAccessor<string, Record<string | symbol, import("../types/data").RawValue>>;
         shapeRendering: import("../types/index.js").ConstantAccessor<import("csstype").Property.ShapeRendering, Record<string | symbol, import("../types/data").RawValue>>;
         paintOrder: import("../types/index.js").ConstantAccessor<string, Record<string | symbol, import("../types/data").RawValue>>;

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

@@ -26,6 +26,7 @@ declare function $$render<Datum extends DataRow>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, Record<string | symbol, import("../types/data").RawValue>>;
         mixBlendMode: import("../types/index.js").ConstantAccessor<import("csstype").Property.MixBlendMode, Record<string | symbol, import("../types/data").RawValue>>;
         clipPath: string;
+        mask: string;
         imageFilter: import("../types/index.js").ConstantAccessor<string, Record<string | symbol, import("../types/data").RawValue>>;
         shapeRendering: import("../types/index.js").ConstantAccessor<import("csstype").Property.ShapeRendering, Record<string | symbol, import("../types/data").RawValue>>;
         paintOrder: import("../types/index.js").ConstantAccessor<string, Record<string | symbol, import("../types/data").RawValue>>;

package/dist/marks/Frame.svelte

@@ -21,17 +21,12 @@
         insetBottom?: number;
     }
     import Mark from '../Mark.svelte';
-    import { getContext } from 'svelte';
-    import type {
-        PlotContext,
-        BaseRectMarkProps,
-        LinkableMarkProps,
-        DataRecord
-    } from '../types/index.js';
+    import type { BaseRectMarkProps, LinkableMarkProps, DataRecord } from '../types/index.js';
     import type { BaseMarkProps } from '../types/index.js';
     import RectPath from './helpers/RectPath.svelte';
     import { resolveProp } from '../helpers/resolve';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: FrameMarkProps = $props();
 
@@ -61,8 +56,7 @@
     const dx = $derived(resolveProp(options.dx, null, 0) || 0);
     const dy = $derived(resolveProp(options.dy, null, 0) || 0);
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 </script>
 
 <Mark type="frame" {automatic}>

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

@@ -26,6 +26,7 @@ declare function $$render<Datum extends DataRecord>(): {
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, 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>;