layerchart 0.53.0 → 0.54.1

package/dist/components/charts/AreaChart.svelte

@@ -1,62 +1,142 @@
-<script generics="TData">import {} from 'svelte';
-import { scaleLinear, scaleOrdinal, scaleTime } from 'd3-scale';
-import { stack, stackOffsetDiverging, stackOffsetExpand, stackOffsetNone } from 'd3-shape';
-import { sum } from 'd3-array';
-import { format } from '@layerstack/utils';
-import Area from '../Area.svelte';
-import Axis from '../Axis.svelte';
-import Chart from '../Chart.svelte';
-import Highlight from '../Highlight.svelte';
-import Labels from '../Labels.svelte';
-import Legend from '../Legend.svelte';
-import Line from '../Line.svelte';
-import Points from '../Points.svelte';
-import Rule from '../Rule.svelte';
-import Svg from '../layout/Svg.svelte';
-import * as Tooltip from '../tooltip/index.js';
-import { accessor, chartDataArray } from '../../utils/common.js';
-export let data = [];
-export let x = undefined;
-export let y = undefined;
-/** Use radial instead of cartesian coordinates, mapping `x` to `angle` and `y`` to radial.  Radial lines are positioned relative to the origin, use transform (ex. `<Group center>`) to change the origin */
-export let radial = false;
-export let series = [{ key: 'default', value: y, color: 'hsl(var(--color-primary))' }];
-/** Determine how to layout series.  Overlap (default) or stack */
-export let seriesLayout = 'overlap';
-$: stackSeries = seriesLayout.startsWith('stack');
-export let axis = true;
-export let rule = true;
-export let labels = false;
-export let legend = false;
-export let points = false;
-export let props = {};
-$: allSeriesData = series
+<script lang="ts" generics="TData">
+  import { type ComponentProps } from 'svelte';
+  import { scaleLinear, scaleOrdinal, scaleTime } from 'd3-scale';
+  import { stack, stackOffsetDiverging, stackOffsetExpand, stackOffsetNone } from 'd3-shape';
+  import { sum } from 'd3-array';
+  import { format } from '@layerstack/utils';
+
+  import Area from '../Area.svelte';
+  import Axis from '../Axis.svelte';
+  import Chart from '../Chart.svelte';
+  import Grid from '../Grid.svelte';
+  import Highlight from '../Highlight.svelte';
+  import Labels from '../Labels.svelte';
+  import Legend from '../Legend.svelte';
+  import Line from '../Line.svelte';
+  import Points from '../Points.svelte';
+  import Rule from '../Rule.svelte';
+  import Svg from '../layout/Svg.svelte';
+  import * as Tooltip from '../tooltip/index.js';
+
+  import { accessor, chartDataArray, type Accessor } from '../../utils/common.js';
+
+  interface $$Props extends ComponentProps<Chart<TData>> {
+    axis?: typeof axis;
+    grid?: typeof grid;
+    labels?: typeof labels;
+    legend?: typeof legend;
+    points?: typeof points;
+    props?: typeof props;
+    rule?: typeof rule;
+    series?: typeof series;
+    seriesLayout?: typeof seriesLayout;
+  }
+
+  export let data: $$Props['data'] = [];
+  export let x: Accessor<TData> = undefined;
+  export let y: Accessor<TData> = undefined;
+
+  /** Use radial instead of cartesian coordinates, mapping `x` to `angle` and `y`` to radial.  Radial lines are positioned relative to the origin, use transform (ex. `<Group center>`) to change the origin */
+  export let radial = false;
+
+  export let series: {
+    key: string;
+    label?: string;
+    value?: Accessor<TData>;
+    /** Provider series data, else uses chart data (with value/key accessor) */
+    data?: TData[];
+    color?: string;
+    props?: Partial<ComponentProps<Area>>;
+  }[] = [{ key: 'default', value: y, color: 'hsl(var(--color-primary))' }];
+  $: isDefaultSeries = series.length === 1 && series[0].key === 'default';
+
+  /** Determine how to layout series.  Overlap (default) or stack */
+  export let seriesLayout: 'overlap' | 'stack' | 'stackExpand' | 'stackDiverging' = 'overlap';
+  $: stackSeries = seriesLayout.startsWith('stack');
+
+  export let axis: ComponentProps<Axis> | 'x' | 'y' | boolean = true;
+  export let grid: ComponentProps<Grid> | boolean = true;
+  export let rule: ComponentProps<Rule> | boolean = true;
+  export let labels: ComponentProps<Labels> | boolean = false;
+  export let legend: ComponentProps<Legend> | boolean = false;
+  export let points: ComponentProps<Points> | boolean = false;
+
+  export let props: {
+    xAxis?: Partial<ComponentProps<Axis>>;
+    yAxis?: Partial<ComponentProps<Axis>>;
+    grid?: Partial<ComponentProps<Grid>>;
+    rule?: Partial<ComponentProps<Rule>>;
+    area?: Partial<ComponentProps<Area>>;
+    line?: Partial<ComponentProps<Line>>;
+    legend?: Partial<ComponentProps<Legend>>;
+    points?: Partial<ComponentProps<Points>>;
+    highlight?: Partial<ComponentProps<Highlight>>;
+    labels?: Partial<ComponentProps<Labels>>;
+  } = {};
+
+  $: allSeriesData = series
     .flatMap((s) => s.data?.map((d) => ({ seriesKey: s.key, ...d })))
