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

package/dist/components/Circle.svelte

@@ -1,16 +1,21 @@
 <script lang="ts" module>
-  import type { CommonStyleProps, Without } from '../utils/types.js';
+  import type { Snippet } from 'svelte';
+  import type { Without } from '../utils/types.js';
+  import type { DataProp, DataDrivenStyleProps } from '../utils/dataProp.js';
 
   export type CirclePropsWithoutHTML = {
     /**
      * The center x position of the circle.
+     * - `number`: pixel value (direct)
+     * - `string`: data property name, resolved via xScale
+     * - `function(d)`: accessor called per data item, result passed through xScale
      *
      * @default 0
      */
-    cx?: number;
+    cx?: DataProp;
 
     /**
-     * The initial center x position of the circle.
+     * The initial center x position of the circle (pixel mode only).
      *
      * @default cx
      */
@@ -18,13 +23,16 @@
 
     /**
      * The center y position of the circle.
+     * - `number`: pixel value (direct)
+     * - `string`: data property name, resolved via yScale
+     * - `function(d)`: accessor called per data item, result passed through yScale
      *
      * @default 0
      */
-    cy?: number;
+    cy?: DataProp;
 
     /**
-     * The initial center y position of the circle.
+     * The initial center y position of the circle (pixel mode only).
      *
      * @default cy
      */
@@ -32,27 +40,47 @@
 
     /**
      * The radius of the circle.
+     * - `number`: pixel value (direct)
+     * - `string`: data property name, resolved via rScale
+     * - `function(d)`: accessor called per data item, result passed through rScale
      *
      * @default 1
      */
-    r?: number;
+    r?: DataProp;
 
     /**
-     * The initial radius of the circle.
+     * The initial radius of the circle (pixel mode only).
      *
      * @default r
      */
     initialR?: number;
 
     /**
-     * A bindable reference to the `<circle>` element
+     * Data array to iterate over in data mode.
+     * Falls back to chart context data when not provided.
+     */
+    data?: any[];
+
+    /**
+     * Key function for keyed {#each} rendering in data mode.
+     *
+     * @default (d, i) => i
+     */
+    key?: (d: any, index: number) => any;
+
+    /**
+     * A bindable reference to the `<circle>` element (pixel mode only).
      *
      * @bindable
      */
     ref?: SVGCircleElement;
 
+    /** Motion configuration (pixel mode only). */
     motion?: MotionProp;
-  } & CommonStyleProps;
+
+    /** Children content to render.  Note: Only works for Html layers */
+    children?: Snippet;
+  } & DataDrivenStyleProps;
 
   export type CircleProps = CirclePropsWithoutHTML &
     Without<SVGAttributes<Element>, CirclePropsWithoutHTML>;
@@ -60,15 +88,18 @@
 
 <script lang="ts">
   import { cls } from '@layerstack/tailwind';
-  import { merge } from 'lodash-es';
+  import { merge } from '@layerstack/utils';
 
-  import { getRenderContext } from './Chart.svelte';
-  import { createMotion, type MotionProp } from '../utils/motion.svelte.js';
-  import { registerCanvasComponent } from './layout/Canvas.svelte';
+  import { getLayerContext } from '../contexts/layer.js';
+  import { getChartContext } from '../contexts/chart.js';
+  import { untrack } from 'svelte';
+  import { createMotion, createDataMotionMap, type MotionProp } from '../utils/motion.svelte.js';
   import { renderCircle, type ComputedStylesOptions } from '../utils/canvas.js';
+  import { hasAnyDataProp, resolveDataProp, resolveColorProp, resolveGeoDataPair, resolveStyleProp } from '../utils/dataProp.js';
+  import { getGeoContext } from '../contexts/geo.js';
+  import { chartDataArray } from '../utils/common.js';
   import type { SVGAttributes } from 'svelte/elements';
   import { createKey } from '../utils/key.svelte.js';
