From bfefae0e5fc40558285f599e773c63e742857428 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 14 Jul 2022 17:55:35 +0100
Subject: [PATCH] Update cut+paste so cut doesn't actually remove the component
 from the tree and use new patch function

---
 .../src/builderStore/store/frontend.js        | 76 +++++++++++--------
 .../navigation/ComponentTree.svelte           |  9 ++-
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 63c6073efd..e0ddd00bd8 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -534,13 +534,10 @@ export const getFrontendStore = () => {
           return state
         })
 
-        // Remove the component from its parent if we're cutting
+        // Select the parent if cutting
         if (cut) {
           const parent = findComponentParent(selectedAsset.props, component._id)
           if (parent) {
-            parent._children = parent._children.filter(
-              child => child._id !== component._id
-            )
             if (selectParent) {
               store.update(state => {
                 state.selectedComponentId = parent._id
@@ -551,23 +548,41 @@ export const getFrontendStore = () => {
         }
       },
       paste: async (targetComponent, mode) => {
-        let promises = []
-        store.update(state => {
-          // Stop if we have nothing to paste
-          if (!state.componentToPaste) {
-            return state
+        const state = get(store)
+        if (!state.componentToPaste) {
+          return
+        }
+        let newComponentId
+
+        // Patch screen
+        const patch = screen => {
+          // Get up to date ref to target
+          targetComponent = findComponent(screen.props, targetComponent._id)
+          if (!targetComponent) {
+            return
           }
           const cut = state.componentToPaste.isCut
-
-          // Clone the component to paste and make unique if copying
-          delete state.componentToPaste.isCut
+          const originalId = state.componentToPaste._id
           let componentToPaste = cloneDeep(state.componentToPaste)
-          if (cut) {
-            state.componentToPaste = null
-          } else {
+          delete componentToPaste.isCut
+
+          // Make new component unique if copying
+          if (!cut) {
             makeComponentUnique(componentToPaste)
           }
+          newComponentId = componentToPaste._id
 
+          // Delete old component if cutting
+          if (cut) {
+            const parent = findComponentParent(screen.props, originalId)
+            if (parent?._children) {
+              parent._children = parent._children.filter(
+                component => component._id !== originalId
+              )
+            }
+          }
+
+          // Paste new component
           if (mode === "inside") {
             // Paste inside target component if chosen
             if (!targetComponent._children) {
@@ -575,32 +590,29 @@ export const getFrontendStore = () => {
             }
             targetComponent._children.push(componentToPaste)
           } else {
-            // Otherwise find the parent so we can paste in the correct order
-            // in the parents child components
-            const selectedAsset = get(currentAsset)
-            if (!selectedAsset) {
-              return state
-            }
+            // Otherwise paste in the correct order in the parent's children
             const parent = findComponentParent(
-              selectedAsset.props,
+              screen.props,
               targetComponent._id
             )
-            if (!parent) {
-              return state
+            if (!parent?._children) {
+              return false
             }
-
-            // Insert the component in the correct position
-            const targetIndex = parent._children.indexOf(targetComponent)
+            const targetIndex = parent._children.findIndex(component => {
+              return component._id === targetComponent._id
+            })
             const index = mode === "above" ? targetIndex : targetIndex + 1
-            parent._children.splice(index, 0, cloneDeep(componentToPaste))
+            parent._children.splice(index, 0, componentToPaste)
           }
+        }
+        await store.actions.screens.patch(state.selectedScreenId, patch)
 
-          // Save and select the new component
-          promises.push(store.actions.preview.saveSelected())
-          state.selectedComponentId = componentToPaste._id
+        // Update state
+        store.update(state => {
+          delete state.componentToPaste
+          state.selectedComponentId = newComponentId
           return state
         })
-        await Promise.all(promises)
       },
       updateStyle: async (name, value) => {
         const selected = get(selectedComponent)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte
index cc7f70f2c5..6704027f35 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte
@@ -18,6 +18,13 @@
 
   let closedNodes = {}
 
+  $: filteredComponents = components?.filter(component => {
+    return (
+      !$store.componentToPaste?.isCut ||
+      component._id !== $store.componentToPaste?._id
+    )
+  })
+
   const dragover = (component, index) => e => {
     const mousePosition = e.offsetY / e.currentTarget.offsetHeight
     dndStore.actions.dragover({
@@ -91,7 +98,7 @@
 </script>
 
 <ul>
-  {#each components || [] as component, index (component._id)}
+  {#each filteredComponents || [] as component, index (component._id)}
     {@const opened = isOpen(component, $selectedComponentPath, closedNodes)}
     <li
       on:click|stopPropagation={() => {