@file-viewer/renderer-cad 3.0.0 → 3.0.1

package/dist/cad.js

@@ -5,6 +5,8 @@ const CAD_WORKER_TIMEOUT = 120000;
 const CAD_DEFAULT_FIT_PADDING = 0.92;
 const CAD_BOUNDS_EPSILON = 1e-9;
 const CAD_BEST_FIT_OUTLIER_RATIO = 8;
+const CAD_NATIVE_MIN_ZOOM_RATIO = 0.05;
+const CAD_NATIVE_MAX_ZOOM_RATIO = 64;
 const cadStyle = `
 .cad-shell{display:flex;height:100%;min-height:100%;flex-direction:column;background:#f5f7fb;color:#142335}
 .cad-shell *{box-sizing:border-box}
@@ -198,6 +200,105 @@ const getCadDocumentBaseUrl = (target) => {
         : 'file:///';
 };
 const CAD_DWG_WORKER_FILENAME = 'file-viewer-input.dwg';
+const getCadPinchSnapshot = (points) => {
+    const [first, second] = Array.from(points.values());
+    if (!first || !second) {
+        return null;
+    }
+    return {
+        center: {
+            x: (first.x + second.x) / 2,
+            y: (first.y + second.y) / 2,
+        },
+        distance: Math.hypot(second.x - first.x, second.y - first.y),
+    };
+};
+/**
+ * The bundled CAD engines currently treat every touch pointer as the same
+ * drag. Coordinate two touch pointers before their target listeners run so a
+ * pinch becomes one anchored zoom operation instead of two competing pans.
+ */
+const registerCadPinchZoom = (surface, onStart, onZoom) => {
+    const points = new Map();
+    let previous = null;
+    let suppressDragUntilRelease = false;
+    const suppressPointerEvent = (event) => {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+    };
+    const handlePointerDown = (event) => {
+        if (event.pointerType !== 'touch') {
+            return;
+        }
+        points.set(event.pointerId, { x: event.clientX, y: event.clientY });
+        try {
+            surface.setPointerCapture(event.pointerId);
+        }
+        catch {
+            // Synthetic browser harness events may not create an active pointer.
+        }
+        if (points.size < 2) {
+            return;
+        }
+        suppressDragUntilRelease = true;
+        previous = getCadPinchSnapshot(points);
+        onStart();
+        suppressPointerEvent(event);
+    };
+    const handlePointerMove = (event) => {
+        if (event.pointerType !== 'touch' || !points.has(event.pointerId)) {
+            return;
+        }
+        points.set(event.pointerId, { x: event.clientX, y: event.clientY });
+        if (!suppressDragUntilRelease) {
+            return;
+        }
+        if (points.size >= 2) {
+            const current = getCadPinchSnapshot(points);
+            if (previous && current && previous.distance > 0 && current.distance > 0) {
+                onZoom({
+                    center: current.center,
+                    deltaX: current.center.x - previous.center.x,
+                    deltaY: current.center.y - previous.center.y,
+                    factor: Math.min(2, Math.max(0.5, current.distance / previous.distance)),
+                });
+            }
+            previous = current;
+        }
+        suppressPointerEvent(event);
+    };
+    const handlePointerEnd = (event) => {
+        if (event.pointerType !== 'touch' || !points.has(event.pointerId)) {
+            return;
+        }
+        points.delete(event.pointerId);
+        previous = points.size >= 2 ? getCadPinchSnapshot(points) : null;
+        if (points.size === 0) {
+            suppressDragUntilRelease = false;
+        }
+        try {
+            if (surface.hasPointerCapture(event.pointerId)) {
+                surface.releasePointerCapture(event.pointerId);
+            }
+        }
+        catch {
+            // The underlying engine may already have released this pointer.
+        }
+        // Do not stop pointerup/cancel: the engine must clear the single-pointer
+        // drag that began before the second finger started the pinch.
+    };
+    surface.addEventListener('pointerdown', handlePointerDown, { capture: true });
+    surface.addEventListener('pointermove', handlePointerMove, { capture: true });
+    surface.addEventListener('pointerup', handlePointerEnd, { capture: true });
+    surface.addEventListener('pointercancel', handlePointerEnd, { capture: true });
+    return () => {
+        surface.removeEventListener('pointerdown', handlePointerDown, { capture: true });
+        surface.removeEventListener('pointermove', handlePointerMove, { capture: true });
+        surface.removeEventListener('pointerup', handlePointerEnd, { capture: true });
+        surface.removeEventListener('pointercancel', handlePointerEnd, { capture: true });
+        points.clear();
+    };
+};
 const createEmptyCadBounds = () => ({
     minX: Number.POSITIVE_INFINITY,
     minY: Number.POSITIVE_INFINITY,
@@ -557,7 +658,10 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
     let viewer = null;
     let resizeObserver = null;
     let abortController = null;
+    let disposeCadPinch = null;
+    let disposeNativeInteractions = null;
     let fitViewActive = true;
+    let nativeZoomRatio = 1;
     let disposed = false;
     const style = createStyle();
     const shell = createElement('div', 'cad-shell');
@@ -615,8 +719,11 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
     };
     const getWarnings = () => (loadResult === null || loadResult === void 0 ? void 0 : loadResult.warnings) || (loadResult === null || loadResult === void 0 ? void 0 : loadResult.document.warnings) || [];
     const getZoomPercent = () => {
-        var _a, _b, _c;
-        const zoom = (_c = (_a = viewState === null || viewState === void 0 ? void 0 : viewState.zoomPercent) !== null && _a !== void 0 ? _a : (_b = viewer === null || viewer === void 0 ? void 0 : viewer.getZoomPercent) === null || _b === void 0 ? void 0 : _b.call(viewer)) !== null && _c !== void 0 ? _c : 100;
+        var _a, _b, _c, _d;
+        if ((_a = viewer === null || viewer === void 0 ? void 0 : viewer.isNativeRendererActive) === null || _a === void 0 ? void 0 : _a.call(viewer)) {
+            return Math.round(nativeZoomRatio * 100);
+        }
+        const zoom = (_d = (_b = viewState === null || viewState === void 0 ? void 0 : viewState.zoomPercent) !== null && _b !== void 0 ? _b : (_c = viewer === null || viewer === void 0 ? void 0 : viewer.getZoomPercent) === null || _c === void 0 ? void 0 : _c.call(viewer)) !== null && _d !== void 0 ? _d : 100;
         return Number.isFinite(zoom) ? Math.round(zoom) : 100;
     };
     const getCadZoomState = () => {
@@ -655,6 +762,98 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
         }
         return state;
     };
+    const clampNativeZoomRatio = (ratio) => {
+        return Math.min(CAD_NATIVE_MAX_ZOOM_RATIO, Math.max(CAD_NATIVE_MIN_ZOOM_RATIO, ratio));
+    };
+    const notifyNativeZoomChange = (action) => {
+        cadZoomEmitter.emit();
+        syncState();
+        emitCadViewStateChange(action, 'user');
+    };
+    const bindNativeCadInteractions = () => {
+        disposeNativeInteractions === null || disposeNativeInteractions === void 0 ? void 0 : disposeNativeInteractions();
+        disposeNativeInteractions = null;
+        const surface = nativeHost.querySelector('.dwfv-overlay-canvas');
+        if (!surface) {
+            return;
+        }
+        let notificationQueued = false;
+        const queueNativeZoomChange = (action) => {
+            if (notificationQueued) {
+                return;
+            }
+            notificationQueued = true;
+            queueMicrotask(() => {
+                var _a;
+                notificationQueued = false;
+                if (!disposed && ((_a = viewer === null || viewer === void 0 ? void 0 : viewer.isNativeRendererActive) === null || _a === void 0 ? void 0 : _a.call(viewer))) {
+                    notifyNativeZoomChange(action);
+                }
+            });
+        };
+        const applyNativeZoomFactor = (factor, action) => {
+            if (!Number.isFinite(factor) || factor <= 0) {
+                return;
+            }
+            nativeZoomRatio = clampNativeZoomRatio(nativeZoomRatio * factor);
+            queueNativeZoomChange(action);
+        };
+        const handleNativeClick = (event) => {
+            const eventTarget = event.target;
+            const button = eventTarget instanceof Element ? eventTarget.closest('button') : null;
+            if (!button || !nativeHost.contains(button)) {
+                return;
+            }
+            const label = (button.textContent || '').trim();
+            if (label === '+') {
+                applyNativeZoomFactor(1.25, 'zoom-in');
+            }
+            else if (label === '-' || label === '−') {
+                applyNativeZoomFactor(0.8, 'zoom-out');
+            }
+            else if (/适应|fit|reset/i.test(label)) {
+                nativeZoomRatio = 1;
+                queueNativeZoomChange('zoom-reset');
+            }
+        };
+        const handleNativeWheel = (event) => {
+            const rect = surface.getBoundingClientRect();
+            const delta = event.deltaMode === WheelEvent.DOM_DELTA_LINE
+                ? event.deltaY * 16
+                : event.deltaMode === WheelEvent.DOM_DELTA_PAGE
+                    ? event.deltaY * Math.max(1, rect.height)
+                    : event.deltaY;
+            applyNativeZoomFactor(Math.exp(-delta * 0.0015), 'cad-view-change');
+        };
+        const handleNativePageChange = (event) => {
+            if (event.target instanceof HTMLSelectElement && nativeHost.contains(event.target)) {
+                nativeZoomRatio = 1;
+                queueNativeZoomChange('zoom-reset');
+            }
+        };
+        const disposePinch = registerCadPinchZoom(surface, () => {
+            fitViewActive = false;
+        }, ({ center, factor }) => {
+            const deltaY = -Math.log(factor) / 0.0015;
+            surface.dispatchEvent(new WheelEvent('wheel', {
+                bubbles: true,
+                cancelable: true,
+                clientX: center.x,
+                clientY: center.y,
+                deltaMode: WheelEvent.DOM_DELTA_PIXEL,
+                deltaY,
+            }));
+        });
+        nativeHost.addEventListener('click', handleNativeClick);
+        nativeHost.addEventListener('change', handleNativePageChange);
+        surface.addEventListener('wheel', handleNativeWheel);
+        disposeNativeInteractions = () => {
+            disposePinch();
+            nativeHost.removeEventListener('click', handleNativeClick);
+            nativeHost.removeEventListener('change', handleNativePageChange);
+            surface.removeEventListener('wheel', handleNativeWheel);
+        };
+    };
     const syncInspector = () => {
         const summary = loadResult === null || loadResult === void 0 ? void 0 : loadResult.summary;
         const rows = [
@@ -744,6 +943,7 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
             return false;
         }
         if ((_a = viewer.isNativeRendererActive) === null || _a === void 0 ? void 0 : _a.call(viewer)) {
+            nativeZoomRatio = 1;
             viewer.fit();
             return true;
         }
@@ -918,6 +1118,19 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
                 syncState();
             },
         });
+        disposeCadPinch === null || disposeCadPinch === void 0 ? void 0 : disposeCadPinch();
+        const renderer = nextViewer.renderer;
+        disposeCadPinch = registerCadPinchZoom(nextViewer.canvas, () => {
+            fitViewActive = false;
+        }, ({ center, deltaX, deltaY, factor }) => {
+            var _a, _b;
+            const rect = nextViewer.canvas.getBoundingClientRect();
+            (_a = renderer.panByScreenDelta) === null || _a === void 0 ? void 0 : _a.call(renderer, deltaX, deltaY);
+            (_b = renderer.zoom) === null || _b === void 0 ? void 0 : _b.call(renderer, factor, {
+                x: center.x - rect.left,
+                y: center.y - rect.top,
+            });
+        });
         if (options.preloadDwg !== false && normalizedType === 'dwg') {
             void nextViewer.preloadDwg({ wasmPath, workerUrl }).catch(() => {
                 // 预热失败不阻断真实加载，loadBuffer 会返回完整错误上下文。
@@ -926,6 +1139,7 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
         return nextViewer;
     };
     const loadCad = async () => {
+        var _a;
         status = 'loading';
         progressMessage = t('cad.state.parsing');
         errorMessage = '';
@@ -934,6 +1148,9 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
         viewState = null;
         layers = [];
         fitViewActive = true;
+        nativeZoomRatio = 1;
+        disposeNativeInteractions === null || disposeNativeInteractions === void 0 ? void 0 : disposeNativeInteractions();
+        disposeNativeInteractions = null;
         syncUi();
         abortController === null || abortController === void 0 ? void 0 : abortController.abort();
         const controller = new AbortController();
@@ -956,6 +1173,9 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
             loadResult = restoreLoadResultSourceName(result);
             layers = collectLayers(result);
             status = 'ready';
+            if ((_a = viewer.isNativeRendererActive) === null || _a === void 0 ? void 0 : _a.call(viewer)) {
+                bindNativeCadInteractions();
+            }
             syncUi();
             queueMicrotask(() => {
                 applyCadFit();
@@ -999,6 +1219,10 @@ export default async function renderCad(buffer, target, type = 'dxf', context) {
             unregisterFileViewerZoomProvider(shell);
             abortController === null || abortController === void 0 ? void 0 : abortController.abort();
             abortController = null;
+            disposeCadPinch === null || disposeCadPinch === void 0 ? void 0 : disposeCadPinch();
+            disposeCadPinch = null;
+            disposeNativeInteractions === null || disposeNativeInteractions === void 0 ? void 0 : disposeNativeInteractions();
+            disposeNativeInteractions = null;
             resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.disconnect();
             resizeObserver = null;
             viewer === null || viewer === void 0 ? void 0 : viewer.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-cad",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": false,
   "type": "module",
   "description": "Standalone CAD renderer plugin for File Viewer powered by @flyfish-dev/cad-viewer.",
@@ -56,7 +56,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "3.0.0",
+    "@file-viewer/core": "3.0.1",
     "@flyfish-dev/cad-viewer": "0.8.0"
   },
   "devDependencies": {