Merge main again for 0.26.0

# Conflicts: # gradle.properties
JetBrains · Oct 21, 2024 · 48be805 · 48be805
2 parents 86d3c62 + 9bf43ee
commit 48be805
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 73 deletions.
diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api
@@ -254,10 +254,6 @@ public final class org/jetbrains/jewel/foundation/code/highlighting/NoOpCodeHigh
 	public fun highlight-C7ITchA (Ljava/lang/String;Ljava/lang/String;)Lkotlinx/coroutines/flow/Flow;
 }
 
-public final class org/jetbrains/jewel/foundation/lazy/BasicSelectableLazyColumnKt {
-	public static final fun BasicSelectableLazyColumn (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Landroidx/compose/foundation/layout/PaddingValues;ZLkotlin/jvm/functions/Function1;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/foundation/gestures/FlingBehavior;Lorg/jetbrains/jewel/foundation/lazy/tree/KeyActions;Lorg/jetbrains/jewel/foundation/lazy/tree/PointerEventActions;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V
-}
-
 public class org/jetbrains/jewel/foundation/lazy/DefaultMacOsSelectableColumnKeybindings : org/jetbrains/jewel/foundation/lazy/DefaultSelectableColumnKeybindings {
 	public static final field $stable I
 	public static final field Companion Lorg/jetbrains/jewel/foundation/lazy/DefaultMacOsSelectableColumnKeybindings$Companion;
@@ -376,6 +372,10 @@ public final class org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEven
 	public static fun onSelectPreviousItem (Lorg/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;)V
 }
 
+public final class org/jetbrains/jewel/foundation/lazy/SelectableLazyColumnKt {
+	public static final fun SelectableLazyColumn (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Landroidx/compose/foundation/layout/PaddingValues;ZLkotlin/jvm/functions/Function1;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/foundation/gestures/FlingBehavior;Lorg/jetbrains/jewel/foundation/lazy/tree/KeyActions;Lorg/jetbrains/jewel/foundation/lazy/tree/PointerEventActions;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V
+}
+
 public abstract interface class org/jetbrains/jewel/foundation/lazy/SelectableLazyItemScope : androidx/compose/foundation/lazy/LazyItemScope {
 	public abstract fun isActive ()Z
 	public abstract fun isSelected ()Z

diff --git a/...ndation/lazy/BasicSelectableLazyColumn.kt → ...l/foundation/lazy/SelectableLazyColumn.kt b/...ndation/lazy/BasicSelectableLazyColumn.kt → ...l/foundation/lazy/SelectableLazyColumn.kt
@@ -43,7 +43,7 @@ import org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions
 
 /** A composable that displays a scrollable and selectable list of items in a column arrangement. */
 @Composable
-public fun BasicSelectableLazyColumn(
+public fun SelectableLazyColumn(
     modifier: Modifier = Modifier,
     selectionMode: SelectionMode = SelectionMode.Multiple,
     state: SelectableLazyListState = rememberSelectableLazyListState(),

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
-import org.jetbrains.jewel.foundation.lazy.BasicSelectableLazyColumn
+import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyItemScope
 import org.jetbrains.jewel.foundation.lazy.SelectionMode
 import org.jetbrains.jewel.foundation.lazy.itemsIndexed
@@ -109,7 +109,7 @@ public fun <T> BasicLazyTree(
         )
     }
 
-    BasicSelectableLazyColumn(
+    SelectableLazyColumn(
         modifier = modifier,
         state = treeState.delegate,
         selectionMode = selectionMode,

diff --git a/foundation/src/test/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumnTest.kt b/foundation/src/test/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumnTest.kt
@@ -33,7 +33,7 @@ internal class SelectableLazyColumnTest {
             val scrollState = SelectableLazyListState(LazyListState())
             composeRule.setContent {
                 Box(modifier = Modifier.requiredHeight(100.dp)) {
-                    BasicSelectableLazyColumn(state = scrollState) {
+                    SelectableLazyColumn(state = scrollState) {
                         items(items1.size, key = { items1[it] }) {
                             val itemText = "Item ${items1[it]}"
                             BasicText(itemText, modifier = Modifier.testTag(itemText))
@@ -59,7 +59,7 @@ internal class SelectableLazyColumnTest {
         val state = SelectableLazyListState(LazyListState())
         composeRule.setContent {
             Box(modifier = Modifier.requiredHeight(300.dp)) {
-                BasicSelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
+                SelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
                     items(items.size, key = { items[it] }) {
                         val itemText = "Item ${items[it]}"
                         BasicText(itemText, modifier = Modifier.testTag(itemText))
@@ -115,7 +115,7 @@ internal class SelectableLazyColumnTest {
         val state = SelectableLazyListState(LazyListState())
         composeRule.setContent {
             Box(modifier = Modifier.requiredHeight(300.dp)) {
-                BasicSelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
+                SelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
                     items(items.size, key = { items[it] }) {
                         val itemText = "Item ${items[it]}"
                         BasicText(itemText, modifier = Modifier.testTag(itemText))
@@ -179,7 +179,7 @@ internal class SelectableLazyColumnTest {
         val state = SelectableLazyListState(LazyListState())
         composeRule.setContent {
             Box(modifier = Modifier.requiredHeight(300.dp)) {
-                BasicSelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
+                SelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
                     items(items.size, key = { items[it] }) {
                         val itemText = "Item ${items[it]}"
                         BasicText(itemText, modifier = Modifier.testTag(itemText))
@@ -226,7 +226,7 @@ internal class SelectableLazyColumnTest {
         composeRule.setContent {
             Box(modifier = Modifier.requiredHeight(300.dp)) {
                 val items = currentItems.value
-                BasicSelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
+                SelectableLazyColumn(state = state, modifier = Modifier.testTag("list")) {
                     items(items.size, key = { items[it] }) {
                         val itemText = "Item ${items[it]}"
                         BasicText(itemText, modifier = Modifier.testTag(itemText))

diff --git a/...main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt b/...main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ReleasesSampleCompose.kt
@@ -69,6 +69,7 @@ import org.jetbrains.jewel.bridge.medium
 import org.jetbrains.jewel.bridge.regular
 import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified
 import org.jetbrains.jewel.bridge.toComposeColor
+import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
 import org.jetbrains.jewel.foundation.lazy.SelectionMode
 import org.jetbrains.jewel.foundation.lazy.items
 import org.jetbrains.jewel.foundation.lazy.rememberSelectableLazyListState
@@ -78,7 +79,6 @@ import org.jetbrains.jewel.ui.component.HorizontalSplitLayout
 import org.jetbrains.jewel.ui.component.Icon
 import org.jetbrains.jewel.ui.component.IconButton
 import org.jetbrains.jewel.ui.component.PopupMenu
-import org.jetbrains.jewel.ui.component.SelectableLazyColumn
 import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.component.TextField
 import org.jetbrains.jewel.ui.component.Typography

diff --git a/...one/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt b/...one/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp
 import kotlin.random.Random
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
 import org.jetbrains.jewel.foundation.lazy.SelectionMode
 import org.jetbrains.jewel.foundation.lazy.rememberSelectableLazyListState
 import org.jetbrains.jewel.foundation.lazy.tree.buildTree
@@ -40,7 +41,6 @@ import org.jetbrains.jewel.ui.component.GroupHeader
 import org.jetbrains.jewel.ui.component.LazyTree
 import org.jetbrains.jewel.ui.component.OutlinedButton
 import org.jetbrains.jewel.ui.component.RadioButtonChip
-import org.jetbrains.jewel.ui.component.SelectableLazyColumn
 import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.component.ToggleableChip
 import org.jetbrains.jewel.ui.theme.colorPalette

diff --git a/ui/api/ui.api b/ui/api/ui.api
@@ -721,10 +721,6 @@ public final class org/jetbrains/jewel/ui/component/SelectableIconButtonState$Co
 	public static synthetic fun of-z9lnavA$default (Lorg/jetbrains/jewel/ui/component/SelectableIconButtonState$Companion;ZZZZZZILjava/lang/Object;)J
 }
 
-public final class org/jetbrains/jewel/ui/component/SelectableLazyColumnKt {
-	public static final fun SelectableLazyColumn (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Landroidx/compose/foundation/layout/PaddingValues;ZLkotlin/jvm/functions/Function1;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;Landroidx/compose/foundation/gestures/FlingBehavior;Lorg/jetbrains/jewel/foundation/lazy/tree/KeyActions;Lorg/jetbrains/jewel/foundation/lazy/tree/PointerEventActions;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V
-}
-
 public final class org/jetbrains/jewel/ui/component/SliderKt {
 	public static final fun Slider (FLkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;ZLkotlin/ranges/ClosedFloatingPointRange;ILkotlin/jvm/functions/Function0;Landroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/ui/component/styling/SliderStyle;Landroidx/compose/runtime/Composer;II)V
 }

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SelectableLazyColumn.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SelectableLazyColumn.kt