@archvisioninc/canvas 3.3.2 → 3.3.4

package/dist/helpers/canvasUpdateHelpers.js

@@ -316,7 +316,7 @@ export const updateMaterial = inboundData => {
       material.name = newId;
       if (Array.isArray(scene.metadata.selectedMaterials) && scene.metadata.selectedMaterials.length > 0) {
         // We currently only support one selectedMaterial at a time so we should set the changed material to selected
-        scene.metadata.selectedMaterials = [material];
+        newMetaDataEntry('selectedMaterials', [material]);
       }
     }
 

package/dist/helpers/meshHelpers.js

@@ -29,13 +29,13 @@ export const getScaleFactor = sourceUnit => {
 export const getBoundingMeshData = meshArray => {
   const meshes = meshArray || getUserMeshes();
   const singleSelection = meshes.length === 1;
-  const singleBox = singleSelection && meshes[0].getBoundingInfo?.().boundingBox;
+  const singleBox = singleSelection && meshes[0]?.getBoundingInfo?.().boundingBox;
   const scaling = singleSelection && meshes[0].scaling;
   const rotation = singleSelection && meshes[0].rotation;
   let minimum = newVector(0, 0, 0);
   let maximum = newVector(0, 0, 0);
   for (let i = 0; i < meshes.length; i++) {
-    const boundingInfo = meshes[i].getBoundingInfo?.();
+    const boundingInfo = meshes[i]?.getBoundingInfo?.();
     if (boundingInfo) {
       const workingBoundingBox = boundingInfo.boundingBox;
       if (i === 0) {

package/dist/helpers/utilityHelpers.js

@@ -288,11 +288,8 @@ export const buildSelectedMaterialArray = () => {
   }).filter(val => val);
   if (_.isEmpty(arr)) {
     if (!_.isEmpty(scene.metadata.selectedMaterials)) {
-      console.log({
-        emptyMeshesNotEmptyMaterials: scene.metadata.selectedMaterials
-      });
       const currentSelectedMaterial = scene.metadata.selectedMaterials[0];
-      const materialMatch = scene.metadata.materials?.find(material => currentSelectedMaterial.materialId === material.materialId) || scene.metadata.materials?.[0];
+      const materialMatch = scene.metadata.materials?.find(material => currentSelectedMaterial.materialId === material.materialId) || {};
       return [materialMatch];
     }
     return [scene.metadata.materials?.[0] || {}];

package/dist/helpers/viewportHelpers.js

@@ -124,7 +124,7 @@ export const resetSelectedMeshes = () => {
     const existingMaterial = scene.metadata?.materials?.find?.(mat => mat.materialId === firstMaterial.id);
     newMetaDataEntry('selectedMaterials', [existingMaterial]);
   }
-  if (props.integration?.meshHighlighting !== false) {
+  if (props.integration?.meshHighlighting !== false && highlightManager) {
     highlightManager.removeAllMeshes();
   }
   selectedMeshes = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archvisioninc/canvas",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "private": false,
   "main": "dist/Canvas.js",
   "module": "dist/Canvas.js",

package/src/package/helpers/canvasUpdateHelpers.js

@@ -377,7 +377,7 @@ export const updateMaterial = inboundData => {
 
       if (Array.isArray(scene.metadata.selectedMaterials) && scene.metadata.selectedMaterials.length > 0) {
         // We currently only support one selectedMaterial at a time so we should set the changed material to selected
-        scene.metadata.selectedMaterials = [ material ];
+        newMetaDataEntry('selectedMaterials', [ material ]);
       }
     }
 

package/src/package/helpers/meshHelpers.js

@@ -37,14 +37,14 @@ export const getScaleFactor = sourceUnit => {
 export const getBoundingMeshData = meshArray => {
   const meshes = meshArray || getUserMeshes();
   const singleSelection = meshes.length === 1;
-  const singleBox = singleSelection && meshes[0].getBoundingInfo?.().boundingBox;
+  const singleBox = singleSelection && meshes[0]?.getBoundingInfo?.().boundingBox;
   const scaling = singleSelection && meshes[0].scaling;
   const rotation = singleSelection && meshes[0].rotation;
   let minimum = newVector(0, 0, 0);
   let maximum = newVector(0, 0, 0);
 
   for (let i = 0; i < meshes.length; i++) {
-    const boundingInfo = meshes[i].getBoundingInfo?.();
+    const boundingInfo = meshes[i]?.getBoundingInfo?.();
 
     if (boundingInfo) {
       const workingBoundingBox = boundingInfo.boundingBox;
@@ -192,4 +192,4 @@ export const getScaleToZeroOne = vertices => {
   });
 
   return scaledVertices;
-};
+};

package/src/package/helpers/utilityHelpers.js

@@ -355,11 +355,10 @@ export const buildSelectedMaterialArray = () => {
 
   if (_.isEmpty(arr)) {
     if (!_.isEmpty(scene.metadata.selectedMaterials)) {
-      console.log({ emptyMeshesNotEmptyMaterials: scene.metadata.selectedMaterials });
       const currentSelectedMaterial = scene.metadata.selectedMaterials[0];
       const materialMatch = scene.metadata.materials?.find(material => (
         currentSelectedMaterial.materialId === material.materialId
-      )) || scene.metadata.materials?.[0];
+      )) || {};
 
       return [ materialMatch ];
     }

package/src/package/helpers/viewportHelpers.js

@@ -180,7 +180,7 @@ export const resetSelectedMeshes = () => {
     newMetaDataEntry('selectedMaterials', [ existingMaterial ]);
   }
 
-  if (props.integration?.meshHighlighting !== false) {
+  if (props.integration?.meshHighlighting !== false && highlightManager) {
     highlightManager.removeAllMeshes();
   }
 
@@ -440,4 +440,4 @@ export const prepareAxes = () => {
   zAxisMesh.parent = zAxisTNode;
 
   new BABYLON.AxesViewer(scene, 1, null, xAxisTNode, yAxisTNode, zAxisTNode, 0.5);
-};
+};