layerchart 2.0.0-next.45 → 2.0.0-next.47

package/dist/components/TransformContext.svelte

@@ -1,74 +1,18 @@
 <script lang="ts" module>
   import type { HTMLAttributes } from 'svelte/elements';
-  import { setTransformContext, type TransformContextValue } from '../contexts/transform.js';
-  import {
-    DEFAULT_SCALE,
-    DEFAULT_TRANSLATE,
-    type TransformMode,
-    type TransformScrollMode,
-  } from '../states/transform.svelte.js';
+  import { TransformState, type TransformStateOptions } from '../states/transform.svelte.js';
+  import type { MotionProp } from '../utils/motion.svelte.js';
 
-  type TransformContextPropsWithoutHTML = {
-    mode?: TransformMode;
-    processTranslate?: (
-      x: number,
-      y: number,
-      deltaX: number,
-      deltaY: number
-    ) => {
-      x: number;
-      y: number;
-    };
+  type TransformContextPropsWithoutHTML = TransformStateOptions & {
     /**
-     * Disable pointer events including move/dragging.  Useful for `mode="canvas" but only want
-     * zoomTo() interactions
-     *
-     * @default false
-     */
-    disablePointer?: boolean;
-
-    /**
-     * A bindable reference to the transform context value.
+     * A bindable reference to TransformState.
      *
      * @bindable
      */
-    transformContext?: TransformContextValue;
-
-    /**
-     * Initial scroll mode.
-     * This is set to `none` by default, but can be set to `scale` or `translate`
-     *
-     * @default 'none'
-     */
-    initialScrollMode?: TransformScrollMode;
-
-    /**
-     * Distance/threshold to consider drag vs click (disable click propagation)
-     *
-     * @default 10
-     */
-    clickDistance?: number;
+    state?: TransformState;
 
-    /**
-     * Initial translate value
-     */
-    initialTranslate?: { x: number; y: number };
-
-    /**
-     *  Initial scale value
-     */
-    initialScale?: number;
-
-    /**
-     * A callback function that is called when the transform is applied.
-     * @param e
-     */
-    onTransform?: (details: { scale: number; translate: { x: number; y: number } }) => void;
-
-    ondragstart?: () => void;
-    ondragend?: () => void;
     ref?: HTMLElement;
-    children?: Snippet<[{ transformContext: TransformContextValue }]>;
+    children?: Snippet<[{ transformState: TransformState }]>;
 
     motion?: MotionProp;
   };
@@ -79,32 +23,11 @@
 
 <script lang="ts">
   import type { Snippet } from 'svelte';
-  import { localPoint } from '@layerstack/utils';
-  import { watch } from 'runed';
   import type { Without } from '../utils/types.js';
   import { getChartContext } from '../contexts/chart.js';
-  import {
-    createControlledMotion,
-    createMotionTracker,
-    parseMotionProp,
-    type MotionProp,
-  } from '../utils/motion.svelte.js';
 
   let {
-    mode = 'none',
-    motion,
-    processTranslate = (x: number, y: number, deltaX: number, deltaY: number) => ({
-      x: x + deltaX,
-      y: y + deltaY,
-    }),
-    disablePointer = false,
-    initialScrollMode = 'none',
-    clickDistance = 10,
-    ondragend = () => {},
-    ondragstart = () => {},
-    onTransform = () => {},
-    initialTranslate,
-    initialScale,
+    state: stateProp = $bindable(),
     onwheel = () => {},
     onpointerdown = () => {},
     onpointermove = () => {},
@@ -115,156 +38,143 @@
     ref: refProp = $bindable(),
     children,
     class: className,
-    transformContext = $bindable(),
+    mode,
+    axis,
+    motion,
+    processTranslate,
+    disablePointer,
+    scrollMode,
+    clickDistance,
+    initialTranslate,
+    initialScale,
+    onTransform,
+    ondragstart,
+    ondragend,
+    scaleExtent,
+    translateExtent,
+    constrain,
+    inertia,
+    scrollActivationKey,
     ...restProps
   }: TransformContextProps = $props();
 
+  const options: TransformStateOptions = {
+    mode,
+    axis,
+    motion,
+    processTranslate,
+    disablePointer,
+    scrollMode,
+    clickDistance,
+    initialTranslate,
+    initialScale,
+    onTransform,
+    ondragstart,
+    ondragend,
+    scaleExtent,
+    translateExtent,
+    constrain,
+    inertia,
+    scrollActivationKey,
+  };
+
   let ref = $state<HTMLElement>();
   $effect.pre(() => {
     refProp = ref;
   });
 
-  transformContext = {
-    get mode() {
-      return mode;
-    },
-    get scale() {
-      return scale.current;
-    },
-    setScale,
-    get translate() {
-      return translate.current;
-    },
-    setTranslate,
-    get dragging() {
-      return dragging;
-    },
-    get moving() {
-      return moving;
-    },
-    reset,
-    zoomIn,
-    zoomOut,
-    translateCenter,
-    zoomTo,
-    get scrollMode() {
-      return scrollMode;
-    },
-    setScrollMode,
-  };
-
   const ctx = getChartContext();
 
-  let pointerDown = false;
-  let dragging = $state(false);
-  let scrollMode = $state<TransformScrollMode>(initialScrollMode);
+  // Create TransformState instance
+  const transformState = new TransformState(ctx, options);
 
-  const resolvedMotion = parseMotionProp(motion);
-
-  const translate = createControlledMotion(initialTranslate ?? DEFAULT_TRANSLATE, resolvedMotion);
-  const scale = createControlledMotion(initialScale ?? DEFAULT_SCALE, resolvedMotion);
-
-  let startPoint: { x: number; y: number } = { x: 0, y: 0 };
-  let startTranslate: { x: number; y: number } = { x: 0, y: 0 };
-
-  export function setScrollMode(mode: TransformScrollMode) {
-    scrollMode = mode;
-  }
+  // Sync initial transform values when they change (e.g., when projection changes for geo transforms)
+  $effect.pre(() => {
+    const newTranslate = initialTranslate ?? { x: 0, y: 0 };
+    const newScale = initialScale ?? 1;
+    // Only reset if values actually changed from current initial values
+    if (
+      newTranslate.x !== transformState.initialTranslate.x ||
+      newTranslate.y !== transformState.initialTranslate.y ||
+      newScale !== transformState.initialScale
+    ) {
+      transformState.initialTranslate = newTranslate;
+      transformState.initialScale = newScale;
+      transformState.reset();
+    }
+  });
 
-  export function reset() {
-    translate.target = initialTranslate ?? DEFAULT_TRANSLATE;
-    scale.target = initialScale ?? DEFAULT_SCALE;
-  }
+  $effect.pre(() => {
+    if (scrollMode !== undefined) {
+      transformState.scrollMode = scrollMode;
+    }
+  });
 
-  export function zoomIn() {
-    scaleTo(1.25, { x: (ctx.width + ctx.padding.left) / 2, y: (ctx.height + ctx.padding.top) / 2 });
-  }
+  $effect.pre(() => {
+    transformState.constrain = constrain;
+  });
 
-  export function zoomOut() {
-    scaleTo(0.8, { x: (ctx.width + ctx.padding.left) / 2, y: (ctx.height + ctx.padding.top) / 2 });
-  }
+  $effect.pre(() => {
+    transformState.scaleExtent = scaleExtent;
+  });
 
-  export function translateCenter() {
-    translate.target = {
-      x: 0,
-      y: 0,
-    };
-  }
+  $effect.pre(() => {
+    transformState.translateExtent = translateExtent;
+  });
 
-  export function zoomTo(
-    center: { x: number; y: number },
-    rect?: { width: number; height: number }
-  ) {
-    const newScale = rect
-      ? ctx.width < ctx.height
-        ? ctx.width / rect.width
-        : ctx.height / rect.height
-      : 1;
+  $effect.pre(() => {
+    if (inertia === true) {
+      transformState.inertia = {
+        enabled: true,
+        decay: 0.99,
+        minVelocity: 0.1,
+        maxVelocity: Infinity,
+        velocityWindow: 160,
+      };
+    } else if (typeof inertia === 'object') {
+      transformState.inertia = {
+        enabled: true,
+        decay: inertia.decay ?? 0.99,
+        minVelocity: inertia.minVelocity ?? 0.1,
+        maxVelocity: inertia.maxVelocity ?? Infinity,
+        velocityWindow: inertia.velocityWindow ?? 160,
+      };
+    } else {
+      transformState.inertia = {
+        enabled: false,
+        decay: 0.99,
+        minVelocity: 0.1,
+        maxVelocity: Infinity,
+        velocityWindow: 160,
+      };
+    }
+  });
 
-    translate.target = {
-      x: ctx.width / 2 - center.x * newScale,
-      y: ctx.height / 2 - center.y * newScale,
-    };
+  $effect.pre(() => {
+    transformState.scrollActivationKey = scrollActivationKey;
+  });
 
-    if (rect) {
-      scale.target = newScale;
-    }
-  }
+  // Bind `state` prop
+  stateProp = transformState;
 
   function onPointerDown(e: PointerEvent & { currentTarget: HTMLElement }) {
     onpointerdown?.(e);
-    if (mode === 'none' || disablePointer) return;
-
-    e.preventDefault();
-
-    pointerDown = true;
-    dragging = false;
-    startPoint = localPoint(e);
-    startTranslate = translate.current;
-
-    ondragstart?.();
+    transformState.onPointerDown(e);
   }
 
   function onPointerMove(e: PointerEvent & { currentTarget: HTMLElement }) {
     onpointermove?.(e);
-    if (!pointerDown) return;
-
-    e.preventDefault(); // Stop text selection
-
-    const endPoint = localPoint(e);
-    const deltaX = endPoint.x - startPoint.x;
-    const deltaY = endPoint.y - startPoint.y;
-
-    if (!dragging) {
-      // If dragged beyond threshold, disable click propagation
-      dragging = deltaX * deltaX + deltaY * deltaY > clickDistance;
-    }
-
-    if (dragging) {
-      e.stopPropagation(); // Stop tooltip from trigging (along with `capture: true`)
-      e.currentTarget?.setPointerCapture(e.pointerId);
-
-      setTranslate(
-        processTranslate(startTranslate.x, startTranslate.y, deltaX, deltaY),
-        translate.type === 'spring'
-          ? { instant: true }
-          : translate.type === 'tween'
-            ? { duration: 0 }
-            : undefined
-      );
-    }
+    transformState.onPointerMove(e);
   }
 
   function onPointerUp(e: PointerEvent & { currentTarget: HTMLElement }) {
     onpointerup?.(e);
-    pointerDown = false;
-    dragging = false;
-    ondragend?.();
+    transformState.onPointerUp(e);
   }
 
   function onClick(e: MouseEvent & { currentTarget: HTMLElement }) {
     onclickcapture?.(e);
-    if (dragging) {
+    if (transformState.dragging) {
       // Do not propagate click event to children if drag/moved.  Registered in capture phase (top-down)
       e.stopPropagation();
     }
@@ -272,100 +182,13 @@
 
   function onDoubleClick(e: MouseEvent & { currentTarget: HTMLElement }) {
     ondblclick?.(e);
-    if (mode === 'none' || disablePointer) return;
-    const point = localPoint(e);
-    scaleTo(e.shiftKey ? 0.5 : 2, point);
+    transformState.onDoubleClick(e);
   }
 
   function onWheel(e: WheelEvent & { currentTarget: HTMLElement }) {
     onwheel?.(e);
-    if (mode === 'none' || disablePointer || scrollMode === 'none') return;
-
-    e.preventDefault();
-
-    const point = (startPoint = localPoint(e));
-
-    // Pinch to zoom is registered as a wheel event with control key
-    const pinchToZoom = e.ctrlKey;
-
-    if (scrollMode === 'scale' || pinchToZoom) {
-      // https://github.com/d3/d3-zoom#zoom_wheelDelta
-      const scaleBy =
-        -e.deltaY * (e.deltaMode === 1 ? 0.05 : e.deltaMode ? 1 : 0.002) * (e.ctrlKey ? 10 : 1);
-
-      scaleTo(
-        Math.pow(2, scaleBy),
-        point,
-        scale.type === 'spring'
-          ? { instant: true }
-          : scale.type === 'tween'
-            ? { duration: 0 }
-            : undefined
-      );
-    } else if (scrollMode === 'translate') {
-      const startTranslate = translate.current;
-      translate
-        .set(
-          processTranslate(startTranslate.x, startTranslate.y, -e.deltaX, -e.deltaY),
-          translate.type === 'spring'
-            ? { instant: true }
-            : translate.type === 'tween'
-              ? { duration: 0 }
-              : undefined
-        )
-        .then(() => {})
-        .catch(() => {});
-    }
-  }
-
-  /**
-   * Apply scale and translate towards point
-   */
-  function scaleTo(
-    value: number,
-    point: { x: number; y: number },
-    options: Parameters<(typeof scale)['set']>[1] | undefined = undefined
-  ) {
-    const currentScale = scale.current;
-    const newScale = scale.current * value;
-    setScale(newScale, options);
-
-    // Translate towards point (ex. mouse cursor/center) while zooming in/out
-    const invertTransformPoint = {
-      x: (point.x - ctx.padding.left - translate.current.x) / currentScale,
-      y: (point.y - ctx.padding.top - translate.current.y) / currentScale,
-    };
-    const newTranslate = {
-      x: point.x - ctx.padding.left - invertTransformPoint.x * newScale,
-      y: point.y - ctx.padding.top - invertTransformPoint.y * newScale,
-    };
-    setTranslate(newTranslate, options);
-  }
-
-  const translating = createMotionTracker();
-  const scaling = createMotionTracker();
-
-  const moving = $derived(dragging || translating.current || scaling.current);
-
-  export function setTranslate(
-    point: { x: number; y: number },
-    options?: Parameters<(typeof translate)['set']>[1]
-  ) {
-    translating.handle(translate.set(point, options));
+    transformState.onWheel(e);
   }
-
-  export function setScale(value: number, options?: MotionProp) {
-    scaling.handle(scale.set(value, options));
-  }
-
-  watch([() => scale.current, () => translate.current], () => {
-    onTransform({
-      scale: scale.current,
-      translate: translate.current,
-    });
-  });
-
-  setTransformContext(transformContext);
 </script>
 
 <div
@@ -377,7 +200,7 @@
     // Touch events cause pointer events to be interrupted.
     // Typically `touch-action: none` works, but doesn't appear to with SVG, but `preventDefault()` works here
     // https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events#touch-action_css_property
-    if (mode !== 'none' && !disablePointer) {
+    if (transformState.mode !== 'none' && !transformState.disablePointer) {
       e.preventDefault();
     }
   }}
@@ -388,7 +211,7 @@
   bind:this={ref}
   {...restProps}
 >
-  {@render children?.({ transformContext: transformContext })}
+  {@render children?.({ transformState })}
 </div>
 
 <style>

package/dist/components/TransformContext.svelte.d.ts

@@ -0,0 +1,22 @@
+import type { HTMLAttributes } from 'svelte/elements';
+import { TransformState, type TransformStateOptions } from '../states/transform.svelte.js';
+import type { MotionProp } from '../utils/motion.svelte.js';
+type TransformContextPropsWithoutHTML = TransformStateOptions & {
+    /**
+     * A bindable reference to TransformState.
+     *
+     * @bindable
+     */
+    state?: TransformState;
+    ref?: HTMLElement;
+    children?: Snippet<[{
+        transformState: TransformState;
+    }]>;
+    motion?: MotionProp;
+};
+type TransformContextProps = TransformContextPropsWithoutHTML & Without<HTMLAttributes<HTMLElement>, TransformContextPropsWithoutHTML>;
+import type { Snippet } from 'svelte';
+import type { Without } from '../utils/types.js';
+declare const TransformContext: import("svelte").Component<TransformContextProps, {}, "ref" | "state">;
+type TransformContext = ReturnType<typeof TransformContext>;
+export default TransformContext;