@ifc-lite/viewer 1.17.6 → 1.18.0

package/src/components/viewer/tools/AddElementOverlay.tsx

@@ -0,0 +1,540 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+/**
+ * Live 3D placement preview for the Add Element tool.
+ *
+ * Renders SVG lines / rectangles / polygons over the canvas, anchored
+ * to renderer-frame world coords pulled from the addElement slice
+ * (`pendingPoints` + `hoverPoint`). Each point is projected to screen
+ * via the camera's `projectToScreen` callback so the preview tracks
+ * the camera in real time.
+ *
+ * What it draws (per element type):
+ *   - column: nothing (single click — snap dot is enough)
+ *   - wall:   first click → marker; on hover → marker → cursor + length
+ *   - beam:   identical to wall
+ *   - slab rectangle: first click → corner marker; on hover → axis-
+ *     aligned rectangle with the diagonal, plus W/D readouts
+ *   - slab polygon: pending edges + closing-edge ghost back to start
+ *     when ≥3 points exist (so the user can preview the close)
+ */
+
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useViewerStore } from '@/store';
+import { useIfc } from '@/hooks/useIfc';
+import type { AddElementVec3 } from '@/store/slices/addElementSlice';
+
+type Pt = { x: number; y: number };
+type Project = (worldPos: { x: number; y: number; z: number }) => { x: number; y: number } | null;
+
+const PRIMARY = '#10b981'; // emerald-500
+const PRIMARY_LIGHT = 'rgba(16, 185, 129, 0.18)';
+const GHOST = 'rgba(16, 185, 129, 0.45)';
+
+export function AddElementOverlay() {
+  const activeTool = useViewerStore((s) => s.activeTool);
+  const type = useViewerStore((s) => s.addElementType);
+  const slabMode = useViewerStore((s) => s.addElementSlabMode);
+  const pendingPoints = useViewerStore((s) => s.addElementPendingPoints);
+  const hoverPoint = useViewerStore((s) => s.addElementHoverPoint);
+  const autoSpacePreview = useViewerStore((s) => s.addElementAutoSpacePreview);
+  const projectToScreen = useViewerStore((s) => s.cameraCallbacks.projectToScreen);
+  const { models, ifcDataStore } = useIfc();
+  const addElementModelId = useViewerStore((s) => s.addElementModelId);
+  const activeModelId = useViewerStore((s) => s.activeModelId);
+
+  // Camera realtime updates intentionally bypass React renders for
+  // performance (see `updateCameraRotationRealtime`), so we drive our
+  // own RAF tick while the tool is active to re-project pending +
+  // hover points each frame. The tick state is just a number that
+  // forces a re-render; the projection itself is read fresh from the
+  // store callback.
+  const [frameTick, setFrameTick] = useState(0);
+  const rafRef = useRef<number | null>(null);
+  useEffect(() => {
+    if (activeTool !== 'addElement') return;
+    let mounted = true;
+    const loop = () => {
+      if (!mounted) return;
+      setFrameTick((t) => (t + 1) & 0xffff);
+      rafRef.current = requestAnimationFrame(loop);
+    };
+    rafRef.current = requestAnimationFrame(loop);
+    return () => {
+      mounted = false;
+      if (rafRef.current !== null) cancelAnimationFrame(rafRef.current);
+      rafRef.current = null;
+    };
+  }, [activeTool]);
+
+  const projection = useMemo(
+    () => makeProjection(projectToScreen),
+    // Re-creating the memoized projection on every tick is wasted —
+    // the underlying function reference rarely changes. We only
+    // depend on `projectToScreen` itself; the RAF tick triggers the
+    // re-render that calls the projection again with current camera.
+    [projectToScreen],
+  );
+
+  // Reading frameTick keeps React from optimizing the render away.
+  void frameTick;
+
+  if (activeTool !== 'addElement') return null;
+  if (!projection) return null;
+
+  // Resolve storey elevation for the auto-space preview projection.
+  // IFC Z (storey elevation) maps directly to renderer Y (Y-up).
+  let storeyElevation = 0;
+  if (autoSpacePreview) {
+    const effectiveModelId = addElementModelId ?? activeModelId ?? null;
+    const ds = effectiveModelId
+      ? models.get(effectiveModelId)?.ifcDataStore ?? ifcDataStore
+      : ifcDataStore;
+    const elev = ds?.spatialHierarchy?.storeyElevations?.get(autoSpacePreview.storeyExpressId);
+    if (typeof elev === 'number' && Number.isFinite(elev)) storeyElevation = elev;
+  }
+  const ifcToRenderer = (xy: [number, number]) =>
+    projection({ x: xy[0], y: storeyElevation, z: -xy[1] });
+
+  const screenPending = pendingPoints
+    .map(projection)
+    .filter((p): p is Pt => p !== null);
+  const hover = hoverPoint ? projection(hoverPoint) : null;
+  const hasPreview = !!autoSpacePreview && autoSpacePreview.outlines.length > 0;
+
+  if (screenPending.length === 0 && !hover && !hasPreview) return null;
+
+  return (
+    <svg
+      className="absolute inset-0 pointer-events-none z-20"
+      style={{ overflow: 'visible' }}
+    >
+      <defs>
+        <filter id="add-elem-glow">
+          <feGaussianBlur stdDeviation="2" result="blur" />
+          <feMerge>
+            <feMergeNode in="blur" />
+            <feMergeNode in="SourceGraphic" />
+          </feMerge>
+        </filter>
+      </defs>
+
+      {/* Hover-ghost for single-click placements — column/door/window. */}
+      {(type === 'column' || type === 'door' || type === 'window') && hoverPoint && (
+        <SingleClickGhost
+          type={type}
+          hoverWorld={hoverPoint}
+          projection={projection}
+        />
+      )}
+
+      {/* Two-click axial placements share the same start→end preview. */}
+      {type === 'wall' || type === 'beam' || type === 'member' ? (
+        <WallBeamPreview
+          pending={screenPending}
+          hover={hover}
+          pendingWorld={pendingPoints}
+          hoverWorld={hoverPoint}
+          projection={projection}
+        />
+      ) : null}
+
+      {/* Rectangle profile (slab / roof / plate / space) — flat rect on storey floor. */}
+      {(type === 'slab' || type === 'roof' || type === 'plate' || type === 'space') && slabMode === 'rectangle' ? (
+        <SlabRectanglePreview
+          pending={screenPending}
+          hover={hover}
+          pendingWorld={pendingPoints}
+          hoverWorld={hoverPoint}
+          projection={projection}
+        />
+      ) : null}
+
+      {/* Polygon profile (same set of types) — pending polyline + ghost close. */}
+      {(type === 'slab' || type === 'roof' || type === 'plate' || type === 'space') && slabMode === 'polygon' ? (
+        <SlabPolygonPreview pending={screenPending} hover={hover} />
+      ) : null}
+
+      {/* Pending point markers — drawn on top so they're always visible. */}
+      {screenPending.map((p, i) => (
+        <circle key={i} cx={p.x} cy={p.y} r={4.5} fill="white" stroke={PRIMARY} strokeWidth={2} />
+      ))}
+
+      {/* Auto-space preview: candidate outlines from the wall-graph
+          face finder. Distinct from the click-to-place preview to
+          avoid confusion when both are active. */}
+      {hasPreview && autoSpacePreview!.outlines.map((outline, idx) => {
+        const pts: Pt[] = [];
+        for (const xy of outline) {
+          const sp = ifcToRenderer(xy);
+          if (sp) pts.push(sp);
+        }
+        if (pts.length < 3) return null;
+        const polygon = pts.map((p) => `${p.x},${p.y}`).join(' ');
+        const cx = pts.reduce((s, p) => s + p.x, 0) / pts.length;
+        const cy = pts.reduce((s, p) => s + p.y, 0) / pts.length;
+        const region = autoSpacePreview!.regions[idx];
+        return (
+          <g key={`auto-${idx}`}>
+            <polygon
+              points={polygon}
+              fill={PRIMARY_LIGHT}
+              stroke={PRIMARY}
+              strokeWidth={1.5}
+              strokeDasharray="4,3"
+            />
+            {region && (
+              <Label x={cx} y={cy} text={`${region.area.toFixed(1)} m²`} />
+            )}
+          </g>
+        );
+      })}
+    </svg>
+  );
+}
+
+/* ------------------------------------------------------------------ */
+/* Per-type preview components                                         */
+/* ------------------------------------------------------------------ */
+
+function WallBeamPreview({
+  pending,
+  hover,
+  pendingWorld,
+  hoverWorld,
+  projection,
+}: {
+  pending: Pt[];
+  hover: Pt | null;
+  pendingWorld: AddElementVec3[];
+  hoverWorld: AddElementVec3 | null;
+  projection: Project;
+}) {
+  if (pending.length === 0 || !hover) return null;
+  const start = pending[0];
+  const startWorld = pendingWorld[0];
+  const length = hoverWorld ? worldDistance2D(startWorld, hoverWorld) : 0;
+  const mid = { x: (start.x + hover.x) / 2, y: (start.y + hover.y) / 2 };
+
+  // 3D ghost box — read the per-type params from the store so the
+  // outline matches the about-to-commit element's actual size.
+  const ghost = useViewerStore.getState();
+  const type = ghost.addElementType;
+  const thick = type === 'wall'
+    ? ghost.addElementWallParams.Thickness
+    : type === 'beam'
+      ? ghost.addElementBeamParams.Width
+      : ghost.addElementMemberParams.Width;
+  const height = type === 'wall'
+    ? ghost.addElementWallParams.Height
+    : type === 'beam'
+      ? ghost.addElementBeamParams.Height
+      : ghost.addElementMemberParams.Height;
+
+  let ghostOutline: string | null = null;
+  if (hoverWorld) {
+    const corners = linearBoxCorners(startWorld, hoverWorld, thick, height);
+    const projected = corners.map((c) => projection({ x: c[0], y: c[1], z: c[2] }));
+    if (projected.every((p): p is Pt => p !== null)) {
+      ghostOutline = projectedHullOutline(projected as Pt[]);
+    }
+  }
+
+  return (
+    <>
+      {ghostOutline && (
+        <polygon
+          points={ghostOutline}
+          fill={PRIMARY_LIGHT}
+          stroke={GHOST}
+          strokeWidth={1}
+          strokeDasharray="3,3"
+        />
+      )}
+      <line
+        x1={start.x}
+        y1={start.y}
+        x2={hover.x}
+        y2={hover.y}
+        stroke={PRIMARY}
+        strokeWidth={2}
+        strokeDasharray="6,4"
+        filter="url(#add-elem-glow)"
+      />
+      {length > 0.001 && <Label x={mid.x} y={mid.y} text={`${length.toFixed(2)} m`} />}
+    </>
+  );
+}
+
+/**
+ * Single-click ghost for column / door / window — projects the
+ * about-to-commit axis box at the cursor so the user sees where
+ * the leaf / cross-section actually lands before clicking.
+ */
+function SingleClickGhost({
+  type,
+  hoverWorld,
+  projection,
+}: {
+  type: 'column' | 'door' | 'window';
+  hoverWorld: AddElementVec3;
+  projection: Project;
+}) {
+  const state = useViewerStore.getState();
+  let sx: number, sy: number, sz: number;
+  if (type === 'column') {
+    const p = state.addElementColumnParams;
+    sx = p.Width; sy = p.Depth; sz = p.Height;
+  } else if (type === 'door') {
+    const p = state.addElementDoorParams;
+    sx = p.Width; sy = p.FrameThickness; sz = p.Height;
+  } else {
+    const p = state.addElementWindowParams;
+    sx = p.Width; sy = p.FrameThickness; sz = p.Height;
+  }
+  // Hover is in renderer-frame; project the axis-aligned box around it.
+  const hx = sx / 2;
+  const hz = sy / 2; // renderer Z
+  const cy = hoverWorld.y;
+  const cx = hoverWorld.x;
+  const cz = hoverWorld.z;
+  const corners: Array<[number, number, number]> = [
+    [cx - hx, cy,        cz - hz],
+    [cx + hx, cy,        cz - hz],
+    [cx + hx, cy,        cz + hz],
+    [cx - hx, cy,        cz + hz],
+    [cx - hx, cy + sz,   cz - hz],
+    [cx + hx, cy + sz,   cz - hz],
+    [cx + hx, cy + sz,   cz + hz],
+    [cx - hx, cy + sz,   cz + hz],
+  ];
+  const projected = corners.map((c) => projection({ x: c[0], y: c[1], z: c[2] }));
+  if (!projected.every((p): p is Pt => p !== null)) return null;
+  const outline = projectedHullOutline(projected as Pt[]);
+  return (
+    <polygon
+      points={outline}
+      fill={PRIMARY_LIGHT}
+      stroke={GHOST}
+      strokeWidth={1}
+      strokeDasharray="3,3"
+    />
+  );
+}
+
+/**
+ * Eight renderer-frame corners of a thickness-extruded segment
+ * (wall / beam / member). Bottom and top rings each track their
+ * endpoint's Y so a sloped beam previews as a sloped prism instead of
+ * being flattened to the start elevation.
+ */
+function linearBoxCorners(
+  startWorld: AddElementVec3,
+  endWorld: AddElementVec3,
+  thickness: number,
+  height: number,
+): Array<[number, number, number]> {
+  const dx = endWorld.x - startWorld.x;
+  const dz = endWorld.z - startWorld.z;
+  const len = Math.hypot(dx, dz);
+  if (len < 1e-6) return [];
+  const ax = dx / len, az = dz / len;
+  // Perpendicular in the ground plane (renderer X/Z, Y is up).
+  const nx = -az, nz = ax;
+  const half = thickness / 2;
+  const startBaseY = startWorld.y;
+  const endBaseY = endWorld.y;
+  const startTopY = startBaseY + height;
+  const endTopY = endBaseY + height;
+  return [
+    [startWorld.x + nx * half, startBaseY, startWorld.z + nz * half],
+    [endWorld.x   + nx * half, endBaseY,   endWorld.z   + nz * half],
+    [endWorld.x   - nx * half, endBaseY,   endWorld.z   - nz * half],
+    [startWorld.x - nx * half, startBaseY, startWorld.z - nz * half],
+    [startWorld.x + nx * half, startTopY,  startWorld.z + nz * half],
+    [endWorld.x   + nx * half, endTopY,    endWorld.z   + nz * half],
+    [endWorld.x   - nx * half, endTopY,    endWorld.z   - nz * half],
+    [startWorld.x - nx * half, startTopY,  startWorld.z - nz * half],
+  ];
+}
+
+/**
+ * 2D convex hull of projected screen points → SVG polygon string.
+ * The 8 box corners projected to screen don't always trace a clean
+ * outline edge-by-edge (back faces overlap), so we just render the
+ * silhouette envelope. Andrew's monotone-chain on (x, y).
+ */
+function projectedHullOutline(pts: Pt[]): string {
+  if (pts.length < 3) return pts.map((p) => `${p.x},${p.y}`).join(' ');
+  const sorted = [...pts].sort((a, b) => a.x === b.x ? a.y - b.y : a.x - b.x);
+  const cross = (o: Pt, a: Pt, b: Pt) => (a.x - o.x) * (b.y - o.y) - (a.y - o.y) * (b.x - o.x);
+  const lower: Pt[] = [];
+  for (const p of sorted) {
+    while (lower.length >= 2 && cross(lower[lower.length - 2], lower[lower.length - 1], p) <= 0) lower.pop();
+    lower.push(p);
+  }
+  const upper: Pt[] = [];
+  for (let i = sorted.length - 1; i >= 0; i--) {
+    const p = sorted[i];
+    while (upper.length >= 2 && cross(upper[upper.length - 2], upper[upper.length - 1], p) <= 0) upper.pop();
+    upper.push(p);
+  }
+  upper.pop();
+  lower.pop();
+  return [...lower, ...upper].map((p) => `${p.x},${p.y}`).join(' ');
+}
+
+function SlabRectanglePreview({
+  pending,
+  hover,
+  pendingWorld,
+  hoverWorld,
+  projection,
+}: {
+  pending: Pt[];
+  hover: Pt | null;
+  pendingWorld: AddElementVec3[];
+  hoverWorld: AddElementVec3 | null;
+  projection: Project;
+}) {
+  if (pending.length === 0 || !hover || !pendingWorld[0] || !hoverWorld) return null;
+  // Build the four world-space corners on the storey floor (renderer
+  // Y is the world up axis, so rectangle corners share Y with the
+  // first click — gives a flat axis-aligned outline regardless of the
+  // hover point's height).
+  const a = pendingWorld[0];
+  const b = hoverWorld;
+  const y = a.y;
+  const cornersWorld: AddElementVec3[] = [
+    { x: a.x, y, z: a.z },
+    { x: b.x, y, z: a.z },
+    { x: b.x, y, z: b.z },
+    { x: a.x, y, z: b.z },
+  ];
+  const cornersScreen = cornersWorld.map(projection).filter((p): p is Pt => p !== null);
+  if (cornersScreen.length !== 4) return null;
+  const points = cornersScreen.map((p) => `${p.x},${p.y}`).join(' ');
+
+  // Width and Depth in IFC X/Y (renderer X / -Z).
+  const width = Math.abs(b.x - a.x);
+  const depth = Math.abs(b.z - a.z); // renderer Z magnitude maps to IFC Y magnitude
+  const widthMid = midpoint(cornersScreen[0], cornersScreen[1]);
+  const depthMid = midpoint(cornersScreen[1], cornersScreen[2]);
+
+  return (
+    <>
+      <polygon points={points} fill={PRIMARY_LIGHT} stroke={PRIMARY} strokeWidth={2} strokeDasharray="6,4" />
+      {width > 0.001 && <Label x={widthMid.x} y={widthMid.y} text={`${width.toFixed(2)} m`} />}
+      {depth > 0.001 && <Label x={depthMid.x} y={depthMid.y} text={`${depth.toFixed(2)} m`} />}
+    </>
+  );
+}
+
+function SlabPolygonPreview({ pending, hover }: { pending: Pt[]; hover: Pt | null }) {
+  if (pending.length === 0) return null;
+  const liveEnd = hover ?? pending[pending.length - 1];
+  const path = pending.map((p) => `${p.x},${p.y}`).join(' ');
+
+  return (
+    <>
+      {/* Solid path through committed points. */}
+      <polyline
+        points={path}
+        fill="none"
+        stroke={PRIMARY}
+        strokeWidth={2}
+        filter="url(#add-elem-glow)"
+      />
+      {/* Pending edge from last committed point to cursor. */}
+      {hover && (
+        <line
+          x1={pending[pending.length - 1].x}
+          y1={pending[pending.length - 1].y}
+          x2={liveEnd.x}
+          y2={liveEnd.y}
+          stroke={PRIMARY}
+          strokeWidth={2}
+          strokeDasharray="6,4"
+        />
+      )}
+      {/* Closing-edge ghost when ≥ 3 points exist so the user previews how the polygon closes. */}
+      {pending.length >= 3 && hover && (
+        <line
+          x1={liveEnd.x}
+          y1={liveEnd.y}
+          x2={pending[0].x}
+          y2={pending[0].y}
+          stroke={GHOST}
+          strokeWidth={1.5}
+          strokeDasharray="3,4"
+        />
+      )}
+      {pending.length >= 3 && !hover && (
+        <line
+          x1={pending[pending.length - 1].x}
+          y1={pending[pending.length - 1].y}
+          x2={pending[0].x}
+          y2={pending[0].y}
+          stroke={GHOST}
+          strokeWidth={1.5}
+          strokeDasharray="3,4"
+        />
+      )}
+    </>
+  );
+}
+
+/* ------------------------------------------------------------------ */
+/* Helpers                                                             */
+/* ------------------------------------------------------------------ */
+
+function makeProjection(projectToScreen: Project | undefined): Project | null {
+  if (!projectToScreen) return null;
+  return projectToScreen;
+}
+
+function worldDistance2D(a: AddElementVec3, b: AddElementVec3): number {
+  // Renderer Y is the world up axis; the storey floor sits in the X/Z
+  // plane, so length is a 2D distance in renderer X/Z.
+  const dx = b.x - a.x;
+  const dz = b.z - a.z;
+  return Math.hypot(dx, dz);
+}
+
+function midpoint(a: Pt, b: Pt): Pt {
+  return { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 };
+}
+
+interface LabelProps {
+  x: number;
+  y: number;
+  text: string;
+}
+
+function Label({ x, y, text }: LabelProps) {
+  return (
+    <g pointerEvents="none">
+      <rect
+        x={x - text.length * 4 - 6}
+        y={y - 11}
+        width={text.length * 8 + 12}
+        height={16}
+        rx={3}
+        fill="rgba(15, 23, 42, 0.92)"
+      />
+      <text
+        x={x}
+        y={y}
+        fill="white"
+        fontSize="11"
+        fontFamily="ui-monospace,SFMono-Regular,Menlo,monospace"
+        textAnchor="middle"
+        dominantBaseline="middle"
+      >
+        {text}
+      </text>
+    </g>
+  );
+}