-    .filter((d) => d);
-$: chartData = (allSeriesData.length ? allSeriesData : chartDataArray(data));
-$: if (stackSeries) {
+    .filter((d) => d) as Array<TData & { stackData?: any }>;
+
+  $: chartData = (allSeriesData.length ? allSeriesData : chartDataArray(data)) as Array<
+    TData & { stackData?: any }
+  >;
+
+  $: if (stackSeries) {
     const seriesKeys = series.map((s) => s.key);
-    const offset = seriesLayout === 'stackExpand'
+    const offset =
+      seriesLayout === 'stackExpand'
         ? stackOffsetExpand
         : seriesLayout === 'stackDiverging'
-            ? stackOffsetDiverging
-            : stackOffsetNone;
+          ? stackOffsetDiverging
+          : stackOffsetNone;
     const stackData = stack()
-        .keys(seriesKeys)
-        .value((d, key) => {
-        const s = series.find((d) => d.key === key);
-        return accessor(s.value ?? s.key)(d);
-    })
-        .offset(offset)(chartDataArray(data));
+      .keys(seriesKeys)
+      .value((d, key) => {
+        const s = series.find((d) => d.key === key)!;
+        return accessor(s.value ?? s.key)(d as any);
+      })
+      .offset(offset)(chartDataArray(data)) as any[];
+
     chartData = chartData.map((d, i) => {
-        return {
-            ...d,
-            stackData: stackData.map((sd) => sd[i]),
-        };
+      return {
+        ...d,
+        stackData: stackData.map((sd) => sd[i]),
+      };
     });
-}
-// Default xScale based on first data's `x` value
-$: xScale = accessor(x)(chartData[0]) instanceof Date ? scaleTime() : scaleLinear();
+  }
+
+  // Default xScale based on first data's `x` value
+  $: xScale = accessor(x)(chartData[0]) instanceof Date ? scaleTime() : scaleLinear();
+
+  function getAreaProps(s: (typeof series)[number], i: number) {
+    const lineProps = {
+      ...props.line,
+      ...(typeof props.area?.line === 'object' ? props.area.line : null),
+      ...(typeof s.props?.line === 'object' ? s.props.line : null),
+    };
+
+    const areaProps: ComponentProps<Area> = {
+      data: s.data,
+      y0: stackSeries ? (d) => d.stackData[i][0] : Array.isArray(s.value) ? s.value[0] : undefined,
+      y1: stackSeries
+        ? (d) => d.stackData[i][1]
+        : Array.isArray(s.value)
+          ? s.value[1]
+          : (s.value ?? s.key),
+      fill: s.color,
+      'fill-opacity': 0.3,
+      ...props.area,
+      ...s.props,
+      line: {
+        class: !('stroke-width' in lineProps) ? 'stroke-2' : '',
+        stroke: s.color,
+        ...lineProps,
+      },
+    };
+
+    return areaProps;
+  }
 </script>
 
 <Chart
@@ -82,20 +162,41 @@ $: xScale = accessor(x)(chartData[0]) instanceof Date ? scaleTime() : scaleLinea
   let:xScale
   let:y
   let:yScale
+  let:c
+  let:cScale
   let:width
   let:height
   let:padding
   let:tooltip
 >
