From 7cb74ab2c2638e6454fb1e7ef8814db4ba50dded Mon Sep 17 00:00:00 2001
From: Pablo <pablo@dhis2.org>
Date: Tue, 13 Aug 2024 09:06:55 +0200
Subject: [PATCH] use lazy column

Signed-off-by: Pablo <pablo@dhis2.org>
---
 .../mobile/ui/designsystem/component/BaseCard.kt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt
index d406f36b0..ce203e5f9 100644
--- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt
+++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
@@ -48,6 +49,7 @@ import androidx.compose.ui.unit.dp
 import org.hisp.dhis.mobile.ui.designsystem.component.internal.conditional
 import org.hisp.dhis.mobile.ui.designsystem.theme.Radius
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
+import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing16
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing4
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
@@ -136,21 +138,23 @@ fun <T> ExpandableItemColumn(
         }
     }
 
-    Column(
+    LazyColumn (
         modifier = modifier
-            .verticalScroll(rememberScrollState())
             .onSizeChanged {
                 if (parentSize == -1) {
                     parentSize = it.height
                 }
             },
         verticalArrangement = spacedBy(itemSpacing),
+        contentPadding = PaddingValues(Spacing16)
     ) {
         itemList.forEachIndexed { index, item ->
-            itemLayout(item, itemVerticalPadding) {
-                val childMap = childrenSize.toMutableMap()
-                childMap[index] = it.height
-                childrenSize = childMap
+            item{
+                itemLayout(item, itemVerticalPadding) {
+                    val childMap = childrenSize.toMutableMap()
+                    childMap[index] = it.height
+                    childrenSize = childMap
+                }
             }
         }
     }