layerchart 0.3.4 → 0.4.0

package/components/ChartClipPath.svelte

@@ -0,0 +1,14 @@
+<script >import { getContext } from 'svelte';
+import RectClipPath from './RectClipPath.svelte';
+const { width, height, padding } = getContext('LayerCake');
+</script>
+
+<RectClipPath
+	x={-$padding.left}
+	y={-$padding.top}
+	width={$width + $padding.left + $padding.right}
+	height={$height + $padding.top + $padding.bottom}
+	{...$$restProps}
+>
+	<slot />
+</RectClipPath>

package/components/ChartClipPath.svelte.d.ts

@@ -0,0 +1,18 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        [x: string]: any;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {};
+    };
+};
+export declare type ChartClipPathProps = typeof __propDef.props;
+export declare type ChartClipPathEvents = typeof __propDef.events;
+export declare type ChartClipPathSlots = typeof __propDef.slots;
+export default class ChartClipPath extends SvelteComponentTyped<ChartClipPathProps, ChartClipPathEvents, ChartClipPathSlots> {
+}
+export {};

package/components/Link.svelte

@@ -1,21 +1,26 @@
-<script >import { linkHorizontal } from 'd3-shape';
+<script >import { link as d3Link, curveBumpX, curveBumpY } from 'd3-shape';
 import { interpolatePath } from 'd3-interpolate-path';
 import { createMotionStore } from '../stores/motionStore';
 // Properties to override what is used from context
 export let data = undefined; // TODO: Update Type
+export let orientation = 'horizontal';
 /**
  * Update source and target accessors to be compatibke with d3-sankey.  see: https://github.com/d3/d3-sankey#sankeyLinkHorizontal
  */
 export let sankey = false;
 export let source = sankey ? (d) => [d.source.x1, d.y0] : (d) => d.source;
 export let target = sankey ? (d) => [d.target.x0, d.y1] : (d) => d.target;
+export let x = sankey ? (d) => d[0] : (d) => (orientation === 'horizontal' ? d.y : d.x);
+export let y = sankey ? (d) => d[1] : (d) => (orientation === 'horizontal' ? d.x : d.y);
+export let curve = orientation === 'horizontal' ? curveBumpX : curveBumpY;
 export let tweened = undefined;
 export let color = 'black';
 export let width = undefined;
 $: tweenedOptions = tweened ? { interpolate: interpolatePath, ...tweened } : false;
 $: tweened_d = createMotionStore('', { tweened: tweenedOptions });
 $: {
-    const link = linkHorizontal().source(source).target(target);
+    orientation; // subscribe to orientation changes to link is update
+    const link = d3Link(curve).source(source).target(target).x(x).y(y);
     const d = link(data);
     tweened_d.set(d);
 }

package/components/Link.svelte.d.ts