package/src/components/viewer/useDuplicateShortcut.ts

@@ -0,0 +1,77 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+/**
+ * Global ⌘D / Ctrl+D shortcut for duplicating the selected entity.
+ *
+ * Lives outside `useKeyboardControls` so the camera-movement loop
+ * stays focused on its job; the duplicate flow doesn't need
+ * keyState tracking or per-frame work, just a one-shot trigger.
+ *
+ * Mirrors the right-click menu's gating: only fires when there's a
+ * selection and the active model has a live mutation view.
+ */
+
+import { useEffect } from 'react';
+import { useViewerStore, resolveEntityRef } from '@/store';
+import { toast } from '@/components/ui/toast';
+
+export function useDuplicateShortcut() {
+  const duplicateEntity = useViewerStore((s) => s.duplicateEntity);
+  const getMutationView = useViewerStore((s) => s.getMutationView);
+  const setSelectedEntityId = useViewerStore((s) => s.setSelectedEntityId);
+
+  useEffect(() => {
+    const handler = (e: KeyboardEvent) => {
+      if (!(e.metaKey || e.ctrlKey)) return;
+      if (e.key !== 'd' && e.key !== 'D') return;
+
+      // Ignore when the user is typing somewhere — Ctrl+D in an
+      // input usually means "delete word forward" or browser-bookmark.
+      const target = e.target as HTMLElement | null;
+      if (
+        target?.tagName === 'INPUT' ||
+        target?.tagName === 'TEXTAREA' ||
+        target?.isContentEditable
+      ) {
+        return;
+      }
+
+      const state = useViewerStore.getState();
+      const selectedId = state.selectedEntityId;
+      if (selectedId === null) return;
+
+      const ref = resolveEntityRef(selectedId);
+      if (!ref) return;
+
+      // Suppress the browser's bookmark default for any duplicate
+      // shortcut we recognise — even when the model has no editable
+      // mutation view, otherwise Ctrl/⌘+D opens the bookmark dialog
+      // while we're "silently no-op'ing" below.
+      e.preventDefault();
+      e.stopPropagation();
+
+      // Match the menu's canEdit gating — silently no-op on
+      // native-metadata models.
+      const view = getMutationView(ref.modelId);
+      if (!view) return;
+
+      // ⌘D + Shift = +Z (up), ⌘D + Alt = +Y (north), default = +X (east).
+      // Power users can chain modifiers without leaving the keyboard;
+      // the menu's chip row covers everyone else.
+      const direction = e.shiftKey ? '+Z' : e.altKey ? '+Y' : '+X';
+
+      const result = duplicateEntity(ref.modelId, ref.expressId, direction);
+      if ('error' in result) {
+        toast.error(`Couldn't duplicate: ${result.error}`);
+      } else {
+        setSelectedEntityId(result.globalId);
+        toast.success(`Duplicated as #${result.expressId} (${direction}) — undo to remove`);
+      }
+    };
+
+    window.addEventListener('keydown', handler);
+    return () => window.removeEventListener('keydown', handler);
+  }, [duplicateEntity, getMutationView, setSelectedEntityId]);
+}

