Table

JetBrains · Aug 29, 2024 · bc325a2 · bc325a2
1 parent c4fcde1
commit bc325a2
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 189 deletions.
diff --git a/...kotlin/org/jetbrains/jewel/foundation/lazy/table/selectable/SingleCellSelectionManager.kt b/...kotlin/org/jetbrains/jewel/foundation/lazy/table/selectable/SingleCellSelectionManager.kt
@@ -10,9 +10,12 @@ import org.jetbrains.jewel.foundation.lazy.selectable.SelectionType
 /**
  * A [SelectionManager] that support single cell selection.
  */
-public open class SingleCellSelectionManager : TableSelectionManager {
-    private var selectedRowKey: Any? by mutableStateOf(null)
-    private var selectedColumnKey: Any? by mutableStateOf(null)
+public open class SingleCellSelectionManager(
+    initialColumnKey: Any?,
+    initialRowKey: Any?,
+) : TableSelectionManager {
+    private var selectedRowKey: Any? by mutableStateOf(initialRowKey)
+    private var selectedColumnKey: Any? by mutableStateOf(initialColumnKey)
 
     override val interactionSource: MutableInteractionSource = MutableInteractionSource()
 

diff --git a/.../kotlin/org/jetbrains/jewel/foundation/lazy/table/selectable/SingleRowSelectionManager.kt b/.../kotlin/org/jetbrains/jewel/foundation/lazy/table/selectable/SingleRowSelectionManager.kt
@@ -7,8 +7,10 @@ import androidx.compose.runtime.setValue
 import org.jetbrains.jewel.foundation.lazy.selectable.SelectionEvent
 import org.jetbrains.jewel.foundation.lazy.selectable.SelectionType
 
-public class SingleRowSelectionManager : TableSelectionManager {
-    private var selectedRowKey: Any? by mutableStateOf(null)
+public class SingleRowSelectionManager(
+    initialRowKey: Any?,
+) : TableSelectionManager {
+    private var selectedRowKey: Any? by mutableStateOf(initialRowKey)
 
     override val interactionSource: MutableInteractionSource = MutableInteractionSource()
 

diff --git a/...main/kotlin/org/jetbrains/jewel/foundation/lazy/table/selectable/TableSelectionManager.kt b/...main/kotlin/org/jetbrains/jewel/foundation/lazy/table/selectable/TableSelectionManager.kt
@@ -1,5 +1,7 @@
 package org.jetbrains.jewel.foundation.lazy.table.selectable
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import org.jetbrains.jewel.foundation.lazy.selectable.SelectionManager
 
 public interface TableSelectionManager : SelectionManager {
@@ -29,3 +31,18 @@ public interface TableSelectionManager : SelectionManager {
         return false
     }
 }
+
+@Composable
+public fun rememberSingleCellSelectionManager(
+    initialColumnKey: Any? = null,
+    initialRowKey: Any? = null,
+): TableSelectionManager =
+    remember {
+        SingleCellSelectionManager(initialColumnKey, initialRowKey)
+    }
+
+@Composable
+public fun rememberSingleRowSelectionManager(initialRowKey: Any? = null): TableSelectionManager =
+    remember {
+        SingleRowSelectionManager(initialRowKey)
+    }
diff --git a/...ndation/lazy/table/view/ColumnAccessor.kt → .../foundation/lazy/table/view/ColumnView.kt b/...ndation/lazy/table/view/ColumnAccessor.kt → .../foundation/lazy/table/view/ColumnView.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.unit.Constraints
 import org.jetbrains.jewel.foundation.lazy.table.LazyTableItemScope
 import org.jetbrains.jewel.foundation.lazy.table.LazyTableLayoutScope
 
-public interface ColumnAccessor<T> {
+public interface ColumnView<T> {
     public fun columns(): Int
 
     public fun pinnedColumns(): Int
@@ -29,14 +29,6 @@ public interface ColumnAccessor<T> {
     ) {
     }
 
-    @Composable
-    public fun container(
-        rowKey: Any?,
-        columnKey: Any?,
-        content: @Composable () -> Unit,
-    ) {
-    }
-
     @Composable
     public fun supportColumnSorting(): Boolean = false