layerchart 0.5.2 → 0.6.0

package/components/Circle.svelte

@@ -1,6 +1,6 @@
 <script>import { motionStore } from '../stores/motionStore';
-export let cx;
-export let cy;
+export let cx = 0;
+export let cy = 0;
 export let r;
 export let spring = undefined;
 export let tweened = undefined;

package/components/Circle.svelte.d.ts

@@ -3,8 +3,8 @@ import type { spring as springStore, tweened as tweenedStore } from 'svelte/moti
 declare const __propDef: {
     props: {
         [x: string]: any;
-        cx: number;
-        cy: number;
+        cx?: number;
+        cy?: number;
         r: number;
         spring?: boolean | Parameters<typeof springStore>[1];
         tweened?: boolean | Parameters<typeof tweenedStore>[1];

package/components/Pack.svelte

@@ -0,0 +1,19 @@
+<script>import { getContext } from 'svelte';
+import { pack as d3Pack } from 'd3-hierarchy';
+const { data, width, height } = getContext('LayerCake');
+export let size = undefined;
+/**
+ * see: https://github.com/d3/d3-hierarchy#pack_padding
+ */
+export let padding = undefined;
+let pack;
+$: {
+    pack = d3Pack().size(size ?? [$width, $height]);
+    if (padding) {
+        pack.padding(padding);
+    }
+}
+$: packData = pack($data);
+</script>
+
+<slot nodes={packData.descendants()} />

package/components/Pack.svelte.d.ts

@@ -0,0 +1,23 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        size?: [number, number] | undefined;
+        /**
+             * see: https://github.com/d3/d3-hierarchy#pack_padding
+             */ padding?: number | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {
+            nodes: import("d3-hierarchy").HierarchyCircularNode<unknown>[];
+        };
+    };
+};
+export declare type PackProps = typeof __propDef.props;
+export declare type PackEvents = typeof __propDef.events;
+export declare type PackSlots = typeof __propDef.slots;
+export default class Pack extends SvelteComponentTyped<PackProps, PackEvents, PackSlots> {
+}
+export {};

package/components/Treemap.svelte

@@ -1,10 +1,5 @@
-<script>/**
- * TODO:
- *   - [ ] Improve zoomable nested (apply extent ratio?  const extentRatio = ($extents.y1 - $extents.y0) / $height;
- */
-import { getContext } from 'svelte';
+<script>import { getContext } from 'svelte';
 import * as d3 from 'd3-hierarchy';
-import { group } from 'd3-array';
 import { aspectTile } from '../utils/treemap';
 const { data, width, height } = getContext('LayerCake');
 export let tile = d3.treemapSquarify;
@@ -15,7 +10,6 @@ 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'
@@ -56,17 +50,9 @@ $: {
         treemap.paddingRight(paddingRight);
     }
 }
-$: root = treemap($data);
+$: treemapData = treemap($data);
 // TODO: Remove selected
-$: selected = root; // set initial selection
-// group nodes by depth so can be rendered lowest to highest, to stack properly
-$: nodesByDepth = group(root, (d) => d.depth);
+$: selected = treemapData; // set initial selection
 </script>
 
