layerchart 0.53.0 → 0.54.1

package/dist/components/tooltip/TooltipContext.svelte

@@ -1,308 +1,375 @@
-<script context="module">import { getContext, setContext } from 'svelte';
-export const tooltipContextKey = Symbol();
-const defaultContext = writable({
+<script lang="ts" context="module">
+  import { getContext, setContext } from 'svelte';
+  import type { Readable } from 'svelte/store';
+
+  export const tooltipContextKey = Symbol();
+
+  export type TooltipContextValue = {
+    x: number;
+    y: number;
+    data: any;
+    show(e: PointerEvent, tooltipData?: any): void;
+    hide(e?: PointerEvent): void;
+  };
+
+  export type TooltipContext = Readable<TooltipContextValue>;
+
+  const defaultContext: TooltipContext = writable({
     x: 0,
     y: 0,
-    data: null,
-    show: () => { },
-    hide: () => { },
-});
-export function tooltipContext() {
-    return getContext(tooltipContextKey) ?? defaultContext;
-}
-function setTooltipContext(tooltip) {
+    data: null as any,
+    show: () => {},
+    hide: () => {},
+  });
+  export function tooltipContext() {
+    return getContext<TooltipContext>(tooltipContextKey) ?? defaultContext;
+  }
+
+  function setTooltipContext(tooltip: TooltipContext) {
     setContext(tooltipContextKey, tooltip);
-}
+  }
 </script>
 
