From c00cfca02c11c507301a84246fd4d90754198aec Mon Sep 17 00:00:00 2001
From: moklick <info@moritzklack.com>
Date: Wed, 18 Nov 2020 11:16:00 +0100
Subject: [PATCH] fix(store): remove elements

---
 src/store/index.ts | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/store/index.ts b/src/store/index.ts
index 9cc7f7f8..89638164 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -198,13 +198,15 @@ export const storeModel: StoreModel = {
 
   setElements: action((state, propElements) => {
     // remove deleted elements
-    state.elements.forEach((se, i) => {
-      const removeElement = !propElements.some((pe) => pe.id === se.id);
+    for (let i = 0; i < state.elements.length; i++) {
+      const se = state.elements[i];
+      const elementExistsInProps = propElements.find((pe) => pe.id === se.id);
 
-      if (removeElement) {
+      if (!elementExistsInProps) {
         state.elements.splice(i, 1);
+        i--;
       }
-    });
+    }
 
     propElements.forEach((el) => {
       const storeElementIndex = state.elements.findIndex((se) => se.id === el.id);
@@ -213,35 +215,44 @@ export const storeModel: StoreModel = {
       if (storeElementIndex !== -1) {
         const storeElement = state.elements[storeElementIndex];
 
-        state.elements[storeElementIndex] = {
-          ...storeElement,
-          ...el,
-        };
-
         if (isNode(state.elements[storeElementIndex])) {
           const propNode = el as Node;
           const storeNode = state.elements[storeElementIndex] as Node;
 
-          const poitionChanged =
+          const positionChanged =
             storeNode.position.x !== propNode.position.x || storeNode.position.y !== propNode.position.y;
 
-          if (poitionChanged) {
-            (state.elements[storeElementIndex] as Node).__rf = {
-              ...storeNode.__rf,
+          if (positionChanged) {
+            (state.elements[storeElementIndex] as Node) = {
+              ...storeElement,
+              ...el,
+              __rf: {
+                ...storeNode.__rf,
+                position: propNode.position,
+              },
               position: propNode.position,
             };
+          } else {
+            state.elements[storeElementIndex] = {
+              ...storeElement,
+              ...el,
+            };
           }
-
           // we reset the elements dimensions here in order to force a re-calculation of the bounds.
           // When the type of a node changes it is possible that the number or positions of handles changes too.
-          if (propNode.type !== storeNode.type) {
+          if (typeof propNode.type !== 'undefined' && propNode.type !== storeNode.type) {
             (state.elements[storeElementIndex] as Node).__rf.width = null;
             (state.elements[storeElementIndex] as Node).__rf.height = null;
           }
+        } else {
+          state.elements[storeElementIndex] = {
+            ...storeElement,
+            ...el,
+          };
         }
       } else {
         // add new element
-        state.elements.push(parseElement(el));
+        state.elements.push(parseElement({ ...el }));
       }
     });
   }),