remove unused imports after delete

concrete-utopia · Dec 19, 2023 · 34974fd · 34974fd
1 parent cbacbf9
commit 34974fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/editor/src/components/editor/actions/actions.tsx b/editor/src/components/editor/actions/actions.tsx
@@ -976,6 +976,7 @@ function deleteElements(
           return {
             ...simpleSuccess,
             utopiaComponents: withTargetRemoved.components,
+            imports: withTargetRemoved.imports,
           }
         }, success)
       }

diff --git a/editor/src/components/editor/store/editor-state.ts b/editor/src/components/editor/store/editor-state.ts
@@ -1908,21 +1908,23 @@ type RemoveElementResult = {
 export function removeElementAtPath(
   target: ElementPath,
   components: Array<UtopiaJSXComponent>,
-  imports?: Imports,
+  originalImports?: Imports,
 ): RemoveElementResult {
   const staticTarget = EP.dynamicPathToStaticPath(target)
-  let resultImports = imports ?? emptyImports()
+  let resultImports = originalImports ?? emptyImports()
   if (staticTarget == null) {
     return { components, imports: resultImports }
   } else {
-    const element = findJSXElementAtStaticPath(components, staticTarget)
-    const resultComponents = removeJSXElementChild(staticTarget, components)
-    if (element != null) {
+    const removedElement = findJSXElementAtStaticPath(components, staticTarget)
+    const remainingComponents = removeJSXElementChild(staticTarget, components)
+    if (removedElement != null) {
       resultImports =
-        imports != null ? removeUnusedImports(element, resultComponents, imports) : emptyImports()
+        originalImports != null
+          ? removeUnusedImports(removedElement, remainingComponents, originalImports)
+          : emptyImports()
     }
     return {
-      components: resultComponents,
+      components: remainingComponents,
       imports: resultImports,
     }
   }