svelteplot 0.8.1 → 0.9.0-pr-309.0

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

@@ -1,4 +1,5 @@
 import type { RawValue, ChannelAccessor } from '../types/index.js';
+import { autoTicks } from '../helpers/autoTicks.js';
 declare function $$render<Datum = RawValue>(): {
     props: Omit<Partial<{
         filter: import("../types/index.js").ConstantAccessor<boolean, Datum>;
@@ -7,14 +8,14 @@ declare function $$render<Datum = RawValue>(): {
         fy: ChannelAccessor<Datum>;
         dx: import("../types/index.js").ConstantAccessor<number, Datum>;
         dy: import("../types/index.js").ConstantAccessor<number, Datum>;
-        dodgeX: import("../transforms/dodge").DodgeXOptions;
-        dodgeY: import("../transforms/dodge").DodgeYOptions;
+        dodgeX: autoTicks;
+        dodgeY: autoTicks;
         fill: ChannelAccessor<Datum>;
         fillOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
-        sort: ((a: RawValue, b: RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | import("../types/index.js").ConstantAccessor<RawValue, Datum>;
+        } | ((a: RawValue, b: RawValue) => number) | import("../types/index.js").ConstantAccessor<RawValue, Datum>;
         stroke: ChannelAccessor<Datum>;
         strokeWidth: import("../types/index.js").ConstantAccessor<number, Datum>;
         strokeOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
@@ -26,6 +27,7 @@ declare function $$render<Datum = RawValue>(): {
         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/HTMLTooltip.svelte

@@ -12,17 +12,17 @@
         fy?: ChannelAccessor<Datum>;
         children: Snippet<[{ datum: Datum }]>;
     }
-    import { getContext, type Snippet } from 'svelte';
-    import type { ChannelAccessor, DataRow, PlotContext } from '../types/index.js';
-
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    let plot = $derived(getPlotState());
+    import { type Snippet } from 'svelte';
+    import type { ChannelAccessor, DataRow } from '../types/index.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     import { resolveChannel } from '../helpers/resolve.js';
     import { quadtree } from 'd3-quadtree';
     import { projectX, projectY } from '../helpers/scales.js';
     import { groupFacetsAndZ } from '../helpers/group.js';
 
+    const plot = usePlot();
+
     let { data, x, y, r, fx, fy, children }: HTMLTooltipMarkProps = $props();
 
     let datum = $state(false);

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

@@ -1,79 +1,6 @@
-import type { ChannelAccessor, ConstantAccessor, DataRecord, LinkableMarkProps } from '../types';
+import type { DataRecord } from '../types';
 declare function $$render<Datum extends DataRecord>(): {
-    props: Partial<{
-        filter: ConstantAccessor<boolean, Datum>;
-        facet: "auto" | "include" | "exclude";
-        fx: ChannelAccessor<Datum>;
-        fy: ChannelAccessor<Datum>;
-        dx: ConstantAccessor<number, Datum>;
-        dy: ConstantAccessor<number, Datum>;
-        dodgeX: import("../transforms/dodge").DodgeXOptions;
-        dodgeY: import("../transforms/dodge").DodgeYOptions;
-        fill: ChannelAccessor<Datum>;
-        fillOpacity: ConstantAccessor<number, Datum>;
-        sort: ((a: import("../types").RawValue, b: import("../types").RawValue) => number) | {
-            channel: string;
-            order?: "ascending" | "descending";
-        } | ConstantAccessor<import("../types").RawValue, Datum>;
-        stroke: ChannelAccessor<Datum>;
-        strokeWidth: ConstantAccessor<number, Datum>;
-        strokeOpacity: ConstantAccessor<number, Datum>;
-        strokeLinejoin: ConstantAccessor<import("csstype").Property.StrokeLinejoin, Datum>;
-        strokeLinecap: ConstantAccessor<import("csstype").Property.StrokeLinecap, Datum>;
-        strokeMiterlimit: ConstantAccessor<number, Datum>;
-        opacity: ChannelAccessor<Datum>;
-        strokeDasharray: ConstantAccessor<string, Datum>;
-        strokeDashoffset: ConstantAccessor<number, Datum>;
-        mixBlendMode: ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
-        clipPath: string;
-        imageFilter: ConstantAccessor<string, Datum>;
-        shapeRendering: ConstantAccessor<import("csstype").Property.ShapeRendering, Datum>;
-        paintOrder: ConstantAccessor<string, Datum>;
-        onclick: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondblclick: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmouseup: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmousedown: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmouseenter: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmousemove: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmouseleave: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmouseout: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onmouseover: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointercancel: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointerdown: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointerup: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointerenter: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointerleave: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointermove: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointerover: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onpointerout: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondrag: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondrop: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondragstart: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondragenter: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondragleave: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondragover: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ondragend: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ontouchstart: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ontouchmove: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ontouchend: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        ontouchcancel: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        oncontextmenu: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        onwheel: import("svelte/elements").MouseEventHandler<SVGPathElement>;
-        class: string;
-        style: string;
-        cursor: ConstantAccessor<import("csstype").Property.Cursor, Datum>;
-    }> & LinkableMarkProps<Datum> & {
-        data: Datum[];
-        x: ChannelAccessor<Datum>;
-        y: ChannelAccessor<Datum>;
-        r?: ChannelAccessor<Datum>;
-        width?: ConstantAccessor<number, Datum>;
-        height?: ConstantAccessor<number, Datum>;
-        src?: ConstantAccessor<string, Datum>;
-        title?: ConstantAccessor<string, Datum>;
-        preserveAspectRatio?: string;
-        imageClass?: ConstantAccessor<string, Datum>;
-    };
+    props: any;
     exports: {};
     bindings: "";
     slots: {};

package/dist/marks/Line.svelte

@@ -23,7 +23,6 @@
     }
     import type {
         CurveName,
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         ConstantAccessor,
@@ -33,7 +32,6 @@
     } from '../types/index.js';
     import Mark from '../Mark.svelte';
     import MarkerPath from './helpers/MarkerPath.svelte';
-    import { getContext } from 'svelte';
     import { resolveProp, resolveStyles } from '../helpers/resolve.js';
     import { line, type CurveFactory, type Line as D3Line } from 'd3-shape';
     import { geoPath } from 'd3-geo';
@@ -48,6 +46,7 @@
     import { recordizeXY } from '../transforms/recordize.js';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: LineMarkProps = $props();
 
@@ -76,7 +75,10 @@
 
     const args = $derived(sort(recordizeXY({ data, ...options })));
 
-    function groupIndex(data: ScaledDataRecord[], groupByKey) {
+    /**
+     * Groups the data by the specified key
+     */
+    function groupIndex(data: ScaledDataRecord[], groupByKey: ChannelAccessor<Datum> | null) {
         if (!groupByKey) return [data];
         let group = [];
         const groups = [group];
@@ -95,10 +97,9 @@
         return groups;
     }
 
-    const groupByKey = $derived(args.z || args.stroke);
+    const groupByKey = $derived(args.z || args.stroke) as ChannelAccessor<Datum> | null;
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const linePath: D3Line<ScaledDataRecord> = $derived(
         plot.scales.projection && curve === 'auto'

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

@@ -1,5 +1,6 @@
 import type { CurveName, DataRecord, ConstantAccessor, ChannelAccessor, MarkerOptions } from '../types/index.js';
 import { type CurveFactory } from 'd3-shape';
+import callWithProps from '../helpers/callWithProps.js';
 import type { RawValue } from '../types/index.js';
 declare function $$render<Datum extends DataRecord>(): {
     props: MarkerOptions & Partial<{
@@ -9,14 +10,14 @@ declare function $$render<Datum extends DataRecord>(): {
         fy: ChannelAccessor<Datum>;
         dx: ConstantAccessor<number, Datum>;
         dy: ConstantAccessor<number, Datum>;
-        dodgeX: import("../transforms/dodge.js").DodgeXOptions;
-        dodgeY: import("../transforms/dodge.js").DodgeYOptions;
+        dodgeX: callWithProps;
+        dodgeY: callWithProps;
         fill: ChannelAccessor<Datum>;
         fillOpacity: ConstantAccessor<number, Datum>;
-        sort: ((a: RawValue, b: RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | ConstantAccessor<RawValue, Datum>;
+        } | ((a: import("../types/data.js").RawValue, b: import("../types/data.js").RawValue) => number) | ConstantAccessor<import("../types/data.js").RawValue, Datum>;
         stroke: ChannelAccessor<Datum>;
         strokeWidth: ConstantAccessor<number, Datum>;
         strokeOpacity: ConstantAccessor<number, Datum>;
@@ -28,6 +29,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/LineX.svelte.d.ts

@@ -1,3 +1,4 @@
+import { recordizeX } from '../index.js';
 import type { DataRow } from '../index.js';
 declare function $$render<Datum extends DataRow>(): {
     props: Omit<import("../types").MarkerOptions & Partial<{
@@ -7,14 +8,14 @@ declare function $$render<Datum extends DataRow>(): {
         fy: import("../types").ChannelAccessor<Record<string | symbol, import("../types").RawValue>>;
         dx: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         dy: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
-        dodgeX: import("../transforms/dodge").DodgeXOptions;
-        dodgeY: import("../transforms/dodge").DodgeYOptions;
+        dodgeX: recordizeX;
+        dodgeY: recordizeX;
         fill: import("../types").ChannelAccessor<Record<string | symbol, import("../types").RawValue>>;
         fillOpacity: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
-        sort: ((a: import("../types").RawValue, b: import("../types").RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | import("../types").ConstantAccessor<import("../types").RawValue, Record<string | symbol, import("../types").RawValue>>;
+        } | ((a: import("../types").RawValue, b: import("../types").RawValue) => number) | import("../types").ConstantAccessor<import("../types").RawValue, Record<string | symbol, import("../types").RawValue>>;
         stroke: import("../types").ChannelAccessor<Record<string | symbol, import("../types").RawValue>>;
         strokeWidth: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         strokeOpacity: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
@@ -26,6 +27,7 @@ declare function $$render<Datum extends DataRow>(): {
         strokeDashoffset: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         mixBlendMode: import("../types").ConstantAccessor<import("csstype").Property.MixBlendMode, Record<string | symbol, import("../types").RawValue>>;
         clipPath: string;
+        mask: string;
         imageFilter: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
         shapeRendering: import("../types").ConstantAccessor<import("csstype").Property.ShapeRendering, Record<string | symbol, import("../types").RawValue>>;
         paintOrder: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
@@ -72,7 +74,7 @@ declare function $$render<Datum extends DataRow>(): {
         outlineStrokeOpacity?: number;
         curve?: import("../types").CurveName | import("d3-shape").CurveFactory | "auto";
         tension?: number;
-        sort?: import("../types").ConstantAccessor<import("../types").RawValue, Record<string | symbol, import("../types").RawValue>> | {
+        sort?: import("../types").ConstantAccessor<recordizeX, Datum_1> | {
             channel: "stroke" | "fill";
         };
         text?: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
@@ -82,7 +84,7 @@ declare function $$render<Datum extends DataRow>(): {
         textStrokeWidth?: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         lineClass?: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
         canvas?: boolean;
-    }, "data" | "y"> & {
+    }, "y" | "data"> & {
         data: Datum[];
     };
     exports: {};

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

@@ -1,3 +1,4 @@
+import { recordizeY } from '../index.js';
 import type { DataRow } from '../index.js';
 declare function $$render<Datum extends DataRow>(): {
     props: Omit<import("../types").MarkerOptions & Partial<{
@@ -7,14 +8,14 @@ declare function $$render<Datum extends DataRow>(): {
         fy: import("../types").ChannelAccessor<Record<string | symbol, import("../types").RawValue>>;
         dx: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         dy: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
-        dodgeX: import("../transforms/dodge").DodgeXOptions;
-        dodgeY: import("../transforms/dodge").DodgeYOptions;
+        dodgeX: recordizeY;
+        dodgeY: recordizeY;
         fill: import("../types").ChannelAccessor<Record<string | symbol, import("../types").RawValue>>;
         fillOpacity: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
-        sort: ((a: import("../types").RawValue, b: import("../types").RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | import("../types").ConstantAccessor<import("../types").RawValue, Record<string | symbol, import("../types").RawValue>>;
+        } | ((a: import("../types").RawValue, b: import("../types").RawValue) => number) | import("../types").ConstantAccessor<import("../types").RawValue, Record<string | symbol, import("../types").RawValue>>;
         stroke: import("../types").ChannelAccessor<Record<string | symbol, import("../types").RawValue>>;
         strokeWidth: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         strokeOpacity: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
@@ -26,6 +27,7 @@ declare function $$render<Datum extends DataRow>(): {
         strokeDashoffset: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         mixBlendMode: import("../types").ConstantAccessor<import("csstype").Property.MixBlendMode, Record<string | symbol, import("../types").RawValue>>;
         clipPath: string;
+        mask: string;
         imageFilter: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
         shapeRendering: import("../types").ConstantAccessor<import("csstype").Property.ShapeRendering, Record<string | symbol, import("../types").RawValue>>;
         paintOrder: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
@@ -72,7 +74,7 @@ declare function $$render<Datum extends DataRow>(): {
         outlineStrokeOpacity?: number;
         curve?: import("../types").CurveName | import("d3-shape").CurveFactory | "auto";
         tension?: number;
-        sort?: import("../types").ConstantAccessor<import("../types").RawValue, Record<string | symbol, import("../types").RawValue>> | {
+        sort?: import("../types").ConstantAccessor<recordizeY, Datum_1> | {
             channel: "stroke" | "fill";
         };
         text?: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
@@ -82,7 +84,7 @@ declare function $$render<Datum extends DataRow>(): {
         textStrokeWidth?: import("../types").ConstantAccessor<number, Record<string | symbol, import("../types").RawValue>>;
         lineClass?: import("../types").ConstantAccessor<string, Record<string | symbol, import("../types").RawValue>>;
         canvas?: boolean;
-    }, "data" | "x"> & {
+    }, "x" | "data"> & {
         data: Datum[];
     };
     exports: {};

package/dist/marks/Link.svelte

@@ -34,9 +34,7 @@
          */
         text?: ConstantAccessor<string, Datum>;
     }
-    import { getContext } from 'svelte';
     import type {
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         ConstantAccessor,
@@ -58,6 +56,7 @@
     import { sort } from '../transforms/sort.js';
     import { indexData } from '../transforms/recordize.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: LinkMarkProps = $props();
     const DEFAULTS = {
@@ -75,8 +74,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    let plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const args = $derived(
         replaceChannels(

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

@@ -1,4 +1,5 @@
 import type { DataRecord, ConstantAccessor, ChannelAccessor, CurveName, MarkerOptions, RawValue } from '../types/index.js';
+import { replaceChannels } from '../transforms/rename.js';
 import { type CurveFactory } from 'd3-shape';
 declare function $$render<Datum extends DataRecord>(): {
     props: Partial<{
@@ -8,14 +9,14 @@ declare function $$render<Datum extends DataRecord>(): {
         fy: ChannelAccessor<Datum>;
         dx: ConstantAccessor<number, Datum>;
         dy: ConstantAccessor<number, Datum>;
-        dodgeX: import("../transforms/dodge.js").DodgeXOptions;
-        dodgeY: import("../transforms/dodge.js").DodgeYOptions;
+        dodgeX: replaceChannels;
+        dodgeY: replaceChannels;
         fill: ChannelAccessor<Datum>;
         fillOpacity: ConstantAccessor<number, Datum>;
-        sort: ((a: RawValue, b: RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | ConstantAccessor<RawValue, Datum>;
+        } | ((a: RawValue, b: RawValue) => number) | ConstantAccessor<RawValue, Datum>;
         stroke: ChannelAccessor<Datum>;
         strokeWidth: ConstantAccessor<number, Datum>;
         strokeOpacity: ConstantAccessor<number, Datum>;
@@ -27,6 +28,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/Pointer.svelte

@@ -23,8 +23,8 @@
         onupdate?: (data: Datum[]) => void;
     }
 
-    import { getContext, type Snippet } from 'svelte';
-    import type { ChannelAccessor, DataRow, PlotContext } from '../types/index.js';
+    import { type Snippet } from 'svelte';
+    import type { ChannelAccessor, DataRow } from '../types/index.js';
     import { resolveChannel } from '../helpers/resolve.js';
     import { quadtree } from 'd3-quadtree';
     import { projectXY } from '../helpers/scales.js';
@@ -32,9 +32,9 @@
     import { indexData, RAW_VALUE } from '../transforms/recordize.js';
     import { groupFacetsAndZ } from '../helpers/group.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const POINTER_X = Symbol('pointerX');
     const POINTER_Y = Symbol('pointerY');

package/dist/marks/Rect.svelte

@@ -16,10 +16,8 @@
         className?: string;
     }
     import Mark from '../Mark.svelte';
-    import { getContext } from 'svelte';
     import { intervalX, intervalY } from '../index.js';
     import type {
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         BaseRectMarkProps,
@@ -30,6 +28,7 @@
     import RectPath from './helpers/RectPath.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
     import { IS_SORTED } from '../transforms/sort';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: RectMarkProps = $props();
 
@@ -46,8 +45,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    let plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const args = $derived(
         intervalY(intervalX({ data, ...options }, { plot }), { plot }) as RectMarkProps

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

@@ -1,3 +1,4 @@
+import { intervalX } from '../index.js';
 import type { DataRecord, BaseRectMarkProps, ChannelAccessor, LinkableMarkProps } from '../types/index.js';
 declare function $$render<Datum extends DataRecord>(): {
     props: Partial<{
@@ -7,14 +8,14 @@ declare function $$render<Datum extends DataRecord>(): {
         fy: ChannelAccessor<Datum>;
         dx: import("../types/index.js").ConstantAccessor<number, Datum>;
         dy: import("../types/index.js").ConstantAccessor<number, Datum>;
-        dodgeX: import("../transforms/dodge").DodgeXOptions;
-        dodgeY: import("../transforms/dodge").DodgeYOptions;
+        dodgeX: intervalX;
+        dodgeY: intervalX;
         fill: ChannelAccessor<Datum>;
         fillOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
-        sort: ((a: import("../types/data").RawValue, b: import("../types/data").RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | import("../types/index.js").ConstantAccessor<import("../types/data").RawValue, Datum>;
+        } | ((a: import("../types/data").RawValue, b: import("../types/data").RawValue) => number) | import("../types/index.js").ConstantAccessor<import("../types/data").RawValue, Datum>;
         stroke: ChannelAccessor<Datum>;
         strokeWidth: import("../types/index.js").ConstantAccessor<number, Datum>;
         strokeOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
@@ -26,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/RectX.svelte

@@ -9,10 +9,11 @@
 
     import Rect from './Rect.svelte';
     import { intervalY, stackX, recordizeX } from '../index.js';
-    import type { DataRecord, PlotContext } from '../types/index.js';
-    import { getContext, type ComponentProps } from 'svelte';
+    import type { DataRecord } from '../types/index.js';
+    import { type ComponentProps } from 'svelte';
     import type { StackOptions } from '../transforms/stack.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: RectXMarkProps = $props();
 
@@ -30,8 +31,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    let plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const args = $derived(stackX(intervalY(recordizeX({ data, ...options }), { plot }), stack));
 </script>

package/dist/marks/RectY.svelte

@@ -7,10 +7,11 @@
     }
     import Rect from './Rect.svelte';
     import { intervalX, stackY, recordizeY } from '../index.js';
-    import type { DataRecord, PlotContext } from '../types/index.js';
-    import { getContext, type ComponentProps } from 'svelte';
+    import type { DataRecord } from '../types/index.js';
+    import { type ComponentProps } from 'svelte';
     import type { StackOptions } from '../transforms/stack.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: RectYMarkProps = $props();
 
@@ -28,8 +29,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
 
     const args = $derived(stackY(intervalX(recordizeY({ data, ...options }), { plot }), stack));
 </script>

package/dist/marks/RuleX.svelte

@@ -13,11 +13,9 @@
     }
     import Mark from '../Mark.svelte';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
-    import { getContext } from 'svelte';
     import { recordizeX } from '../transforms/recordize.js';
     import { resolveProp, resolveStyles } from '../helpers/resolve.js';
     import type {
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         ConstantAccessor,
@@ -25,6 +23,7 @@
         RawValue
     } from '../types/index.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: RuleXMarkProps = $props();
     const DEFAULTS = {
@@ -40,8 +39,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
     const args = $derived(recordizeX({ data, ...options }, { withIndex: false }));
 </script>
 

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

@@ -1,3 +1,4 @@
+import { recordizeX } from '../transforms/recordize.js';
 import type { DataRecord, ConstantAccessor, ChannelAccessor, RawValue } from '../types/index.js';
 declare function $$render<Datum = DataRecord | RawValue>(): {
     props: Omit<Partial<{
@@ -7,14 +8,14 @@ declare function $$render<Datum = DataRecord | RawValue>(): {
         fy: ChannelAccessor<Datum>;
         dx: ConstantAccessor<number, Datum>;
         dy: ConstantAccessor<number, Datum>;
-        dodgeX: import("../transforms/dodge").DodgeXOptions;
-        dodgeY: import("../transforms/dodge").DodgeYOptions;
+        dodgeX: recordizeX;
+        dodgeY: recordizeX;
         fill: ChannelAccessor<Datum>;
         fillOpacity: ConstantAccessor<number, Datum>;
-        sort: ((a: RawValue, b: RawValue) => number) | {
+        sort: {
             channel: string;
             order?: "ascending" | "descending";
-        } | ConstantAccessor<RawValue, Datum>;
+        } | ((a: RawValue, b: RawValue) => number) | ConstantAccessor<RawValue, Datum>;
         stroke: ChannelAccessor<Datum>;
         strokeWidth: ConstantAccessor<number, Datum>;
         strokeOpacity: ConstantAccessor<number, Datum>;
@@ -26,6 +27,7 @@ declare function $$render<Datum = DataRecord | RawValue>(): {
         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/RuleY.svelte

@@ -13,11 +13,9 @@
     }
     import Mark from '../Mark.svelte';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
-    import { getContext } from 'svelte';
     import { recordizeY } from '../transforms/recordize.js';
     import { resolveProp, resolveStyles } from '../helpers/resolve.js';
     import type {
-        PlotContext,
         DataRecord,
         BaseMarkProps,
         ConstantAccessor,
@@ -25,6 +23,7 @@
     } from '../types/index.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
     import { IS_SORTED } from '../transforms/sort';
+    import { usePlot } from '../hooks/usePlot.svelte.js';
 
     let markProps: RuleYMarkProps = $props();
     const DEFAULTS = {
@@ -40,8 +39,7 @@
         ...markProps
     });
 
-    const { getPlotState } = getContext<PlotContext>('svelteplot');
-    const plot = $derived(getPlotState());
+    const plot = usePlot();
     const args = $derived(recordizeY({ data, ...options }, { withIndex: false }));
 </script>