-<script>import { raise } from 'layercake';
-import { writable } from 'svelte/store';
-import { bisector, max, min } from 'd3-array';
-import { quadtree as d3Quadtree } from 'd3-quadtree';
-import { sortFunc } from '@layerstack/utils';
-import { cls } from '@layerstack/tailwind';
-import Svg from './../layout/Svg.svelte';
-import { chartContext } from './../ChartContext.svelte';
-import ChartClipPath from './../ChartClipPath.svelte';
-import Voronoi from './../Voronoi.svelte';
-import { localPoint } from '../../utils/event.js';
-import { isScaleBand, scaleInvert } from '../../utils/scales.js';
-import { cartesianToPolar } from '../../utils/math.js';
-import { quadtreeRects } from '../../utils/quadtree.js';
-const { flatData, x, xScale, xGet, xRange, y, yScale, yGet, yRange, width, height, containerWidth, containerHeight, padding, radial, } = chartContext();
-/*
-      TODO: Defaults to consider (if possible to detect scale type, which might not be possible)
-      - scaleTime / scaleLinear: bisect
-      - scaleTime / scaleLinear (multi/stack): bisect
-      - scaleTime / scaleBand: bisect (or band)
-      - scaleTime (multi) / scaleBand: bounds (or possible band if not overlapping)
-      - scaleBand, scaleLinear: band (or bounds)
-      - scaleBand, scaleLinear: band (or bounds) - multiple (overlapping) bars
-      - scaleLinear, scaleLinear: voronoi (or quadtree)
-  */
-/**
- * @type {'bisect-x' | 'bisect-y' | 'band' | 'bisect-band' | 'bounds' | 'voronoi' | 'quadtree' | 'manual'}
- */
-export let mode = 'manual';
-/**
- * @type {'closest' | 'left' | 'right'}
- */
-export let findTooltipData = 'closest';
-/** Similar to d3-selection's raise, re-insert the e.target as the last child of its parent, so to be the top-most element */
-export let raiseTarget = false;
-/** quadtree search radius
- * @type {number}
- */
-export let radius = Infinity;
-/** Enable debug view (show hit targets, etc) */
-export let debug = false;
-export let onClick = () => { };
-const tooltip = writable({
+<script lang="ts">
+  import { raise } from 'layercake';
+  import { writable } from 'svelte/store';
+  import { bisector, max, min } from 'd3-array';
+  import { quadtree as d3Quadtree, type Quadtree } from 'd3-quadtree';
+  import { sortFunc } from '@layerstack/utils';
+  import { cls } from '@layerstack/tailwind';
+
+  import Svg from './../layout/Svg.svelte';
+  import { chartContext } from './../ChartContext.svelte';
+  import ChartClipPath from './../ChartClipPath.svelte';
+  import Voronoi from './../Voronoi.svelte';
+
+  import { localPoint } from '../../utils/event.js';
+  import { isScaleBand, scaleInvert } from '../../utils/scales.js';
+  import { cartesianToPolar } from '../../utils/math.js';
+  import { quadtreeRects } from '../../utils/quadtree.js';
+
+  const {
+    flatData,
+    x,
+    xScale,
+    xGet,
+    xRange,
+    y,
+    yScale,
+    yGet,
+    yRange,
+    width,
+    height,
+    containerWidth,
+    containerHeight,
+    padding,
+    radial,
+  } = chartContext<any>();
+
+  /*
+		TODO: Defaults to consider (if possible to detect scale type, which might not be possible)
+		- scaleTime / scaleLinear: bisect
+		- scaleTime / scaleLinear (multi/stack): bisect 
+		- scaleTime / scaleBand: bisect (or band)
+		- scaleTime (multi) / scaleBand: bounds (or possible band if not overlapping)
+		- scaleBand, scaleLinear: band (or bounds)
+		- scaleBand, scaleLinear: band (or bounds) - multiple (overlapping) bars
+		- scaleLinear, scaleLinear: voronoi (or quadtree)
+	*/
+
+  /**
+   * @type {'bisect-x' | 'bisect-y' | 'band' | 'bisect-band' | 'bounds' | 'voronoi' | 'quadtree' | 'manual'}
+   */
+  export let mode:
+    | 'bisect-x'
+    | 'bisect-y'
+    | 'band'
+    | 'bisect-band'
+    | 'bounds'
+    | 'voronoi'
+    | 'quadtree'
+    | 'manual' = 'manual';
+  /**
+   * @type {'closest' | 'left' | 'right'}
+   */
+  export let findTooltipData: 'closest' | 'left' | 'right' = 'closest';
+
+  /** Similar to d3-selection's raise, re-insert the e.target as the last child of its parent, so to be the top-most element */
+  export let raiseTarget = false;
+
+  /** quadtree search radius
+   * @type {number}
+   */
+  export let radius: number = Infinity;
+  /** Enable debug view (show hit targets, etc) */
+  export let debug = false;
+
+  export let onClick: ({ data }: { data: any }) => any = () => {};
+
+  /** Exposed to allow binding in Chart */
+  export let tooltip = writable({
     y: 0,
     x: 0,
-    data: null,
+    data: null as any,
     show: showTooltip,
     hide: hideTooltip,
-});
-setTooltipContext(tooltip);
-let hideTimeoutId;
-$: bisectX = bisector((d) => {
+  });
+  setTooltipContext(tooltip);
+
+  let hideTimeoutId: NodeJS.Timeout;
+
+  $: bisectX = bisector((d: any) => {
     const value = $x(d);
     if (Array.isArray(value)) {
-        // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
-        // Using first value.  Consider using average, max, etc
-        // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
-        // return midpoint;
-        return value[0];
-    }
-    else {
-        return value;
+      // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
+      // Using first value.  Consider using average, max, etc
+      // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
+      // return midpoint;
+      return value[0];
+    } else {
+      return value;
     }
-}).left;
-$: bisectY = bisector((d) => {
+  }).left;
+
+  $: bisectY = bisector((d: any) => {
     const value = $y(d);
     if (Array.isArray(value)) {
-        // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
-        // Using first value.  Consider using average, max, etc
-        // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
-        // return midpoint;
-        return value[0];
-    }
-    else {
-        return value;
+      // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
+      // Using first value.  Consider using average, max, etc
+      // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
+      // return midpoint;
+      return value[0];
+    } else {
+      return value;
     }
-}).left;
-function findData(previousValue, currentValue, valueAtPoint, accessor) {
+  }).left;
+
+  function findData(previousValue: any, currentValue: any, valueAtPoint: any, accessor: Function) {
     switch (findTooltipData) {
-        case 'closest':
-            if (currentValue === undefined) {
-                return previousValue;
-            }
-            else if (previousValue === undefined) {
-                return currentValue;
-            }
-            else {
-                return Number(valueAtPoint) - Number(accessor(previousValue)) >
-                    Number(accessor(currentValue)) - Number(valueAtPoint)
-                    ? currentValue
-                    : previousValue;
-            }
-        case 'left':
-            return previousValue;
-        case 'right':
-        default:
-            return currentValue;
+      case 'closest':
+        if (currentValue === undefined) {
+          return previousValue;
+        } else if (previousValue === undefined) {
+          return currentValue;
+        } else {
+          return Number(valueAtPoint) - Number(accessor(previousValue)) >
+            Number(accessor(currentValue)) - Number(valueAtPoint)
+            ? currentValue
+            : previousValue;
+        }
+      case 'left':
+        return previousValue;
+      case 'right':
+      default:
+        return currentValue;
     }
-}
-function showTooltip(e, tooltipData) {
+  }
+
+  function showTooltip(e: PointerEvent, tooltipData?: any) {
     // Cancel hiding tooltip if from previous event loop
     clearTimeout(hideTimeoutId);
-    const referenceNode = e.target.closest('.layercake-container');
+
+    const referenceNode = (e.target as Element).closest('.layercake-container')!;
     const point = localPoint(referenceNode, e);
     const localX = point?.x ?? 0;
     const localY = point?.y ?? 0;
+
     if (
-    // @ts-expect-error
-    e.offsetX < e.currentTarget?.offsetLeft ||
-        // @ts-expect-error
-        e.offsetX > e.currentTarget?.offsetLeft + e.currentTarget?.offsetWidth ||
-        // @ts-expect-error
-        e.offsetY < e.currentTarget?.offsetTop ||
-        // @ts-expect-error
-        e.offsetY > e.currentTarget?.offsetTop + e.currentTarget?.offsetHeight) {
-        // Ignore if within padding of chart
-        hideTooltip();
-        return;
+      // @ts-expect-error
+      e.offsetX < e.currentTarget?.offsetLeft ||
+      // @ts-expect-error
+      e.offsetX > e.currentTarget?.offsetLeft + e.currentTarget?.offsetWidth ||
+      // @ts-expect-error
+      e.offsetY < e.currentTarget?.offsetTop ||
+      // @ts-expect-error
+      e.offsetY > e.currentTarget?.offsetTop + e.currentTarget?.offsetHeight
+    ) {
+      // Ignore if within padding of chart
+      hideTooltip();
+      return;
     }
+
     // If tooltipData not provided already (voronoi, etc), attempt to find it
     // TODO: When using bisect-x/y/band, values should be sorted.  Typically they are for `x`, but not `y` (and band depends on if x or y scale)
     if (tooltipData == null) {
-        switch (mode) {
-            case 'bisect-x': {
-                let xValueAtPoint;
-                if ($radial) {
-                    // Assume radial is always centered
-                    const { radians } = cartesianToPolar(localX - $width / 2, localY - $height / 2);
-                    xValueAtPoint = scaleInvert($xScale, radians);
-                }
-                else {
-                    xValueAtPoint = scaleInvert($xScale, localX - $padding.left);
-                }
-                const index = bisectX($flatData, xValueAtPoint, 1);
-                const previousValue = $flatData[index - 1];
-                const currentValue = $flatData[index];
-                tooltipData = findData(previousValue, currentValue, xValueAtPoint, $x);
-                break;
-            }
-            case 'bisect-y': {
-                // `y` value at pointer coordinate
-                const yValueAtPoint = scaleInvert($yScale, localY - $padding.top);
-                const index = bisectY($flatData, yValueAtPoint, 1);
-                const previousValue = $flatData[index - 1];
-                const currentValue = $flatData[index];
-                tooltipData = findData(previousValue, currentValue, yValueAtPoint, $y);
-                break;
-            }
-            case 'bisect-band': {
-                // `x` and `y` values at pointer coordinate
-                const xValueAtPoint = scaleInvert($xScale, localX);
-                const yValueAtPoint = scaleInvert($yScale, localY);
-                if (isScaleBand($xScale)) {
-                    // Find point closest to pointer within the x band
-                    const bandData = $flatData
-                        .filter((d) => $x(d) === xValueAtPoint)
-                        .sort(sortFunc($y)); // sort for bisect
-                    const index = bisectY(bandData, yValueAtPoint, 1);
-                    const previousValue = bandData[index - 1];
-                    const currentValue = bandData[index];
-                    tooltipData = findData(previousValue, currentValue, yValueAtPoint, $y);
-                }
-                else if (isScaleBand($yScale)) {
-                    // Find point closest to pointer within the y band
-                    const bandData = $flatData
-                        .filter((d) => $y(d) === yValueAtPoint)
-                        .sort(sortFunc($x)); // sort for bisect
-                    const index = bisectX(bandData, xValueAtPoint, 1);
-                    const previousValue = bandData[index - 1];
-                    const currentValue = bandData[index];
-                    tooltipData = findData(previousValue, currentValue, xValueAtPoint, $x);
-                }
-                else {
-                    // TODO: Support `bisect-band` without band?  Fallback to bisect?
-                }
-                break;
-            }
-            case 'quadtree': {
-                tooltipData = quadtree.find(localX, localY, radius);
-                break;
-            }
+      switch (mode) {
+        case 'bisect-x': {
+          let xValueAtPoint: any;
+          if ($radial) {
+            // Assume radial is always centered
+            const { radians } = cartesianToPolar(localX - $width / 2, localY - $height / 2);
+            xValueAtPoint = scaleInvert($xScale, radians);
+          } else {
+            xValueAtPoint = scaleInvert($xScale, localX - $padding.left);
+          }
+
+          const index = bisectX($flatData, xValueAtPoint, 1);
+          const previousValue = $flatData[index - 1];
+          const currentValue = $flatData[index];
+          tooltipData = findData(previousValue, currentValue, xValueAtPoint, $x);
+          break;
         }
-    }
-    if (tooltipData) {
-        if (raiseTarget) {
-            raise(e.target);
+
+        case 'bisect-y': {
+          // `y` value at pointer coordinate
+          const yValueAtPoint = scaleInvert($yScale, localY - $padding.top);
+
+          const index = bisectY($flatData, yValueAtPoint, 1);
+          const previousValue = $flatData[index - 1];
+          const currentValue = $flatData[index];
+          tooltipData = findData(previousValue, currentValue, yValueAtPoint, $y);
+          break;
+        }
+
+        case 'bisect-band': {
+          // `x` and `y` values at pointer coordinate
+          const xValueAtPoint = scaleInvert($xScale, localX);
+          const yValueAtPoint = scaleInvert($yScale, localY);
+
+          if (isScaleBand($xScale)) {
+            // Find point closest to pointer within the x band
+            const bandData = $flatData
+              .filter((d) => $x(d) === xValueAtPoint)
+              .sort(sortFunc($y as () => any)); // sort for bisect
+            const index = bisectY(bandData, yValueAtPoint, 1);
+            const previousValue = bandData[index - 1];
+            const currentValue = bandData[index];
+            tooltipData = findData(previousValue, currentValue, yValueAtPoint, $y);
+          } else if (isScaleBand($yScale)) {
+            // Find point closest to pointer within the y band
+            const bandData = $flatData
+              .filter((d) => $y(d) === yValueAtPoint)
+              .sort(sortFunc($x as () => any)); // sort for bisect
+            const index = bisectX(bandData, xValueAtPoint, 1);
+            const previousValue = bandData[index - 1];
+            const currentValue = bandData[index];
+            tooltipData = findData(previousValue, currentValue, xValueAtPoint, $x);
+          } else {
+            // TODO: Support `bisect-band` without band?  Fallback to bisect?
+          }
+          break;
+        }
+
+        case 'quadtree': {
+          tooltipData = quadtree.find(localX, localY, radius);
+          break;
         }
-        $tooltip = {
-            ...$tooltip,
-            x: localX,
-            y: localY,
-            data: tooltipData,
-        };
+      }
     }
-    else {
-        // Hide tooltip if unable to locate
-        hideTooltip();
+
+    if (tooltipData) {
+      if (raiseTarget) {
+        raise(e.target as Element);
+      }
+
+      $tooltip = {
+        ...$tooltip,
+        x: localX,
+        y: localY,
+        data: tooltipData,
+      };
+    } else {
+      // Hide tooltip if unable to locate
+      hideTooltip();
     }
-}
-function hideTooltip() {
+  }
+
+  function hideTooltip() {
     // Wait an event loop tick in case `showTooltip` is called immediately on another element, to allow tweeneing (ex. moving between bands/bars)
     hideTimeoutId = setTimeout(() => {
-        $tooltip = { ...$tooltip, data: null };
+      $tooltip = { ...$tooltip, data: null };
     });
-}
-let quadtree;
-$: if (mode === 'quadtree') {
+  }
+
+  let quadtree: Quadtree<[number, number]>;
+  $: if (mode === 'quadtree') {
     quadtree = d3Quadtree()
-        .extent([
+      .extent([
         [0, 0],
         [$width, $height],
-    ])
-        .x((d) => {
+      ])
+      .x((d) => {
         const value = $xGet(d);
+
         if (Array.isArray(value)) {
-            // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
-            // Using first value.  Consider using average, max, etc
-            // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
-            // return midpoint;
-            return min(value);
-        }
-        else {
-            return value;
+          // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
+          // Using first value.  Consider using average, max, etc
+          // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
+          // return midpoint;
+          return min(value);
+        } else {
+          return value;
         }
-    })
-        .y((d) => {
+      })
+      .y((d) => {
         const value = $yGet(d);
+
         if (Array.isArray(value)) {
-            // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
-            // Using first value.  Consider using average, max, etc
-            // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
-            // return midpoint;
-            return min(value);
-        }
-        else {
-            return value;
+          // `x` accessor with multiple properties (ex. `x={['start', 'end']})`)
+          // Using first value.  Consider using average, max, etc
+          // const midpoint = new Date((value[1].valueOf() + value[0].getTime()) / 2);
+          // return midpoint;
+          return min(value);
+        } else {
+          return value;
         }
-    })
-        .addAll($flatData);
-}
-let rects = [];
-$: if (mode === 'bounds' || mode === 'band') {
+      })
+      .addAll($flatData as [number, number][]);
+  }
+
+  let rects: Array<{ x: number; y: number; width: number; height: number; data: any }> = [];
+  $: if (mode === 'bounds' || mode === 'band') {
     // @ts-expect-error
     rects = $flatData
-        .map((d) => {
+      .map((d) => {
         const xValue = $xGet(d);
         const yValue = $yGet(d);
+
         const x = Array.isArray(xValue) ? xValue[0] : xValue;
         const y = Array.isArray(yValue) ? yValue[0] : yValue;
+
         const xOffset = isScaleBand($xScale) ? ($xScale.padding() * $xScale.step()) / 2 : 0;
         const yOffset = isScaleBand($yScale) ? ($yScale.padding() * $yScale.step()) / 2 : 0;
+
         // @ts-expect-error
         const fullWidth = max($xRange) - min($xRange);
         // @ts-expect-error
         const fullHeight = max($yRange) - min($yRange);
+
         if (mode === 'band') {
-            // full band width/height regardless of value
-            return {
-                x: isScaleBand($xScale) ? x - xOffset : min($xRange),
-                y: isScaleBand($yScale) ? y - yOffset : min($yRange),
-                width: isScaleBand($xScale) ? $xScale.step() : fullWidth,
-                height: isScaleBand($yScale) ? $yScale.step() : fullHeight,
-                data: d,
-            };
-        }
-        else if (mode === 'bounds') {
-            return {
-                x: isScaleBand($xScale) || Array.isArray(xValue) ? x - xOffset : min($xRange),
-                // y: isScaleBand($yScale) || Array.isArray(yValue) ? y - yOffset : min($yRange),
-                y: y - yOffset,
-                width: Array.isArray(xValue)
-                    ? xValue[1] - xValue[0]
-                    : isScaleBand($xScale)
-                        ? $xScale.step()
-                        : min($xRange) + x,
-                height: Array.isArray(yValue)
-                    ? yValue[1] - yValue[0]
-                    : isScaleBand($yScale)
-                        ? $yScale.step()
-                        : // @ts-expect-error
-                            max($yRange) - y,
-                data: d,
-            };
+          // full band width/height regardless of value
+          return {
+            x: isScaleBand($xScale) ? x - xOffset : min($xRange),
+            y: isScaleBand($yScale) ? y - yOffset : min($yRange),
+            width: isScaleBand($xScale) ? $xScale.step() : fullWidth,
+            height: isScaleBand($yScale) ? $yScale.step() : fullHeight,
+            data: d,
+          };
+        } else if (mode === 'bounds') {
+          return {
+            x: isScaleBand($xScale) || Array.isArray(xValue) ? x - xOffset : min($xRange),
+            // y: isScaleBand($yScale) || Array.isArray(yValue) ? y - yOffset : min($yRange),
+            y: y - yOffset,
+
+            width: Array.isArray(xValue)
+              ? xValue[1] - xValue[0]
+              : isScaleBand($xScale)
+                ? $xScale.step()
+                : min($xRange) + x,
+            height: Array.isArray(yValue)
+              ? yValue[1] - yValue[0]
+              : isScaleBand($yScale)
+                ? $yScale.step()
+                : // @ts-expect-error
+                  max($yRange) - y,
+            data: d,
+          };
         }
-    })
-        .sort(sortFunc('x'));
-}
-$: triggerPointEvents = ['bisect-x', 'bisect-y', 'bisect-band', 'quadtree'].includes(mode);
+      })
+      .sort(sortFunc('x'));
+  }
+
+  $: triggerPointEvents = ['bisect-x', 'bisect-y', 'bisect-band', 'quadtree'].includes(mode);
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->

package/dist/components/tooltip/TooltipContext.svelte.d.ts

@@ -26,6 +26,13 @@ declare const __propDef: {
         onClick?: ({ data }: {
             data: any;
         }) => any;
+        /** Exposed to allow binding in Chart */ tooltip?: import("svelte/store").Writable<{
+            y: number;
+            x: number;
+            data: any;
+            show: (e: PointerEvent, tooltipData?: any) => void;
+            hide: () => void;
+        }>;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/tooltip/TooltipHeader.svelte

@@ -1,6 +1,12 @@
-<script>import { cls } from '@layerstack/tailwind';
-export let color = undefined;
-export let classes = {};
+<script lang="ts">
+  import { cls } from '@layerstack/tailwind';
+
+  export let color: string | undefined = undefined;
+
+  export let classes: {
+    root?: string;
+    color?: string;
+  } = {};
 </script>
 
 <div