layerchart 2.0.0-next.37 → 2.0.0-next.39

package/dist/components/charts/PieChart.svelte

@@ -172,11 +172,11 @@
 </script>
 
 <script lang="ts" generics="TData">
-  import { onMount, type ComponentProps, type Snippet } from 'svelte';
+  import { onMount, type ComponentProps } from 'svelte';
   import { format } from '@layerstack/utils';
-  import { cls } from '@layerstack/tailwind';
-  import { SelectionState } from '@layerstack/svelte-state';
   import type { PieArcDatum } from 'd3-shape';
+  import { schemeObservable10 } from 'd3-scale-chromatic';
+  import { getObjectOrNull } from '../../utils/common.js';
 
   import Arc from '../Arc.svelte';
   import Chart from '../Chart.svelte';
@@ -194,7 +194,8 @@
     SimplifiedChartPropsObject,
     SimplifiedChartSnippet,
   } from './types.js';
-  import { HighlightKey } from './utils.svelte.js';
+  import { SeriesState } from '../../states/series.svelte.js';
+  import { createLegendProps } from './utils.svelte.js';
   import { setTooltipMetaContext } from '../tooltip/tooltipMetaContext.js';
 
   let {
@@ -237,67 +238,37 @@
   const series = $derived(
     seriesProp === undefined ? [{ key: 'default', value: value }] : seriesProp
   );
+  const seriesState = new SeriesState(() => series);
 
   const keyAccessor = $derived(accessor(key));
   const labelAccessor = $derived(accessor(label));
   const valueAccessor = $derived(accessor(value));
   const cAccessor = $derived(accessor(c));
 
-  const allSeriesData = $derived(
-    series
-      .flatMap((s) => s.data?.map((d) => ({ seriesKey: s.key, ...d })))
-      .filter((d) => d) as Array<TData>
-  );
-
   const chartData = $derived(
-    allSeriesData.length ? allSeriesData : chartDataArray(data)
+    seriesState.allSeriesData.length ? seriesState.allSeriesData : chartDataArray(data)
   ) as Array<TData>;
 
-  const seriesColors = $derived(series.map((s) => s.color).filter((d) => d != null));
-
-  const highlightKey = new HighlightKey<TData, typeof Arc>();
-  const selectedKeys = new SelectionState();
-  const selectedSeries = new SelectionState();
-
   const visibleData = $derived(
     chartData.filter((d) => {
       const dataKey = keyAccessor(d);
-      return selectedKeys.isEmpty() || selectedKeys.isSelected(dataKey);
+      return seriesState.selectedKeys.isEmpty() || seriesState.selectedKeys.isSelected(dataKey);
     })
   );
 
-  // TODO: note, I added this because it wasn't consistent with all the other charts
-  // unsure if it is correct but will validate with Sean
-  const visibleSeries = $derived(
-    series.filter((s) => selectedSeries.isEmpty() || selectedSeries.isSelected(s.key))
-  );
-
   function getLegendProps(): ComponentProps<typeof Legend> {
-    return {
-      tickFormat: (tick) => {
-        const item = chartData.find((d) => keyAccessor(d) === tick);
-        return item ? (labelAccessor(item) ?? tick) : tick;
-      },
-      placement: 'bottom',
-      variant: 'swatches',
-      onclick: (e, item) => {
-        selectedKeys.toggle(item.value);
-        // TODO: investigate
-        // selectedSeries.toggle(item.value);
-      },
-      onpointerenter: (e, item) => (highlightKey.current = item.value),
-      onpointerleave: (e) => (highlightKey.current = null),
-      ...props.legend,
-      ...(typeof legend === 'object' ? legend : null),
-      classes: {
-        item: (item) =>
-          visibleData.length && !visibleData.some((d) => keyAccessor(d) === item.value)
-            ? 'opacity-50'
-            : '',
-        ...props.legend?.classes,
-        ...(typeof legend === 'object' ? legend.classes : null),
+    return createLegendProps({
+      seriesState,
+      props: {
+        tickFormat: (tick) => {
+          // Use data label instead of series label
+          const item = chartData.find((d) => keyAccessor(d) === tick);
+          return item ? (labelAccessor(item) ?? tick) : tick;
+        },
+        ...props.legend,
+        ...getObjectOrNull(legend),
       },
-    };
+    });
   }
 
   function getGroupProps(): ComponentProps<typeof Group> {
@@ -338,7 +309,8 @@
     return {
       startAngle: arc.startAngle,
       endAngle: arc.endAngle,
-      outerRadius: visibleSeries.length > 1 ? seriesIndex * (outerRadius ?? 0) : outerRadius,
+      outerRadius:
+        seriesState.visibleSeries.length > 1 ? seriesIndex * (outerRadius ?? 0) : outerRadius,
       innerRadius,
       cornerRadius,
       padAngle,
@@ -350,10 +322,7 @@
         // Workaround for `tooltip={{ mode: 'manual' }}
         onTooltipClick(e, { data: arc.data });
       },
-      class: cls(
-        'transition-opacity',
-        highlightKey.current && highlightKey.current !== keyAccessor(arc.data) && 'opacity-50'
-      ),
+      opacity: seriesState.isHighlighted(keyAccessor(arc.data), true) ? 1 : 0.5,
       ...props.arc,
       ...s.props,
       ...arcDataProps,
@@ -382,7 +351,7 @@
       return key;
     },
     get visibleSeries() {
-      return visibleSeries;
+      return seriesState.visibleSeries;
     },
   });
 </script>