-  import { layerClass } from '../utils/attributes.js';
 
   let {
     cx = 0,
@@ -77,6 +108,8 @@
     initialCy: initialCyProp,
     r = 1,
     initialR: initialRProp,
+    data: dataProp,
+    key: keyFn = (_: any, i: number) => i,
     motion,
     fill,
     fillOpacity,
@@ -85,48 +118,173 @@
     opacity,
     class: className,
     ref: refProp = $bindable(),
+    children,
     ...restProps
   }: CircleProps = $props();
 
+  // Data mode detection: if any positional prop is a string or function
+  const dataMode = $derived(hasAnyDataProp(cx, cy, r));
+
+  // Chart context (safe to call outside Chart — returns fallback)
+  const chartCtx = getChartContext();
+  const geo = getGeoContext();
+
+  // Data to iterate over in data mode
+  const resolvedData: any[] = $derived(
+    dataMode ? (dataProp ?? chartDataArray(chartCtx.data)) : []
+  );
+
+  // Resolve a single data item to pixel coordinates
+  function resolveCircle(d: any) {
+    if (geo.projection) {
+      const [projX, projY] = resolveGeoDataPair(cx, cy, d, geo.projection);
+      return {
+        cx: projX,
+        cy: projY,
+        r: resolveDataProp(r, d, chartCtx.rScale, typeof r === 'number' ? r : 1),
+      };
+    }
+    return {
+      cx: resolveDataProp(cx, d, chartCtx.xScale, 0),
+      cy: resolveDataProp(cy, d, chartCtx.yScale, 0),
+      r: resolveDataProp(r, d, chartCtx.rScale, typeof r === 'number' ? r : 1),
+    };
+  }
+
+  // --- Data mode: resolved items with optional motion ---
+  const dataMotionMap = createDataMotionMap(motion);
+
+  // Only create the data motion tracking effect when motion is actually configured
+  if (dataMotionMap) {
+    $effect(() => {
+      if (!dataMode) return;
+      const activeKeys = new Set<any>();
+      for (let i = 0; i < resolvedData.length; i++) {
+        const d = resolvedData[i];
+        const key = keyFn(d, i);
+        activeKeys.add(key);
+        const resolved = resolveCircle(d);
+        untrack(() => dataMotionMap.update(key, resolved));
+      }
+      untrack(() => dataMotionMap.cleanup(activeKeys));
+    });
+  }
+
+  // Single source of truth: resolved values with animated overlay
+  // Reading Spring .current here makes this reactive to animation frames
+  const resolvedItems = $derived.by(() => {
+    if (!dataMode) return [];
+    return resolvedData.map((d, i) => {
+      const key = keyFn(d, i);
+      const resolved = resolveCircle(d);
+      const animated = dataMotionMap?.get(key);
+      return {
+        d,
+        key,
+        cx: animated?.cx ?? resolved.cx,
+        cy: animated?.cy ?? resolved.cy,
+        r: animated?.r ?? resolved.r,
+      };
+    });
+  });
+
+  // --- Pixel mode ---
   let ref = $state<SVGCircleElement>();
 
   $effect.pre(() => {
     refProp = ref;
   });
 
-  const initialCx = initialCxProp ?? cx;
-  const initialCy = initialCyProp ?? cy;
-  const initialR = initialRProp ?? r;
+  const initialCx = initialCxProp ?? (typeof cx === 'number' ? cx : 0);
+  const initialCy = initialCyProp ?? (typeof cy === 'number' ? cy : 0);
+  const initialR = initialRProp ?? (typeof r === 'number' ? r : 1);
+
+  const layerCtx = getLayerContext();
 
-  const renderCtx = getRenderContext();
+  const motionCx = createMotion(
+    initialCx,
+    () => (typeof cx === 'number' ? cx : 0),
+    motion
+  );
+  const motionCy = createMotion(
+    initialCy,
+    () => (typeof cy === 'number' ? cy : 0),
+    motion
+  );
+  const motionR = createMotion(
+    initialR,
+    () => (typeof r === 'number' ? r : 1),
+    motion
+  );
 
