svelteplot 0.5.2-pr-251.3 → 0.5.2-pr-252.0

package/dist/marks/CustomMark.svelte

@@ -5,7 +5,6 @@
 <script lang="ts" generics="Datum extends DataRecord">
     interface CustomMarkProps extends BaseMarkProps<Datum> {
         data?: Datum[];
-        type?: string;
         x?: ChannelAccessor<Datum>;
         x1?: ChannelAccessor<Datum>;
         x2?: ChannelAccessor<Datum>;
@@ -19,6 +18,7 @@
         marks?: Snippet<[{ records: ScaledDataRecord<Datum>[]; usedScales: UsedScales }]>;
     }
 
+    import { getContext } from 'svelte';
     import type {
         PlotContext,
         DataRecord,
@@ -33,13 +33,7 @@
 
     import Mark from '../Mark.svelte';
 
-    let {
-        data = [{} as Datum],
-        mark,
-        type = 'custom',
-        marks,
-        ...options
-    }: CustomMarkProps = $props();
+    let { data = [{} as Datum], mark, marks, ...options }: CustomMarkProps = $props();
 
     const args = $derived(sort({ data, ...options })) as CustomMarkProps;
 
@@ -59,7 +53,7 @@
     ];
 </script>
 
-<Mark {type} required={[]} channels={channels.filter((d) => !!options[d])} {...args}>
+<Mark type="custom" required={[]} channels={channels.filter((d) => !!options[d])} {...args}>
     {#snippet children({ scaledData, usedScales })}
         {#if marks}
             {@render marks({ records: scaledData.filter((d) => d.valid), usedScales })}

package/dist/marks/helpers/Anchor.svelte

@@ -1,21 +1,7 @@
-<script lang="ts" generics="Datum extends Record<string, any>">
+<script>
     import { resolveProp } from '../../helpers/resolve.js';
-    import type { ConstantAccessor } from '../../types';
 
-    interface AnchorProps {
-        datum?: Datum;
-        options?: {
-            href?: ConstantAccessor<string, Datum>;
-            target?: ConstantAccessor<string, Datum>;
-            rel?: ConstantAccessor<string, Datum>;
-            type?: ConstantAccessor<string, Datum>;
-            download?: ConstantAccessor<string, Datum>;
-            [key: string]: any;
-        };
-        children?: () => any;
-    }
-
-    let { datum = {}, options = {}, children }: AnchorProps = $props();
+    let { datum = {}, options = {}, children } = $props();
 
     const href = $derived(resolveProp(options.href, datum, null));
     const target = $derived(resolveProp(options.target, datum, null));

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

@@ -1,29 +1,15 @@
-import type { ConstantAccessor } from '../../types';
-declare class __sveltets_Render<Datum extends Record<string, any>> {
-    props(): {
-        datum?: Datum | undefined;
-        options?: {
-            [key: string]: any;
-            href?: ConstantAccessor<string, Datum_1>;
-            target?: ConstantAccessor<string, Datum_1>;
-            rel?: ConstantAccessor<string, Datum_1>;
-            type?: ConstantAccessor<string, Datum_1>;
-            download?: ConstantAccessor<string, Datum_1>;
-        } | undefined;
-        children?: (() => any) | undefined;
-    };
-    events(): {};
-    slots(): {};
-    bindings(): "";
-    exports(): {};
-}
-interface $$IsomorphicComponent {
-    new <Datum extends Record<string, any>>(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 extends Record<string, any>>(internal: unknown, props: ReturnType<__sveltets_Render<Datum>['props']> & {}): ReturnType<__sveltets_Render<Datum>['exports']>;
-    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
-}
-declare const Anchor: $$IsomorphicComponent;
-type Anchor<Datum extends Record<string, any>> = InstanceType<typeof Anchor<Datum>>;
 export default Anchor;
+type Anchor = {
+    $on?(type: string, callback: (e: any) => void): () => void;
+    $set?(props: Partial<$$ComponentProps>): void;
+};
+declare const Anchor: import("svelte").Component<{
+    datum?: Record<string, any>;
+    options?: Record<string, any>;
+    children: any;
+}, {}, "">;
+type $$ComponentProps = {
+    datum?: Record<string, any>;
+    options?: Record<string, any>;
+    children: any;
+};

package/dist/marks/helpers/BaseAxisX.svelte

@@ -22,7 +22,7 @@
         scaleFn: (d: RawValue) => number;
         scaleType: ScaleType;
         ticks: RawValue[];
-        tickFormat: (d: RawValue, i: number) => string | string[];
+        tickFormat: (d: RawValue, i: number, ticks: RawValue[]) => string | string[];
         anchor: 'top' | 'bottom';
         tickSize: number;
         tickPadding: number;
@@ -87,7 +87,7 @@
                     dx: +resolveProp(options.dx, datum, 0),
                     dy: +resolveProp(options.dy, datum, 0),
                     x: scaleFn(tick) + (scaleType === 'band' ? scaleFn.bandwidth() * 0.5 : 0),
-                    text: splitTick(tickFormat(tick, i)),
+                    text: splitTick(tickFormat(tick, i, ticks)),
                     element: null as SVGTextElement | null
                 };
             })

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