@@ -394,19 +363,21 @@
   x={value}
   c={key}
   cDomain={chartData.map(keyAccessor)}
-  cRange={seriesColors.length
-    ? seriesColors
+  cRange={seriesState.allSeriesColors.length
+    ? seriesState.allSeriesColors
     : c !== key
       ? chartData.map((d) => cAccessor(d))
       : [
-          'var(--color-primary)',
-          'var(--color-secondary)',
-          'var(--color-info)',
-          'var(--color-success)',
-          'var(--color-warning)',
-          'var(--color-danger)',
+          `var(--color-primary, ${schemeObservable10[0]})`,
+          `var(--color-secondary, ${schemeObservable10[1]})`,
+          `var(--color-info, ${schemeObservable10[2]})`,
+          `var(--color-success, ${schemeObservable10[3]})`,
+          `var(--color-warning, ${schemeObservable10[4]})`,
+          `var(--color-danger, ${schemeObservable10[5]})`,
         ]}
-  padding={{ bottom: legend === true ? 32 : 0 }}
+  padding={{
+    bottom: legend === true || getObjectOrNull(legend)?.placement?.includes('bottom') ? 32 : 0,
+  }}
   {...restProps}
   tooltip={tooltip === false
     ? false
@@ -420,10 +391,10 @@
       color: cAccessor,
       context,
       series,
-      visibleSeries,
+      visibleSeries: seriesState.visibleSeries,
       visibleData,
-      highlightKey: highlightKey.current,
-      setHighlightKey: highlightKey.set,
+      highlightKey: seriesState.highlightKey.current,
+      setHighlightKey: seriesState.highlightKey.set,
       getLegendProps,
       getGroupProps,
     }}
@@ -444,7 +415,8 @@
           {@render marks(snippetProps)}
         {:else}
           <Group {...getGroupProps()}>
