svelteplot 0.4.5-pr-208.0 → 0.4.5-pr-209.0

package/dist/types/mark.d.ts

@@ -12,19 +12,16 @@ import type { MouseEventHandler } from 'svelte/elements';
 import type { ChannelAccessor, ConstantAccessor, DataRecord, RawValue } from './index.js';
 import type * as CSS from 'csstype';
 import type { ScaledChannelName, ScaleName } from './scale.js';
-import type { DodgeXOptions, DodgeYOptions } from '../transforms/dodge.js';
 export type BaseMarkProps<T> = Partial<{
     /**
      * Filter the data without modifying the inferred scales
      */
-    filter: ConstantAccessor<boolean, T>;
-    facet: 'auto' | 'include' | 'exclude';
+    filter?: ConstantAccessor<boolean, T>;
+    facet?: 'auto' | 'include' | 'exclude';
     fx: ChannelAccessor<T>;
     fy: ChannelAccessor<T>;
     dx: ConstantAccessor<number, T>;
     dy: ConstantAccessor<number, T>;
-    dodgeX: DodgeXOptions;
-    dodgeY: DodgeYOptions;
     fill: ChannelAccessor<T>;
     fillOpacity: ConstantAccessor<number, T>;
     sort: string | ConstantAccessor<RawValue, T> | ((a: RawValue, b: RawValue) => number) | {
@@ -47,44 +44,44 @@ export type BaseMarkProps<T> = Partial<{
     imageFilter: ConstantAccessor<string, T>;
     shapeRendering: ConstantAccessor<CSS.Property.ShapeRendering, T>;
     paintOrder: ConstantAccessor<string, T>;
-    onclick: MouseEventHandler<SVGPathElement>;
-    ondblclick: MouseEventHandler<SVGPathElement>;
-    onmouseup: MouseEventHandler<SVGPathElement>;
-    onmousedown: MouseEventHandler<SVGPathElement>;
-    onmouseenter: MouseEventHandler<SVGPathElement>;
-    onmousemove: MouseEventHandler<SVGPathElement>;
-    onmouseleave: MouseEventHandler<SVGPathElement>;
-    onmouseout: MouseEventHandler<SVGPathElement>;
-    onmouseover: MouseEventHandler<SVGPathElement>;
-    onpointercancel: MouseEventHandler<SVGPathElement>;
-    onpointerdown: MouseEventHandler<SVGPathElement>;
-    onpointerup: MouseEventHandler<SVGPathElement>;
-    onpointerenter: MouseEventHandler<SVGPathElement>;
-    onpointerleave: MouseEventHandler<SVGPathElement>;
-    onpointermove: MouseEventHandler<SVGPathElement>;
-    onpointerover: MouseEventHandler<SVGPathElement>;
-    onpointerout: MouseEventHandler<SVGPathElement>;
-    ondrag: MouseEventHandler<SVGPathElement>;
-    ondrop: MouseEventHandler<SVGPathElement>;
-    ondragstart: MouseEventHandler<SVGPathElement>;
-    ondragenter: MouseEventHandler<SVGPathElement>;
-    ondragleave: MouseEventHandler<SVGPathElement>;
-    ondragover: MouseEventHandler<SVGPathElement>;
-    ondragend: MouseEventHandler<SVGPathElement>;
-    ontouchstart: MouseEventHandler<SVGPathElement>;
-    ontouchmove: MouseEventHandler<SVGPathElement>;
-    ontouchend: MouseEventHandler<SVGPathElement>;
-    ontouchcancel: MouseEventHandler<SVGPathElement>;
-    oncontextmenu: MouseEventHandler<SVGPathElement>;
-    onwheel: MouseEventHandler<SVGPathElement>;
+    onclick?: MouseEventHandler<SVGPathElement>;
+    ondblclick?: MouseEventHandler<SVGPathElement>;
+    onmouseup?: MouseEventHandler<SVGPathElement>;
+    onmousedown?: MouseEventHandler<SVGPathElement>;
+    onmouseenter?: MouseEventHandler<SVGPathElement>;
+    onmousemove?: MouseEventHandler<SVGPathElement>;
+    onmouseleave?: MouseEventHandler<SVGPathElement>;
+    onmouseout?: MouseEventHandler<SVGPathElement>;
+    onmouseover?: MouseEventHandler<SVGPathElement>;
+    onpointercancel?: MouseEventHandler<SVGPathElement>;
+    onpointerdown?: MouseEventHandler<SVGPathElement>;
+    onpointerup?: MouseEventHandler<SVGPathElement>;
+    onpointerenter?: MouseEventHandler<SVGPathElement>;
+    onpointerleave?: MouseEventHandler<SVGPathElement>;
+    onpointermove?: MouseEventHandler<SVGPathElement>;
+    onpointerover?: MouseEventHandler<SVGPathElement>;
+    onpointerout?: MouseEventHandler<SVGPathElement>;
+    ondrag?: MouseEventHandler<SVGPathElement>;
+    ondrop?: MouseEventHandler<SVGPathElement>;
+    ondragstart?: MouseEventHandler<SVGPathElement>;
+    ondragenter?: MouseEventHandler<SVGPathElement>;
+    ondragleave?: MouseEventHandler<SVGPathElement>;
+    ondragover?: MouseEventHandler<SVGPathElement>;
+    ondragend?: MouseEventHandler<SVGPathElement>;
+    ontouchstart?: MouseEventHandler<SVGPathElement>;
+    ontouchmove?: MouseEventHandler<SVGPathElement>;
+    ontouchend?: MouseEventHandler<SVGPathElement>;
+    ontouchcancel?: MouseEventHandler<SVGPathElement>;
+    oncontextmenu?: MouseEventHandler<SVGPathElement>;
+    onwheel?: MouseEventHandler<SVGPathElement>;
     /**
      * if you want to give your mark element an extra CSS class
      */
-    class: string;
+    class?: string;
     /**
      * if you want to give your mark element an extra inline style
      */
-    style: string;
+    style?: string;
     cursor: ConstantAccessor<CSS.Property.Cursor, T>;
 }>;
 export type LinkableMarkProps<T> = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.4.5-pr-208.0",
+    "version": "0.4.5-pr-209.0",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",
@@ -114,7 +114,6 @@
     "types": "./dist/index.d.ts",
     "type": "module",
     "dependencies": {
-        "@gka/d3-regression": "^1.3.10-pr48",
         "d3-array": "^3.2.4",
         "d3-color": "^3.1.0",
         "d3-format": "^3.1.0",
@@ -123,13 +122,13 @@
         "d3-path": "^3.1.0",
         "d3-quadtree": "^3.0.1",
         "d3-random": "^3.0.1",
+        "@gka/d3-regression": "^1.3.10-pr48",
         "d3-scale": "^4.0.2",
         "d3-scale-chromatic": "^3.1.0",
         "d3-shape": "^3.2.0",
         "d3-time": "^3.1.0",
         "es-toolkit": "^1.39.10",
         "fast-equals": "^5.2.2",
-        "interval-tree-1d": "^1.0.4",
         "merge-deep": "^3.0.3",
         "svelte": "5.38.7"
     }

package/dist/transforms/dodge.d.ts

@@ -1,17 +0,0 @@
-import type { ScaledDataRecord, TransformArg, PlotState } from '../types';
-type BaseDodgeOptions = {
-    anchor?: string;
-    padding?: number;
-    r?: number;
-};
-type AnchorX = 'left' | 'right' | 'middle';
-type AnchorY = 'top' | 'bottom' | 'middle';
-export type DodgeXOptions = AnchorX | (BaseDodgeOptions & {
-    anchor?: 'left' | 'right' | 'middle';
-});
-export type DodgeYOptions = AnchorY | (BaseDodgeOptions & {
-    anchor?: 'top' | 'bottom' | 'middle';
-});
-export declare function dodgeX(args: TransformArg<ScaledDataRecord>, plotState: PlotState): ScaledDataRecord[];
-export declare function dodgeY(args: TransformArg<ScaledDataRecord>, plotState: PlotState): ScaledDataRecord[];
-export {};

package/dist/transforms/dodge.js

@@ -1,128 +0,0 @@
-import IntervalTree from 'interval-tree-1d';
-import { groupFacetsAndZ } from '../helpers/group';
-export function dodgeX(args, plotState) {
-    if (!args.dodgeX)
-        return args.data;
-    let { anchor = 'left', padding = 1, r = args.dodgeX.r } = maybeAnchor(args.dodgeX);
-    let anchorFunction;
-    switch (`${anchor}`.toLowerCase()) {
-        case 'left':
-            anchorFunction = anchorXLeft;
-            break;
-        case 'right':
-            anchorFunction = anchorXRight;
-            break;
-        case 'middle':
-            anchorFunction = anchorXMiddle;
-            break;
-        default:
-            throw new Error(`unknown dodge anchor: ${anchor}`);
-    }
-    return dodge('x', 'y', anchorFunction, Number(padding), r, args, plotState);
-}
-export function dodgeY(args, plotState) {
-    if (!args.dodgeY)
-        return args.data;
-    let { anchor = 'bottom', padding = 1, r = args.dodgeY.r } = maybeAnchor(args.dodgeY);
-    let anchorFunction;
-    switch (`${anchor}`.toLowerCase()) {
-        case 'top':
-            anchorFunction = anchorYTop;
-            break;
-        case 'bottom':
-            anchorFunction = anchorYBottom;
-            break;
-        case 'middle':
-            anchorFunction = anchorYMiddle;
-            break;
-        default:
-            throw new Error(`unknown dodge anchor: ${anchor}`);
-    }
-    return dodge('y', 'x', anchorFunction, Number(padding), r, args, plotState);
-}
-function dodge(y, x, anchor, padding, r, { data, ...channels }, plotState) {
-    if (r != null && typeof r !== 'number') {
-        // use the r channel
-        // let { channels, sort, reverse } = options;
-        // channels = maybeNamed(channels);
-        // if (channels?.r === undefined)
-        //     options = { ...options, channels: { ...channels, r: { value: r, scale: 'r' } } };
-        // if (sort === undefined && reverse === undefined) options.sort = { channel: '-r' };
-    }
-    const { fx, fy } = channels;
-    let [ky, ty] = anchor(plotState);
-    const compare = ky ? compareAscending : compareSymmetric;
-    const cr = r !== undefined ? r : 3; // default radius if no r channel
-    // group data by facets
-    groupFacetsAndZ(data, { fx, fy }, (items) => {
-        // apply dodge within each facet
-        const tree = IntervalTree();
-        const data = items.filter((d) => (typeof d.r !== 'number' || d.r >= 0) && isFinite(d[x]) && isFinite(d[y]));
-        const intervals = new Float64Array(2 * data.length + 2);
-        data.forEach((d, i) => {
-            const ri = d.r ?? r ?? 3;
-            const y0 = ky ? ri + padding : 0; // offset baseline for varying radius
-            const l = d[x] - ri;
-            const h = d[x] + ri;
-            // The first two positions are 0 to test placing the dot on the baseline.
-            let k = 2;
-            // For any previously placed circles that may overlap this circle, compute
-            // the y-positions that place this circle tangent to these other circles.
-            // https://observablehq.com/@mbostock/circle-offset-along-line
-            tree.queryInterval(l - padding, h + padding, ([, , j]) => {
-                const yj = data[j][y] - y0;
-                const dx = d[x] - data[j][x];
-                const dr = padding + (channels.r ? d.r + data[j].r : 2 * cr);
-                const dy = Math.sqrt(dr * dr - dx * dx);
-                intervals[k++] = yj - dy;
-                intervals[k++] = yj + dy;
-            });
-            // Find the best y-value where this circle can fit.
-            let candidates = intervals.slice(0, k);
-            if (ky)
-                candidates = candidates.filter((y) => y >= 0);
-            out: for (const diff of candidates.sort(compare)) {
-                for (let j = 0; j < k; j += 2) {
-                    if (intervals[j] + 1e-6 < diff && diff < intervals[j + 1] - 1e-6) {
-                        continue out;
-                    }
-                }
-                d[y] = diff + y0;
-                break;
-            }
-            // Insert the placed circle into the interval tree.
-            tree.insert([l, h, i]);
-        });
-        if (!ky)
-            ky = 1;
-        data.forEach((d) => (d[y] = d[y] * ky + ty));
-    });
-    return data;
-}
-function maybeAnchor(anchor) {
-    return typeof anchor === 'string' ? { anchor } : anchor;
-}
-function anchorXLeft({ options: { marginLeft } }) {
-    return [1, marginLeft];
-}
-function anchorXRight({ facetWidth: width, options: { marginLeft } }) {
-    return [-1, marginLeft + width];
-}
-function anchorXMiddle({ facetWidth: width, options: { marginLeft } }) {
-    return [0, marginLeft + width / 2];
-}
-function anchorYTop({ options: { marginTop } }) {
-    return [1, marginTop];
-}
-function anchorYBottom({ facetHeight: height }) {
-    return [-1, height];
-}
-function anchorYMiddle({ facetHeight: height, options: { marginTop, marginBottom } }) {
-    return [0, (marginTop + height) / 2];
-}
-function compareSymmetric(a, b) {
-    return Math.abs(a) - Math.abs(b);
-}
-function compareAscending(a, b) {
-    return a - b;
-}