layerchart 2.0.0-next.44 → 2.0.0-next.46

package/dist/components/Path.svelte

@@ -0,0 +1,344 @@
+<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 { registerCanvasComponent } from './layers/Canvas.svelte';
+  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,
+    strokeWidth,
+    fillOpacity,
+    class: className,
+    marker,
+    markerStart: markerStartProp,
+    markerMid: markerMidProp,
+    markerEnd: markerEndProp,
+    startContent,
+    endContent,
+    opacity,
+    pathRef: pathRefProp = $bindable(),
+    ...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, 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 = createKey(() => fill);
+  const strokeKey = createKey(() => stroke);
+
+  if (layerCtx === 'canvas') {
+    registerCanvasComponent({
+      name: 'Path',
+      render,
+      events: {
+        click: restProps.onclick,
+        pointerenter: restProps.onpointerenter,
+        pointermove: restProps.onpointermove,
+        pointerleave: restProps.onpointerleave,
+        pointerdown: restProps.onpointerdown,
+        pointerover: restProps.onpointerover,
+        pointerout: restProps.onpointerout,
+        touchmove: restProps.ontouchmove,
+      },
+      deps: () => [
+        fillKey.current,
+        fillOpacity,
+        strokeKey.current,
+        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}
+      class={cls('lc-path', className)}
+      {fill}
+      fill-opacity={fillOpacity}
+      {stroke}
+      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;

package/dist/components/Pattern.svelte

@@ -125,8 +125,8 @@
 </script>
 
 <script lang="ts">
-  import { getRenderContext } from './Chart.svelte';
-  import { registerCanvasComponent } from './layout/Canvas.svelte';
+  import { getLayerContext } from '../contexts/layer.js';
+  import { registerCanvasComponent } from './layers/Canvas.svelte';
   import { createPattern } from '../utils/canvas.js';
 
   const uid = $props.id();
@@ -144,7 +144,7 @@
     ...restProps
   }: PatternProps = $props();
 
-  const renderCtx = getRenderContext();
+  const layerCtx = getLayerContext();
 
   let canvasPattern = $state<CanvasPattern | null>(null);
 
@@ -247,7 +247,7 @@
     canvasPattern = pattern;
   }
 
-  if (renderCtx === 'canvas') {
+  if (layerCtx === 'canvas') {
     registerCanvasComponent({
       name: 'Pattern',
       render,
@@ -256,9 +256,9 @@
   }
 </script>
 
-{#if renderCtx === 'canvas'}
+{#if layerCtx === 'canvas'}
   {@render children?.({ id, pattern: asAny(canvasPattern) })}
-{:else if renderCtx === 'svg'}
+{:else if layerCtx === 'svg'}
   <defs>
     <pattern
       {id}

package/dist/components/Pie.svelte

@@ -78,8 +78,8 @@
   import Arc from './Arc.svelte';
   import { degreesToRadians } from '../utils/math.js';
   import { createMotion, type MotionProp } from '../utils/motion.svelte.js';
-  import type { TooltipContextValue } from './tooltip/TooltipContext.svelte';
-  import { getChartContext } from './Chart.svelte';
+  import type { TooltipContextValue } from '../contexts/tooltip.js';
+  import { getChartContext } from '../contexts/chart.js';
   import type { Snippet } from 'svelte';
 
   /*

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

@@ -59,7 +59,7 @@ export type PiePropsWithoutHTML = {
     motion?: MotionProp;
 };
 import { type MotionProp } from '../utils/motion.svelte.js';
-import type { TooltipContextValue } from './tooltip/TooltipContext.svelte';
+import type { TooltipContextValue } from '../contexts/tooltip.js';
 import type { Snippet } from 'svelte';
 declare const Pie: import("svelte").Component<PiePropsWithoutHTML, {}, "">;
 type Pie = ReturnType<typeof Pie>;

package/dist/components/Point.svelte

@@ -15,7 +15,7 @@
 </script>
 
 <script lang="ts">
-  import { getChartContext } from './Chart.svelte';
+  import { getChartContext } from '../contexts/chart.js';
 
   let { d, children }: PointProps = $props();
 

package/dist/components/Points.svelte

@@ -50,7 +50,7 @@
   import Circle, { type CircleProps } from './Circle.svelte';
   import { isScaleBand, type AnyScale } from '../utils/scales.svelte.js';
   import { accessor, type Accessor } from '../utils/common.js';
-  import { getChartContext } from './Chart.svelte';
+  import { getChartContext } from '../contexts/chart.js';
   import { extractLayerProps } from '../utils/attributes.js';
 
   const ctx = getChartContext();

package/dist/components/Polygon.svelte

@@ -131,17 +131,17 @@
 <script lang="ts">
   import type { SVGAttributes } from 'svelte/elements';
   import { cls } from '@layerstack/tailwind';
-  import { merge } from 'lodash-es';
+  import { merge } from '@layerstack/utils';
   import { interpolatePath } from 'd3-interpolate-path';
 
-  import { getRenderContext } from './Chart.svelte';
+  import { getLayerContext } from '../contexts/layer.js';
   import {
     createMotion,
     extractTweenConfig,
     type MotionProp,
     type ResolvedMotion,
   } from '../utils/motion.svelte.js';
-  import { registerCanvasComponent } from './layout/Canvas.svelte';
+  import { registerCanvasComponent } from './layers/Canvas.svelte';
   import { renderPathData, type ComputedStylesOptions } from '../utils/canvas.js';
   import { createKey } from '../utils/key.svelte.js';
   import { polygon } from '../utils/shape.js';
@@ -220,7 +220,7 @@
 
   const tweenedState = createMotion(null, () => d, tweenedOptions);
 
-  const renderCtx = getRenderContext();
+  const layerCtx = getLayerContext();
 
   function render(
     ctx: CanvasRenderingContext2D,
@@ -234,6 +234,7 @@
         : {
             styles: { fill, fillOpacity, stroke, strokeWidth, opacity },
             classes: cls('lc-polygon', className),
+            style: restProps.style as string | undefined,
           }
     );
   }
@@ -242,7 +243,7 @@
   const fillKey = createKey(() => fill);
   const strokeKey = createKey(() => stroke);
 
-  if (renderCtx === 'canvas') {
+  if (layerCtx === 'canvas') {
     registerCanvasComponent({
       name: 'Polygon',
       render,
@@ -264,12 +265,13 @@
         opacity,
         className,
         tweenedState.current,
+        restProps.style,
       ],
     });
   }
 </script>
 
-{#if renderCtx === 'svg'}
+{#if layerCtx === 'svg'}
   <path
     d={tweenedState.current}
     {fill}

package/dist/components/RadialGradient.svelte

@@ -83,11 +83,11 @@
 </script>
 
 <script lang="ts">
-  import { getRenderContext } from './Chart.svelte';
-  import { registerCanvasComponent } from './layout/Canvas.svelte';
+  import { getLayerContext } from '../contexts/layer.js';
+  import { registerCanvasComponent } from './layers/Canvas.svelte';
   import { getComputedStyles } from '../utils/canvas.js';
   import { parsePercent } from '../utils/math.js';
-  import { getChartContext } from './Chart.svelte';
+  import { getChartContext } from '../contexts/chart.js';
   import { createId } from '../utils/createId.js';
   import { extractLayerProps } from '../utils/attributes.js';
   import { cls } from '@layerstack/tailwind';
@@ -114,7 +114,7 @@
 
   const ctx = getChartContext();
 
-  const renderCtx = getRenderContext();
+  const layerCtx = getLayerContext();
 
   let canvasGradient = $state<CanvasGradient>();
 
@@ -144,7 +144,7 @@
     canvasGradient = gradient;
   }
 
-  if (renderCtx === 'canvas') {
+  if (layerCtx === 'canvas') {
     registerCanvasComponent({
       name: 'Gradient',
       render,
@@ -153,9 +153,9 @@
   }
 </script>
 
-{#if renderCtx === 'canvas'}
+{#if layerCtx === 'canvas'}
   {@render children?.({ id, gradient: canvasGradient as any })}
-{:else if renderCtx === 'svg'}
+{:else if layerCtx === 'svg'}
   <defs>
     <radialGradient
       {id}