@trdrs/quickcharts 2.0.0 → 2.0.1

package/dist/drawings.js

@@ -85,7 +85,7 @@ import {
   visibilityPreset,
   visibleAt,
   withAlpha
-} from "./chunk-6S6TO2N6.js";
+} from "./chunk-YR7NT5ZW.js";
 import {
   DRAWING_CONTEXT_VERSION,
   DRAWING_DOCUMENT_VERSION,

package/dist/feature-manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0",
+  "version": "2.0.1",
   "styles": [
     {
       "id": "candles",

package/dist/index.js

@@ -82,7 +82,7 @@ import {
   viewportOf,
   visibilityPreset,
   withAlpha
-} from "./chunk-6S6TO2N6.js";
+} from "./chunk-YR7NT5ZW.js";
 import {
   ResourceAbortError,
   memorySaveLoadAdapter
@@ -8132,6 +8132,10 @@ var PLACE_DRAG_PX = 6;
 var MOVE_EPSILON_PX = 2;
 var HANDLE_GRAB_PX = 11;
 var GRIP_GRAB_PX = 9;
+var TOUCH_REACH_PX = 14;
+var TOUCH_GRAB_PX = 22;
+var TOUCH_PLACE_DRAG_PX = 12;
+var TOUCH_MOVE_PX = 6;
 var STROKE_STEP_PX = 3;
 var isTransientArmed = (tool) => tool === "measure" || tool === "zoom" || tool === "eraser";
 function bindGestures(ctx) {
@@ -8163,11 +8167,38 @@ function bindGestures(ctx) {
     if (mode === "off") return raw;
     return magnetSnap(chart, series2, p, mode) ?? raw;
   };
+  let touching = false;
+  const hitAt = (p) => {
+    const under = manager.hitTest(p);
+    if (under || !touching) return under;
+    for (const radius of [TOUCH_REACH_PX / 2, TOUCH_REACH_PX]) {
+      for (let k = 0; k < 8; k++) {
+        const angle = k * Math.PI / 4;
+        const near2 = manager.hitTest({ x: p.x + radius * Math.cos(angle), y: p.y + radius * Math.sin(angle) });
+        if (near2) return near2;
+      }
+    }
+    return null;
+  };
+  const showPoint = (anchor) => {
+    if (!touching || !anchor) return;
+    try {
+      chart.setCrosshairPosition(anchor.price, anchor.time, series2);
+    } catch {
+    }
+  };
+  const hidePoint = () => {
+    if (!touching) return;
+    try {
+      chart.clearCrosshairPosition();
+    } catch {
+    }
+  };
   const anchorHit = (drawing2, p) => {
     const vp = viewport();
     if (!vp) return null;
     let best = null;
-    let bestD = HANDLE_GRAB_PX;
+    let bestD = touching ? TOUCH_GRAB_PX : HANDLE_GRAB_PX;
     for (const cp of drawing2.getControlPoints(vp)) {
       const d = Math.hypot(cp.x - p.x, cp.y - p.y);
       if (d <= bestD) {
@@ -8239,6 +8270,7 @@ function bindGestures(ctx) {
   };
   const onDown = (e) => {
     if (e.button !== 0) return;
+    touching = e.pointerType === "touch";
     if (ctx.textEditOpen()) return;
     wearCursor(ctx.cursorCss());
     container.focus({ preventScroll: true });
@@ -8247,7 +8279,7 @@ function bindGestures(ctx) {
     if (!ctx.draft && ctx.transient.size && tool !== "measure" && tool !== "zoom") ctx.clearTransients();
     if (tool === "eraser") {
       if (ctx.locked()) return;
-      const hit = manager.hitTest(p);
+      const hit = hitAt(p);
       if (hit && !editRefused("erase", hit.options, false)) {
         manager.remove(hit.id);
         ctx.persist();
@@ -8284,7 +8316,8 @@ function bindGestures(ctx) {
         }
         const vp = viewport();
         if (vp) {
-          const grip = sel.resizeHandles(vp).findIndex((g) => Math.hypot(g.x - p.x, g.y - p.y) <= GRIP_GRAB_PX);
+          const gripReach = touching ? TOUCH_GRAB_PX : GRIP_GRAB_PX;
+          const grip = sel.resizeHandles(vp).findIndex((g) => Math.hypot(g.x - p.x, g.y - p.y) <= gripReach);
           if (grip !== -1) {
             startDrag("resize", sel, grip, p);
             return;
@@ -8302,7 +8335,7 @@ function bindGestures(ctx) {
           return;
         }
       }
-      const hit = manager.hitTest(p);
+      const hit = hitAt(p);
       if (hit) {
         if ((e.ctrlKey || e.metaKey) && !editRefused("cloneDrag", hit.options, false) && ctx.copies(hit.type)) {
           const copy = drawingTools.restore({ ...hit.toJSON(), id: ctx.nextId() });
@@ -8322,7 +8355,10 @@ function bindGestures(ctx) {
       manager.deselect();
       return;
     }
-    if (ctx.draft) return;
+    if (ctx.draft) {
+      if (touching) followDraft(ctx.draft, p, e.shiftKey);
+      return;
+    }
     if (ctx.locked()) return;
     const def = drawingTools.get(tool);
     if (!def) return;
@@ -8355,6 +8391,7 @@ function bindGestures(ctx) {
     }
     manager.add(drawing2);
     ctx.draft = { drawing: drawing2, required, placed: 1, downX: p.x, downY: p.y, pendingDrag: true, hasText: !!def.hasText, mode, lastX: p.x, lastY: p.y };
+    showPoint(anchor);
     if (mode === "fixed" && required === 1) completePlacement(ctx.draft, p);
   };
   const constrainedEnd = (draft, p, shift) => {
@@ -8363,12 +8400,22 @@ function bindGestures(ctx) {
     const first = vp && draft.drawing.anchors[0] ? draft.drawing.anchorToPixel(draft.drawing.anchors[0], vp) : null;
     return first ? constrain45(first, p) : p;
   };
+  const followDraft = (draft, p, shift) => {
+    const live = constrainedEnd(draft, p, shift);
+    const anchor = isTransientArmed(ctx.armed()) ? anchorAt(live) : snappedAnchorAt(live, shift);
+    if (anchor) draft.drawing.updateAnchor(draft.drawing.anchors.length - 1, anchor);
+    showPoint(anchor);
+  };
   const onMove = (e) => {
     const p = localXY(e);
     const drag = ctx.drag;
     if (drag) {
       let { x, y } = p;
-      if (!drag.moved && Math.abs(x - drag.grabX) + Math.abs(y - drag.grabY) > MOVE_EPSILON_PX) drag.moved = true;
+      if (!drag.moved) {
+        const travel = Math.abs(x - drag.grabX) + Math.abs(y - drag.grabY);
+        if (touching && travel <= TOUCH_MOVE_PX) return;
+        if (travel > MOVE_EPSILON_PX) drag.moved = true;
+      }
       const vp = viewport();
       if (!vp) return;
       if (drag.mode === "resize" && drag.anchorIndex !== null) {
@@ -8382,6 +8429,7 @@ function bindGestures(ctx) {
         }
         const anchor = snappedAnchorAt({ x, y }, e.shiftKey);
         if (anchor) drag.drawing.updateAnchor(drag.anchorIndex, anchor);
+        showPoint(anchor);
         return;
       }
       const dx = x - drag.grabX;
@@ -8404,18 +8452,16 @@ function bindGestures(ctx) {
     const draft = ctx.draft;
     if (draft) {
       if (draft.mode === "freehand") {
-        const anchor2 = anchorAt(p);
-        if (!anchor2) return;
+        const anchor = anchorAt(p);
+        if (!anchor) return;
         if (Math.hypot(p.x - draft.lastX, p.y - draft.lastY) >= STROKE_STEP_PX) {
-          draft.drawing.appendAnchor(anchor2);
+          draft.drawing.appendAnchor(anchor);
           draft.lastX = p.x;
           draft.lastY = p.y;
         }
         return;
       }
-      const live = constrainedEnd(draft, p, e.shiftKey);
-      const anchor = isTransientArmed(ctx.armed()) ? anchorAt(live) : snappedAnchorAt(live, e.shiftKey);
-      if (anchor) draft.drawing.updateAnchor(draft.drawing.anchors.length - 1, anchor);
+      followDraft(draft, p, e.shiftKey);
       return;
     }
     wearCursor(ctx.cursorCss());
@@ -8425,33 +8471,38 @@ function bindGestures(ctx) {
     ctx.setHovered(manager.hitTest(localXY(e))?.id ?? null);
   };
   const onLeave = () => ctx.setHovered(null);
+  const placeSlop = () => touching ? TOUCH_PLACE_DRAG_PX : PLACE_DRAG_PX;
+  const endDrag = (drag) => {
+    ctx.drag = null;
+    freezePan(!!ctx.armed());
+    if (drag.cloned && !drag.moved) manager.remove(drag.drawing.id);
+    if (!drag.moved && !drag.cloned && drag.mode === "move" && drag.drawing.type === "table") {
+      const vp = viewport();
+      const table = drag.drawing;
+      const cell2 = vp && table.cellAt ? table.cellAt({ x: drag.grabX, y: drag.grabY }, vp) : null;
+      if (cell2) {
+        ctx.openCellEdit(drag.drawing, cell2);
+        return;
+      }
+    }
+    if (drag.moved || drag.cloned) {
+      ctx.persist();
+      ctx.changed();
+    }
+  };
   const onUp = (e) => {
     const p = localXY(e);
+    hidePoint();
     const drag = ctx.drag;
     if (drag) {
-      ctx.drag = null;
-      freezePan(!!ctx.armed());
-      if (drag.cloned && !drag.moved) manager.remove(drag.drawing.id);
-      if (!drag.moved && !drag.cloned && drag.mode === "move" && drag.drawing.type === "table") {
-        const vp = viewport();
-        const table = drag.drawing;
-        const cell2 = vp && table.cellAt ? table.cellAt({ x: drag.grabX, y: drag.grabY }, vp) : null;
-        if (cell2) {
-          ctx.openCellEdit(drag.drawing, cell2);
-          return;
-        }
-      }
-      if (drag.moved || drag.cloned) {
-        ctx.persist();
-        ctx.changed();
-      }
+      endDrag(drag);
       return;
     }
     const draft = ctx.draft;
     if (!draft) return;
     const tool = ctx.armed();
     if (tool === "measure" || tool === "zoom") {
-      const moved2 = Math.abs(p.x - draft.downX) + Math.abs(p.y - draft.downY) > 4;
+      const moved2 = Math.abs(p.x - draft.downX) + Math.abs(p.y - draft.downY) > (touching ? TOUCH_PLACE_DRAG_PX : 4);
       if (!moved2 && draft.pendingDrag) {
         draft.pendingDrag = false;
         return;
@@ -8471,7 +8522,7 @@ function bindGestures(ctx) {
       return;
     }
     if (draft.mode === "multipoint") {
-      if (draft.pendingDrag && Math.abs(p.x - draft.downX) + Math.abs(p.y - draft.downY) <= PLACE_DRAG_PX) {
+      if (draft.pendingDrag && Math.abs(p.x - draft.downX) + Math.abs(p.y - draft.downY) <= placeSlop()) {
         draft.pendingDrag = false;
         return;
       }
@@ -8487,7 +8538,7 @@ function bindGestures(ctx) {
     const snapped = snappedAnchorAt(constrainedEnd(draft, p, e.shiftKey), e.shiftKey);
     const lastIndex = draft.drawing.anchors.length - 1;
     if (snapped) draft.drawing.updateAnchor(lastIndex, snapped);
-    const moved = Math.abs(p.x - draft.downX) + Math.abs(p.y - draft.downY) > PLACE_DRAG_PX;
+    const moved = Math.abs(p.x - draft.downX) + Math.abs(p.y - draft.downY) > placeSlop();
     if (draft.pendingDrag && !moved) {
       draft.pendingDrag = false;
       return;
@@ -8501,6 +8552,14 @@ function bindGestures(ctx) {
       draft.drawing.appendAnchor({ ...next });
     }
   };
+  const onCancel = () => {
+    hidePoint();
+    if (ctx.drag) endDrag(ctx.drag);
+    else if (ctx.draft) ctx.draft.pendingDrag = false;
+  };
+  const onTouchStart = (e) => {
+    if (ctx.drag || ctx.draft) e.preventDefault();
+  };
   const onDblClick = (e) => {
     if (ctx.locked()) return;
     const draft = ctx.draft;
@@ -8525,18 +8584,22 @@ function bindGestures(ctx) {
     ctx.openTextEdit(hit, p.x, p.y, false);
   };
   container.addEventListener("pointerdown", onDown);
+  container.addEventListener("touchstart", onTouchStart, { passive: false });
   container.addEventListener("pointermove", onHover);
   container.addEventListener("pointerleave", onLeave);
   container.addEventListener("dblclick", onDblClick);
   window.addEventListener("pointermove", onMove);
   window.addEventListener("pointerup", onUp);
+  window.addEventListener("pointercancel", onCancel);
   return () => {
     container.removeEventListener("pointerdown", onDown);
+    container.removeEventListener("touchstart", onTouchStart);
     container.removeEventListener("pointermove", onHover);
     container.removeEventListener("pointerleave", onLeave);
     container.removeEventListener("dblclick", onDblClick);
     window.removeEventListener("pointermove", onMove);
     window.removeEventListener("pointerup", onUp);
+    window.removeEventListener("pointercancel", onCancel);
   };
 }