layerchart 2.0.0-next.5 → 2.0.0-next.50

package/dist/components/MonthPath.svelte

@@ -15,35 +15,43 @@
      */
     cellSize: number | [number, number];
 
+    /**
+     * The start date of the calendar (used to calculate week offsets).
+     */
+    startOfRange: Date;
+
     /**
      * A bindable reference to the underlying `<path>` element.
      *
      * @bindable
      */
-    ref?: SVGPathElement;
+    pathRef?: SVGPathElement;
   };
 
   export type MonthPathProps = MonthPathPropsWithoutHTML &
-    Without<SVGAttributes<SVGPathElement>, MonthPathPropsWithoutHTML>;
+    // we omit the path props to avoid conflicts with attribute names since we are
+    // passing them through to `<Path />`
+    Without<SVGAttributes<SVGPathElement>, MonthPathPropsWithoutHTML & PathPropsWithoutHTML>;
 </script>
 
 <script lang="ts">
-  import { timeWeek, timeYear } from 'd3-time';
-  import { endOfMonth } from 'date-fns';
+  import { timeWeek } from 'd3-time';
   import { cls } from '@layerstack/tailwind';
-  import { layerClass } from '../utils/attributes.js';
+  import { endOfInterval } from '@layerstack/utils';
+  import Path, { type PathPropsWithoutHTML } from './Path.svelte';
 
   let {
     date,
     cellSize: cellSizeProp,
-    ref: refProp = $bindable(),
+    startOfRange,
+    pathRef: pathRefProp = $bindable(),
     class: className,
     ...restProps
   }: MonthPathProps = $props();
 
