react-os-shell 2.4.0 → 2.5.0

package/dist/{chunk-CGSN2MCD.js → chunk-UFTJG6IM.js}

@@ -1,7 +1,7 @@
 import { ImageAnnotator_default } from './chunk-KUIPWCTJ.js';
 import { toast_default } from './chunk-WIJ45SYD.js';
-import { AboutApp } from './chunk-A7MAQOF3.js';
-import { WindowTitle, getActiveModalId } from './chunk-QAHF22KW.js';
+import { AboutApp } from './chunk-QQ3K3EMW.js';
+import { WindowTitle, registerModalEscapeInterceptor, getActiveModalId } from './chunk-TJ6N7SI5.js';
 import { createContext, useRef, useEffect, useState, useContext } from 'react';
 import { createPortal } from 'react-dom';
 import * as pdfjsLib from 'pdfjs-dist';
@@ -604,6 +604,61 @@ var DEFAULT_DXF_FONTS = [
   "https://cdn.jsdelivr.net/gh/vagran/dxf-viewer-example-src@master/src/assets/fonts/NotoSansDisplay-SemiCondensedLightItalic.ttf",
   "https://cdn.jsdelivr.net/gh/vagran/dxf-viewer-example-src@master/src/assets/fonts/NanumGothic-Regular.ttf"
 ];
+var DXF_EDIT_COMMANDS = {
+  l: "LINE",
+  line: "LINE",
+  pl: "PLINE",
+  pline: "PLINE",
+  ex: "EXTEND",
+  extend: "EXTEND",
+  tr: "TRIM",
+  trim: "TRIM",
+  e: "ERASE",
+  erase: "ERASE",
+  m: "MOVE",
+  move: "MOVE",
+  co: "COPY",
+  cp: "COPY",
+  copy: "COPY",
+  o: "OFFSET",
+  offset: "OFFSET",
+  f: "FILLET",
+  fillet: "FILLET",
+  cha: "CHAMFER",
+  chamfer: "CHAMFER",
+  x: "EXPLODE",
+  explode: "EXPLODE",
+  mi: "MIRROR",
+  mirror: "MIRROR",
+  ro: "ROTATE",
+  rotate: "ROTATE",
+  sc: "SCALE",
+  scale: "SCALE",
+  s: "STRETCH",
+  stretch: "STRETCH",
+  ar: "ARRAY",
+  array: "ARRAY",
+  rec: "RECTANG",
+  rectang: "RECTANG",
+  rectangle: "RECTANG",
+  c: "CIRCLE",
+  circle: "CIRCLE",
+  a: "ARC",
+  arc: "ARC",
+  el: "ELLIPSE",
+  ellipse: "ELLIPSE",
+  t: "MTEXT",
+  mt: "MTEXT",
+  mtext: "MTEXT",
+  text: "TEXT",
+  b: "BLOCK",
+  block: "BLOCK",
+  i: "INSERT",
+  insert: "INSERT",
+  ha: "HATCH",
+  hatch: "HATCH"
+};
+var DXF_CMD_HELP = "Commands: DI distance \xB7 DIM/DLI linear dim \xB7 H / V force axis \xB7 <number> lock \u0394 \xB7 U undo pick \xB7 Z fit \xB7 LA layers \xB7 Esc exit";
 function DxfPanel({ url, filename, onDownload, onEmail }) {
   const containerRef = useRef(null);
   const viewerRef = useRef(null);
@@ -613,8 +668,9 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
   const [showLayers, setShowLayers] = useState(false);
   const [showHint, setShowHint] = useState(true);
   const [measureEnabled, setMeasureEnabled] = useState(false);
-  const [measureMode, setMeasureMode] = useState("horizontal");
+  const [measureMode, setMeasureMode] = useState("auto");
   const [measureDistance, setMeasureDistance] = useState(null);
+  const [measureResolved, setMeasureResolved] = useState(null);
   const [measureFixedDist, setMeasureFixedDist] = useState(null);
   const [measureFixedInput, setMeasureFixedInput] = useState("");
   const measureModeRef = useRef(measureMode);
@@ -626,6 +682,13 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
     measureFixedDistRef.current = measureFixedDist;
   }, [measureFixedDist]);
   const measureRedrawRef = useRef(null);
+  const measureResetRef = useRef(null);
+  const measureUndoRef = useRef(null);
+  const [cmdValue, setCmdValue] = useState("");
+  const [cmdEcho, setCmdEcho] = useState(null);
+  const lastCmdRef = useRef("");
+  const cmdInputRef = useRef(null);
+  const rootRef = useRef(null);
   const measureRef = useRef(null);
   useEffect(() => {
     let cancelled = false;
@@ -729,6 +792,7 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
     const t = setTimeout(() => setShowHint(false), 5e3);
     return () => clearTimeout(t);
   }, [showHint, loading]);
+  const layersKey = layers.map((l) => l.visible ? "1" : "0").join("");
   useEffect(() => {
     const v = viewerRef.current;
     if (loading || error || !v) return;
@@ -745,6 +809,7 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
     if (!measureEnabled) {
       teardown();
       setMeasureDistance(null);
+      setMeasureResolved(null);
       return;
     }
     const overlay = document.createElement("div");
@@ -768,13 +833,18 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
     defs.appendChild(marker);
     svg.appendChild(defs);
     overlay.appendChild(svg);
-    const refLineEl = document.createElementNS("http://www.w3.org/2000/svg", "line");
-    refLineEl.setAttribute("stroke", "#ff8800");
-    refLineEl.setAttribute("stroke-width", "1");
-    refLineEl.setAttribute("stroke-dasharray", "6,4");
-    refLineEl.setAttribute("opacity", "0.55");
-    refLineEl.style.display = "none";
-    svg.appendChild(refLineEl);
+    const mkRefLine = () => {
+      const el = document.createElementNS("http://www.w3.org/2000/svg", "line");
+      el.setAttribute("stroke", "#ff8800");
+      el.setAttribute("stroke-width", "1");
+      el.setAttribute("stroke-dasharray", "6,4");
+      el.setAttribute("opacity", "0.55");
+      el.style.display = "none";
+      svg.appendChild(el);
+      return el;
+    };
+    const refLineEl = mkRefLine();
+    const refLineVEl = mkRefLine();
     const extLineA = document.createElementNS("http://www.w3.org/2000/svg", "line");
     extLineA.setAttribute("stroke", "#ff8800");
     extLineA.setAttribute("stroke-width", "1");
@@ -850,10 +920,44 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       poly.setAttribute("stroke-linejoin", "round");
       g.appendChild(poly);
     });