@@ -3,7 +3,7 @@ type BaseAxisXProps = {
     scaleFn: (d: RawValue) => number;
     scaleType: ScaleType;
     ticks: RawValue[];
-    tickFormat: (d: RawValue, i: number) => string | string[];
+    tickFormat: (d: RawValue, i: number, ticks: RawValue[]) => string | string[];
     anchor: 'top' | 'bottom';
     tickSize: number;
     tickPadding: number;

package/dist/marks/helpers/BaseAxisY.svelte

@@ -19,7 +19,7 @@
         scaleFn: (d: RawValue) => number;
         scaleType: ScaleType;
         ticks: RawValue[];
-        tickFormat: (d: RawValue) => string | string[];
+        tickFormat: (d: RawValue, i: number, ticks: RawValue[]) => string | string[];
         anchor: 'left' | 'right';
         lineAnchor: 'top' | 'center' | 'bottom';
         tickSize: number;
@@ -72,7 +72,7 @@
                 dx: +resolveProp(options.dx, datum, 0),
                 dy: +resolveProp(options.dy, datum, 0),
                 y: scaleFn(tick) + (scaleType === 'band' ? scaleFn.bandwidth() * 0.5 : 0),
-                text: tickFormat(tick, i),
+                text: tickFormat(tick, i, ticks),
                 element: null as SVGTextElement | null
             };
         });

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

