made changes in layers

dhruvpatidar359 · Jun 7, 2024 · b3f7399 · b3f7399
1 parent cf219cd
commit b3f7399
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/components/PropertiesBar/PropertiesBar.jsx b/components/PropertiesBar/PropertiesBar.jsx
@@ -272,51 +272,59 @@ const PropertiesBar = () => {
     }
 
     const modifiedElements = (elementsCopy) => {
-        return elementsCopy.filter(element => element.id !== selectedElement.id);
+        return elementsCopy.filter(element => (element.id !== selectedElement.id));
     }
 
     function sendToBack() {
-        const elementsCopy = elements.map((element) => {
-            return {...element};
-        });
+        if(elements.length == 1 || elements.length == 0) {
+            return;
+        }
 
+        const elementsCopy = elements.filter(element => element !== null && element !== undefined && Object.keys(element).length > 0).map(element => ({ ...element }));
         const key = selectedElement.id.split("#")[0];
         let temp = { ...selectedElement };
         let filteredElements = modifiedElements(elementsCopy);
         temp.id = key + "#0";
         filteredElements.unshift(temp);
 
         for(let i = 1; i < filteredElements.length; i ++) {
-            const elemId = filteredElements[i].id.split("#");
-            filteredElements[i].id = elemId[0] + `#${i}`;
+            if(filteredElements[i] !== null && filteredElements[i] !== undefined) {
+                const elemId = filteredElements[i].id.split("#");
+                filteredElements[i].id = elemId[0] + `#${i}`;
+            }
         }
 
         dispatch(setElement([filteredElements, true, null]));
     }
 
     function bringToFront() {
-        const elementsCopy = elements.map((element) => {
-            return {...element};
-        });
+        if(elements.length == 1 || elements.length == 0) {
+            return;
+        }
 
+        const elementsCopy = elements.filter(element => element !== null && element !== undefined && Object.keys(element).length > 0).map(element => ({ ...element }));
         const key = selectedElement.id.split("#")[0];
         let temp = { ...selectedElement };
         let filteredElements = modifiedElements(elementsCopy);
         temp.id = key + `#${filteredElements.length}`;
         filteredElements.push(temp);
 
         for(let i = 0; i < filteredElements.length - 1; i ++) {
-            const elemId = filteredElements[i].id.split("#");
-            filteredElements[i].id = elemId[0] + `#${i}`;
+            if(filteredElements[i] !== null && filteredElements[i] !== undefined) {
+                const elemId = filteredElements[i].id.split("#");
+                filteredElements[i].id = elemId[0] + `#${i}`;
+            }   
         }
 
         dispatch(setElement([filteredElements, true, null]));
     }
 
     function sendBackward() {
-        const elementsCopy = elements.map((element) => {
-            return {...element};
-        });
+        if(elements.length == 1 || elements.length == 0) {
+            return;
+        }
+
+        const elementsCopy = elements.filter(element => element !== null && element !== undefined && Object.keys(element).length > 0).map(element => ({ ...element }));
 
         let i = 0;
         while(elementsCopy[i].id != selectedElement.id) {
@@ -339,9 +347,11 @@ const PropertiesBar = () => {
     }
 
     function bringForward() {
-        const elementsCopy = elements.map((element) => {
-            return {...element};
-        });
+        if(elements.length == 1 || elements.length == 0) {
+            return;
+        }
+
+        const elementsCopy = elements.filter(element => element !== null && element !== undefined && Object.keys(element).length > 0).map(element => ({ ...element }));
 
         let i = 0;
         while(elementsCopy[i].id != selectedElement.id) {