From 69e1ae0aec72ddb26fccf66d834f38a59dae7446 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 17 Feb 2025 19:48:15 +0100
Subject: [PATCH] Cleanups

---
 packages/builder/src/helpers/components.ts        |  2 +-
 packages/builder/src/stores/builder/components.ts | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/helpers/components.ts b/packages/builder/src/helpers/components.ts
index be14866f7a..074f74f06d 100644
--- a/packages/builder/src/helpers/components.ts
+++ b/packages/builder/src/helpers/components.ts
@@ -85,7 +85,7 @@ export const findComponentPath = (
  * a certain selector
  */
 export const findAllMatchingComponents = (
-  rootComponent: Component,
+  rootComponent: Component | null,
   selector: (component: Component) => boolean
 ) => {
   if (!rootComponent || !selector) {
diff --git a/packages/builder/src/stores/builder/components.ts b/packages/builder/src/stores/builder/components.ts
index f1bd1e77c4..af3716e207 100644
--- a/packages/builder/src/stores/builder/components.ts
+++ b/packages/builder/src/stores/builder/components.ts
@@ -485,7 +485,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
         (component: Component) => component._component.endsWith("/form")
       )
       const formSteps = findAllMatchingComponents(
-        parentForm!,
+        parentForm,
         (component: Component) => component._component.endsWith("/formstep")
       )
       extras.step = formSteps.length + 1
@@ -644,7 +644,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
         nextId = nextId.replace("-navigation", "-screen")
       }
       this.update(state => {
-        state.selectedComponentId = nextId!
+        state.selectedComponentId = nextId ?? undefined
         return state
       })
     }
@@ -704,7 +704,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
   }
 
   async paste(
-    targetComponent: Component | null,
+    targetComponent: Component,
     mode: string,
     targetScreen: Screen,
     selectComponent = true
@@ -727,7 +727,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
     // Patch screen
     const patch = (screen: Screen) => {
       // Get up to date ref to target
-      targetComponent = findComponent(screen.props, targetComponent!._id!)
+      targetComponent = findComponent(screen.props, targetComponent!._id!)!
       if (!targetComponent) {
         return false
       }
@@ -789,7 +789,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
         }
         const targetIndex = parent._children.findIndex(
           (component: Component) => {
-            return component._id === targetComponent!._id
+            return component._id === targetComponent._id
           }
         )
         const index = mode === "above" ? targetIndex : targetIndex + 1