@archvisioninc/canvas 3.3.0 → 3.3.2

package/dist/helpers/canvasUpdateHelpers.js

@@ -314,6 +314,10 @@ export const updateMaterial = inboundData => {
     if (newId) {
       material.id = newId;
       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];
+      }
     }
 
     // Select all meshes with current material.

package/dist/helpers/utilityHelpers.js

@@ -288,8 +288,11 @@ 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) || {};
+      const materialMatch = scene.metadata.materials?.find(material => currentSelectedMaterial.materialId === material.materialId) || scene.metadata.materials?.[0];
       return [materialMatch];
     }
     return [scene.metadata.materials?.[0] || {}];

package/package.json

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

package/src/package/helpers/canvasUpdateHelpers.js

@@ -374,6 +374,11 @@ export const updateMaterial = inboundData => {
     if (newId) {
       material.id = newId;
       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 ];
+      }
     }
 
     // Select all meshes with current material.

package/src/package/helpers/utilityHelpers.js

@@ -355,10 +355,11 @@ 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/scenes/App/App.js

@@ -5,9 +5,9 @@ import { AppContainer, DebugButtons, Button } from './styles';
 import { theme } from 'static/theme';
 import { fetchDownloadURL } from 'helpers/fetchHelpers';
 import { ENVIRONMENTS } from 'constants';
-import { updateViewport, scene, updateLighting } from 'package/helpers';
+import { updateViewport, scene, updateLighting, updateMaterial } from 'package/helpers';
 import Canvas from 'package/Canvas';
-import _ from 'lodash';
+import _, { update } from 'lodash';
 
 const materialMode = false;
 const previewMode = false;
@@ -142,14 +142,15 @@ const App = () => {
           onClick={() => {
             const inboundData = {
               payload: {
-                id: 'directional',
-                intensity: 5,
+                id: 'Body',
+                newId: 'test',
               },
             };
-            updateLighting(inboundData);
+            updateMaterial(inboundData);
+            console.log({ metadata: scene.metadata });
           }}
         >
-          Update Intensity
+          Update Body Material
         </Button>
       </DebugButtons>
     </AppContainer>