@@ -3,7 +3,7 @@ type BaseAxisYProps = {
     scaleFn: (d: RawValue) => number;
     scaleType: ScaleType;
     ticks: RawValue[];
-    tickFormat: (d: RawValue) => string | string[];
+    tickFormat: (d: RawValue, i: number, ticks: RawValue[]) => string | string[];
     anchor: 'left' | 'right';
     lineAnchor: 'top' | 'center' | 'bottom';
     tickSize: number;

package/dist/marks/index.d.ts

@@ -27,7 +27,6 @@ export { default as Geo } from './Geo.svelte';
 export { default as Graticule } from './Graticule.svelte';
 export { default as GridX } from './GridX.svelte';
 export { default as GridY } from './GridY.svelte';
-export { default as Image } from './Image.svelte';
 export { default as Line } from './Line.svelte';
 export { default as LineX } from './LineX.svelte';
 export { default as LineY } from './LineY.svelte';

package/dist/marks/index.js

@@ -27,7 +27,6 @@ export { default as Geo } from './Geo.svelte';
 export { default as Graticule } from './Graticule.svelte';
 export { default as GridX } from './GridX.svelte';
 export { default as GridY } from './GridY.svelte';
-export { default as Image } from './Image.svelte';
 export { default as Line } from './Line.svelte';
 export { default as LineX } from './LineX.svelte';
 export { default as LineY } from './LineY.svelte';

package/dist/types/plot.d.ts

@@ -3,7 +3,7 @@ import type { ColorScheme } from './colorScheme.js';
 import type { GeoProjection } from 'd3-geo';
 import type { ChannelAccessor, ChannelName, ColorScaleOptions, DataRecord, LegendScaleOptions, PlotScales, ScaleOptions, XScaleOptions, YScaleOptions } from './index.js';
 import type { Snippet } from 'svelte';
-import type { Area, AreaX, AreaY, Arrow, AxisX, AxisY, BarX, BarY, BoxX, BoxY, Brush, BrushX, BrushY, Cell, DifferenceY, Dot, Frame, Geo, Graticule, GridX, GridY, Image, Line, Link, Pointer, Rect, RectX, RectY, RuleX, RuleY, Sphere, Spike, Text, TickX, TickY, Vector } from '../marks/index.js';
+import type { Area, AreaX, AreaY, Arrow, AxisX, AxisY, BarX, BarY, BoxX, BoxY, Brush, BrushX, BrushY, Cell, DifferenceY, Dot, Frame, Geo, Graticule, GridX, GridY, Line, Link, Pointer, Rect, RectX, RectY, RuleX, RuleY, Sphere, Spike, Text, TickX, TickY, Vector } from '../marks/index.js';
 export type PlotState = {
     width: number;
     height: number;
@@ -230,10 +230,6 @@ export type PlotDefaults = {
     gridY: Partial<Omit<ComponentProps<typeof GridY>, IgnoreDefaults> & {
         implicit: boolean;
     }>;
-    /**
-     * default props for image marks
-     */
-    image: Partial<Omit<ComponentProps<typeof Image>, IgnoreDefaults>>;
     /**
      * default props for line marks
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.5.2-pr-251.3",
+    "version": "0.5.2-pr-252.0",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",

package/dist/marks/Image.svelte

@@ -1,76 +0,0 @@
-<!--
-    @component 
-    For showing images positioned at x/y coordinates
--->
-<script lang="ts" generics="Datum extends DataRecord">
-    interface ImageMarkProps extends BaseMarkProps<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;
-        // canvas?: boolean;
-        imageClass?: ConstantAccessor<string, Datum>;
-    }
-
-    import type {
-        BaseMarkProps,
-        ChannelAccessor,
-        ConstantAccessor,
-        DataRecord,
-        LinkableMarkProps
-    } from '../types';
-    import { resolveProp } from '../helpers/resolve';
-    import CustomMark from './CustomMark.svelte';
-    import { getPlotDefaults } from '../hooks/plotDefaults';
-    import { sort } from '../transforms';
-    import Anchor from './helpers/Anchor.svelte';
-
-    let markProps: ImageMarkProps = $props();
-
-    const DEFAULTS: Partial<ImageMarkProps> = {
-        width: 20,
-        preserveAspectRatio: 'xMidYMin slice',
-        ...getPlotDefaults().image
-    };
-
-    const {
-        data = [{} as Datum],
-        width,
-        height,
-        src,
-        title,
-        imageClass,
-        preserveAspectRatio,
-        ...options
-    }: ImageMarkProps = $derived({
-        ...DEFAULTS,
-        ...markProps
-    });
-
-    const args = $derived(sort({ data, ...options }));
-</script>
-
-<CustomMark type="image" {...args}>
-    {#snippet mark({ record, index, usedScales })}
-        {@const w = record.r !== undefined ? record.r * 2 : resolveProp(width, record.datum, 20)}
-        {@const h =
-            record.r !== undefined ? record.r * 2 : resolveProp(height || width, record.datum, 20)}
-        <Anchor {options} datum={record.datum}>
-            <image
-                class={resolveProp(imageClass, record.datum, null)}
-                href={resolveProp(src, record.datum, '')}
-                x={record.x - w * 0.5}
-                y={record.y - h * 0.5}
-                {preserveAspectRatio}
-                clip-path={record.r !== undefined ? `circle(${record.r}px)` : null}
-                width={w}
-                height={h}
-                >{#if title}<title>{resolveProp(title, record.datum, '')}</title>{/if}</image>
-        </Anchor>
-    {/snippet}
-</CustomMark>

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

@@ -1,19 +0,0 @@
-import type { DataRecord } from '../types';
-declare class __sveltets_Render<Datum extends DataRecord> {
-    props(): any;
-    events(): {};
-    slots(): {};
-    bindings(): "";
-    exports(): {};
-}
-interface $$IsomorphicComponent {
-    new <Datum extends 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 extends DataRecord>(internal: unknown, props: ReturnType<__sveltets_Render<Datum>['props']> & {}): ReturnType<__sveltets_Render<Datum>['exports']>;
-    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
-}
-/** For showing images positioned at x/y coordinates */
-declare const Image: $$IsomorphicComponent;
-type Image<Datum extends DataRecord> = InstanceType<typeof Image<Datum>>;
-export default Image;