-            {#each visibleSeries as s, seriesIdx (s.key)}
+            <!-- Use `series` instead of `visibleSeries` since data is filtered (legend) instead of series -->
+            {#each series as s, seriesIdx (s.key)}
               {#if typeof pie === 'function'}
                 {@render pie({
                   ...snippetProps,
@@ -496,8 +468,8 @@
                 value={valueAccessor(data)}
                 color={context.cScale?.(context.c(data))}
                 {format}
-                onpointerenter={() => (highlightKey.current = keyAccessor(data))}
-                onpointerleave={() => (highlightKey.current = null)}
+                onpointerenter={() => (seriesState.highlightKey.current = keyAccessor(data))}
+                onpointerleave={() => (seriesState.highlightKey.current = null)}
                 {...props.tooltip?.item}
               />
             </Tooltip.List>

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

@@ -126,10 +126,17 @@ import Group from '../Group.svelte';
 import Pie from '../Pie.svelte';
 import { type Accessor } from '../../utils/common.js';
 import type { SeriesData, SimplifiedChartProps, SimplifiedChartPropsObject, SimplifiedChartSnippet } from './types.js';
+declare function $$render<TData>(): {
+    props: PieChartProps<TData>;
+    exports: {};
+    bindings: "context";
+    slots: {};
+    events: {};
+};
 declare class __sveltets_Render<TData> {
-    props(): PieChartProps<TData>;
-    events(): {};
-    slots(): {};
+    props(): ReturnType<typeof $$render<TData>>['props'];
+    events(): ReturnType<typeof $$render<TData>>['events'];
+    slots(): ReturnType<typeof $$render<TData>>['slots'];
     bindings(): "context";
     exports(): {};
 }

package/dist/components/charts/ScatterChart.svelte

@@ -61,9 +61,10 @@
   import Rule from '../Rule.svelte';
   import * as Tooltip from '../tooltip/index.js';
 
-  import { accessor, chartDataArray, defaultChartPadding } from '../../utils/common.js';
+  import { chartDataArray, defaultChartPadding } from '../../utils/common.js';
   import { asAny } from '../../utils/types.js';
-  import { createLegendProps, SeriesState } from './utils.svelte.js';
+  import { SeriesState } from '../../states/series.svelte.js';
+  import { createLegendProps } from './utils.svelte.js';
 
   let {
     data = [],
@@ -117,16 +118,10 @@
     return {
       data: s.data,
       fill: s.color,
+      opacity: seriesState.isHighlighted(s.key, true) ? 1 : 0.1,
       ...props.points,
       ...s.props,
-      class: cls(
-        'transition-opacity',
-        seriesState.highlightKey.current &&
-          seriesState.highlightKey.current !== s.key &&
-          'opacity-10',
-        props.points?.class,
-        s.props?.class
-      ),
+      class: cls(props.points?.class, s.props?.class),
     };
   }
 
@@ -136,16 +131,10 @@
   ): ComponentProps<typeof Labels<TData>> {
     return {
       data: s.data,
+      opacity: seriesState.isHighlighted(s.key, true) ? 1 : 0.1,
       ...props.labels,
       ...(typeof labels === 'object' ? labels : null),
-      class: cls(
-        'stroke-surface-200 transition-opacity',
-        seriesState.highlightKey.current &&
-          seriesState.highlightKey.current !== s.key &&
-          'opacity-10',
-        props.labels?.class,
-        typeof labels === 'object' && labels.class
-      ),
+      class: cls(props.labels?.class, typeof labels === 'object' && labels.class),
     };
   }
 
@@ -230,7 +219,7 @@
   {yDomain}
   yNice
   c={yProp}
-  cRange={['var(--color-primary)']}
+  cRange={['var(--color-primary, currentColor)']}
   padding={defaultChartPadding(axis, legend)}
   {...restProps}
   tooltip={tooltip === false

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

@@ -20,10 +20,17 @@ import Highlight from '../Highlight.svelte';
 import Labels from '../Labels.svelte';
 import Points from '../Points.svelte';
 import Rule from '../Rule.svelte';
+declare function $$render<TData>(): {
+    props: ScatterChartProps<TData>;
+    exports: {};
+    bindings: "context";
+    slots: {};
+    events: {};
+};
 declare class __sveltets_Render<TData> {
-    props(): ScatterChartProps<TData>;
-    events(): {};
-    slots(): {};
+    props(): ReturnType<typeof $$render<TData>>['props'];
+    events(): ReturnType<typeof $$render<TData>>['events'];
+    slots(): ReturnType<typeof $$render<TData>>['slots'];
     bindings(): "context";
     exports(): {};
 }

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

@@ -1,24 +1,6 @@
 import type { Component, ComponentProps } from 'svelte';
-import { SelectionState } from '@layerstack/svelte-state';
-import type { SeriesData } from './types.js';
 import type Legend from '../Legend.svelte';
-export declare class HighlightKey<TData, SeriesComponent extends Component> {
-    current: string | null;
-    set: (seriesKey: typeof this.current) => void;
-}
-export declare class SeriesState<TData, TComponent extends Component> {
-    #private;
-    selectedSeries: SelectionState<unknown, false>;
-    selectedKeys: SelectionState<unknown, false>;
-    highlightKey: HighlightKey<TData, TComponent>;
-    constructor(getSeries: () => SeriesData<TData, TComponent>[]);
-    get series(): SeriesData<TData, TComponent>[];
-    get isDefaultSeries(): boolean;
-    get allSeriesData(): Array<TData & {
-        seriesKey: string;
-    }>;
-    get visibleSeries(): SeriesData<TData, TComponent>[];
-}
+import type { SeriesState } from '../../states/series.svelte.js';
 type CreateLegendPropsOptions<TData, TComponent extends Component> = {
     seriesState: SeriesState<TData, TComponent>;
     props: Partial<ComponentProps<typeof Legend>>;

package/dist/components/charts/utils.svelte.js

@@ -1,38 +1,6 @@
-import { SelectionState } from '@layerstack/svelte-state';
 import { scaleOrdinal } from 'd3-scale';
-export class HighlightKey {
-    current = $state(null);
-    set = (seriesKey) => {
-        this.current = seriesKey;
-    };
-}
-export class SeriesState {
-    #series = $state.raw([]);
-    selectedSeries = new SelectionState();
-    selectedKeys = new SelectionState();
-    highlightKey = new HighlightKey();
-    constructor(getSeries) {
-        this.#series = getSeries();
-        $effect.pre(() => {
-            // keep series state in sync with the prop
-            this.#series = getSeries();
-        });
-    }
-    get series() {
-        return this.#series;
-    }
-    get isDefaultSeries() {
-        return this.#series.length === 1 && this.#series[0].key === 'default';
-    }
-    get allSeriesData() {
-        return this.#series
-            .flatMap((s) => s.data?.map((d) => ({ seriesKey: s.key, ...d })))
-            .filter((d) => d);
-    }
-    get visibleSeries() {
-        return this.#series.filter((s) => this.selectedSeries.isEmpty() || this.selectedSeries.isSelected(s.key));
-    }
-}
+import { cls } from '@layerstack/tailwind';
+import { resolveMaybeFn } from '../../utils/common.js';
 /**
  * A prop builder for the legend component shared between the simplified charts.
  */
@@ -44,15 +12,15 @@ export function createLegendProps(opts) {
         tickFormat: (key) => opts.seriesState.series.find((s) => s.key === key)?.label ?? key,
         placement: 'bottom',
         variant: 'swatches',
-        onclick: (_, item) => opts.seriesState.selectedSeries.toggle(item.value),
+        selected: opts.seriesState.selectedKeys.current,
+        onclick: (_, item) => opts.seriesState.selectedKeys.toggle(item.value),
         onpointerenter: (_, item) => (opts.seriesState.highlightKey.current = item.value),
         onpointerleave: () => (opts.seriesState.highlightKey.current = null),
         ...opts.props,
         classes: {
-            item: (item) => opts.seriesState.visibleSeries.length &&
-                !opts.seriesState.visibleSeries.some((s) => s.key === item.value)
-                ? 'opacity-50'
-                : '',
+            item: (item) => {
+                return cls(resolveMaybeFn(opts.props?.classes?.item, item));
+            },
             ...opts.props?.classes,
         },
     };

package/dist/components/layout/Canvas.svelte

@@ -149,7 +149,6 @@
 
 <script lang="ts">
   import { onMount, untrack, type Snippet } from 'svelte';
-  import { cls } from '@layerstack/tailwind';
   import { Logger, localPoint } from '@layerstack/utils';
   import { MediaQueryPresets } from '@layerstack/svelte-state';
 
@@ -166,7 +165,6 @@
   } from 'svelte/elements';
   import type { Without } from '../../utils/types.js';
   import { getChartContext } from '../Chart.svelte';
-  import { layerClass } from '../../utils/attributes.js';
 
   let {
     ref: refProp = $bindable(),
@@ -453,12 +451,8 @@
 <canvas
   bind:this={ref}
   style:z-index={zIndex}
-  class={cls(
-    layerClass('layout-canvas'),
-    'absolute top-0 left-0 w-full h-full',
-    pointerEvents === false && 'pointer-events-none',
-    className
-  )}
+  class={['lc-layout-canvas', className]}
+  class:disablePointerEvents={pointerEvents === false}
   onclick={(e) => {
     const component = getPointerComponent(e);
     component?.events?.click?.(e);
@@ -507,17 +501,32 @@
 </canvas>
 
 <!-- Hit canvas used for hidden context -->
-<canvas
-  bind:this={hitCanvasElement}
-  class={cls(
-    layerClass('hit-canvas'),
-    'layerchart-hitcanvas',
-    'absolute top-0 left-0 w-full h-full',
-    'pointer-events-none', // events all handled by main canvas
-    // '[image-rendering:pixelated]', // https://developer.mozilla.org/en-US/docs/Web/CSS/image-rendering
-    'border border-danger',
-    !debug && 'opacity-0'
-  )}
-></canvas>
+<canvas bind:this={hitCanvasElement} class="lc-hit-canvas" class:debug></canvas>
 
 {@render children?.({ ref, canvasContext: context })}
+
+<style>
+  @layer base {
+    :where(.lc-layout-canvas) {
+      position: absolute;
+      inset: 0;
+
+      &.disablePointerEvents {
+        pointer-events: none;
+      }
+    }
+
+    :where(.lc-hit-canvas) {
+      position: absolute;
+      inset: 0;
+      pointer-events: none; /* events handled by main canvas */
+      image-rendering: pixelated; /* https://developer.mozilla.org/en-US/docs/Web/CSS/image-rendering */
+
+      opacity: 0;
+      &.debug {
+        border: 1px solid var(--color-danger, red);
+        opacity: 1;
+      }
+    }
+  }
+</style>

package/dist/components/layout/Html.svelte

@@ -46,11 +46,9 @@
 </script>
 
 <script lang="ts">
-  import { cls } from '@layerstack/tailwind';
   import { getTransformContext } from '../TransformContext.svelte';
 
   import { getChartContext, setRenderContext } from '../Chart.svelte';
-  import { layerClass } from '../../utils/attributes.js';
 
   let {
     ref: refProp = $bindable(),
@@ -90,16 +88,11 @@
 
 <div
   bind:this={ref}
-  class={cls(
-    layerClass('layout-html'),
-    'absolute top-0 left-0',
-    pointerEvents === false && 'pointer-events-none',
-    className
-  )}
+  class={['lc-layout-html', className]}
+  class:disablePointerEvents={pointerEvents === false}
   style:transform
   style:transform-origin="top left"
   style:z-index={zIndex}
-  style:pointer-events={pointerEvents === false ? 'none' : null}
   style:top="{ctx.padding.top}px"
   style:bottom="{ctx.padding.bottom}px"
   style:left="{ctx.padding.left}px"
@@ -112,3 +105,16 @@
 >
   {@render children?.({ ref })}
 </div>
+
+<style>
+  @layer base {
+    :where(.lc-layout-html) {
+      position: absolute;
+      inset: 0;
+
+      &.disablePointerEvents {
+        pointer-events: none;
+      }
+    }
+  }
+</style>

package/dist/components/layout/Svg.svelte

@@ -63,11 +63,9 @@
 </script>
 
 <script lang="ts">
-  import { cls } from '@layerstack/tailwind';
   import { getTransformContext } from '../TransformContext.svelte';
 
   import { getChartContext, setRenderContext } from '../Chart.svelte';
-  import { layerClass } from '../../utils/attributes.js';
 
   let {
     ref: refProp = $bindable(),
@@ -114,19 +112,15 @@
   width={ctx.containerWidth}
   height={ctx.containerHeight}
   style:z-index={zIndex}
-  class={cls(
-    layerClass('layout-svg'),
-    'absolute top-0 left-0 overflow-visible',
-    pointerEvents === false && 'pointer-events-none',
-    className
-  )}
+  class={['lc-layout-svg', className]}
+  class:disablePointerEvents={pointerEvents === false}
   role="figure"
   {...restProps}
 >
   {#if typeof title === 'function'}
     {@render title()}
   {:else if title}
-    <title class={layerClass('layout-svg-title')}>{title}</title>
+    <title class="lc-layout-svg-title">{title}</title>
   {/if}
 
   <defs>
@@ -135,11 +129,11 @@
 
   <g
     bind:this={innerRef}
-    class={layerClass('layout-svg-g')}
+    class="lc-layout-svg-g"
     transform="translate({ctx.padding.left}, {ctx.padding.top})"
   >
     {#if transform}
-      <g {transform} class={layerClass('layout-svg-g-transform')}>
+      <g {transform} class="lc-layout-svg-g-transform">
         {@render children?.({ ref })}
       </g>
     {:else}
@@ -147,3 +141,17 @@
     {/if}
   </g>
 </svg>
+
+<style>
+  @layer base {
+    :where(.lc-layout-svg) {
+      position: absolute;
+      inset: 0;
+      overflow: visible; /* match html and allow viewing outside of bounds (useful for axis that leak and general debugging)*/
+
+      &.disablePointerEvents {
+        pointer-events: none;
+      }
+    }
+  }
+</style>

package/dist/components/layout/WebGL.svelte

@@ -1,5 +1,9 @@
 <script lang="ts" module>
-  export type WebGLProps = {
+  import type { Snippet } from 'svelte';
+  import type { Without } from '../../utils/types.js';
+  import type { HTMLCanvasAttributes } from 'svelte/elements';
+
+  export type WebGLPropsWithoutHTML = {
     /**
      * A reference to the  `<canvas>` element.
      *
@@ -44,6 +48,9 @@
     >;
   };
 
+  export type WebGLProps = WebGLPropsWithoutHTML &
+    Without<HTMLCanvasAttributes, WebGLPropsWithoutHTML>;
+
   export type WebGLContextValue = {
     gl: WebGLRenderingContext | null;
   };
@@ -61,10 +68,9 @@
 </script>
 
 <script lang="ts">
-  import { onMount, type Snippet } from 'svelte';
+  import { onMount } from 'svelte';
   import { getChartContext } from '../Chart.svelte';
   import { Context } from 'runed';
-  import { extractLayerProps } from '../../utils/attributes.js';
 
   let {
     context = $bindable(),
@@ -73,6 +79,7 @@
     fallback = '',
     pointerEvents = true,
     zIndex = 0,
+    class: className,
     children,
     ...restProps
   }: WebGLProps = $props();
@@ -116,14 +123,14 @@
 
 <canvas
   bind:this={ref}
+  class={['lc-layout-webgl', className]}
+  class:disablePointerEvents={pointerEvents === false}
   style:z-index={zIndex}
-  style:pointer-events={pointerEvents === false ? 'none' : null}
   style:top={ctx.padding.top + 'px'}
   style:right={ctx.padding.right + 'px'}
   style:bottom={ctx.padding.bottom + 'px'}
   style:left={ctx.padding.left + 'px'}
-  style="width:100%;height:100%;position:absolute;"
-  {...extractLayerProps(restProps, 'layout-webgl')}
+  {...restProps}
 >
   {#if typeof fallback === 'function'}
     {@render fallback()}
@@ -133,3 +140,16 @@
 </canvas>
 
 {@render children?.({ ref, webGLContext: context })}
+
+<style>
+  @layer base {
+    :where(.lc-layout-webgl) {
+      position: absolute;
+      inset: 0;
+
+      &.disablePointerEvents {
+        pointer-events: none;
+      }
+    }
+  }
+</style>

package/dist/components/layout/WebGL.svelte.d.ts

@@ -1,4 +1,7 @@
-export type WebGLProps = {
+import type { Snippet } from 'svelte';
+import type { Without } from '../../utils/types.js';
+import type { HTMLCanvasAttributes } from 'svelte/elements';
+export type WebGLPropsWithoutHTML = {
     /**
      * A reference to the  `<canvas>` element.
      *
@@ -39,12 +42,12 @@ export type WebGLProps = {
         }
     ]>;
 };
+export type WebGLProps = WebGLPropsWithoutHTML & Without<HTMLCanvasAttributes, WebGLPropsWithoutHTML>;
 export type WebGLContextValue = {
     gl: WebGLRenderingContext | null;
 };
 export declare function setWebGLContext(context: WebGLContextValue): WebGLContextValue;
 export declare function getWebGLContext(): WebGLContextValue;
-import { type Snippet } from 'svelte';
 declare const WebGl: import("svelte").Component<WebGLProps, {}, "ref" | "context">;
 type WebGl = ReturnType<typeof WebGl>;
 export default WebGl;