+    const snapGlyphMidpoint = mkSnapGlyph((g) => {
+      const poly = document.createElementNS(SVGNS, "polygon");
+      poly.setAttribute("points", "11,3 19,18 3,18");
+      poly.setAttribute("fill", "rgba(255,255,255,0.9)");
+      poly.setAttribute("stroke", "#ff8800");
+      poly.setAttribute("stroke-width", "1.8");
+      poly.setAttribute("stroke-linejoin", "round");
+      g.appendChild(poly);
+    });
+    const snapGlyphNode = mkSnapGlyph((g) => {
+      const c = document.createElementNS(SVGNS, "circle");
+      c.setAttribute("cx", "11");
+      c.setAttribute("cy", "11");
+      c.setAttribute("r", "7");
+      c.setAttribute("fill", "rgba(255,255,255,0.9)");
+      c.setAttribute("stroke", "#ff8800");
+      c.setAttribute("stroke-width", "1.8");
+      g.appendChild(c);
+      const mkLn = (x1, y1, x2, y2) => {
+        const ln = document.createElementNS(SVGNS, "line");
+        ln.setAttribute("x1", String(x1));
+        ln.setAttribute("y1", String(y1));
+        ln.setAttribute("x2", String(x2));
+        ln.setAttribute("y2", String(y2));
+        ln.setAttribute("stroke", "#ff8800");
+        ln.setAttribute("stroke-width", "1.6");
+        ln.setAttribute("stroke-linecap", "round");
+        return ln;
+      };
+      g.appendChild(mkLn(6.5, 6.5, 15.5, 15.5));
+      g.appendChild(mkLn(15.5, 6.5, 6.5, 15.5));
+    });
     const setSnapGlyph = (type) => {
       snapGlyphEndpoint.style.display = type === "endpoint" ? "" : "none";
       snapGlyphIntersection.style.display = type === "intersection" ? "" : "none";
       snapGlyphLine.style.display = type === "line" ? "" : "none";
+      snapGlyphMidpoint.style.display = type === "midpoint" ? "" : "none";
+      snapGlyphNode.style.display = type === "node" ? "" : "none";
     };
     overlay.appendChild(snapEl);
     measureRef.current = {
@@ -865,12 +969,14 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       fixedLine: fixedLineEl,
       fixedLabel: null,
       refLine: refLineEl,
+      refLineV: refLineVEl,
       extLineA,
       extLineB,
       markers: [],
       label: null,
       snap: snapEl,
-      segments: []
+      segs: null,
+      nodes: null
     };
     let THREE = null;
     let ready = false;
@@ -880,28 +986,82 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       const w = canvas.clientWidth, h = canvas.clientHeight;
       return { x: (v3.x + 1) / 2 * w, y: (-v3.y + 1) / 2 * h };
     };