@@ -4,9 +4,13 @@ declare const __propDef: {
     props: {
         [x: string]: any;
         data?: any;
+        orientation?: 'vertical' | 'horizontal';
         sankey?: boolean;
         source?: (d: any) => any;
         target?: (d: any) => any;
+        x?: (d: any) => any;
+        y?: (d: any) => any;
+        curve?: import("d3-shape").CurveFactory;
         tweened?: boolean | Parameters<typeof tweenedStore>[1];
         color?: string;
         width?: any;

package/components/Points.svelte

@@ -58,8 +58,10 @@ $: points = $data.flatMap((d) => {
 });
 </script>
 
-<g class="point-group">
-	{#each points as p}
-		<Circle cx={p.x} cy={p.y} {r} {...$$restProps} />
-	{/each}
-</g>
+<slot {points}>
+	<g class="point-group">
+		{#each points as point}
+			<Circle cx={point.x} cy={point.y} {r} {...$$restProps} />
+		{/each}
+	</g>
+</slot>

package/components/Points.svelte.d.ts

@@ -9,7 +9,11 @@ declare const __propDef: {
     events: {
         [evt: string]: CustomEvent<any>;
     };
-    slots: {};
+    slots: {
+        default: {
+            points: any;
+        };
+    };
 };
 export declare type PointsProps = typeof __propDef.props;
 export declare type PointsEvents = typeof __propDef.events;

package/components/Tree.svelte

@@ -0,0 +1,30 @@
+<script >import { getContext } from 'svelte';
+import { tree as d3Tree } from 'd3-hierarchy';
+const { data, width, height, padding } = getContext('LayerCake');
+/**
+ * Sets this tree layout’s node size to the specified two-element array of numbers `[width, height]`.
+ * If unset, layout size is used instead.  When a node size is specified, the root node is always
+ * positioned at `⟨0, 0⟩`.
+ *
+ * see: https://github.com/d3/d3-hierarchy#tree_nodeSize
+ */
+export let nodeSize = undefined;
+/**
+ * see: https://github.com/d3/d3-hierarchy#tree_separation
+ */
+export let separation = undefined;
+export let orientation = 'horizontal';
+let tree;
+$: {
+    tree = d3Tree().size(orientation === 'horizontal' ? [$height, $width] : [$width, $height]);
+    if (nodeSize) {
+        tree.nodeSize(nodeSize);
+    }
+    if (separation) {
+        tree.separation(separation);
+    }
+}
+$: treeData = tree($data);
+</script>
+
+<slot nodes={treeData.descendants()} links={treeData.links()} />

package/components/Tree.svelte.d.ts

@@ -0,0 +1,32 @@
+import { SvelteComponentTyped } from "svelte";
+import { HierarchyPointNode } from 'd3-hierarchy';
+declare const __propDef: {
+    props: {
+        /**
+             * Sets this tree layout’s node size to the specified two-element array of numbers `[width, height]`.
+             * If unset, layout size is used instead.  When a node size is specified, the root node is always
+             * positioned at `⟨0, 0⟩`.
+             *
+             * see: https://github.com/d3/d3-hierarchy#tree_nodeSize
+             */ nodeSize?: [number, number] | undefined;
+        /**
+             * see: https://github.com/d3/d3-hierarchy#tree_separation
+             */ separation?: (a: HierarchyPointNode<any>, b: HierarchyPointNode<any>) => number;
+        orientation?: 'vertical' | 'horizontal';
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {
+            nodes: any;
+            links: any;
+        };
+    };
+};
+export declare type TreeProps = typeof __propDef.props;
+export declare type TreeEvents = typeof __propDef.events;
+export declare type TreeSlots = typeof __propDef.slots;
+export default class Tree extends SvelteComponentTyped<TreeProps, TreeEvents, TreeSlots> {
+}
+export {};

package/components/Treemap.svelte

@@ -19,6 +19,7 @@ export let paddingTop = 0;
 export let paddingBottom = 0;
 export let paddingLeft = undefined;
 export let paddingRight = undefined;
+export let nodeKey = (node, i) => i;
 export let selected = null;
 $: tileFunc =
     tile === 'squarify'
@@ -61,8 +62,8 @@ $: {
 }
 $: root = treemap($data);
 $: selected = root; // set initial selection
-// group nodes by height so can be rendered lowest to highest
-$: nodesByHeight = group(root, (d) => d.height);
+// group nodes by depth so can be rendered lowest to highest
+$: nodesByDepth = group(root, (d) => d.depth);
 const duration = 800;
 const extents = tweened(undefined, { easing: cubicOut, duration });
 $: $extents = selected
@@ -83,9 +84,9 @@ $: yScale = scaleLinear().domain([$extents.y0, $extents.y1]).rangeRound([0, $hei
 </script>
 
 <RectClipPath width={$width} height={$height}>
-	{#each Array.from(nodesByHeight) as [height, nodes]}
+	{#each Array.from(nodesByDepth) as [depth, nodes]}
 		<g>
-			{#each nodes as node}
+			{#each nodes as node, i (nodeKey(node, i))}
 				<slot
 					name="node"
 					{node}

package/components/Treemap.svelte.d.ts

@@ -10,6 +10,7 @@ declare const __propDef: {
         paddingBottom?: number;
         paddingLeft?: any;
         paddingRight?: any;
+        nodeKey?: (node: d3.HierarchyNode<any>, i: number) => any;
         selected?: any;
     };
     events: {

package/components/Zoom.svelte

@@ -0,0 +1,108 @@
+<script >import { getContext } from 'svelte';
+import { spring } from 'svelte/motion';
+const { width, height, padding } = getContext('LayerCake');
+let dragging = false;
+let translate = spring({ x: 0, y: 0 });
+let scale = spring({ x: 1, y: 1 });
+let startPoint;
+let startTranslate;
+let svgEl = null;
+export function reset() {
+    $translate = { x: 0, y: 0 };
+    $scale = { x: 1, y: 1 };
+}
+export function increase() {
+    $scale = {
+        x: $scale.x * 1.25,
+        y: $scale.y * 1.25
+    };
+}
+export function decrease() {
+    $scale = {
+        x: $scale.x * 0.8,
+        y: $scale.y * 0.8
+    };
+}
+export function translateCenter() {
+    $translate = {
+        x: 0,
+        y: 0
+    };
+}
+function handleMouseDown(e) {
+    dragging = true;
+    svgEl = e.target.ownerSVGElement;
+    startPoint = localPoint(svgEl, e);
+    startTranslate = $translate;
+    window.addEventListener('mousemove', handleMouseMove);
+    window.addEventListener('mouseup', handleMouseUp);
+}
+function handleMouseUp(e) {
+    dragging = false;
+    window.removeEventListener('mousemove', handleMouseMove);
+    window.removeEventListener('mouseup', handleMouseUp);
+}
+function handleMouseMove(e) {
+    if (!dragging)
+        return;
+    const endPoint = localPoint(svgEl, e);
+    const deltaX = endPoint.x - startPoint.x;
+    const deltaY = endPoint.y - startPoint.y;
+    translate.set({
+        x: startTranslate.x + deltaX / $scale.x,
+        y: startTranslate.y + deltaY / $scale.y
+    }, { hard: true });
+}
+function handleDoubleClick() {
+    increase();
+}
+function handleWheel(e) {
+    e.preventDefault();
+    const scaleBy = -e.deltaY > 0 ? 1.1 : 0.9;
+    // TODO: Update to match d3-zoom delta
+    // https://github.com/d3/d3-zoom#zoom_wheelDelta
+    // const scaleBy = -e.deltaY * (e.deltaMode === 1 ? 0.05 : e.deltaMode ? 1 : 0.002);
+    scale.set({
+        x: $scale.x * scaleBy,
+        y: $scale.y * scaleBy
+    }, { hard: true });
+}
+function localPoint(svgEl, e) {
+    const screenCTM = svgEl.getScreenCTM();
+    const coords = {
+        x: e.clientX,
+        y: e.clientY
+    };
+    let point = svgEl.createSVGPoint();
+    point.x = coords.x;
+    point.y = coords.y;
+    point = point.matrixTransform(screenCTM.inverse());
+    return {
+        x: point.x,
+        y: point.y
+    };
+}
+$: center = { x: $width / 2, y: $height / 2 };
+$: viewportCenter = {
+    x: center.x - $translate.x,
+    y: center.y - $translate.y
+};
+$: newTranslate = {
+    x: $translate.x * $scale.x + center.x - center.x * $scale.x,
+    y: $translate.y * $scale.y + center.y - center.y * $scale.y
+};
+</script>
+
+<rect
+	x={-$padding.left}
+	y={-$padding.top}
+	width={$width + $padding.left + $padding.right}
+	height={$height + $padding.top + $padding.bottom}
+	on:mousewheel={handleWheel}
+	on:mousedown={handleMouseDown}
+	on:dblclick={handleDoubleClick}
+	fill="transparent"
+/>
+<g transform="translate({newTranslate.x},{newTranslate.y}) scale({$scale.x},{$scale.y})">
+	<slot />
+</g>

package/components/Zoom.svelte.d.ts

@@ -0,0 +1,25 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        reset?: () => void;
+        increase?: () => void;
+        decrease?: () => void;
+        translateCenter?: () => void;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {};
+    };
+};
+export declare type ZoomProps = typeof __propDef.props;
+export declare type ZoomEvents = typeof __propDef.events;
+export declare type ZoomSlots = typeof __propDef.slots;
+export default class Zoom extends SvelteComponentTyped<ZoomProps, ZoomEvents, ZoomSlots> {
+    get reset(): () => void;
+    get increase(): () => void;
+    get decrease(): () => void;
+    get translateCenter(): () => void;
+}
+export {};

package/components/index.d.ts

@@ -6,6 +6,7 @@ export { default as AxisY } from './AxisY.svelte';
 export { default as Bars } from './Bars.svelte';
 export { default as Baseline } from './Baseline.svelte';
 export { default as Chart } from './Chart.svelte';
+export { default as ChartClipPath } from './ChartClipPath.svelte';
 export { default as Circle } from './Circle.svelte';
 export { default as CircleClipPath } from './CircleClipPath.svelte';
 export { default as ClipPath } from './ClipPath.svelte';
@@ -28,3 +29,4 @@ export { default as Text } from './Text.svelte';
 export { default as Threshold } from './Threshold.svelte';
 export { default as Tooltip } from './Tooltip.svelte';
 export { default as Treemap } from './Treemap.svelte';
+export { default as Zoom } from './Zoom.svelte';

package/components/index.js

@@ -6,6 +6,7 @@ export { default as AxisY } from './AxisY.svelte';
 export { default as Bars } from './Bars.svelte';
 export { default as Baseline } from './Baseline.svelte';
 export { default as Chart } from './Chart.svelte';
+export { default as ChartClipPath } from './ChartClipPath.svelte';
 export { default as Circle } from './Circle.svelte';
 export { default as CircleClipPath } from './CircleClipPath.svelte';
 export { default as ClipPath } from './ClipPath.svelte';
@@ -28,3 +29,4 @@ export { default as Text } from './Text.svelte';
 export { default as Threshold } from './Threshold.svelte';
 export { default as Tooltip } from './Tooltip.svelte';
 export { default as Treemap } from './Treemap.svelte';
+export { default as Zoom } from './Zoom.svelte';

package/package.json

@@ -3,8 +3,9 @@
   "author": "Sean Lynch <techniq35@gmail.com>",
   "license": "MIT",
   "repository": "techniq/layerchart",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "devDependencies": {
+    "@rollup/plugin-dsv": "^2.0.3",
     "@sveltejs/adapter-vercel": "^1.0.0-next.47",
     "@sveltejs/kit": "^1.0.0-next.303",
     "@tailwindcss/typography": "^0.5.2",
@@ -25,7 +26,6 @@
     "svelte-preprocess": "^4.10.4",
     "svelte2tsx": "^0.5.6",
     "tailwindcss": "^3.0.23",
-    "tailwindcss-elevation": "^1.0.1",
     "tslib": "^2.3.1",
     "typescript": "^4.6.3",
     "unist-util-visit": "^4.1.0",
@@ -45,7 +45,7 @@
     "date-fns": "^2.28.0",
     "layercake": "^6.1.0",
     "lodash-es": "^4.17.21",
-    "svelte-ux": "^0.4.7"
+    "svelte-ux": "^0.5.0"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -57,6 +57,7 @@
     "./components/Bars.svelte": "./components/Bars.svelte",
     "./components/Baseline.svelte": "./components/Baseline.svelte",
     "./components/Chart.svelte": "./components/Chart.svelte",
+    "./components/ChartClipPath.svelte": "./components/ChartClipPath.svelte",
     "./components/Circle.svelte": "./components/Circle.svelte",
     "./components/CircleClipPath.svelte": "./components/CircleClipPath.svelte",
     "./components/ClipPath.svelte": "./components/ClipPath.svelte",
@@ -78,7 +79,9 @@
     "./components/Text.svelte": "./components/Text.svelte",
     "./components/Threshold.svelte": "./components/Threshold.svelte",
     "./components/Tooltip.svelte": "./components/Tooltip.svelte",
+    "./components/Tree.svelte": "./components/Tree.svelte",
     "./components/Treemap.svelte": "./components/Treemap.svelte",
+    "./components/Zoom.svelte": "./components/Zoom.svelte",
     "./components": "./components/index.js",
     "./docs/Blockquote.svelte": "./docs/Blockquote.svelte",
     "./docs/Code.svelte": "./docs/Code.svelte",

package/utils/genData.d.ts

@@ -30,3 +30,22 @@ export declare const longData: {
     fruit: string;
     value: number;
 }[];
+export declare function getPhyllotaxis({ radius, count, width, height }: {
+    radius: any;
+    count: any;
+    width: any;
+    height: any;
+}): {
+    x: number;
+    y: number;
+}[];
+export declare function getSpiral({ angle, radius, count, width, height }: {
+    angle: any;
+    radius: any;
+    count: any;
+    width: any;
+    height: any;
+}): {
+    x: number;
+    y: number;
+}[];

package/utils/genData.js

@@ -1,4 +1,5 @@
 import { subDays } from 'date-fns';
+import { degreesToRadians, radiansToDegrees } from './math';
 /**
  * Get random number between min (inclusive) and max (exclusive)
  *   see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random#getting_a_random_number_between_0_inclusive_and_1_exclusive
@@ -57,3 +58,18 @@ export const longData = [
     { year: '2016', basket: 2, fruit: 'cherries', value: 720 },
     { year: '2016', basket: 2, fruit: 'dates', value: 400 }
 ];
+export function getPhyllotaxis({ radius, count, width, height }) {
+    // Phyllotaxis: https://www.youtube.com/watch?v=KWoJgHFYWxY
+    const rads = Math.PI * (3 - Math.sqrt(5)); // ~2.4 rads or ~137.5 degrees
+    return getSpiral({ angle: radiansToDegrees(rads), radius, count, width, height });
+}
+export function getSpiral({ angle, radius, count, width, height }) {
+    return Array.from({ length: count }, (_, i) => {
+        const r = radius * Math.sqrt(i);
+        const a = degreesToRadians(angle * i);
+        return {
+            x: width / 2 + r * Math.cos(a),
+            y: height / 2 + r * Math.sin(a)
+        };
+    });
+}

package/utils/math.d.ts

@@ -2,3 +2,7 @@
  * Convert degrees to radians
  */
 export declare function degreesToRadians(degrees: number): number;
+/**
+ * Convert radians to degrees
+ */
+export declare function radiansToDegrees(radians: number): number;

package/utils/math.js

@@ -4,3 +4,9 @@
 export function degreesToRadians(degrees) {
     return (degrees * Math.PI) / 180;
 }
+/**
+ * Convert radians to degrees
+ */
+export function radiansToDegrees(radians) {
+    return radians * (180 / Math.PI);
+}