Add dependency on fastscroller, use their scrollbar, remove platform-specific code

Author: sproctor

data-table/src/commonMain/kotlin/com/seanproctor/datatable/paging/BasicPaginatedDataTable.kt

@@ -44,9 +44,7 @@ fun BasicPaginatedDataTable(
     ) {
         val start = state.pageIndex * state.pageSize
         val scope = PaginatedRowScope(start, start + state.pageSize, this)
-        with(scope) {
-            content()
-        }
+        content(scope)
         if (state.count != scope.index) {
             state.count = scope.index
         }

demo-common/build.gradle.kts

@@ -11,20 +11,9 @@ kotlin {
             dependencies {
                 implementation(project(":data-table-material3"))
                 implementation(compose.material3)
+                implementation(libs.fastscroller.m3)
             }
         }
-
-        val skikoMain by creating {
-            dependsOn(commonMain)
-        }
-
-        val jvmMain by getting {
-            dependsOn(skikoMain)
-        }
-
-        val jsMain by getting {
-            dependsOn(skikoMain)
-        }
     }
 }
 

demo-common/src/androidMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.android.kt

@@ -31,6 +31,9 @@ import com.seanproctor.datatable.material3.DataTable
 import com.seanproctor.datatable.material3.LazyPaginatedDataTable
 import com.seanproctor.datatable.material3.PaginatedDataTable
 import com.seanproctor.datatable.paging.rememberPaginatedDataTableState
+import io.github.oikvpqya.compose.fastscroller.HorizontalScrollbar
+import io.github.oikvpqya.compose.fastscroller.VerticalScrollbar
+import io.github.oikvpqya.compose.fastscroller.material3.defaultMaterialScrollbarStyle
 import kotlin.math.min
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -125,12 +128,14 @@ fun App(onRowClick: (Int) -> Unit) {
                         println("total size: ${scrollState.horizontalScrollState.totalSize}")
                     }
                     VerticalScrollbar(
-                        scrollState.verticalScrollState,
-                        Modifier.fillMaxHeight().align(Alignment.CenterEnd)
+                        adapter = rememberScrollbarAdapter(scrollState.verticalScrollState),
+                        style = defaultMaterialScrollbarStyle(),
+                        modifier = Modifier.fillMaxHeight().align(Alignment.CenterEnd),
                     )
                     HorizontalScrollbar(
-                        scrollState.horizontalScrollState,
-                        Modifier.fillMaxWidth().align(Alignment.BottomCenter)
+                        adapter = rememberScrollbarAdapter(scrollState.horizontalScrollState),
+                        style = defaultMaterialScrollbarStyle(),
+                        modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter)
                     )
                 }
             } else if (selectedIndex == 1) {

demo-common/src/commonMain/kotlin/com/seanproctor/datatable/demo/App.kt

@@ -1,11 +1,33 @@
 package com.seanproctor.datatable.demo
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.seanproctor.datatable.DataTableScrollState
+import io.github.oikvpqya.compose.fastscroller.ScrollbarAdapter
+import kotlin.math.roundToInt
 
 @Composable
-expect fun VerticalScrollbar(scrollState: DataTableScrollState, modifier: Modifier)
+fun rememberScrollbarAdapter(scrollState: DataTableScrollState): ScrollbarAdapter {
+    return remember(scrollState) { DataTableScrollbarAdapter(scrollState) }
+}
 
-@Composable
-expect fun HorizontalScrollbar(scrollState: DataTableScrollState, modifier: Modifier)
+internal class DataTableScrollbarAdapter(
+    private val scrollState: DataTableScrollState
+) : ScrollbarAdapter {
+    override val scrollOffset: Double get() = scrollState.offset.toDouble()
+
+    override suspend fun scrollTo(scrollOffset: Double) {
+        scrollState.scrollTo(scrollOffset.roundToInt())
+    }
+
+    override val contentSize: Double
+        // This isn't strictly correct, as the actual content can be smaller
+        // than the viewport when scrollState.maxValue is 0, but the scrollbar
+        // doesn't really care as long as contentSize <= viewportSize; it's
+        // just not showing itself
+        get() = scrollState.totalSize.toDouble()
+
+    override val viewportSize: Double
+        get() = scrollState.viewportSize.toDouble()
+}

demo-common/src/commonMain/kotlin/com/seanproctor/datatable/demo/Scrollbar.kt

@@ -18,18 +18,20 @@ datatable-android-application = { id = "datatable.android.application" }
 
 [versions]
 
-activityCompose = "1.10.0"
+activityCompose = "1.10.1"
 androidGradlePlugin = "8.7.3"
 androidTools = "31.7.3"
 androidxLintGradle = "1.0.0-alpha03"
 compose = "1.7.3"
+fastscroller = "0.3.0"
 kotlin = "2.1.10"
 truth = "1.4.4"
 vanniktech = "0.30.0"
 
 [libraries]
 
 activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
+fastscroller-m3 = { module = "io.github.oikvpqya.compose.fastscroller:fastscroller-material3", version.ref = "fastscroller" }
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 
 # Dependencies of the included build-logic