+    const MAX_SNAP_SEGS = 4e5;
     (async () => {
       try {
         THREE = await import(
           /* @vite-ignore */
           'three'
         );
-        const segs = measureRef.current?.segments;
-        if (!segs) return;
-        const va = new THREE.Vector3(), vb = new THREE.Vector3();
-        scene.traverse((obj) => {
-          if (!obj?.isLineSegments) return;
-          const pos = obj.geometry?.attributes?.position;
+        const st = measureRef.current;
+        if (!st) return;
+        const segXY = [];
+        const nodeXY = [];
+        let truncated = false;
+        const instanceXforms = (g) => {
+          const t0 = g?.attributes?.instanceTransform0;
+          const t1 = g?.attributes?.instanceTransform1;
+          if (t0 && t1) {
+            const out = [];
+            const n = Math.min(t0.count, t1.count);
+            for (let k = 0; k < n; k++) {
+              out.push([t0.getX(k), t0.getY(k), t0.getZ(k), t1.getX(k), t1.getY(k), t1.getZ(k)]);
+            }
+            return out;
+          }
+          const tp = g?.attributes?.instanceTransform;
+          if (tp) {
+            const out = [];
+            for (let k = 0; k < tp.count; k++) out.push([1, 0, tp.getX(k), 0, 1, tp.getY(k)]);
+            return out;
+          }
+          return [[1, 0, 0, 0, 1, 0]];
+        };
+        const visit = (obj) => {
+          const isSeg = !!obj?.isLineSegments;
+          const isPts = !!obj?.isPoints;
+          if (!isSeg && !isPts) return;
+          const g = obj.geometry;
+          const pos = g?.attributes?.position;
           if (!pos) return;
-          const arr = pos.array;
-          obj.updateMatrixWorld?.();
-          const m = obj.matrixWorld;
-          for (let i = 0; i < arr.length; i += 6) {
-            va.set(arr[i], arr[i + 1], arr[i + 2]).applyMatrix4(m);
-            vb.set(arr[i + 3], arr[i + 4], arr[i + 5]).applyMatrix4(m);
-            segs.push({ ax: va.x, ay: va.y, bx: vb.x, by: vb.y });
+          const xfs = instanceXforms(g);
+          if (isSeg) {
+            const idx = g.index;
+            const pairCount = Math.floor((idx ? idx.count : pos.count) / 2);
+            for (let p = 0; p < pairCount; p++) {
+              const ia = idx ? idx.getX(2 * p) : 2 * p;
+              const ib = idx ? idx.getX(2 * p + 1) : 2 * p + 1;
+              const ax = pos.getX(ia), ay = pos.getY(ia);
+              const bx = pos.getX(ib), by = pos.getY(ib);
+              if (!Number.isFinite(ax + ay + bx + by)) continue;
+              for (const m of xfs) {
+                if (segXY.length >= MAX_SNAP_SEGS * 4) {
+                  truncated = true;
+                  return;
+                }
+                const tax = m[0] * ax + m[1] * ay + m[2], tay = m[3] * ax + m[4] * ay + m[5];
+                const tbx = m[0] * bx + m[1] * by + m[2], tby = m[3] * bx + m[4] * by + m[5];
+                if (tax === tbx && tay === tby) continue;
+                segXY.push(tax, tay, tbx, tby);
+              }
+            }
+          } else {
+            for (let i = 0; i < pos.count; i++) {
+              const x = pos.getX(i), y = pos.getY(i);
+              if (!Number.isFinite(x + y)) continue;
+              for (const m of xfs) {
+                nodeXY.push(m[0] * x + m[1] * y + m[2], m[3] * x + m[4] * y + m[5]);
+              }
+            }
           }
-        });
+        };
+        if (typeof scene.traverseVisible === "function") scene.traverseVisible(visit);
+        else scene.traverse(visit);
+        st.segs = new Float64Array(segXY);
+        st.nodes = new Float64Array(nodeXY);
+        if (truncated) {
+          console.warn(`[Preview] DXF snap cache truncated at ${MAX_SNAP_SEGS} segments \u2014 snapping may miss some geometry.`);
+        }
         ready = true;
       } catch {
       }
@@ -918,54 +1078,92 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
     };
     const findSnap = (cx, cy) => {
       const s = measureRef.current;
-      if (!s || !ready) return null;
-      let best = null;
-      let bestD2 = SNAP_PX * SNAP_PX;
-      const candidateD2 = SNAP_PX * SNAP_PX;
+      if (!s || !ready || !s.segs) return null;
+      const o = pxFromScene(0, 0);
+      const ex = pxFromScene(1, 0);
+      const ey = pxFromScene(0, 1);
+      const mxx = ex.x - o.x, mxy = ex.y - o.y;
+      const myx = ey.x - o.x, myy = ey.y - o.y;
+      const det = mxx * myy - myx * mxy;
+      if (!det) return null;
+      const csx = ((cx - o.x) * myy - (cy - o.y) * myx) / det;
+      const csy = ((cy - o.y) * mxx - (cx - o.x) * mxy) / det;
+      const rx = SNAP_PX / (Math.hypot(mxx, mxy) || 1);
+      const ry = SNAP_PX / (Math.hypot(myx, myy) || 1);
+      const minX = csx - rx, maxX = csx + rx, minY = csy - ry, maxY = csy + ry;
+      const T2 = SNAP_PX * SNAP_PX;
+      let bestPt = null, dPt = T2;
+      let bestMid = null, dMid = T2;
+      let bestLine = null, dLine = T2;
+      let bestX = null, dX = T2;
       const cand = [];
-      for (const seg of s.segments) {
-        const ap = pxFromScene(seg.ax, seg.ay);
-        const bp = pxFromScene(seg.bx, seg.by);
-        const apx = ap.x, apy = ap.y, bpx = bp.x, bpy = bp.y;
-        const rejectX = apx < cx - SNAP_PX && bpx < cx - SNAP_PX || apx > cx + SNAP_PX && bpx > cx + SNAP_PX;
-        const rejectY = apy < cy - SNAP_PX && bpy < cy - SNAP_PX || apy > cy + SNAP_PX && bpy > cy + SNAP_PX;
-        if (rejectX || rejectY) continue;
-        const ldx = seg.bx - seg.ax, ldy = seg.by - seg.ay;
-        const llen = Math.sqrt(ldx * ldx + ldy * ldy) || 1;
-        const segDir = { dx: ldx / llen, dy: ldy / llen };
+      const segs = s.segs;
+      for (let i = 0; i < segs.length; i += 4) {
+        const ax = segs[i], ay = segs[i + 1], bx = segs[i + 2], by = segs[i + 3];
+        if (ax < minX && bx < minX || ax > maxX && bx > maxX || ay < minY && by < minY || ay > maxY && by > maxY) continue;
+        const apx = o.x + mxx * ax + myx * ay, apy = o.y + mxy * ax + myy * ay;
+        const bpx = o.x + mxx * bx + myx * by, bpy = o.y + mxy * bx + myy * by;
+        let near = false;
         let dx = cx - apx, dy = cy - apy;
-        const dEpA2 = dx * dx + dy * dy;
-        if (dEpA2 < bestD2) {
-          best = { sx: seg.ax, sy: seg.ay, type: "endpoint", dir: segDir };
-          bestD2 = dEpA2;
+        let d2 = dx * dx + dy * dy;
+        if (d2 < T2) {
+          near = true;
+          if (d2 < dPt) {
+            dPt = d2;
+            bestPt = { sx: ax, sy: ay, type: "endpoint" };
+          }
         }
         dx = cx - bpx;
         dy = cy - bpy;
-        const dEpB2 = dx * dx + dy * dy;
-        if (dEpB2 < bestD2) {
-          best = { sx: seg.bx, sy: seg.by, type: "endpoint", dir: segDir };
-          bestD2 = dEpB2;
+        d2 = dx * dx + dy * dy;
+        if (d2 < T2) {
+          near = true;
+          if (d2 < dPt) {
+            dPt = d2;
+            bestPt = { sx: bx, sy: by, type: "endpoint" };
+          }
+        }
+        dx = cx - (apx + bpx) / 2;
+        dy = cy - (apy + bpy) / 2;
+        d2 = dx * dx + dy * dy;
+        if (d2 < T2) {
+          near = true;
+          if (d2 < dMid) {
+            dMid = d2;
+            bestMid = { sx: (ax + bx) / 2, sy: (ay + by) / 2, type: "midpoint" };
+          }
         }
         const sdx = bpx - apx, sdy = bpy - apy;
         const len2 = sdx * sdx + sdy * sdy;
-        let dLine2 = Infinity;
         if (len2 > 0) {
           const t = ((cx - apx) * sdx + (cy - apy) * sdy) / len2;
           if (t > 0 && t < 1) {
-            const px = apx + t * sdx, py = apy + t * sdy;
-            dx = cx - px;
-            dy = cy - py;
-            dLine2 = dx * dx + dy * dy;
-            if (dLine2 < bestD2) {
-              const sx = seg.ax + t * (seg.bx - seg.ax);
-              const sy = seg.ay + t * (seg.by - seg.ay);
-              best = { sx, sy, type: "line", dir: segDir };
-              bestD2 = dLine2;
+            dx = cx - (apx + t * sdx);
+            dy = cy - (apy + t * sdy);
+            d2 = dx * dx + dy * dy;
+            if (d2 < T2) {
+              near = true;
+              if (d2 < dLine) {
+                dLine = d2;
+                bestLine = { sx: ax + t * (bx - ax), sy: ay + t * (by - ay), type: "line" };
+              }
             }
           }
         }
-        if (dEpA2 < candidateD2 || dEpB2 < candidateD2 || dLine2 < candidateD2) {
-          cand.push({ seg, apx, apy, bpx, bpy });
+        if (near) cand.push({ ax, ay, bx, by, apx, apy, bpx, bpy });
+      }
+      const nodes = s.nodes;
+      if (nodes) {
+        for (let i = 0; i < nodes.length; i += 2) {
+          const x = nodes[i], y = nodes[i + 1];
+          if (x < minX || x > maxX || y < minY || y > maxY) continue;
+          const dx = cx - (o.x + mxx * x + myx * y);
+          const dy = cy - (o.y + mxy * x + myy * y);
+          const d2 = dx * dx + dy * dy;
+          if (d2 < dPt) {
+            dPt = d2;
+            bestPt = { sx: x, sy: y, type: "node" };
+          }
         }
       }
       for (let i = 0; i < cand.length; i++) {
@@ -976,16 +1174,13 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
           if (!ix) continue;
           const dx = cx - ix.px, dy = cy - ix.py;
           const d2 = dx * dx + dy * dy;
-          if (d2 >= SNAP_PX * SNAP_PX) continue;
-          if (!best || best.type !== "intersection" || d2 < bestD2) {
-            const sx = A.seg.ax + ix.t * (A.seg.bx - A.seg.ax);
-            const sy = A.seg.ay + ix.t * (A.seg.by - A.seg.ay);
-            best = { sx, sy, type: "intersection" };
-            bestD2 = d2;
-          }
+          if (d2 >= T2 || d2 >= dX) continue;
+          dX = d2;
+          bestX = { sx: A.ax + ix.t * (A.bx - A.ax), sy: A.ay + ix.t * (A.by - A.ay), type: "intersection" };
         }
       }
-      return best;
+      const top = bestX && bestPt ? dX < dPt - 1 ? bestX : bestPt : bestX ?? bestPt;
+      return top ?? bestMid ?? bestLine;
     };
     const makeMarker = () => {
       const el = document.createElement("div");
@@ -1026,16 +1221,23 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
         s.picks[1] = { x: raw.x, y: raw.y };
       }
     };
+    const resolveMode = (a, b) => {
+      const mode = measureModeRef.current;
+      if (mode !== "auto") return mode;
+      if (!a || !b) return "horizontal";
+      return Math.abs(b.x - a.x) >= Math.abs(b.y - a.y) ? "horizontal" : "vertical";
+    };
     const computeMainDimEnds = () => {
       const s = measureRef.current;
       const a = s.picks[0];
       const b = s.picks[1];
-      const mode = measureModeRef.current;
+      const mode = resolveMode(a, b);
+      const rawMode = measureModeRef.current;
       const fixed = measureFixedDistRef.current;
-      if (fixed !== null && Number.isFinite(fixed) && mode === "horizontal") {
+      if (fixed !== null && Number.isFinite(fixed) && rawMode === "horizontal") {
         return { from: { x: b.x, y: a.y }, to: { x: b.x, y: b.y } };
       }
-      if (fixed !== null && Number.isFinite(fixed) && mode === "vertical") {
+      if (fixed !== null && Number.isFinite(fixed) && rawMode === "vertical") {
         return { from: { x: a.x, y: b.y }, to: { x: b.x, y: b.y } };
       }
       if (mode === "horizontal") return { from: a, to: { x: b.x, y: a.y } };
@@ -1046,36 +1248,49 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       const s = measureRef.current;
       if (!s) return;
       reconcileLockedPick();
-      const mode = measureModeRef.current;
+      const rawMode = measureModeRef.current;
       const fixed = measureFixedDistRef.current;
-      const fixedActive = fixed !== null && Number.isFinite(fixed) && (mode === "horizontal" || mode === "vertical");
+      const fixedActive = fixed !== null && Number.isFinite(fixed) && (rawMode === "horizontal" || rawMode === "vertical");
       if (s.markers[0]) positionMarker(s.markers[0], s.picks[0].x, s.picks[0].y);
       if (s.markers[1]) positionMarker(s.markers[1], s.picks[1].x, s.picks[1].y);
-      const refDir = mode === "horizontal" ? { dx: 1, dy: 0 } : mode === "vertical" ? { dx: 0, dy: 1 } : null;
-      if (refDir && s.picks.length >= 1 && s.refLine) {
+      const drawRefLine = (el, dir, visible) => {
+        if (!el) return;
+        if (!visible || s.picks.length < 1) {
+          el.style.display = "none";
+          return;
+        }
         const a = s.picks[0];
         const w = canvas.clientWidth, h = canvas.clientHeight;
         const screenSpan = Math.hypot(w, h) * 4;
         const ap = pxFromScene(a.x, a.y);
-        const probe = pxFromScene(a.x + refDir.dx, a.y + refDir.dy);
+        const probe = pxFromScene(a.x + dir.dx, a.y + dir.dy);
         const pxLen = Math.hypot(probe.x - ap.x, probe.y - ap.y) || 1;
         const sceneStep = screenSpan / pxLen;
-        const x0 = a.x - refDir.dx * sceneStep;
-        const y0 = a.y - refDir.dy * sceneStep;
-        const x1 = a.x + refDir.dx * sceneStep;
-        const y1 = a.y + refDir.dy * sceneStep;
-        const p0 = pxFromScene(x0, y0);
-        const p1 = pxFromScene(x1, y1);
-        s.refLine.setAttribute("x1", String(p0.x));
-        s.refLine.setAttribute("y1", String(p0.y));
-        s.refLine.setAttribute("x2", String(p1.x));
-        s.refLine.setAttribute("y2", String(p1.y));
-        s.refLine.style.display = "";
-      } else if (s.refLine) {
-        s.refLine.style.display = "none";
+        const p0 = pxFromScene(a.x - dir.dx * sceneStep, a.y - dir.dy * sceneStep);
+        const p1 = pxFromScene(a.x + dir.dx * sceneStep, a.y + dir.dy * sceneStep);
+        el.setAttribute("x1", String(p0.x));
+        el.setAttribute("y1", String(p0.y));
+        el.setAttribute("x2", String(p1.x));
+        el.setAttribute("y2", String(p1.y));
+        el.style.display = "";
+      };
+      let showH = rawMode === "horizontal";
+      let showV = rawMode === "vertical";
+      if (rawMode === "auto") {
+        if (s.picks.length >= 2) {
+          const r = resolveMode(s.picks[0], s.picks[1]);
+          showH = r === "horizontal";
+          showV = r === "vertical";
+        } else {
+          showH = true;
+          showV = true;
+        }
       }
+      drawRefLine(s.refLine, { dx: 1, dy: 0 }, showH);
+      drawRefLine(s.refLineV, { dx: 0, dy: 1 }, showV);
       if (s.picks.length === 2) {
         const a = s.picks[0], b = s.picks[1];
+        const mode = resolveMode(a, b);
         const ends = computeMainDimEnds();
         const fp = pxFromScene(ends.from.x, ends.from.y);
         const tp = pxFromScene(ends.to.x, ends.to.y);
@@ -1212,28 +1427,46 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       if (!s || s.picks.length !== 2) return;
       reconcileLockedPick();
       const a = s.picks[0], b = s.picks[1];
-      const mode = measureModeRef.current;
+      const rawMode = measureModeRef.current;
+      const mode = resolveMode(a, b);
       const fixed = measureFixedDistRef.current;
-      const fixedActive = fixed !== null && Number.isFinite(fixed) && (mode === "horizontal" || mode === "vertical");
+      const fixedActive = fixed !== null && Number.isFinite(fixed) && (rawMode === "horizontal" || rawMode === "vertical");
       let dist;
       let suffix = "";
-      if (fixedActive && mode === "horizontal") {
-        dist = Math.abs(b.y - a.y);
+      let echo;
+      let shown = mode;
+      const adx = Math.abs(b.x - a.x), ady = Math.abs(b.y - a.y);
+      if (fixedActive && rawMode === "horizontal") {
+        dist = ady;
         suffix = " \u2195";
-      } else if (fixedActive && mode === "vertical") {
-        dist = Math.abs(b.x - a.x);
+        shown = "vertical";
+        echo = `\u0394Y = ${formatMeasureDistance(ady)} with \u0394X locked to ${formatMeasureDistance(Math.abs(fixed))}`;
+      } else if (fixedActive && rawMode === "vertical") {
+        dist = adx;
         suffix = " \u2194";
+        shown = "horizontal";
+        echo = `\u0394X = ${formatMeasureDistance(adx)} with \u0394Y locked to ${formatMeasureDistance(Math.abs(fixed))}`;
       } else if (mode === "horizontal") {
-        dist = Math.abs(b.x - a.x);
+        dist = adx;
         suffix = " \u2194";
+        echo = `Linear dimension = ${formatMeasureDistance(adx)} (\u0394X)`;
       } else if (mode === "vertical") {
-        dist = Math.abs(b.y - a.y);
+        dist = ady;
         suffix = " \u2195";
+        echo = `Linear dimension = ${formatMeasureDistance(ady)} (\u0394Y)`;
       } else {
-        const dx = b.x - a.x, dy = b.y - a.y;
-        dist = Math.sqrt(dx * dx + dy * dy);
+        dist = Math.hypot(b.x - a.x, b.y - a.y);
+        echo = `Distance = ${formatMeasureDistance(dist)}   \u0394X = ${formatMeasureDistance(adx)}   \u0394Y = ${formatMeasureDistance(ady)}`;
+      }
+      if (!Number.isFinite(dist)) {
+        setMeasureDistance(null);
+        setMeasureResolved(null);
+        if (s.label) s.label.style.opacity = "0";
+        return;
       }
       setMeasureDistance(dist);
+      setMeasureResolved(shown);
+      setCmdEcho(echo);
       const label = ensureLabel();
       label.style.opacity = "1";
       label.textContent = `${formatMeasureDistance(dist)}${suffix}`;
@@ -1242,23 +1475,42 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       recomputeLabel();
       updateOverlay();
     };
+    const hideDimVisuals = (s) => {
+      s.line.style.display = "none";
+      if (s.fixedLine) s.fixedLine.style.display = "none";
+      if (s.fixedLabel) s.fixedLabel.style.display = "none";
+      if (s.extLineA) s.extLineA.style.display = "none";
+      if (s.extLineB) s.extLineB.style.display = "none";
+      if (s.label) s.label.style.opacity = "0";
+      setMeasureDistance(null);
+      setMeasureResolved(null);
+    };
+    const resetPicks = () => {
+      const s = measureRef.current;
+      if (!s) return;
+      for (const m of s.markers) m.parentElement?.removeChild(m);
+      s.markers = [];
+      s.picks = [];
+      s.rawSecondClick = null;
+      if (s.refLine) s.refLine.style.display = "none";
+      if (s.refLineV) s.refLineV.style.display = "none";
+      hideDimVisuals(s);
+    };
+    measureResetRef.current = resetPicks;
+    measureUndoRef.current = () => {
+      const s = measureRef.current;
+      if (!s || s.picks.length === 0) return;
+      s.picks.pop();
+      const m = s.markers.pop();
+      m?.parentElement?.removeChild(m);
+      s.rawSecondClick = null;
+      hideDimVisuals(s);
+      updateOverlay();
+    };
     const doPick = (p) => {
       const s = measureRef.current;
       if (!s) return;
-      if (s.picks.length === 2) {
-        for (const m of s.markers) m.parentElement?.removeChild(m);
-        s.markers = [];
-        s.picks = [];
-        s.rawSecondClick = null;
-        s.line.style.display = "none";
-        if (s.fixedLine) s.fixedLine.style.display = "none";
-        if (s.fixedLabel) s.fixedLabel.style.display = "none";
-        if (s.refLine) s.refLine.style.display = "none";
-        if (s.extLineA) s.extLineA.style.display = "none";
-        if (s.extLineB) s.extLineB.style.display = "none";
-        if (s.label) s.label.style.opacity = "0";
-        setMeasureDistance(null);
-      }
+      if (s.picks.length === 2) resetPicks();
       if (s.picks.length === 0) {
         s.picks.push({ x: p.x, y: p.y });
         s.markers.push(makeMarker());
@@ -1305,10 +1557,13 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
       canvas.removeEventListener("pointermove", handlePointerMove);
       window.removeEventListener("keydown", onKeyDown);
       measureRedrawRef.current = null;
+      measureResetRef.current = null;
+      measureUndoRef.current = null;
       teardown();
       setMeasureDistance(null);
+      setMeasureResolved(null);
     };
-  }, [measureEnabled, loading, error]);
+  }, [measureEnabled, loading, error, layersKey]);
   useEffect(() => {
     measureRedrawRef.current?.();
   }, [measureMode, measureFixedDist]);
@@ -1358,12 +1613,170 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
     } catch {
     }
   };
+  const runCommand = (raw) => {
+    const exec = raw.trim() || lastCmdRef.current;
+    setCmdValue("");
+    if (!exec) return;
+    const cmd = exec.toLowerCase().split(/\s+/)[0];
+    const remember = () => {
+      lastCmdRef.current = exec;
+    };
+    const startMeasure = (mode, echo) => {
+      setMeasureEnabled(true);
+      setMeasureMode(mode);
+      measureResetRef.current?.();
+      setCmdEcho(echo);
+      remember();
+    };
+    if (/^-?(\d+\.?\d*|\.\d+)$/.test(cmd)) {
+      if (measureEnabled && (measureMode === "horizontal" || measureMode === "vertical")) {
+        const n = parseFloat(cmd);
+        if (n) {
+          setMeasureFixedInput(cmd);
+          setMeasureFixedDist(n);
+          setCmdEcho(`\u0394${measureMode === "horizontal" ? "X" : "Y"} locked to ${formatMeasureDistance(Math.abs(n))} \u2014 the label shows the perpendicular distance`);
+        } else {
+          setMeasureFixedInput("");
+          setMeasureFixedDist(null);
+          setCmdEcho("Fixed distance cleared.");
+        }
+      } else {
+        setCmdEcho("Fixed distances apply in H or V mode \u2014 type H or V first.");
+      }
+      return;
+    }
+    switch (cmd) {
+      case "di":
+      case "dist":
+      case "mea":
+      case "measuregeom":
+        startMeasure("point", "DIST \u2014 click two points; straight-line distance (Esc to exit)");
+        break;
+      case "dim":
+      case "dli":
+      case "dimlin":
+      case "dimlinear":
+        startMeasure("auto", "DIMLINEAR \u2014 click two points; measures \u0394X or \u0394Y, whichever is larger (H / V to force)");
+        break;
+      // H / V / AUTO switch the axis without dropping existing picks —
+      // same as clicking the pill.
+      case "h":
+      case "hor":
+      case "horizontal":
+        setMeasureEnabled(true);
+        setMeasureMode("horizontal");
+        setCmdEcho("Horizontal \u2014 \u0394X between the two picks");
+        remember();
+        break;
+      case "v":
+      case "ver":
+      case "vertical":
+        setMeasureEnabled(true);
+        setMeasureMode("vertical");
+        setCmdEcho("Vertical \u2014 \u0394Y between the two picks");
+        remember();
+        break;
+      case "au":
+      case "auto":
+        setMeasureEnabled(true);
+        setMeasureMode("auto");
+        setCmdEcho("Auto (DIMLINEAR) \u2014 measures along the dominant axis of the two picks");
+        remember();
+        break;
+      case "measure":
+        setMeasureEnabled(!measureEnabled);
+        setCmdEcho(measureEnabled ? "Measure off." : "Measure on \u2014 click two points.");
+        remember();
+        break;
+      case "u":
+      case "undo":
+        measureUndoRef.current?.();
+        setCmdEcho("Last pick removed.");
+        remember();
+        break;
+      case "z":
+      case "ze":
+      case "zoom":
+      case "fit":
+      case "zoomextents":
+        handleResetView();
+        setCmdEcho("Zoom extents.");
+        remember();
+        break;
+      case "la":
+      case "layer":
+      case "layers":
+        setShowLayers((s) => !s);
+        setCmdEcho("Layer panel toggled.");
+        remember();
+        break;
+      case "off":
+      case "clear":
+        setMeasureFixedDist(null);
+        setMeasureFixedInput("");
+        measureResetRef.current?.();
+        setCmdEcho("Measurement cleared.");
+        remember();
+        break;
+      case "?":
+      case "help":
+        setCmdEcho(DXF_CMD_HELP);
+        break;
+      default: {
+        const editCmd = DXF_EDIT_COMMANDS[cmd];
+        if (editCmd) setCmdEcho(`${editCmd} is a drawing command \u2014 Preview is a read-only viewer. Measuring: DI, DIM, H, V (? for help)`);
+        else setCmdEcho(`Unknown command "${cmd.toUpperCase()}" \u2014 try DI, DIM, H, V, Z, LA (? for help)`);
+      }
+    }
+  };
+  useEffect(() => {
+    const onKey = (e) => {
+      if (e.defaultPrevented || e.metaKey || e.ctrlKey || e.altKey) return;
+      if (e.key.length !== 1 || e.key === " ") return;
+      const t = e.target;
+      if (t && (t.tagName === "INPUT" || t.tagName === "TEXTAREA" || t.isContentEditable)) return;
+      const root = rootRef.current;
+      if (!root) return;
+      const myModal = root.closest("[data-modal-id]");
+      if (myModal && getActiveModalId() !== myModal.dataset.modalId) return;
+      cmdInputRef.current?.focus();
+    };
+    window.addEventListener("keydown", onKey);
+    return () => window.removeEventListener("keydown", onKey);
+  }, []);
+  const cmdValueRef = useRef(cmdValue);
+  const measureEnabledRef = useRef(measureEnabled);
+  useEffect(() => {
+    cmdValueRef.current = cmdValue;
+  }, [cmdValue]);
+  useEffect(() => {
+    measureEnabledRef.current = measureEnabled;
+  }, [measureEnabled]);
+  useEffect(() => {
+    return registerModalEscapeInterceptor(() => {
+      const root = rootRef.current;
+      if (!root) return false;
+      const myModal = root.closest("[data-modal-id]");
+      if (!myModal || getActiveModalId() !== myModal.dataset.modalId) return false;
+      if (cmdValueRef.current) {
+        setCmdValue("");
+        setCmdEcho("*Cancel*");
+        return true;
+      }
+      if (measureEnabledRef.current) {
+        setMeasureEnabled(false);
+        setCmdEcho("Measure off.");
+        return true;
+      }
+      return false;
+    });
+  }, []);
   const btn = "px-2 py-1 rounded hover:bg-gray-200 transition-colors text-gray-600 flex items-center gap-1";
   const colorHex = (n) => {
     if (typeof n !== "number") return "#999";
     return "#" + n.toString(16).padStart(6, "0");
   };
-  return /* @__PURE__ */ jsxs("div", { className: "flex flex-col h-full", children: [
+  return /* @__PURE__ */ jsxs("div", { ref: rootRef, className: "flex flex-col h-full", children: [
     /* @__PURE__ */ jsxs(PanelActions, { children: [
       /* @__PURE__ */ jsxs(
         "button",
@@ -1391,7 +1804,7 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
         {
           onClick: () => setMeasureEnabled((m) => !m),
           className: btn + (measureEnabled ? " bg-gray-200" : ""),
-          title: measureEnabled ? "Stop measuring (Esc)" : "Measure distance \u2014 click two points on the drawing",
+          title: measureEnabled ? "Stop measuring (Esc)" : "Measure distance \u2014 click two points on the drawing, or type DI / DIM below",
           children: [
             /* @__PURE__ */ jsxs("svg", { className: "h-3.5 w-3.5", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", strokeWidth: 1.5, children: [
               /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M3.75 14.25l6-6 6 6 4.5-4.5M9.75 8.25v3M12.75 11.25v3M15.75 14.25v3" }),
@@ -1406,10 +1819,10 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
           /* @__PURE__ */ jsx(
             "button",
             {
-              onClick: () => setMeasureMode("point"),
-              className: `px-2 transition-colors ${measureMode === "point" ? "bg-orange-500 text-white" : "bg-white text-gray-600 hover:bg-gray-50"}`,
-              title: "Point \u2014 straight-line (Euclidean) distance between two picks",
-              children: "Point"
+              onClick: () => setMeasureMode("auto"),
+              className: `px-2 transition-colors ${measureMode === "auto" ? "bg-orange-500 text-white" : "bg-white text-gray-600 hover:bg-gray-50"}`,
+              title: "Auto \u2014 AutoCAD DIMLINEAR: measures \u0394X or \u0394Y, whichever is larger between the two picks",
+              children: "Auto"
             }
           ),
           /* @__PURE__ */ jsx(
@@ -1429,6 +1842,15 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
               title: "Vertical \u2014 distance along the Y axis between two picks (AutoCAD DIMLINEAR vertical)",
               children: "V"
             }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              onClick: () => setMeasureMode("point"),
+              className: `px-2 transition-colors ${measureMode === "point" ? "bg-orange-500 text-white" : "bg-white text-gray-600 hover:bg-gray-50"}`,
+              title: "Point \u2014 straight-line (Euclidean) distance between two picks (AutoCAD DIST)",
+              children: "Point"
+            }
           )
         ] }),
         (measureMode === "horizontal" || measureMode === "vertical") && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
@@ -1471,10 +1893,10 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
         "div",
         {
           className: "px-2 py-1 text-[11px] font-mono font-semibold text-orange-600 bg-orange-50 border border-orange-200 rounded whitespace-nowrap",
-          title: measureMode === "horizontal" ? "Horizontal distance (\u0394x) between the two picked points" : measureMode === "vertical" ? "Vertical distance (\u0394y) between the two picked points" : "Straight-line distance between the two picked points",
+          title: measureResolved === "horizontal" ? `Horizontal distance (\u0394x) between the two picked points${measureMode === "auto" ? " \u2014 Auto resolved to the X axis" : ""}` : measureResolved === "vertical" ? `Vertical distance (\u0394y) between the two picked points${measureMode === "auto" ? " \u2014 Auto resolved to the Y axis" : ""}` : "Straight-line distance between the two picked points",
           children: [
             formatMeasureDistance(measureDistance),
-            measureMode === "horizontal" ? " \u2194" : measureMode === "vertical" ? " \u2195" : ""
+            measureResolved === "horizontal" ? " \u2194" : measureResolved === "vertical" ? " \u2195" : ""
           ]
         }
       ),
@@ -1530,10 +1952,50 @@ function DxfPanel({ url, filename, onDownload, onEmail }) {
           "Scroll to zoom"
         ] }),
         /* @__PURE__ */ jsx("span", { className: "text-white/40", children: "\u2022" }),
-        /* @__PURE__ */ jsx("span", { children: "Fit to reset" })
+        /* @__PURE__ */ jsx("span", { children: "Fit to reset" }),
+        /* @__PURE__ */ jsx("span", { className: "text-white/40", children: "\u2022" }),
+        /* @__PURE__ */ jsxs("span", { children: [
+          "Type ",
+          /* @__PURE__ */ jsx("span", { className: "font-mono font-semibold", children: "DI" }),
+          " / ",
+          /* @__PURE__ */ jsx("span", { className: "font-mono font-semibold", children: "DIM" }),
+          " to measure"
+        ] })
       ] }),
       loading && /* @__PURE__ */ jsx("div", { className: "absolute inset-0 flex items-center justify-center bg-white/80 text-sm text-gray-500", children: "Loading drawing\u2026" }),
       error && /* @__PURE__ */ jsx("div", { className: "absolute inset-0 flex items-center justify-center text-sm text-red-600 px-6 text-center", children: error })
+    ] }),
+    /* @__PURE__ */ jsxs("div", { className: "shrink-0 border-t border-gray-200 bg-gray-50", children: [
+      cmdEcho && /* @__PURE__ */ jsx("div", { className: "px-2.5 pt-1 text-[11px] font-mono text-gray-500 truncate", title: cmdEcho, children: cmdEcho }),
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5 px-2.5 h-7", children: [
+        /* @__PURE__ */ jsx("span", { className: "text-[11px] font-mono font-semibold text-gray-400 select-none", children: ">" }),
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            ref: cmdInputRef,
+            value: cmdValue,
+            onChange: (e) => setCmdValue(e.target.value),
+            onKeyDown: (e) => {
+              if (e.key === "Enter" || e.key === " ") {
+                e.preventDefault();
+                runCommand(cmdValue);
+              } else if (e.key === "Escape") {
+                if (cmdValue) {
+                  e.stopPropagation();
+                  setCmdValue("");
+                  setCmdEcho("*Cancel*");
+                } else {
+                  e.target.blur();
+                }
+              }
+            },
+            placeholder: "Type a command \u2014 DI, DIM, H, V, Z, LA (? for help)",
+            spellCheck: false,
+            autoComplete: "off",
+            className: "flex-1 min-w-0 bg-transparent text-[11px] font-mono text-gray-700 focus:outline-none placeholder:text-gray-300"
+          }
+        )
+      ] })
     ] })
   ] });
 }
@@ -1557,8 +2019,7 @@ function hexToRgb(OV, hex) {
   return new OV.RGBColor(n >> 16 & 255, n >> 8 & 255, n & 255);
 }
 function formatMeasureDistance(mm) {
-  if (mm >= 1e3) return `${(mm / 1e3).toFixed(2)} m`;
-  if (mm >= 10) return `${mm.toFixed(1)} mm`;
+  if (mm >= 1e3) return `${(mm / 1e3).toFixed(3)} m`;
   return `${mm.toFixed(2)} mm`;
 }
 function StepPanel({ url, filename, onDownload, onEmail }) {
@@ -2838,5 +3299,5 @@ function ImagePanel({ url, filename, onDownload, onEmail }) {
 }
 
 export { Preview, setPdfPreview };
-//# sourceMappingURL=chunk-CGSN2MCD.js.map
-//# sourceMappingURL=chunk-CGSN2MCD.js.map
+//# sourceMappingURL=chunk-UFTJG6IM.js.map
+//# sourceMappingURL=chunk-UFTJG6IM.js.map