-  const motionCx = createMotion(initialCx, () => cx, motion);
-  const motionCy = createMotion(initialCy, () => cy, motion);
-  const motionR = createMotion(initialR, () => r, motion);
+  // Style options (shared between pixel and data mode)
+  function getStyleOptions(
+    styleOverrides: ComputedStylesOptions | undefined,
+    itemFill?: string | undefined,
+    itemStroke?: string | undefined,
+    itemFillOpacity?: number | undefined,
+    itemStrokeWidth?: number | undefined,
+    itemOpacity?: number | undefined,
+    itemClass?: string | undefined
+  ) {
+    return styleOverrides
+      ? merge({ styles: { strokeWidth: itemStrokeWidth ?? (typeof strokeWidth === 'number' ? strokeWidth : undefined) } }, styleOverrides)
+      : {
+          styles: {
+            fill: itemFill ?? fill,
+            fillOpacity: itemFillOpacity ?? (typeof fillOpacity === 'number' ? fillOpacity : undefined),
+            stroke: itemStroke ?? stroke,
+            strokeWidth: itemStrokeWidth ?? (typeof strokeWidth === 'number' ? strokeWidth : undefined),
+            opacity: itemOpacity ?? (typeof opacity === 'number' ? opacity : undefined),
+          },
+          classes: cls('lc-circle', itemClass ?? (typeof className === 'string' ? className : undefined)),
+          style: restProps.style as string | undefined,
+        };
+  }
 
   function render(
     ctx: CanvasRenderingContext2D,
     styleOverrides: ComputedStylesOptions | undefined
   ) {
-    renderCircle(
-      ctx,
-      { cx: motionCx.current, cy: motionCy.current, r: motionR.current },
-      styleOverrides
-        ? merge({ styles: { strokeWidth } }, styleOverrides)
-        : {
-            styles: { fill, fillOpacity, stroke, strokeWidth, opacity },
-            classes: className,
-          }
-    );
+    if (dataMode) {
+      for (const item of resolvedItems) {
+        const resolvedFill = resolveColorProp(fill, item.d, chartCtx.cScale);
+        const resolvedStroke = resolveColorProp(stroke, item.d, chartCtx.cScale);
+        const resolvedFillOpacity = resolveStyleProp(fillOpacity, item.d);
+        const resolvedStrokeWidth = resolveStyleProp(strokeWidth, item.d);
+        const resolvedOpacity = resolveStyleProp(opacity, item.d);
+        const resolvedClass = resolveStyleProp(className, item.d);
+        const styleOpts = getStyleOptions(styleOverrides, resolvedFill, resolvedStroke, resolvedFillOpacity, resolvedStrokeWidth, resolvedOpacity, resolvedClass);
+        renderCircle(ctx, item, styleOpts);
+      }
+    } else {
+      const styleOpts = getStyleOptions(styleOverrides);
+      renderCircle(
+        ctx,
+        { cx: motionCx.current, cy: motionCy.current, r: motionR.current },
+        styleOpts
+      );
+    }
   }
 
   // TODO: Use objectId to work around Svelte 4 reactivity issue (even when memoizing gradients)
-  const fillKey = createKey(() => fill);
-  const strokeKey = createKey(() => stroke);
+  // Only create key trackers when in canvas mode (they're only used for canvas dep tracking)
+  const fillKey = layerCtx === 'canvas' ? createKey(() => fill) : undefined;
+  const strokeKey = layerCtx === 'canvas' ? createKey(() => stroke) : undefined;
 
-  if (renderCtx === 'canvas') {
-    registerCanvasComponent({
-      name: 'Circle',
+  chartCtx.registerComponent({
+    name: 'Circle',
+    kind: 'mark',
+    markInfo: () => {
+      if (!dataMode) return {};
+      return {
+        data: dataProp,
+        x: typeof cx === 'string' ? cx : undefined,
+        y: typeof cy === 'string' ? cy : undefined,
+        color: typeof fill === 'string' ? fill : undefined,
+      };
+    },
+    canvasRender: layerCtx === 'canvas' ? {
       render,
       events: {
         click: restProps.onclick,
@@ -136,32 +294,129 @@
         pointerleave: restProps.onpointerleave,
       },
       deps: () => [
+        dataMode,
+        dataMode ? resolvedItems : null,
         motionCx.current,
         motionCy.current,
         motionR.current,
-        fillKey.current,
+        fillKey!.current,
         fillOpacity,
-        strokeKey.current,
+        strokeKey!.current,
         strokeWidth,
         opacity,
         className,
+        restProps.style,
       ],
-    });
-  }
+    } : undefined,
+  });
 </script>
 
