layerchart 0.53.0 → 0.54.1

package/dist/components/charts/BarChart.svelte

@@ -1,93 +1,178 @@
-<script generics="TData">import {} from 'svelte';
-import { scaleBand, scaleOrdinal, scaleLinear } from 'd3-scale';
-import { stack, stackOffsetDiverging, stackOffsetExpand, stackOffsetNone } from 'd3-shape';
-import { sum } from 'd3-array';
-import { format } from '@layerstack/utils';
-import Axis from '../Axis.svelte';
-import Bars from '../Bars.svelte';
-import Chart from '../Chart.svelte';
-import Highlight from '../Highlight.svelte';
-import Labels from '../Labels.svelte';
-import Legend from '../Legend.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;
-export let orientation = 'vertical';
-$: isVertical = orientation === 'vertical';
-export let series = [
+<script lang="ts" generics="TData">
+  import { type ComponentProps } from 'svelte';
+  import { scaleBand, scaleOrdinal, scaleLinear } from 'd3-scale';
+  import { stack, stackOffsetDiverging, stackOffsetExpand, stackOffsetNone } from 'd3-shape';
+  import { sum } from 'd3-array';
+  import { format } from '@layerstack/utils';
+
+  import Axis from '../Axis.svelte';
+  import Bars from '../Bars.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 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';
+
+  type ChartProps = ComponentProps<Chart<TData>>;
+
+  interface $$Props extends ChartProps {
+    axis?: typeof axis;
+    grid?: typeof grid;
+    bandPadding?: typeof bandPadding;
+    groupPadding?: typeof groupPadding;
+    labels?: typeof labels;
+    legend?: typeof legend;
+    orientation?: typeof orientation;
+    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;
+
+  export let orientation: 'vertical' | 'horizontal' = 'vertical';
+  $: isVertical = orientation === 'vertical';
+
+  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<Bars>>;
+  }[] = [
     {
-        key: 'default',
-        value: orientation === 'vertical' ? y : x,
-        color: 'hsl(var(--color-primary))',
+      key: 'default',
+      value: orientation === 'vertical' ? y : x,
     },
-];
-/** Determine how to layout series.  Overlap (default), stack, or group side by side */
-export let seriesLayout = 'overlap';
-$: stackSeries = seriesLayout.startsWith('stack');
-$: groupSeries = seriesLayout === 'group';
-export let axis = true;
-export let rule = true;
-export let labels = false;
-export let legend = false;
-/** Padding between primary x or y bands/bars, applied to scaleBand().padding() */
-export let bandPadding = 0.4;
-/** Padding between group/series items when using 'seriesLayout="group"', applied to scaleBand().padding() */
-export let groupPadding = 0;
-$: xScale = isVertical ? scaleBand().padding(bandPadding) : scaleLinear();
-$: xBaseline = isVertical ? undefined : 0;
-$: yScale = isVertical ? scaleLinear() : scaleBand().padding(bandPadding);
-$: yBaseline = isVertical ? 0 : undefined;
-let x1Scale;
-let x1Domain;
-let x1Range;
-let y1Scale;
-let y1Domain;
-let y1Range;
-$: if (seriesLayout === 'group') {
+  ];
+  $: isDefaultSeries = series.length === 1 && series[0].key === 'default';
+
+  /** Determine how to layout series.  Overlap (default), stack, or group side by side */
+  export let seriesLayout: 'overlap' | 'group' | 'stack' | 'stackExpand' | 'stackDiverging' =
+    'overlap';
+  $: stackSeries = seriesLayout.startsWith('stack');
+  $: groupSeries = seriesLayout === 'group';
+
+  export let axis: ComponentProps<Axis> | 'x' | 'y' | boolean = true;
+  export let rule: ComponentProps<Rule> | boolean = true;
+  export let grid: ComponentProps<Grid> | boolean = true;
+  export let labels: ComponentProps<Labels> | boolean = false;
+  export let legend: ComponentProps<Legend> | boolean = false;
+
+  /** Padding between primary x or y bands/bars, applied to scaleBand().padding() */
+  export let bandPadding = 0.4;
+  /** Padding between group/series items when using 'seriesLayout="group"', applied to scaleBand().padding() */
+  export let groupPadding = 0;
+
+  $: xScale = isVertical ? scaleBand().padding(bandPadding) : scaleLinear();
+  $: xBaseline = isVertical ? undefined : 0;
+
+  $: yScale = isVertical ? scaleLinear() : scaleBand().padding(bandPadding);
+  $: yBaseline = isVertical ? 0 : undefined;
+
+  let x1Scale: ChartProps['x1Scale'];
+  let x1Domain: ChartProps['x1Domain'];
+  let x1Range: ChartProps['x1Range'];
+
+  let y1Scale: ChartProps['y1Scale'];
+  let y1Domain: ChartProps['y1Domain'];
+  let y1Range: ChartProps['y1Range'];
+
+  $: if (seriesLayout === 'group') {
     if (isVertical) {
-        x1Scale = scaleBand().padding(groupPadding);
-        x1Domain = series.map((s) => s.key);
-        x1Range = ({ xScale }) => [0, xScale.bandwidth?.()];
+      x1Scale = scaleBand().padding(groupPadding);
+      x1Domain = series.map((s) => s.key);
+      x1Range = ({ xScale }) => [0, xScale.bandwidth?.()];
+    } else {
+      y1Scale = scaleBand().padding(groupPadding);
+      y1Domain = series.map((s) => s.key);
+      y1Range = ({ yScale }) => [0, yScale.bandwidth?.()];
     }
-    else {
-        y1Scale = scaleBand().padding(groupPadding);
-        y1Domain = series.map((s) => s.key);
-        y1Range = ({ yScale }) => [0, yScale.bandwidth?.()];
-    }
-}
-export let props = {};
-$: allSeriesData = series
-    .flatMap((s) => s.data?.map((d) => {
-    return { seriesKey: s.key, ...d };
-}))
-    .filter((d) => d);
-$: chartData = (allSeriesData.length ? allSeriesData : chartDataArray(data));
-$: if (stackSeries) {
+  }
+
+  export let props: {
+    xAxis?: Partial<ComponentProps<Axis>>;
+    yAxis?: Partial<ComponentProps<Axis>>;
+    grid?: Partial<ComponentProps<Grid>>;
+    rule?: Partial<ComponentProps<Rule>>;
+    bars?: Partial<ComponentProps<Bars>>;
+    legend?: Partial<ComponentProps<Legend>>;
+    highlight?: Partial<ComponentProps<Highlight>>;
+    labels?: Partial<ComponentProps<Labels>>;
+  } = {};
+
+  $: allSeriesData = series
+    .flatMap((s) =>
+      s.data?.map((d) => {
+        return { seriesKey: s.key, ...d };
+      })
+    )
+    .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 stackData = stack().keys(seriesKeys)(chartDataArray(data)) as any[];
-    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]),
+      };
     });