-  let ref = $state<SVGPathElement>();
+  let pathRef = $state<SVGPathElement>();
   $effect.pre(() => {
-    refProp = ref;
+    pathRefProp = pathRef;
   });
 
   const cellSize = $derived(
@@ -52,12 +60,12 @@
 
   // start of month
   const startDayOfWeek = $derived(date.getDay());
-  const startWeek = $derived(timeWeek.count(timeYear(date), date));
+  const startWeek = $derived(timeWeek.count(startOfRange, date));
 
   // end of month
-  const monthEnd = $derived(endOfMonth(date));
+  const monthEnd = $derived(endOfInterval('month', date));
   const endDayOfWeek = $derived(monthEnd.getDay());
-  const endWeek = $derived(timeWeek.count(timeYear(monthEnd), monthEnd));
+  const endWeek = $derived(timeWeek.count(startOfRange, monthEnd));
 
   const pathData = $derived(`
     M${(startWeek + 1) * cellSize[0]},${startDayOfWeek * cellSize[1]}
@@ -68,10 +76,16 @@
   `);
 </script>
 
-<path
-  bind:this={ref}
-  d={pathData}
-  fill="none"
-  class={cls(layerClass('month-path'), 'stroke-surface-content/20', className)}
-  {...restProps}
-/>
+<Path bind:pathRef {pathData} fill="none" class={cls('lc-month-path', className)} {...restProps} />
+
+<style>
+  @layer components {
+    :global(:where(.lc-month-path)) {
+      --stroke-color: color-mix(
+        in oklab,
+        var(--color-surface-content, currentColor) 20%,
+        transparent
+      );
+    }
+  }
+</style>

package/dist/components/MonthPath.svelte.d.ts

@@ -11,14 +11,19 @@ export type MonthPathPropsWithoutHTML = {
      * - array - sets [width, height].
      */
     cellSize: number | [number, number];
+    /**
+     * The start date of the calendar (used to calculate week offsets).
+     */
+    startOfRange: Date;
     /**
      * A bindable reference to the underlying `<path>` element.
      *
      * @bindable
      */
-    ref?: SVGPathElement;
+    pathRef?: SVGPathElement;
 };
-export type MonthPathProps = MonthPathPropsWithoutHTML & Without<SVGAttributes<SVGPathElement>, MonthPathPropsWithoutHTML>;
-declare const MonthPath: import("svelte").Component<MonthPathProps, {}, "ref">;
+export type MonthPathProps = MonthPathPropsWithoutHTML & Without<SVGAttributes<SVGPathElement>, MonthPathPropsWithoutHTML & PathPropsWithoutHTML>;
+import { type PathPropsWithoutHTML } from './Path.svelte';
+declare const MonthPath: import("svelte").Component<MonthPathProps, {}, "pathRef">;
 type MonthPath = ReturnType<typeof MonthPath>;
 export default MonthPath;

package/dist/components/MotionPath.svelte

@@ -100,7 +100,7 @@
     {fill}
     {rotate}
     bind:this={ref}
-    {...extractLayerProps(restProps, 'motion-path')}
+    {...extractLayerProps(restProps, 'lc-motion-path')}
   >
     <mpath href="#{pathId}" />
   </animateMotion>

package/dist/components/Pack.svelte

@@ -3,6 +3,9 @@
   import type { Snippet } from 'svelte';
 
   export type PackProps<T> = {
+    /** d3 hierarchy node */
+    hierarchy: HierarchyNode<T>;
+
     /**
      * The size of the pack layout.
      */
@@ -15,11 +18,6 @@
      */
     padding?: number;
 
-    /**
-     * The hierarchy data to be packed.
-     */
-    hierarchy: HierarchyNode<T>;
-
     /**
      * A bindable reference to the computed packed nodes.
      *
@@ -32,7 +30,7 @@
 </script>
 
 <script lang="ts" generics="T">
-  import { getChartContext } from './Chart.svelte';
+  import { getChartContext } from '../contexts/chart.js';
 
   const ctx = getChartContext();
 

package/dist/components/Pack.svelte.d.ts

@@ -1,6 +1,8 @@
 import { type HierarchyCircularNode, type HierarchyNode } from 'd3-hierarchy';
 import type { Snippet } from 'svelte';
 export type PackProps<T> = {
+    /** d3 hierarchy node */
+    hierarchy: HierarchyNode<T>;
     /**
      * The size of the pack layout.
      */
@@ -11,10 +13,6 @@ export type PackProps<T> = {
      * @see https://github.com/d3/d3-hierarchy#pack_padding
      */
     padding?: number;
-    /**
-     * The hierarchy data to be packed.
-     */
-    hierarchy: HierarchyNode<T>;
     /**
      * A bindable reference to the computed packed nodes.
      *
@@ -25,10 +23,17 @@ export type PackProps<T> = {
         nodes: HierarchyCircularNode<T>[];
     }]>;
 };
+declare function $$render<T>(): {
+    props: PackProps<T>;
+    exports: {};
+    bindings: "nodes";
+    slots: {};
+    events: {};
+};
 declare class __sveltets_Render<T> {
-    props(): PackProps<T>;
-    events(): {};
-    slots(): {};
+    props(): ReturnType<typeof $$render<T>>['props'];
+    events(): ReturnType<typeof $$render<T>>['events'];
+    slots(): ReturnType<typeof $$render<T>>['slots'];
     bindings(): "nodes";
     exports(): {};
 }

package/dist/components/Partition.svelte

@@ -7,6 +7,9 @@
   import type { Snippet } from 'svelte';
 
   export type PartitionProps<T> = {
+    /** d3 hierarchy node */
+    hierarchy: HierarchyNode<T>;
+
     /**
      * The orientation of the partition layout.
      *
@@ -31,8 +34,6 @@
      */
     round?: boolean;
 
-    hierarchy: HierarchyNode<T>;
-
     /**
      * A bindable reference to the descendants of the partition layout.
      *
@@ -45,7 +46,7 @@
 </script>
 
 <script lang="ts" generics="T">
-  import { getChartContext } from './Chart.svelte';
+  import { getChartContext } from '../contexts/chart.js';
 
   let {
     size,

package/dist/components/Partition.svelte.d.ts

@@ -1,6 +1,8 @@
 import { type HierarchyNode, type HierarchyRectangularNode } from 'd3-hierarchy';
 import type { Snippet } from 'svelte';
 export type PartitionProps<T> = {
+    /** d3 hierarchy node */
+    hierarchy: HierarchyNode<T>;
     /**
      * The orientation of the partition layout.
      *
@@ -21,7 +23,6 @@ export type PartitionProps<T> = {
      * see: https://github.com/d3/d3-hierarchy#tree_nodeSize
      */
     round?: boolean;
-    hierarchy: HierarchyNode<T>;
     /**
      * A bindable reference to the descendants of the partition layout.
      *
@@ -32,10 +33,17 @@ export type PartitionProps<T> = {
         nodes: HierarchyRectangularNode<T>[];
     }]>;
 };
+declare function $$render<T>(): {
+    props: PartitionProps<T>;
+    exports: {};
+    bindings: "nodes";
+    slots: {};
+    events: {};
+};
 declare class __sveltets_Render<T> {
-    props(): PartitionProps<T>;
-    events(): {};
-    slots(): {};
+    props(): ReturnType<typeof $$render<T>>['props'];
+    events(): ReturnType<typeof $$render<T>>['events'];
+    slots(): ReturnType<typeof $$render<T>>['slots'];
     bindings(): "nodes";
     exports(): {};
 }

package/dist/components/Path.svelte

@@ -0,0 +1,361 @@
+<script lang="ts" module>
+  import type { Snippet } from 'svelte';
+  import type { MarkerOptions } from './MarkerWrapper.svelte';
+  import type { CommonStyleProps, Without } from '../utils/types.js';
+  import type { SVGAttributes } from 'svelte/elements';
+
+  import {
+    createControlledMotion,
+    createMotion,
+    extractTweenConfig,
+    type MotionProp,
+    type ResolvedMotion,
+  } from '../utils/motion.svelte.js';
+
+  export type PathPropsWithoutHTML = {
+    /**
+     * Pass `<path d={...} />` explicitly instead of calculating
+     * from data / context
+     */
+    pathData?: string | undefined | null;
+
+    /**
+     * Whether to animate the drawing of the path over time.
+     * Pass either `true` or an object with transition options to
+     * enable the transition.
+     *
+     * Works best with `tweened` disabled.
+     */
+    draw?: boolean | Parameters<typeof _drawTransition>[1];
+
+    /**
+     * Marker to attach to both start and end points of the line
+     */
+    marker?: MarkerOptions;
+
+    /**
+     * Marker to attach to the middle point of the line
+     */
+    markerMid?: MarkerOptions;
+
+    /**
+     * Marker to attach to the start point of the line
+     */
+    markerStart?: MarkerOptions;
+
+    /**
+     * Marker to attach to the end point of the line
+     */
+    markerEnd?: MarkerOptions;
+
+    /**
+     * Add additional content at the start of the line.
+     *
+     * Receives `{ point: DOMPoint; value: { x: number; y: number } }` as a snippet prop.
+     */
+    startContent?: Snippet<[{ point: DOMPoint; value: { x: number; y: number } }]>;
+
+    /**
+     * Add additional content at the end of the line.
+     *
+     * Receives `{ point: DOMPoint; value: { x: number; y: number } }` as a snippet prop.
+     */
+    endContent?: Snippet<[{ point: DOMPoint; value: { x: number; y: number } }]>;
+
+    /**
+     * A reference to the `<path>` element.
+     *
+     * @bindable
+     */
+    pathRef?: SVGPathElement;
+
+    motion?: MotionProp;
+  } & CommonStyleProps;
+
+  export type PathProps = PathPropsWithoutHTML &
+    Without<SVGAttributes<SVGPathElement>, PathPropsWithoutHTML>;
+</script>
+
+<script lang="ts">
+  import { tick } from 'svelte';
+  import { draw as _drawTransition } from 'svelte/transition';
+  import { cubicInOut } from 'svelte/easing';
+  import { merge } from '@layerstack/utils';
+
+  import { interpolatePath } from 'd3-interpolate-path';
+  import { cls } from '@layerstack/tailwind';
+
+  import Group from './Group.svelte';
+  import { flattenPathData } from '../utils/path.js';
+  import { renderPathData, type ComputedStylesOptions } from '../utils/canvas.js';
+  import { getLayerContext } from '../contexts/layer.js';
+  import MarkerWrapper from './MarkerWrapper.svelte';
+  import { getChartContext } from '../contexts/chart.js';
+  import { createKey } from '../utils/key.svelte.js';
+  import { createId } from '../utils/createId.js';
+
+  const ctx = getChartContext();
+
+  const uid = $props.id();
+
+  let {
+    pathData,
+    x,
+    y,
+    motion,
+    draw,
+    fill,
+    stroke,
+    strokeOpacity,
+    strokeWidth,
+    fillOpacity,
+    class: className,
+    marker,
+    markerStart: markerStartProp,
+    markerMid: markerMidProp,
+    markerEnd: markerEndProp,
+    startContent,
+    endContent,
+    opacity,
+    pathRef: pathRefProp = $bindable(),
+    onclick,
+    onpointerenter,
+    onpointermove,
+    onpointerleave,
+    onpointerdown,
+    onpointerover,
+    onpointerout,
+    ontouchmove,
+    ...restProps
+  }: PathProps = $props();
+
+  let pathRef = $state<SVGPathElement>();
+
+  $effect.pre(() => {
+    pathRefProp = pathRef;
+  });
+
+  const markerStart = $derived(markerStartProp ?? marker);
+  const markerMid = $derived(markerMidProp ?? marker);
+  const markerEnd = $derived(markerEndProp ?? marker);
+
+  const markerStartId = $derived(markerStart ? createId('marker-start', uid) : '');
+  const markerMidId = $derived(markerMid ? createId('marker-mid', uid) : '');
+  const markerEndId = $derived(markerEnd ? createId('marker-end', uid) : '');
+
+  const extractedTween = extractTweenConfig(motion);
+
+  const tweenedOptions: ResolvedMotion | undefined = extractedTween
+    ? {
+        type: extractedTween.type,
+        options: { interpolate: interpolatePath, ...extractedTween.options },
+      }
+    : undefined;
+
+  /** Provide initial `0` horizontal baseline and initially hide/untrack scale changes so not reactive (only set on initial mount) */
+  function defaultPathData() {
+    if (!tweenedOptions) {
+      // If not tweened, return empty string (faster initial render)
+      return '';
+    } else if (pathData) {
+      // Flatten all `y` coordinates of pre-defined `pathData`
+      return flattenPathData(pathData, Math.min(ctx.yScale(0) ?? ctx.yRange[0], ctx.yRange[0]));
+    }
+  }
+
+  const d = $derived.by(() => {
+    return pathData;
+  });
+
+  const tweenedState = createMotion(defaultPathData(), () => d, tweenedOptions);
+
+  const drawTransition = $derived(draw ? _drawTransition : () => ({}));
+
+  let key = $state(Symbol());
+
+  const layerCtx = getLayerContext();
+
+  function render(
+    ctx: CanvasRenderingContext2D,
+    styleOverrides: ComputedStylesOptions | undefined
+  ) {
+    renderPathData(
+      ctx,
+      tweenedState.current,
+      styleOverrides
+        ? merge({ styles: { strokeWidth } }, styleOverrides)
+        : {
+            styles: { fill, fillOpacity, stroke, strokeOpacity, strokeWidth, opacity },
+            classes: cls('lc-path', className),
+            style: restProps.style as string | undefined,
+          }
+    );
+  }
+
+  // TODO: Use objectId to work around Svelte 4 reactivity issue (even when memoizing gradients)
+  const fillKey = layerCtx === 'canvas' ? createKey(() => fill) : undefined;
+  const strokeKey = layerCtx === 'canvas' ? createKey(() => stroke) : undefined;
+
+  if (layerCtx === 'canvas') {
+    ctx.registerComponent({ name: 'Path', kind: 'mark', canvasRender: {
+      render,
+      events: {
+        get click() { return onclick; },
+        get pointerenter() { return onpointerenter; },
+        get pointermove() { return onpointermove; },
+        get pointerleave() { return onpointerleave; },
+        get pointerdown() { return onpointerdown; },
+        get pointerover() { return onpointerover; },
+        get pointerout() { return onpointerout; },
+        get touchmove() { return ontouchmove; },
+      },
+      deps: () => [
+        fillKey!.current,
+        fillOpacity,
+        strokeKey!.current,
+        strokeOpacity,
+        strokeWidth,
+        opacity,
+        className,
+        tweenedState.current,
+        restProps.style,
+      ],
+    } });
+  }
+
+  let startPoint = $state<DOMPoint | undefined>();
+
+  const endPointDuration = $derived.by(() => {
+    if (
+      typeof draw === 'object' &&
+      draw.duration !== undefined &&
+      typeof draw.duration !== 'function'
+    ) {
+      return draw.duration;
+    }
+    return 800;
+  });
+
+  const endPoint = createControlledMotion<DOMPoint | undefined>(
+    undefined,
+    draw
+      ? {
+          type: 'tween',
+          duration: () => endPointDuration,
+          easing: typeof draw === 'object' && draw.easing ? draw.easing : cubicInOut,
+          interpolate() {
+            return (t: number) => {
+              const totalLength = pathRef?.getTotalLength() ?? 0;
+              const point = pathRef?.getPointAtLength(totalLength * t);
+              return point;
+            };
+          },
+        }
+      : { type: 'none' }
+  );
+
+  $effect(() => {
+    if (!startContent && !endContent) return;
+    d;
+    if (!pathRef) return;
+
+    // Wait for DOM to update before querying path geometry
+    tick().then(() => {
+      if (!pathRef) return;
+      const totalLength = pathRef.getTotalLength();
+      if (!totalLength) return;
+
+      startPoint = pathRef.getPointAtLength(0);
+      endPoint.target = pathRef.getPointAtLength(totalLength);
+    });
+  });
+
+  $effect(() => {
+    if (!draw) return;
+    // Anytime the path data changes, redraw
+    [pathData /*, data, ctx.data*/];
+    key = Symbol();
+  });
+</script>
+
+{#if layerCtx === 'svg'}
+  {#key key}
+    <path
+      d={tweenedState.current}
+      {...restProps}
+      {onclick}
+      {onpointerenter}
+      {onpointermove}
+      {onpointerleave}
+      {onpointerdown}
+      {onpointerover}
+      {onpointerout}
+      {ontouchmove}
+      class={cls('lc-path', className)}
+      {fill}
+      fill-opacity={fillOpacity}
+      {stroke}
+      stroke-opacity={strokeOpacity}
+      stroke-width={strokeWidth}
+      {opacity}
+      marker-start={markerStartId ? `url(#${markerStartId})` : undefined}
+      marker-mid={markerMidId ? `url(#${markerMidId})` : undefined}
+      marker-end={markerEndId ? `url(#${markerEndId})` : undefined}
+      in:drawTransition|global={typeof draw === 'object' ? draw : undefined}
+      bind:this={pathRef}
+    />
+    <MarkerWrapper id={markerStartId} marker={markerStart} />
+    <MarkerWrapper id={markerMidId} marker={markerMid} />
+    <MarkerWrapper id={markerEndId} marker={markerEnd} />
+
+    {#if startContent && startPoint}
+      <Group x={startPoint.x} y={startPoint.y} class="lc-path-g-start">
+        {@render startContent({
+          point: startPoint,
+          value: {
+            x: ctx.xScale?.invert?.(startPoint.x),
+            y: ctx.yScale?.invert?.(startPoint.y),
+          },
+        })}
+      </Group>
+    {/if}
+
+    {#if endContent && endPoint.current}
+      <Group x={endPoint.current.x} y={endPoint.current.y} class="lc-path-g-end">
+        {@render endContent({
+          point: endPoint.current,
+          value: {
+            x: ctx.xScale?.invert?.(endPoint.current.x),
+            y: ctx.yScale?.invert?.(endPoint.current.y),
+          },
+        })}
+      </Group>
+    {/if}
+  {/key}
+{/if}
+
+<style>
+  @layer base {
+    :global(:where(.lc-path)) {
+      /* Use transparent to enable pointer events */
+      --fill-color: transparent;
+      --stroke-color: var(--color-surface-content, currentColor);
+    }
+
+    /* Svg | Canvas layers */
+    :global(:where(.lc-layout-svg .lc-path, svg.lc-path):not([fill])) {
+      fill: var(--fill-color);
+    }
+    :global(:where(.lc-layout-svg .lc-path, svg.lc-path):not([stroke])) {
+      stroke: var(--stroke-color);
+    }
+
+    /* Html layers */
+    :global(:where(.lc-layout-html .lc-path):not([background-color])) {
+      background-color: var(--fill-color);
+    }
+    :global(:where(.lc-layout-html .lc-path):not([border-color])) {
+      border-color: var(--stroke-color);
+    }
+  }
+</style>

package/dist/components/Path.svelte.d.ts

@@ -0,0 +1,72 @@
+import type { Snippet } from 'svelte';
+import type { MarkerOptions } from './MarkerWrapper.svelte';
+import type { CommonStyleProps, Without } from '../utils/types.js';
+import type { SVGAttributes } from 'svelte/elements';
+import { type MotionProp } from '../utils/motion.svelte.js';
+export type PathPropsWithoutHTML = {
+    /**
+     * Pass `<path d={...} />` explicitly instead of calculating
+     * from data / context
+     */
+    pathData?: string | undefined | null;
+    /**
+     * Whether to animate the drawing of the path over time.
+     * Pass either `true` or an object with transition options to
+     * enable the transition.
+     *
+     * Works best with `tweened` disabled.
+     */
+    draw?: boolean | Parameters<typeof _drawTransition>[1];
+    /**
+     * Marker to attach to both start and end points of the line
+     */
+    marker?: MarkerOptions;
+    /**
+     * Marker to attach to the middle point of the line
+     */
+    markerMid?: MarkerOptions;
+    /**
+     * Marker to attach to the start point of the line
+     */
+    markerStart?: MarkerOptions;
+    /**
+     * Marker to attach to the end point of the line
+     */
+    markerEnd?: MarkerOptions;
+    /**
+     * Add additional content at the start of the line.
+     *
+     * Receives `{ point: DOMPoint; value: { x: number; y: number } }` as a snippet prop.
+     */
+    startContent?: Snippet<[{
+        point: DOMPoint;
+        value: {
+            x: number;
+            y: number;
+        };
+    }]>;
+    /**
+     * Add additional content at the end of the line.
+     *
+     * Receives `{ point: DOMPoint; value: { x: number; y: number } }` as a snippet prop.
+     */
+    endContent?: Snippet<[{
+        point: DOMPoint;
+        value: {
+            x: number;
+            y: number;
+        };
+    }]>;
+    /**
+     * A reference to the `<path>` element.
+     *
+     * @bindable
+     */
+    pathRef?: SVGPathElement;
+    motion?: MotionProp;
+} & CommonStyleProps;
+export type PathProps = PathPropsWithoutHTML & Without<SVGAttributes<SVGPathElement>, PathPropsWithoutHTML>;
+import { draw as _drawTransition } from 'svelte/transition';
+declare const Path: import("svelte").Component<PathProps, {}, "pathRef">;
+type Path = ReturnType<typeof Path>;
+export default Path;