@toolpath/viewer 1.3.0 → 1.4.0

package/README.md

@@ -600,6 +600,9 @@ to, the part's edges stop at the plane, the outline where the plane passes throu
 is an edge with corners of its own, and the capped face is a surface a point can land on. The
 sample follows the cut — drag the handle or set a depth and the next pointer move sees the new cut.
 It reads the plane off the part's own material, so a controlled `section` prop works the same way.
+Beside a `<SectionTool>` that has no cut yet, the measure tool waits: it offers no snap and places
+no point until a cut is chosen or the section tool is unmounted, so the click that picks the cut is
+not also the first point of a measurement. Measurements already made stay up meanwhile.
 
 Hold Shift to hold the next point to the X, Y or Z line through the last one — whichever axis the
 pointer is furthest along — so a length along an edge is measured square rather than slightly across

package/dist/{chunk-HWAEUJ4H.js → chunk-HH3W5T42.js}

@@ -1328,11 +1328,12 @@ function retargetPose(cameraPosition, currentTarget, hitPoint) {
 // src/render/section-store.ts
 function createSectionStore() {
   let current = null;
-  let engaged = 0;
   const listeners = /* @__PURE__ */ new Set();
   const notify = () => {
     for (const listener of listeners) listener();
   };
+  const engaged = counted(notify);
+  const picking = counted(notify);
   return {
     get: () => current,
     set: (next) => {
@@ -1340,12 +1341,10 @@ function createSectionStore() {
       current = next;
       notify();
     },
-    isEngaged: () => engaged > 0,
-    setEngaged: (next) => {
-      const was = engaged > 0;
-      engaged = Math.max(0, engaged + (next ? 1 : -1));
-      if (engaged > 0 !== was) notify();
-    },
+    isEngaged: engaged.is,
+    setEngaged: engaged.set,
+    isPicking: picking.is,
+    setPicking: picking.set,
     subscribe: (listener) => {
       listeners.add(listener);
       return () => {
@@ -1354,6 +1353,17 @@ function createSectionStore() {
     }
   };
 }
+function counted(notify) {
+  let held = 0;
+  return {
+    is: () => held > 0,
+    set: (next) => {
+      const was = held > 0;
+      held = Math.max(0, held + (next ? 1 : -1));
+      if (held > 0 !== was) notify();
+    }
+  };
+}
 
 // src/target-marker.tsx
 import { useFrame as useFrame2, useThree as useThree3 } from "@react-three/fiber";

package/dist/engine/index.js

@@ -12,7 +12,7 @@ import {
   parsePartGeometry,
   partMeshAssets,
   smoothRegionNormals
-} from "../chunk-HWAEUJ4H.js";
+} from "../chunk-HH3W5T42.js";
 export {
   EnginePart,
   MIN_KERNEL_VERSION,

package/dist/index.d.ts

@@ -245,7 +245,9 @@ interface SectionToolProps {
  * the way to set or clear it from outside the canvas. While this is mounted
  * the part reports no hovers or picks: a click on a face cuts through it
  * without also selecting it, and a cut part is looked at rather than picked
- * at. Unmounting it hands the pointer back.
+ * at. Unmounting it hands the pointer back. While it is offering a cut — up,
+ * with none placed yet — a `<MeasureTool>` beside it waits too, so the click
+ * that chooses the cut does not also place a measurement point.
  */
 declare const SectionTool: ({ theme }: SectionToolProps) => react.JSX.Element | null;
 
@@ -687,7 +689,12 @@ interface MeasureToolProps {
  *
  * Nothing needs wiring. While it is mounted the part reports no hovers or
  * picks — a click that places a point is not a click that selects a face — and
- * unmounting it hands the pointer back. It snaps to the edges the part draws,
+ * unmounting it hands the pointer back. Beside a `<SectionTool>` that has no
+ * cut yet it waits: no snap is offered and no click places a point until the
+ * cut is chosen or the section tool is unmounted, and the click that chooses
+ * the cut — the one it wakes on — places nothing either: a click counts only
+ * when it was pressed as well as released while the tool was taking points.
+ * Measurements already made stay up meanwhile. It snaps to the edges the part draws,
  * which are the boundaries between analytic surfaces rather than the mesh's
  * triangles, so a corner is a corner of the part and not of a facet.
  *
@@ -723,6 +730,12 @@ declare const MeasureTool: ({ mode, measurements, onChange, showDeltas, format,
  * on a face is not a request to select the face — which is why the flag is a
  * count rather than a boolean: two tools up at once let go one at a time.
  *
+ * And whether a tool is **picking** — `<SectionTool>` is up with no cut in
+ * place, so the next click on the part chooses where the cut goes. That click
+ * is the section tool's alone: `<MeasureTool>` beside it offers no snap and
+ * places no point until the cut is chosen or the section tool is unmounted.
+ * Counted for the same reason as `engaged`.
+ *
  * A subscription rather than React state, so a drag re-renders the two
  * subscribers and not everything under the canvas.
  */
@@ -733,7 +746,11 @@ interface SectionStore {
     isEngaged(): boolean;
     /** Counted: a tool engages on mount and disengages on unmount, and the part waits for the last. */
     setEngaged(engaged: boolean): void;
-    /** Notified on every change to either the cut or the engaged flag. */
+    /** Whether a section tool is waiting for a click to say where the cut goes. */
+    isPicking(): boolean;
+    /** Counted, as `setEngaged` is: raised while a section tool offers a cut, dropped once one is placed. */
+    setPicking(picking: boolean): void;
+    /** Notified on every change to the cut, the engaged flag, or the picking flag. */
     subscribe(listener: () => void): () => void;
 }
 declare function createSectionStore(): SectionStore;

package/dist/index.js

@@ -131,7 +131,7 @@ import {
   viewUp,
   viewVector,
   visualSurfaces
-} from "./chunk-HWAEUJ4H.js";
+} from "./chunk-HH3W5T42.js";
 
 // src/primitives.tsx
 import { GizmoHelper } from "@react-three/drei";
@@ -644,6 +644,10 @@ var Picker = ({ box, theme }) => {
   const span = useMemo3(() => box.getSize(new Vector34()).length(), [box]);
   const centre = useMemo3(() => box.getCenter(new Vector34()), [box]);
   const previewSize = span * PREVIEW_SCALE;
+  useEffect2(() => {
+    store.setPicking(true);
+    return () => store.setPicking(false);
+  }, [store]);
   useEffect2(() => {
     const raycaster = new Raycaster();
     const pointer = new Vector22();
@@ -840,7 +844,14 @@ var CutSheet = ({ box, section, theme }) => {
 // src/measure-tool.tsx
 import { Html, Line } from "@react-three/drei";
 import { useFrame as useFrame2, useThree as useThree4 } from "@react-three/fiber";
-import { useEffect as useEffect3, useLayoutEffect, useMemo as useMemo4, useRef as useRef3, useState as useState3 } from "react";
+import {
+  useEffect as useEffect3,
+  useLayoutEffect,
+  useMemo as useMemo4,
+  useRef as useRef3,
+  useState as useState3,
+  useSyncExternalStore as useSyncExternalStore2
+} from "react";
 import {
   Matrix4,
   Raycaster as Raycaster2,
@@ -1036,6 +1047,7 @@ var MeasureTool = ({
   const store = useSectionStore();
   const box = useContentBox();
   const resolved = useMemo4(() => resolveTheme(theme), [theme]);
+  const picking = useSyncExternalStore2(store.subscribe, store.isPicking, store.isPicking);
   const [held, setHeld] = useState3([]);
   const controlled = measurements !== void 0;
   const list = controlled ? measurements : held;
@@ -1082,7 +1094,7 @@ var MeasureTool = ({
   if (box.isEmpty()) return null;
   const label = className(labelClassName);
   return /* @__PURE__ */ jsxs4("group", { userData: FURNITURE4, children: [
-    /* @__PURE__ */ jsx4(
+    picking ? null : /* @__PURE__ */ jsx4(
       Snapper,
       {
         mode,
@@ -1212,8 +1224,14 @@ var Snapper = ({ mode, draft, onPlace, theme, format, label }) => {
       if (event.key !== "Shift" || !last || !snap.current) return;
       update(last.x, last.y, event.type === "keydown");
     };
+    let pressed = false;
+    const down = () => {
+      pressed = true;
+    };
     const up = (event) => {
-      if (event.button !== 0 || !isTap(event)) return;
+      const seen = pressed;
+      pressed = false;
+      if (!seen || event.button !== 0 || !isTap(event)) return;
       update(event.clientX, event.clientY, event.shiftKey);
       const found = snap.current;
       if (!found) return;
@@ -1225,12 +1243,14 @@ var Snapper = ({ mode, draft, onPlace, theme, format, label }) => {
     };
     domElement.addEventListener("pointermove", move);
     domElement.addEventListener("pointerleave", leave);
+    domElement.addEventListener("pointerdown", down);
     domElement.addEventListener("pointerup", up);
     window.addEventListener("keydown", key);
     window.addEventListener("keyup", key);
     return () => {
       domElement.removeEventListener("pointermove", move);
       domElement.removeEventListener("pointerleave", leave);
+      domElement.removeEventListener("pointerdown", down);
       domElement.removeEventListener("pointerup", up);
       window.removeEventListener("keydown", key);
       window.removeEventListener("keyup", key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolpath/viewer",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "React Three Fiber viewer for Toolpath Engine part reports",
   "license": "MIT",
   "engines": {