@tscircuit/3d-viewer 0.0.345 → 0.0.347

package/dist/index.js

@@ -25582,7 +25582,7 @@ import * as THREE10 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.344",
+  version: "0.0.346",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -25846,6 +25846,13 @@ import {
   useMemo as useMemo8
 } from "react";
 import * as THREE7 from "three";
+
+// src/react-three/remove-existing-canvases.ts
+function removeExistingCanvases(container) {
+  container.querySelectorAll("canvas").forEach((existingCanvas) => existingCanvas.remove());
+}
+
+// src/react-three/Canvas.tsx
 import { jsx as jsx9 } from "react/jsx-runtime";
 var Canvas = forwardRef(
   ({ children, scene: sceneProps, camera: cameraProps, style }, ref) => {
@@ -25878,6 +25885,7 @@ var Canvas = forwardRef(
     useImperativeHandle(ref, () => rootObject.current);
     useEffect10(() => {
       if (!mountRef.current) return;
+      removeExistingCanvases(mountRef.current);
       const renderer = new THREE7.WebGLRenderer({ antialias: true, alpha: true });
       renderer.setSize(
         mountRef.current.clientWidth,
@@ -28863,7 +28871,7 @@ var BoardMeshes = ({
   }, [rootObject, geometryMeshes, textureMeshes]);
   return null;
 };
-var MANIFOLD_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/manifold-3d@3.1.1";
+var MANIFOLD_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/manifold-3d@3.2.1";
 var CadViewerManifold = ({
   circuitJson: circuitJsonProp,
   autoRotateDisabled,
@@ -28878,32 +28886,57 @@ var CadViewerManifold = ({
   const [manifoldJSModule, setManifoldJSModule] = useState13(null);
   const [manifoldLoadingError, setManifoldLoadingError] = useState13(null);
   useEffect20(() => {
-    const loadManifoldFromCDN = async () => {
+    const initManifold = async (ManifoldModule) => {
       try {
-        const manifoldURL = `${MANIFOLD_CDN_BASE_URL}/manifold.js`;
-        const { default: ManifoldModule } = await import(
-          /* @vite-ignore */
-          manifoldURL
-        );
-        if (ManifoldModule) {
-          const loadedModule = await ManifoldModule({
-            locateFile: () => `${MANIFOLD_CDN_BASE_URL}/manifold.wasm`
-          });
-          loadedModule.setup();
-          setManifoldJSModule(loadedModule);
-        } else {
-          throw new Error(
-            "ManifoldModule not found in dynamically imported module"
-          );
-        }
+        const loadedModule = await ManifoldModule();
+        loadedModule.setup();
+        setManifoldJSModule(loadedModule);
       } catch (error) {
-        console.error("Failed to load Manifold from CDN:", error);
+        console.error("Failed to initialize Manifold:", error);
         setManifoldLoadingError(
-          `Failed to load Manifold module: ${error instanceof Error ? error.message : "Unknown error"}`
+          `Failed to initialize Manifold: ${error instanceof Error ? error.message : "Unknown error"}`
         );
       }
     };
-    loadManifoldFromCDN();
+    if (window.ManifoldModule) {
+      initManifold(window.ManifoldModule);
+      return;
+    }
+    const eventName = "manifoldLoaded";
+    const handleLoad = () => {
+      if (window.ManifoldModule) {
+        initManifold(window.ManifoldModule);
+      } else {
+        const errText = "ManifoldModule not found on window after script load.";
+        console.error(errText);
+        setManifoldLoadingError(errText);
+      }
+    };
+    window.addEventListener(eventName, handleLoad, { once: true });
+    const script = document.createElement("script");
+    script.type = "module";
+    script.innerHTML = `
+try {
+  const { default: ManifoldModule } = await import('${MANIFOLD_CDN_BASE_URL}/manifold.js');
+  window.ManifoldModule = ManifoldModule;
+} catch (e) {
+  console.error('Error importing manifold in dynamic script:', e);
+} finally {
+  window.dispatchEvent(new CustomEvent('${eventName}'));
+}
+    `.trim();
+    const scriptError = (err) => {
+      const errText = "Failed to load Manifold loader script.";
+      console.error(errText, err);
+      setManifoldLoadingError(errText);
+      window.removeEventListener(eventName, handleLoad);
+    };
+    script.addEventListener("error", scriptError);
+    document.body.appendChild(script);
+    return () => {
+      window.removeEventListener(eventName, handleLoad);
+      script.removeEventListener("error", scriptError);
+    };
   }, []);
   const {
     geoms,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.345",
+  "version": "0.0.347",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",