-  {@const slotProps = { x, xScale, y, yScale, width, height, padding, tooltip, series }}
+  {@const slotProps = {
+    x,
+    xScale,
+    y,
+    yScale,
+    c,
+    cScale,
+    width,
+    height,
+    padding,
+    tooltip,
+    series,
+    getAreaProps,
+  }}
+
   <slot {...slotProps}>
     <Svg center={radial}>
+      <slot name="grid" {...slotProps}>
+        {#if grid}
+          <Grid x={radial} y {...typeof grid === 'object' ? grid : null} {...props.grid} />
+        {/if}
+      </slot>
+
       <slot name="axis" {...slotProps}>
         {#if axis}
           {#if axis !== 'x'}
             <Axis
               placement={radial ? 'radius' : 'left'}
-              grid
               format={(value) => {
                 if (seriesLayout === 'stackExpand') {
                   return format(value, 'percentRound');
@@ -111,7 +212,6 @@ $: xScale = accessor(x)(chartData[0]) instanceof Date ? scaleTime() : scaleLinea
           {#if axis !== 'y'}
             <Axis
               placement={radial ? 'angle' : 'bottom'}
-              grid={radial}
               format={(value) => format(value, undefined, { variant: 'short' })}
               {...typeof axis === 'object' ? axis : null}
               {...props.xAxis}
@@ -128,34 +228,7 @@ $: xScale = accessor(x)(chartData[0]) instanceof Date ? scaleTime() : scaleLinea
 
       <slot name="marks" {...slotProps}>
         {#each series as s, i}
-          {@const lineProps = {
-            ...props.line,
-            ...(typeof props.area?.line === 'object' ? props.area.line : null),
-            ...(typeof s.props?.line === 'object' ? s.props.line : null),
-          }}
-
-          <Area
-            data={s.data}
-            y0={stackSeries
-              ? (d) => d.stackData[i][0]
-              : Array.isArray(s.value)
-                ? s.value[0]
-                : undefined}
-            y1={stackSeries
-              ? (d) => d.stackData[i][1]
-              : Array.isArray(s.value)
-                ? s.value[1]
-                : (s.value ?? s.key)}
-            fill={s.color}
-            fill-opacity={0.3}
-            {...props.area}
-            {...s.props}
-            line={{
-              class: !('stroke-width' in lineProps) ? 'stroke-2' : '',
-              stroke: s.color,
-              ...lineProps,
-            }}
-          />
+          <Area {...getAreaProps(s, i)} />
         {/each}
       </slot>
 
@@ -192,10 +265,12 @@ $: xScale = accessor(x)(chartData[0]) instanceof Date ? scaleTime() : scaleLinea
     <slot name="legend" {...slotProps}>
       {#if legend}
         <Legend
-          scale={scaleOrdinal(
-            series.map((s) => s.label ?? s.key),
-            series.map((s) => s.color)
-          )}
+          scale={isDefaultSeries
+            ? undefined
+            : scaleOrdinal(
+                series.map((s) => s.label ?? s.key),
+                series.map((s) => s.color)
+              )}
           placement="bottom"
           variant="swatches"
           {...props.legend}

package/dist/components/charts/AreaChart.svelte.d.ts

@@ -2,6 +2,7 @@ import { SvelteComponentTyped } from "svelte";
 import { type ComponentProps } from 'svelte';
 import Area from '../Area.svelte';
 import Axis from '../Axis.svelte';
+import Grid from '../Grid.svelte';
 import Highlight from '../Highlight.svelte';
 import Labels from '../Labels.svelte';
 import Legend from '../Legend.svelte';
@@ -77,7 +78,7 @@ declare class __sveltets_Render<TData> {
             width: number;
             height: number;
         }) => number[] | string[]) | undefined;
-        cRange?: string[];
+        cRange?: string[] | readonly string[];
         xReverse?: boolean;
         yReverse?: boolean;
         zReverse?: boolean;
@@ -132,6 +133,13 @@ declare class __sveltets_Render<TData> {
             onClick?: ({ data }: {
                 data: any;
             }) => any;
+            tooltip?: import("svelte/store").Writable<{
+                y: number;
+                x: number;
+                data: any;
+                show: (e: PointerEvent, tooltipData?: any) => void;
+                hide: () => void;
+            }>;
         }> | undefined;
         transform?: Partial<{
             mode?: "canvas" | "manual" | "none";
@@ -180,6 +188,14 @@ declare class __sveltets_Render<TData> {
             setScale?: (value: number, options?: import("../../stores/motionStore").MotionOptions) => void;
         }> | undefined;
         transformContext?: import("..").TransformContext;
+        geoProjection?: import("svelte/store").Writable<import("d3-geo").GeoProjection> | undefined;
+        tooltipContext?: import("svelte/store").Writable<{
+            y: number;
+            x: number;
+            data: any;
+            show: (e: PointerEvent, tooltipData?: any) => void;
+            hide: () => void;
+        }> | undefined;
     } & {
         axis?: boolean | "x" | "y" | {
             [x: string]: any;
@@ -187,7 +203,7 @@ declare class __sveltets_Render<TData> {
             label?: string | undefined;
             labelPlacement?: ("start" | "middle" | "end") | undefined;
             labelProps?: Partial<ComponentProps<import("..").Text>> | undefined;
-            rule?: (boolean | Pick<import("svelte/elements").SVGAttributes<SVGElement>, "class" | "style">) | undefined;
+            rule?: (boolean | Partial<ComponentProps<Rule>>) | undefined;
             grid?: (boolean | Pick<import("svelte/elements").SVGAttributes<SVGElement>, "class" | "style">) | undefined;
             ticks?: number | any[] | ((scale: import("../../utils/scales").AnyScale) => any) | null | undefined;
             tickLength?: number | undefined;
@@ -203,8 +219,26 @@ declare class __sveltets_Render<TData> {
                 label?: string;
             } | undefined;
         };
+        grid?: boolean | {
+            [x: string]: any;
+            x?: (boolean | Pick<import("svelte/elements").SVGAttributes<SVGElement>, "class" | "style">) | undefined;
+            y?: (boolean | Pick<import("svelte/elements").SVGAttributes<SVGElement>, "class" | "style">) | undefined;
+            xTicks?: number | any[] | ((scale: import("../../utils/scales").AnyScale) => any) | null | undefined;
+            yTicks?: number | any[] | ((scale: import("../../utils/scales").AnyScale) => any) | null | undefined;
+            bandAlign?: ("center" | "between") | undefined;
+            radialY?: ("circle" | "linear") | undefined;
+            spring?: boolean | Parameters<typeof import("svelte/motion").spring>[1];
+            tweened?: boolean | Parameters<typeof import("svelte/motion").tweened>[1];
+            transitionIn?: (typeof import("svelte/transition").fade | (() => {})) | undefined;
+            transitionInParams?: import("svelte-ux").TransitionParams | undefined;
+            classes?: {
+                root?: string;
+                line?: string;
+            } | undefined;
+        };
         labels?: boolean | {
             [x: string]: any;
+            value?: Accessor;
             placement?: ("inside" | "outside" | "center") | undefined;
             offset?: number | undefined;
             format?: import("@layerstack/utils").FormatType | undefined;
@@ -220,7 +254,7 @@ declare class __sveltets_Render<TData> {
             tickValues?: any[] | undefined;
             tickFontSize?: number | undefined;
             tickLength?: number | undefined;
-            placement?: ("left" | "right" | "center" | "bottom" | "top" | "top-left" | "top-right" | "bottom-left" | "bottom-right") | undefined;
+            placement?: ("center" | "left" | "right" | "bottom" | "top" | "top-left" | "top-right" | "bottom-left" | "bottom-right") | undefined;
             orientation?: ("horizontal" | "vertical") | undefined;
             variant?: ("ramp" | "swatches") | undefined;
             classes?: {
@@ -248,6 +282,7 @@ declare class __sveltets_Render<TData> {
         props?: {
             xAxis?: Partial<ComponentProps<Axis>>;
             yAxis?: Partial<ComponentProps<Axis>>;
+            grid?: Partial<ComponentProps<Grid>>;
             rule?: Partial<ComponentProps<Rule>>;
             area?: Partial<ComponentProps<Area>>;
             line?: Partial<ComponentProps<Line>>;
@@ -259,7 +294,9 @@ declare class __sveltets_Render<TData> {
         rule?: boolean | {
             [x: string]: any;
             x?: (number | Date | boolean | "left" | "right") | undefined;
+            xOffset?: number | undefined;
             y?: (number | Date | boolean | "top" | "bottom") | undefined;
+            yOffset?: number | undefined;
         };
         series?: {
             key: string;
@@ -277,6 +314,7 @@ declare class __sveltets_Render<TData> {
     };
     slots(): {
         default: any;
+        grid: any;
         axis: any;
         'below-marks': any;
         marks: any;