package/src/components/viewer/useMouseControls.ts

@@ -22,6 +22,7 @@ import type {
 import type { MeasurementConstraintEdge, OrthogonalAxis, Vec3 } from '@/store/types.js';
 import { getEntityCenter } from '../../utils/viewportUtils.js';
 import type { MouseHandlerContext } from './mouseHandlerTypes.js';
+import { useViewerStore } from '@/store';
 import {
   handleMeasureDown,
   handleMeasureDrag,
@@ -29,7 +30,7 @@ import {
   handleMeasureUp,
   updateMeasureScreenCoords,
 } from './measureHandlers.js';
-import { handleSelectionClick, handleContextMenu as handleContextMenuSelection } from './selectionHandlers.js';
+import { handleSelectionClick, handleContextMenu as handleContextMenuSelection, handleAddElementHover } from './selectionHandlers.js';
 
 export interface MouseState {
   isDragging: boolean;
@@ -368,6 +369,13 @@ export function useMouseControls(params: UseMouseControlsParams): void {
         if (handleMeasureHover(ctx, x, y)) return;
       }
 
+      // Add-element tool hover preview. Always runs (regardless of
+      // snap toggle) so the live edge/rectangle/polygon overlay can
+      // track the cursor; magnetic snap is layered on when enabled.
+      if (tool === 'addElement' && !mouseState.isDragging) {
+        if (handleAddElementHover(ctx, x, y)) return;
+      }
+
       // Handle orbit/pan for other tools (or measure tool with shift+drag or no active measurement)
       if (mouseState.isDragging && (tool !== 'measure' || !activeMeasurementRef.current)) {
         const dx = e.clientX - mouseState.lastX;