-}
+  }
+
+  function getBarsProps(s: (typeof series)[number], i: number) {
+    const barsProps: ComponentProps<Bars> = {
+      data: s.data,
+      x: !isVertical
+        ? stackSeries
+          ? (d) => d.stackData[i]
+          : (s.value ?? (s.data ? undefined : s.key))
+        : undefined,
+      y: isVertical
+        ? stackSeries
+          ? (d) => d.stackData[i]
+          : (s.value ?? (s.data ? undefined : s.key))
+        : undefined,
+      x1: isVertical && groupSeries ? (d) => s.value ?? s.key : undefined,
+      y1: !isVertical && groupSeries ? (d) => s.value ?? s.key : undefined,
+      radius: 4,
+      strokeWidth: 1,
+      fill: s.color,
+      ...props.bars,
+      ...s.props,
+    };
+
+    return barsProps;
+  }
 </script>
 
 <Chart
@@ -112,6 +197,8 @@ $: if (stackSeries) {
   {y1Scale}
   {y1Domain}
   {y1Range}
+  c={isVertical ? y : x}
+  cRange={['hsl(var(--color-primary))']}
   padding={axis === false
     ? undefined
     : {
@@ -124,20 +211,45 @@ $: if (stackSeries) {
   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,
+    getBarsProps,
+  }}
   <slot {...slotProps}>
     <Svg>
+      <slot name="grid" {...slotProps}>
+        {#if grid}
+          <Grid
+            x={!isVertical}
+            y={isVertical}
+            {...typeof grid === 'object' ? grid : null}
+            {...props.grid}
+          />
+        {/if}
+      </slot>
+
       <slot name="axis" {...slotProps}>
         {#if axis}
           {#if axis !== 'x'}
             <Axis
               placement="left"
-              grid={isVertical}
               format={(value) => {
                 if (isVertical && seriesLayout === 'stackExpand') {
                   return format(value, 'percentRound');
@@ -153,7 +265,6 @@ $: if (stackSeries) {
           {#if axis !== 'y'}
             <Axis
               placement="bottom"
-              grid={!isVertical}
               format={(value) => {
                 if (!isVertical && seriesLayout === 'stackExpand') {
                   return format(value, 'percentRound');
@@ -167,7 +278,12 @@ $: if (stackSeries) {
           {/if}
 
           {#if rule}
-            <Rule x={0} y={0} {...typeof rule === 'object' ? rule : null} {...props.rule} />
+            <Rule
+              x={isVertical ? false : 0}
+              y={isVertical ? 0 : false}
+              {...typeof rule === 'object' ? rule : null}
+              {...props.rule}
+            />
           {/if}
         {/if}
       </slot>
@@ -176,26 +292,7 @@ $: if (stackSeries) {
 
       <slot name="marks" {...slotProps}>
         {#each series as s, i}
-          <Bars
-            data={s.data}
-            x={!isVertical
-              ? stackSeries
-                ? (d) => d.stackData[i]
-                : (s.value ?? (s.data ? undefined : s.key))
-              : undefined}
-            y={isVertical
-              ? stackSeries
-                ? (d) => d.stackData[i]
-                : (s.value ?? (s.data ? undefined : s.key))
-              : undefined}
-            x1={isVertical && groupSeries ? (d) => s.value ?? s.key : undefined}
-            y1={!isVertical && groupSeries ? (d) => s.value ?? s.key : undefined}
-            radius={4}
-            strokeWidth={1}
-            fill={s.color}
-            {...props.bars}
-            {...s.props}
-          />
+          <Bars {...getBarsProps(s, i)} />
         {/each}
       </slot>
 
@@ -213,10 +310,12 @@ $: if (stackSeries) {
     <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}
@@ -236,7 +335,7 @@ $: if (stackSeries) {
             <Tooltip.Item
               label={s.label ?? (s.key !== 'default' ? s.key : 'value')}
               value={valueAccessor(data)}
-              color={s.color}
+              color={s.color ?? cScale?.(c(data))}
               {format}
               valueAlign="right"
             />

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

@@ -2,6 +2,7 @@ import { SvelteComponentTyped } from "svelte";
 import { type ComponentProps } from 'svelte';
 import Axis from '../Axis.svelte';
 import Bars from '../Bars.svelte';
+import Grid from '../Grid.svelte';
 import Highlight from '../Highlight.svelte';
 import Labels from '../Labels.svelte';
 import Legend from '../Legend.svelte';
@@ -75,7 +76,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;
@@ -130,6 +131,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";
@@ -178,6 +186,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;
@@ -185,7 +201,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;
@@ -201,10 +217,28 @@ 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;
+        };
         bandPadding?: number;
         groupPadding?: number;
         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?: {
@@ -236,6 +270,7 @@ declare class __sveltets_Render<TData> {
         props?: {
             xAxis?: Partial<ComponentProps<Axis>>;
             yAxis?: Partial<ComponentProps<Axis>>;
+            grid?: Partial<ComponentProps<Grid>>;
             rule?: Partial<ComponentProps<Rule>>;
             bars?: Partial<ComponentProps<Bars>>;
             legend?: Partial<ComponentProps<Legend>>;
@@ -245,7 +280,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;
@@ -263,6 +300,7 @@ declare class __sveltets_Render<TData> {
     };
     slots(): {
         default: any;
+        grid: any;
         axis: any;
         'below-marks': any;
         marks: any;