Upgrade to Compose 1.7.0-dev1703 (#421)

upgrade to Compose 1.7.0-dev1703
JetBrains · Jul 1, 2024 · 1749631 · 1749631
1 parent 47a9217
commit 1749631
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 32 deletions.
diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api
@@ -322,6 +322,8 @@ public final class org/jetbrains/jewel/foundation/lazy/SelectableLazyListState :
 	public final fun getFirstVisibleItemScrollOffset ()I
 	public final fun getInteractionSource ()Landroidx/compose/foundation/interaction/InteractionSource;
 	public final fun getLastActiveItemIndex ()Ljava/lang/Integer;
+	public fun getLastScrolledBackward ()Z
+	public fun getLastScrolledForward ()Z
 	public final fun getLayoutInfo ()Landroidx/compose/foundation/lazy/LazyListLayoutInfo;
 	public final fun getLazyListState ()Landroidx/compose/foundation/lazy/LazyListState;
 	public fun getSelectedKeys ()Ljava/util/Set;
@@ -656,6 +658,8 @@ public final class org/jetbrains/jewel/foundation/lazy/tree/TreeState : androidx
 	public fun dispatchRawDelta (F)F
 	public fun getCanScrollBackward ()Z
 	public fun getCanScrollForward ()Z
+	public fun getLastScrolledBackward ()Z
+	public fun getLastScrolledForward ()Z
 	public final fun getOpenNodes ()Ljava/util/Set;
 	public fun getSelectedKeys ()Ljava/util/Set;
 	public fun isScrollInProgress ()Z

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 commonmark = "0.22.0"
-composeDesktop = "1.6.20-dev1663"
+composeDesktop = "1.7.0-dev1703"
 detekt = "1.23.6"
 dokka = "1.9.20"
 idea = "241.17890.1"

diff --git a/ui/api/ui.api b/ui/api/ui.api
@@ -62,12 +62,6 @@ public final class org/jetbrains/jewel/ui/DisabledColorFilterKt {
 	public static final fun disabled (Landroidx/compose/ui/graphics/ColorFilter$Companion;)Landroidx/compose/ui/graphics/ColorFilter;
 }
 
-public final class org/jetbrains/jewel/ui/NoIndication : androidx/compose/foundation/Indication {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/NoIndication;
-	public fun rememberUpdatedInstance (Landroidx/compose/foundation/interaction/InteractionSource;Landroidx/compose/runtime/Composer;I)Landroidx/compose/foundation/IndicationInstance;
-}
-
 public final class org/jetbrains/jewel/ui/Orientation : java/lang/Enum {
 	public static final field Horizontal Lorg/jetbrains/jewel/ui/Orientation;
 	public static final field Vertical Lorg/jetbrains/jewel/ui/Orientation;

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/NoIndication.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/NoIndication.kt
diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/IconButton.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/IconButton.kt
@@ -29,7 +29,6 @@ import org.jetbrains.jewel.foundation.state.CommonStateBitMask
 import org.jetbrains.jewel.foundation.state.FocusableComponentState
 import org.jetbrains.jewel.foundation.state.SelectableComponentState
 import org.jetbrains.jewel.foundation.theme.JewelTheme
-import org.jetbrains.jewel.ui.NoIndication
 import org.jetbrains.jewel.ui.component.styling.IconButtonStyle
 import org.jetbrains.jewel.ui.theme.iconButtonStyle
 
@@ -54,7 +53,7 @@ public fun IconButton(
                 enabled = enabled,
                 role = Role.Button,
                 interactionSource = interactionSource,
-                indication = NoIndication,
+                indication = null,
             ),
         style = style,
         interactionSource = interactionSource,

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tabs.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tabs.kt
@@ -44,7 +44,6 @@ import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Selected
 import org.jetbrains.jewel.foundation.state.SelectableComponentState
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.foundation.theme.LocalContentColor
-import org.jetbrains.jewel.ui.NoIndication
 import org.jetbrains.jewel.ui.painter.hints.Stateful
 import org.jetbrains.jewel.ui.theme.defaultTabStyle
 import org.jetbrains.jewel.ui.theme.editorTabStyle
@@ -138,7 +137,7 @@ internal fun TabImpl(
                     onClick = tabData.onClick,
                     selected = tabData.selected,
                     interactionSource = interactionSource,
-                    indication = NoIndication,
+                    indication = null,
                     role = Role.Tab,
                 )
                 .drawBehind {

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/theme/JewelTheme.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/theme/JewelTheme.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.jewel.ui.theme
 
-import androidx.compose.foundation.LocalIndication
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
@@ -11,7 +10,6 @@ import org.jetbrains.jewel.foundation.theme.ThemeColorPalette
 import org.jetbrains.jewel.foundation.theme.ThemeDefinition
 import org.jetbrains.jewel.foundation.theme.ThemeIconData
 import org.jetbrains.jewel.ui.ComponentStyling
-import org.jetbrains.jewel.ui.NoIndication
 import org.jetbrains.jewel.ui.component.styling.ButtonStyle
 import org.jetbrains.jewel.ui.component.styling.CheckboxStyle
 import org.jetbrains.jewel.ui.component.styling.ChipStyle
@@ -192,7 +190,6 @@ public fun BaseJewelTheme(
         CompositionLocalProvider(
             LocalColorPalette provides theme.colorPalette,
             LocalIconData provides theme.iconData,
-            LocalIndication provides NoIndication,
         ) {
             CompositionLocalProvider(values = styling.styles(), content = content)
         }