-{#each Array.from(nodesByDepth) as [depth, nodes]}
-	<g>
-		{#each nodes as node, i (nodeKey(node, i))}
-			<slot name="node" {node} />
-		{/each}
-	</g>
-{/each}
+<slot nodes={treemapData.descendants()} />

package/components/Treemap.svelte.d.ts

@@ -10,15 +10,14 @@ declare const __propDef: {
         paddingBottom?: number;
         paddingLeft?: any;
         paddingRight?: any;
-        nodeKey?: (node: d3.HierarchyNode<any>, i: number) => any;
         selected?: any;
     };
     events: {
         [evt: string]: CustomEvent<any>;
     };
     slots: {
-        node: {
-            node: unknown;
+        default: {
+            nodes: any;
         };
     };
 };

package/components/Zoom.svelte

@@ -1,9 +1,11 @@
 <script>import { getContext } from 'svelte';
-import { spring } from 'svelte/motion';
+import { motionStore } from '../stores/motionStore';
 const { width, height, padding } = getContext('LayerCake');
+export let spring = undefined;
+export let tweened = undefined;
 let dragging = false;
-let translate = spring({ x: 0, y: 0 });
-let scale = spring({ x: 1, y: 1 });
+const translate = motionStore({ x: 0, y: 0 }, { spring, tweened });
+const scale = motionStore({ x: 1, y: 1 }, { spring, tweened });
 let startPoint;
 let startTranslate;
 let svgEl = null;
@@ -29,6 +31,18 @@ export function translateCenter() {
         y: 0
     };
 }
+export function zoomTo(newTranslate, newScale) {
+    $translate = {
+        x: $width / 2 - newTranslate.x,
+        y: $height / 2 - newTranslate.y
+    };
+    if (newScale) {
+        $scale = {
+            x: Math.min($width, $height) / newScale.x,
+            y: Math.min($width, $height) / newScale.y
+        };
+    }
+}
 function handleMouseDown(e) {
     dragging = true;
     svgEl = e.target.ownerSVGElement;
@@ -51,7 +65,7 @@ function handleMouseMove(e) {
     translate.set({
         x: startTranslate.x + deltaX / $scale.x,
         y: startTranslate.y + deltaY / $scale.y
-    }, { hard: true });
+    }, spring ? { hard: true } : tweened ? { duration: 0 } : undefined);
 }
 function handleDoubleClick() {
     increase();
@@ -65,7 +79,7 @@ function handleWheel(e) {
     scale.set({
         x: $scale.x * scaleBy,
         y: $scale.y * scaleBy
-    }, { hard: true });
+    }, spring ? { hard: true } : tweened ? { duration: 0 } : undefined);
 }
 function localPoint(svgEl, e) {
     const screenCTM = svgEl.getScreenCTM();
@@ -104,5 +118,5 @@ $: newTranslate = {
 	fill="transparent"
 />
 <g transform="translate({newTranslate.x},{newTranslate.y}) scale({$scale.x},{$scale.y})">
-	<slot />
+	<slot scale={$scale} />
 </g>

package/components/Zoom.svelte.d.ts

@@ -1,16 +1,28 @@
 import { SvelteComponentTyped } from "svelte";
+import { motionStore } from '../stores/motionStore';
 declare const __propDef: {
     props: {
+        spring?: boolean | Parameters<typeof motionStore>[1]['spring'];
+        tweened?: boolean | Parameters<typeof motionStore>[1]['tweened'];
         reset?: () => void;
         increase?: () => void;
         decrease?: () => void;
         translateCenter?: () => void;
+        zoomTo?: (newTranslate: {
+            x: number;
+            y: number;
+        }, newScale?: {
+            x: number;
+            y: number;
+        }) => void;
     };
     events: {
         [evt: string]: CustomEvent<any>;
     };
     slots: {
-        default: {};
+        default: {
+            scale: any;
+        };
     };
 };
 export declare type ZoomProps = typeof __propDef.props;
@@ -21,5 +33,12 @@ export default class Zoom extends SvelteComponentTyped<ZoomProps, ZoomEvents, Zo
     get increase(): () => void;
     get decrease(): () => void;
     get translateCenter(): () => void;
+    get zoomTo(): (newTranslate: {
+        x: number;
+        y: number;
+    }, newScale?: {
+        x: number;
+        y: number;
+    }) => void;
 }
 export {};

package/package.json

@@ -3,7 +3,7 @@
   "author": "Sean Lynch <techniq35@gmail.com>",
   "license": "MIT",
   "repository": "techniq/layerchart",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "devDependencies": {
     "@rollup/plugin-dsv": "^2.0.3",
     "@sveltejs/adapter-vercel": "^1.0.0-next.58",
@@ -70,6 +70,7 @@
     "./components/Line.svelte": "./components/Line.svelte",
     "./components/LinearGradient.svelte": "./components/LinearGradient.svelte",
     "./components/Link.svelte": "./components/Link.svelte",
+    "./components/Pack.svelte": "./components/Pack.svelte",
     "./components/Partition.svelte": "./components/Partition.svelte",
     "./components/Path.svelte": "./components/Path.svelte",
     "./components/Pattern.svelte": "./components/Pattern.svelte",