svelteplot 0.10.3-pr-486.0 → 0.10.3-pr-487.0

package/dist/marks/Brush.svelte

@@ -2,16 +2,6 @@
     @component
     For creating a two-dimensional brush selection
 -->
-<script module lang="ts">
-    export type Brush = {
-        x1?: number | Date;
-        x2?: number | Date;
-        y1?: number | Date;
-        y2?: number | Date;
-        enabled: boolean;
-    };
-</script>
-
 <script lang="ts" generics="Datum extends DataRecord">
     interface BrushMarkProps extends Pick<
         BaseMarkProps<Datum>,
@@ -68,9 +58,18 @@
         ...getPlotDefaults().brush
     };
 
+    type Brush = {
+        x1?: number | Date;
+        x2?: number | Date;
+        y1?: number | Date;
+        y2?: number | Date;
+        enabled: boolean;
+    };
+
     type BrushEvent = MouseEvent & { brush: Brush };
 
     const {
+        data = [{} as Datum],
         stroke,
         strokeWidth,
         strokeDasharray,
@@ -86,7 +85,7 @@
         onbrushstart,
         onbrushend,
         onbrush
-    }: Omit<BrushMarkProps, 'brush'> = $derived({
+    }: BrushMarkProps = $derived({
         ...DEFAULTS,
         ...markProps
     });
@@ -283,10 +282,10 @@
             // draw new brush selection
             action = 'draw';
             if (typeof xScaleFn.invert === 'function' && limitDimension !== 'y') {
-                x1 = x2 = xScaleFn.invert(dragStart[0]) as number | Date;
+                x1 = x2 = xScaleFn.invert(dragStart[0]);
             }
             if (typeof yScaleFn.invert === 'function' && limitDimension !== 'x') {
-                y1 = y2 = yScaleFn.invert(dragStart[1]) as number | Date;
+                y1 = y2 = yScaleFn.invert(dragStart[1]);
             }
         }
         onbrushstart?.({ ...e, brush });
@@ -328,10 +327,10 @@
             const hasX = limitDimension !== 'y';
             const hasY = limitDimension !== 'x';
 
-            const dx1 = (!hasX ? 0 : xScaleFn.invert(xScaleFn(x1) + px)) as number | Date;
-            const dx2 = (!hasX ? 0 : xScaleFn.invert(xScaleFn(x2) + px)) as number | Date;
-            const dy1 = (!hasY ? 0 : yScaleFn.invert(yScaleFn(y1) + py)) as number | Date;
-            const dy2 = (!hasY ? 0 : yScaleFn.invert(yScaleFn(y2) + py)) as number | Date;
+            const dx1 = !hasX ? 0 : xScaleFn.invert(xScaleFn(x1) + px);
+            const dx2 = !hasX ? 0 : xScaleFn.invert(xScaleFn(x2) + px);
+            const dy1 = !hasY ? 0 : yScaleFn.invert(yScaleFn(y1) + py);
+            const dy2 = !hasY ? 0 : yScaleFn.invert(yScaleFn(y2) + py);
 
             if (action === 'move') {
                 // move edges
@@ -340,8 +339,8 @@
                 y1 = dy1;
                 y2 = dy2;
             } else if (action === 'draw') {
-                x2 = (!hasX ? 0 : xScaleFn.invert(newPos[0])) as number | Date;
-                y2 = (!hasY ? 0 : yScaleFn.invert(newPos[1])) as number | Date;
+                x2 = !hasX ? 0 : xScaleFn.invert(newPos[0]);
+                y2 = !hasY ? 0 : yScaleFn.invert(newPos[1]);
 
                 if (constrainToDomain) {
                     x2 = constrain(x2, xDomain as [typeof x2, typeof x2]);
@@ -384,7 +383,7 @@
         action: ActionType,
         swapDir1: string,
         swapDir2: string
-    ): [number | Date, number | Date, ActionType] {
+    ) {
         if (action && v2 < v1) {
             return [
                 v2,
@@ -427,5 +426,5 @@
     stroke="transparent"
     inset={-20}
     {cursor}
-    onpointerdown={onpointerdown as any}
-    onpointermove={onpointermove as any} />
+    {onpointerdown}
+    {onpointermove} />

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

@@ -1,10 +1,3 @@
-export type Brush = {
-    x1?: number | Date;
-    x2?: number | Date;
-    y1?: number | Date;
-    y2?: number | Date;
-    enabled: boolean;
-};
 import type { DataRecord } from '../types/index.js';
 declare function $$render<Datum extends DataRecord>(): {
     props: Pick<Partial<{
@@ -144,7 +137,13 @@ declare function $$render<Datum extends DataRecord>(): {
         title: import("../types/index.js").ConstantAccessor<string, Datum>;
     }>, "stroke" | "strokeWidth" | "strokeOpacity" | "strokeLinejoin" | "strokeLinecap" | "strokeMiterlimit" | "strokeDasharray" | "strokeDashoffset" | "cursor"> & {
         /** the brush state object (bindable); contains x1, x2, y1, y2, and enabled */
-        brush: Brush;
+        brush: {
+            x1?: number | Date;
+            x2?: number | Date;
+            y1?: number | Date;
+            y2?: number | Date;
+            enabled: boolean;
+        };
         /**
          * limit brushing to x or y dimension
          */
@@ -159,15 +158,33 @@ declare function $$render<Datum extends DataRecord>(): {
         resizeHandleSize?: number;
         /** called when the user starts dragging to create or move a brush */
         onbrushstart?: (evt: MouseEvent & {
-            brush: Brush;
+            brush: {
+                x1?: number | Date;
+                x2?: number | Date;
+                y1?: number | Date;
+                y2?: number | Date;
+                enabled: boolean;
+            };
         }) => void;
         /** called when the user finishes dragging the brush */
         onbrushend?: (evt: MouseEvent & {
-            brush: Brush;
+            brush: {
+                x1?: number | Date;
+                x2?: number | Date;
+                y1?: number | Date;
+                y2?: number | Date;
+                enabled: boolean;
+            };
         }) => void;
         /** called continuously while the user is dragging the brush */
         onbrush?: (evt: MouseEvent & {
-            brush: Brush;
+            brush: {
+                x1?: number | Date;
+                x2?: number | Date;
+                y1?: number | Date;
+                y2?: number | Date;
+                enabled: boolean;
+            };
         }) => void;
     };
     exports: {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.10.3-pr-486.0",
+    "version": "0.10.3-pr-487.0",
     "description": "A Svelte-native data visualization framework based on the layered grammar of graphics principles.",
     "keywords": [
         "svelte",