From 0c7f01adb1506906bace7a2cda6e707295702db6 Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Wed, 9 Apr 2025 17:09:38 +0200
Subject: [PATCH] DROID-3460 Primitives | Screens, vertical scroll (#2269)

---
 .../anytype/feature_object_type/fields/ui/ListScreen.kt    | 7 +++++++
 .../anytype/feature_properties/add/ui/AddScreen.kt         | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/ui/ListScreen.kt b/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/ui/ListScreen.kt
index 9f9804e57d..73119e64b3 100644
--- a/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/ui/ListScreen.kt
+++ b/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/ui/ListScreen.kt
@@ -27,7 +27,9 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Scaffold
@@ -206,6 +208,8 @@ fun FieldsMainModalScreen(
         }
     }
 
+    val scrollState = rememberScrollState()
+
     Column(
         modifier = Modifier.fillMaxSize()
             .nestedScroll(rememberNestedScrollInteropConnection())
@@ -217,12 +221,14 @@ fun FieldsMainModalScreen(
         Dragger(
             modifier = Modifier
                 .padding(vertical = 6.dp)
+                .verticalScroll(state = scrollState)
                 .align(Alignment.CenterHorizontally)
         )
         Box(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(48.dp)
+                .verticalScroll(state = scrollState)
         ) {
             Text(
                 modifier = Modifier
@@ -237,6 +243,7 @@ fun FieldsMainModalScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(36.dp)
+                .verticalScroll(state = scrollState)
                 .background(color = colorResource(R.color.shape_transparent_secondary)),
             uiTitleState = uiTitleState,
             uiIconState = uiIconState
diff --git a/feature-properties/src/main/java/com/anytypeio/anytype/feature_properties/add/ui/AddScreen.kt b/feature-properties/src/main/java/com/anytypeio/anytype/feature_properties/add/ui/AddScreen.kt
index 2755d8df0a..98078a993a 100644
--- a/feature-properties/src/main/java/com/anytypeio/anytype/feature_properties/add/ui/AddScreen.kt
+++ b/feature-properties/src/main/java/com/anytypeio/anytype/feature_properties/add/ui/AddScreen.kt
@@ -19,7 +19,9 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -70,6 +72,8 @@ fun AddFieldScreen(
 
     val lazyListState = rememberLazyListState()
 
+    val scrollState = rememberScrollState()
+
     Scaffold(
         modifier = Modifier
             .fillMaxSize()
@@ -90,10 +94,12 @@ fun AddFieldScreen(
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(48.dp)
+                        .verticalScroll(scrollState)
                 )
                 DefaultSearchBar(
                     modifier = Modifier
                         .fillMaxWidth()
+                        .verticalScroll(scrollState)
                         .padding(horizontal = 20.dp, vertical = 10.dp),
                     hint = R.string.object_type_add_property_screen_search_hint
                 ) { newQuery ->