-{#if renderCtx === 'svg'}
-  <circle
-    bind:this={ref}
-    cx={motionCx.current}
-    cy={motionCy.current}
-    r={motionR.current}
-    {fill}
-    fill-opacity={fillOpacity}
-    {stroke}
-    stroke-width={strokeWidth}
-    {opacity}
-    class={cls(layerClass('circle'), fill == null && 'fill-surface-content', className)}
-    {...restProps}
-  />
+{#if layerCtx === 'svg'}
+  {#if dataMode}
+    {#each resolvedItems as item (item.key)}
+      {@const resolvedFill = resolveColorProp(fill, item.d, chartCtx.cScale)}
+      {@const resolvedStroke = resolveColorProp(stroke, item.d, chartCtx.cScale)}
+      {@const resolvedFillOpacity = resolveStyleProp(fillOpacity, item.d)}
+      {@const resolvedStrokeWidth = resolveStyleProp(strokeWidth, item.d)}
+      {@const resolvedOpacity = resolveStyleProp(opacity, item.d)}
+      {@const resolvedClass = resolveStyleProp(className, item.d)}
+      <circle
+        cx={item.cx}
+        cy={item.cy}
+        r={item.r}
+        fill={resolvedFill}
+        fill-opacity={resolvedFillOpacity}
+        stroke={resolvedStroke}
+        stroke-width={resolvedStrokeWidth}
+        opacity={resolvedOpacity}
+        class={cls('lc-circle', resolvedClass)}
+        {...restProps}
+      />
+    {/each}
+  {:else}
+    <circle
+      bind:this={ref}
+      cx={motionCx.current}
+      cy={motionCy.current}
+      r={motionR.current}
+      fill={fill as string}
+      fill-opacity={fillOpacity as number}
+      stroke={stroke as string}
+      stroke-width={strokeWidth as number}
+      opacity={opacity as number}
+      class={cls('lc-circle', className as string)}
+      {...restProps}
+    />
+  {/if}
+{:else if layerCtx === 'html'}
+  {#if dataMode}
+    {#each resolvedItems as item (item.key)}
+      {@const resolvedFill = resolveColorProp(fill, item.d, chartCtx.cScale)}
+      {@const resolvedStroke = resolveColorProp(stroke, item.d, chartCtx.cScale)}
+      {@const resolvedFillOpacity = resolveStyleProp(fillOpacity, item.d)}
+      {@const resolvedStrokeWidth = resolveStyleProp(strokeWidth, item.d)}
+      {@const resolvedOpacity = resolveStyleProp(opacity, item.d)}
+      {@const resolvedClass = resolveStyleProp(className, item.d)}
+      <div
+        style:position="absolute"
+        style:left="{item.cx}px"
+        style:top="{item.cy}px"
+        style:width="{item.r * 2}px"
+        style:height="{item.r * 2}px"
+        style:border-radius="50%"
+        style:background-color={resolvedFill}
+        style:opacity={resolvedOpacity}
+        style:border-width={resolvedStrokeWidth}
+        style:border-color={resolvedStroke}
+        style:border-style="solid"
+        style:transform="translate(-50%, -50%)"
+        class={cls('lc-circle', resolvedClass)}
+        {...restProps}
+      ></div>
+    {/each}
+  {:else}
+    <div
+      style:position="absolute"
+      style:left="{motionCx.current}px"
+      style:top="{motionCy.current}px"
+      style:width="{motionR.current * 2}px"
+      style:height="{motionR.current * 2}px"
+      style:border-radius="50%"
+      style:background-color={fill as string}
+      style:opacity={opacity as number}
+      style:border-width={strokeWidth as number}
+      style:border-color={stroke as string}
+      style:border-style="solid"
+      style:transform="translate(-50%, -50%)"
+      class={cls('lc-circle', className as string)}
+      {...restProps}
+    >
+      {@render children?.()}
+    </div>
+  {/if}
 {/if}
+
+<style>
+  @layer base {
+    :global(:where(.lc-circle)) {
+      --fill-color: var(--color-surface-content, currentColor);
+      --stroke-color: initial;
+    }
+
+    /* Svg | Canvas layers */
+    :global(:where(.lc-layout-svg .lc-circle, svg.lc-circle):not([fill])) {
+      fill: var(--fill-color);
+    }
+    :global(:where(.lc-layout-svg .lc-circle, svg.lc-circle):not([stroke])) {
+      stroke: var(--stroke-color);
+    }
+
+    /* Html layers */
+    :global(:where(.lc-layout-html .lc-circle):not([background-color])) {
+      background-color: var(--fill-color);
+    }
+    :global(:where(.lc-layout-html .lc-circle):not([border-color])) {
+      border-color: var(--stroke-color);
+    }
+  }
+</style>

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

@@ -1,49 +1,74 @@
-import type { CommonStyleProps, Without } from '../utils/types.js';
+import type { Snippet } from 'svelte';
+import type { Without } from '../utils/types.js';
+import type { DataProp, DataDrivenStyleProps } from '../utils/dataProp.js';
 export type CirclePropsWithoutHTML = {
     /**
      * The center x position of the circle.
+     * - `number`: pixel value (direct)
+     * - `string`: data property name, resolved via xScale
+     * - `function(d)`: accessor called per data item, result passed through xScale
      *
      * @default 0
      */
-    cx?: number;
+    cx?: DataProp;
     /**
-     * The initial center x position of the circle.
+     * The initial center x position of the circle (pixel mode only).
      *
      * @default cx
      */
     initialCx?: number;
     /**
      * The center y position of the circle.
+     * - `number`: pixel value (direct)
+     * - `string`: data property name, resolved via yScale
+     * - `function(d)`: accessor called per data item, result passed through yScale
      *
      * @default 0
      */
-    cy?: number;
+    cy?: DataProp;
     /**
-     * The initial center y position of the circle.
+     * The initial center y position of the circle (pixel mode only).
      *
      * @default cy
      */
     initialCy?: number;
     /**
      * The radius of the circle.
+     * - `number`: pixel value (direct)
+     * - `string`: data property name, resolved via rScale
+     * - `function(d)`: accessor called per data item, result passed through rScale
      *
      * @default 1
      */
-    r?: number;
+    r?: DataProp;
     /**
-     * The initial radius of the circle.
+     * The initial radius of the circle (pixel mode only).
      *
      * @default r
      */
     initialR?: number;
     /**
-     * A bindable reference to the `<circle>` element
+     * Data array to iterate over in data mode.
+     * Falls back to chart context data when not provided.
+     */
+    data?: any[];
+    /**
+     * Key function for keyed {#each} rendering in data mode.
+     *
+     * @default (d, i) => i
+     */
+    key?: (d: any, index: number) => any;
+    /**
+     * A bindable reference to the `<circle>` element (pixel mode only).
      *
      * @bindable
      */
     ref?: SVGCircleElement;
+    /** Motion configuration (pixel mode only). */
     motion?: MotionProp;
-} & CommonStyleProps;
+    /** Children content to render.  Note: Only works for Html layers */
+    children?: Snippet;
+} & DataDrivenStyleProps;
 export type CircleProps = CirclePropsWithoutHTML & Without<SVGAttributes<Element>, CirclePropsWithoutHTML>;
 import { type MotionProp } from '../utils/motion.svelte.js';
 import type { SVGAttributes } from 'svelte/elements';

package/dist/components/Circle.svelte.test.d.ts

@@ -0,0 +1 @@
+export {};