Clean up code, add simple IntUiTheme entry point

Moved foundation.tree into foundation.lazy, too.
JetBrains · Oct 22, 2023 · 3f8aab6 · 3f8aab6
1 parent 935db52
commit 3f8aab6
Show file tree

Hide file tree

Showing 31 changed files with 359 additions and 327 deletions.
diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.window.WindowState
 import androidx.compose.ui.window.rememberWindowState
 import com.jetbrains.JBR
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.window.styling.DecoratedWindowStyle
 import org.jetbrains.jewel.window.utils.DesktopPlatform

diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt
@@ -26,7 +26,8 @@ import java.awt.Frame
 import java.awt.event.MouseEvent
 import java.awt.event.WindowEvent
 
-@Composable internal fun DecoratedWindowScope.TitleBarOnLinux(
+@Composable
+internal fun DecoratedWindowScope.TitleBarOnLinux(
     modifier: Modifier = Modifier,
     gradientStartColor: Color = Color.Unspecified,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,
@@ -72,15 +73,17 @@ import java.awt.event.WindowEvent
     }
 }
 
-@Composable private fun TitleBarScope.CloseButton(
+@Composable
+private fun TitleBarScope.CloseButton(
     onClick: () -> Unit,
     state: DecoratedWindowState,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,
 ) {
     ControlButton(onClick, state, style.icons.closeButton, "Close", style, style.paneCloseButtonStyle)
 }
 
-@Composable private fun TitleBarScope.ControlButton(
+@Composable
+private fun TitleBarScope.ControlButton(
     onClick: () -> Unit,
     state: DecoratedWindowState,
     painterProvider: PainterProvider,

diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.MacOS.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.MacOS.kt
@@ -55,7 +55,8 @@ private class NewFullscreenControlsNode(
     var newControls: Boolean,
 ) : Modifier.Node()
 
-@Composable internal fun DecoratedWindowScope.TitleBarOnMacOs(
+@Composable
+internal fun DecoratedWindowScope.TitleBarOnMacOs(
     modifier: Modifier = Modifier,
     gradientStartColor: Color = Color.Unspecified,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,

diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Windows.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Windows.kt
@@ -17,7 +17,8 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.util.isDark
 import org.jetbrains.jewel.window.styling.TitleBarStyle
 
-@Composable internal fun DecoratedWindowScope.TitleBarOnWindows(
+@Composable
+internal fun DecoratedWindowScope.TitleBarOnWindows(
     modifier: Modifier = Modifier,
     gradientStartColor: Color = Color.Unspecified,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,

diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt
@@ -70,7 +70,8 @@ internal const val TITLE_BAR_BORDER_LAYOUT_ID = "__TITLE_BAR_BORDER__"
     }
 }
 
-@Composable internal fun DecoratedWindowScope.TitleBarImpl(
+@Composable
+internal fun DecoratedWindowScope.TitleBarImpl(
     modifier: Modifier = Modifier,
     gradientStartColor: Color = Color.Unspecified,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,
@@ -224,7 +225,8 @@ internal class TitleBarMeasurePolicy(
     }
 }
 
-@Composable internal fun rememberTitleBarMeasurePolicy(
+@Composable
+internal fun rememberTitleBarMeasurePolicy(
     window: Window,
     state: DecoratedWindowState,
     applyTitleBar: (Dp, DecoratedWindowState) -> PaddingValues,

diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api
diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt
@@ -25,10 +25,10 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListScopeContainer.Entry
-import org.jetbrains.jewel.foundation.tree.DefaultSelectableLazyColumnEventAction
-import org.jetbrains.jewel.foundation.tree.DefaultSelectableLazyColumnKeyActions
-import org.jetbrains.jewel.foundation.tree.KeyBindingActions
-import org.jetbrains.jewel.foundation.tree.PointerEventActions
+import org.jetbrains.jewel.foundation.lazy.tree.DefaultSelectableLazyColumnEventAction
+import org.jetbrains.jewel.foundation.lazy.tree.DefaultSelectableLazyColumnKeyActions
+import org.jetbrains.jewel.foundation.lazy.tree.KeyBindingActions
+import org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions
 
 /**
  * A composable that displays a scrollable and selectable list of items in

diff --git a/...ns/jewel/foundation/tree/BasicLazyTree.kt → ...wel/foundation/lazy/tree/BasicLazyTree.kt b/...ns/jewel/foundation/tree/BasicLazyTree.kt → ...wel/foundation/lazy/tree/BasicLazyTree.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

diff --git a/...brains/jewel/foundation/tree/BuildTree.kt → ...s/jewel/foundation/lazy/tree/BuildTree.kt b/...brains/jewel/foundation/tree/BuildTree.kt → ...s/jewel/foundation/lazy/tree/BuildTree.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import java.io.File
 import java.nio.file.Path

diff --git a/...dation/tree/DefaultTreeViewKeybindings.kt → ...n/lazy/tree/DefaultTreeViewKeybindings.kt b/...dation/tree/DefaultTreeViewKeybindings.kt → ...n/lazy/tree/DefaultTreeViewKeybindings.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyEvent

diff --git a/...ndation/tree/DefaultTreeViewOnKeyEvent.kt → ...on/lazy/tree/DefaultTreeViewOnKeyEvent.kt b/...ndation/tree/DefaultTreeViewOnKeyEvent.kt → ...on/lazy/tree/DefaultTreeViewOnKeyEvent.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListState

diff --git a/...ewel/foundation/tree/KeyBindingActions.kt → ...foundation/lazy/tree/KeyBindingActions.kt b/...ewel/foundation/tree/KeyBindingActions.kt → ...foundation/lazy/tree/KeyBindingActions.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.KeyEventType

diff --git a/...g/jetbrains/jewel/foundation/tree/Tree.kt → ...brains/jewel/foundation/lazy/tree/Tree.kt b/...g/jetbrains/jewel/foundation/tree/Tree.kt → ...brains/jewel/foundation/lazy/tree/Tree.kt
@@ -1,6 +1,6 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
-import org.jetbrains.jewel.foundation.tree.Tree.Element.Node
+import org.jetbrains.jewel.foundation.lazy.tree.Tree.Element.Node
 
 @Suppress("UNCHECKED_CAST")
 fun <T> emptyTree() = Tree.EMPTY as Tree<T>

diff --git a/...brains/jewel/foundation/tree/TreeState.kt → ...s/jewel/foundation/lazy/tree/TreeState.kt b/...brains/jewel/foundation/tree/TreeState.kt → ...s/jewel/foundation/lazy/tree/TreeState.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import androidx.compose.foundation.gestures.ScrollableState
 import androidx.compose.foundation.lazy.LazyListState

diff --git a/...wel/foundation/tree/TreeViewOnKeyEvent.kt → ...oundation/lazy/tree/TreeViewOnKeyEvent.kt b/...wel/foundation/tree/TreeViewOnKeyEvent.kt → ...oundation/lazy/tree/TreeViewOnKeyEvent.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation.tree
+package org.jetbrains.jewel.foundation.lazy.tree
 
 import org.jetbrains.jewel.foundation.lazy.SelectableColumnOnKeyEvent
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey

diff --git a/.../org/jetbrains/jewel/foundation/Border.kt → ...rains/jewel/foundation/modifier/Border.kt b/.../org/jetbrains/jewel/foundation/Border.kt → ...rains/jewel/foundation/modifier/Border.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.foundation
+package org.jetbrains.jewel.foundation.modifier
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -36,6 +36,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isUnspecified
 import androidx.compose.ui.unit.takeOrElse
 import androidx.compose.ui.unit.toSize
+import org.jetbrains.jewel.foundation.Stroke
+import org.jetbrains.jewel.foundation.grow
+import org.jetbrains.jewel.foundation.hasAtLeastOneNonRoundedCorner
+import org.jetbrains.jewel.foundation.shrink
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min

diff --git a/int-ui/int-ui-standalone/api/int-ui-standalone.api b/int-ui/int-ui-standalone/api/int-ui-standalone.api
@@ -337,6 +337,7 @@ public final class org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalMetrics
 
 public final class org/jetbrains/jewel/intui/standalone/theme/IntUiThemeKt {
 	public static final fun IntUiTheme (Lorg/jetbrains/jewel/foundation/theme/ThemeDefinition;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
+	public static final fun IntUiTheme (ZZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
 	public static final fun darkComponentStyling (Lorg/jetbrains/jewel/foundation/theme/JewelTheme$Companion;Lorg/jetbrains/jewel/ui/component/styling/CheckboxStyle;Lorg/jetbrains/jewel/ui/component/styling/ChipStyle;Lorg/jetbrains/jewel/ui/component/styling/CircularProgressStyle;Lorg/jetbrains/jewel/ui/component/styling/ButtonStyle;Lorg/jetbrains/jewel/ui/component/styling/TabStyle;Lorg/jetbrains/jewel/ui/component/styling/DividerStyle;Lorg/jetbrains/jewel/ui/component/styling/DropdownStyle;Lorg/jetbrains/jewel/ui/component/styling/TabStyle;Lorg/jetbrains/jewel/ui/component/styling/GroupHeaderStyle;Lorg/jetbrains/jewel/ui/component/styling/HorizontalProgressBarStyle;Lorg/jetbrains/jewel/ui/component/styling/IconButtonStyle;Lorg/jetbrains/jewel/ui/component/styling/LabelledTextFieldStyle;Lorg/jetbrains/jewel/ui/component/styling/LazyTreeStyle;Lorg/jetbrains/jewel/ui/component/styling/LinkStyle;Lorg/jetbrains/jewel/ui/component/styling/MenuStyle;Lorg/jetbrains/jewel/ui/component/styling/ButtonStyle;Lorg/jetbrains/jewel/ui/component/styling/RadioButtonStyle;Lorg/jetbrains/jewel/ui/component/styling/ScrollbarStyle;Lorg/jetbrains/jewel/ui/component/styling/TextAreaStyle;Lorg/jetbrains/jewel/ui/component/styling/TextFieldStyle;Lorg/jetbrains/jewel/ui/component/styling/TooltipStyle;Lorg/jetbrains/jewel/ui/component/styling/DropdownStyle;Landroidx/compose/runtime/Composer;IIII)Lorg/jetbrains/jewel/ui/ComponentStyling;
 	public static final fun darkThemeDefinition-RFMEUTM (Lorg/jetbrains/jewel/foundation/theme/JewelTheme$Companion;Lorg/jetbrains/jewel/foundation/GlobalColors;Lorg/jetbrains/jewel/foundation/GlobalMetrics;Lorg/jetbrains/jewel/foundation/theme/ThemeColorPalette;Lorg/jetbrains/jewel/foundation/theme/ThemeIconData;Landroidx/compose/ui/text/TextStyle;JLandroidx/compose/runtime/Composer;II)Lorg/jetbrains/jewel/foundation/theme/ThemeDefinition;
 	public static final fun defaultComponentStyling (Lorg/jetbrains/jewel/foundation/theme/JewelTheme$Companion;Lorg/jetbrains/jewel/foundation/theme/ThemeDefinition;Landroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/ui/ComponentStyling;

diff --git a/...lone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt b/...lone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
@@ -60,14 +60,10 @@ fun CheckboxMetrics.Companion.defaults(
 
 @Composable
 fun CheckboxIcons.Companion.light(
-    checkbox: PainterProvider = checkbox("com/intellij/ide/ui/laf/icons/intellij/checkBox.svg"),
+    checkbox: PainterProvider = standalonePainterProvider("com/intellij/ide/ui/laf/icons/intellij/checkBox.svg"),
 ) = CheckboxIcons(checkbox)
 
 @Composable
 fun CheckboxIcons.Companion.dark(
-    checkbox: PainterProvider = checkbox("com/intellij/ide/ui/laf/icons/darcula/checkBox.svg"),
+    checkbox: PainterProvider = standalonePainterProvider("com/intellij/ide/ui/laf/icons/darcula/checkBox.svg"),
 ) = CheckboxIcons(checkbox)
-
-@Composable
-private fun checkbox(basePath: String): PainterProvider =
-    standalonePainterProvider(basePath)
diff --git a/...nt-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiTheme.kt b/...nt-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiTheme.kt
@@ -178,6 +178,27 @@ fun JewelTheme.Companion.lightComponentStyling(
     undecoratedDropdownStyle = undecoratedDropdownStyle,
 )
 
+@Composable
+fun IntUiTheme(
+    isDark: Boolean = false,
+    swingCompatMode: Boolean = false,
+    content: @Composable () -> Unit,
+) {
+    val themeDefinition =
+        if (isDark) {
+            JewelTheme.darkThemeDefinition()
+        } else {
+            JewelTheme.lightThemeDefinition()
+        }
+
+    IntUiTheme(
+        theme = themeDefinition,
+        componentStyling = { emptyArray() },
+        swingCompatMode = swingCompatMode,
+        content = content,
+    )
+}
+
 @Composable
 fun IntUiTheme(
     theme: ThemeDefinition,

diff --git a/.../ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt b/.../ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt
@@ -28,8 +28,8 @@ import com.intellij.ui.JBColor
 import icons.JewelIcons
 import org.jetbrains.jewel.bridge.theme.SwingBridgeTheme
 import org.jetbrains.jewel.bridge.toComposeColor
+import org.jetbrains.jewel.foundation.lazy.tree.buildTree
 import org.jetbrains.jewel.foundation.theme.JewelTheme
-import org.jetbrains.jewel.foundation.tree.buildTree
 import org.jetbrains.jewel.ui.component.CheckboxRow
 import org.jetbrains.jewel.ui.component.CircularProgressIndicator
 import org.jetbrains.jewel.ui.component.CircularProgressIndicatorBig
@@ -43,7 +43,8 @@ import org.jetbrains.jewel.ui.component.Text
 import org.jetbrains.jewel.ui.component.TextField
 import org.jetbrains.jewel.ui.component.Tooltip
 
-@Composable internal fun ComponentShowcaseTab() {
+@Composable
+internal fun ComponentShowcaseTab() {
     SwingBridgeTheme {
         val bgColor by remember(JewelTheme.isDark) { mutableStateOf(JBColor.PanelBackground.toComposeColor()) }
 
@@ -58,7 +59,8 @@ import org.jetbrains.jewel.ui.component.Tooltip
     }
 }
 
-@Composable private fun RowScope.ColumnOne() {
+@Composable
+private fun RowScope.ColumnOne() {
     Column(
         Modifier.weight(1f),
         verticalArrangement = Arrangement.spacedBy(16.dp),
@@ -167,7 +169,8 @@ import org.jetbrains.jewel.ui.component.Tooltip
     }
 }
 
-@Composable private fun RowScope.ColumnTwo() {
+@Composable
+private fun RowScope.ColumnTwo() {
     Column(
         Modifier.weight(1f),
         verticalArrangement = Arrangement.spacedBy(16.dp),

diff --git a/...s/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt b/...s/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.GroupHeader
 import org.jetbrains.jewel.ui.component.OutlinedButton

diff --git a/...ndalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt b/...ndalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt
@@ -23,8 +23,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
+import org.jetbrains.jewel.foundation.lazy.tree.buildTree
 import org.jetbrains.jewel.foundation.theme.JewelTheme
-import org.jetbrains.jewel.foundation.tree.buildTree
 import org.jetbrains.jewel.ui.component.Chip
 import org.jetbrains.jewel.ui.component.GroupHeader
 import org.jetbrains.jewel.ui.component.LazyTree

diff --git a/ui/api/ui.api b/ui/api/ui.api
@@ -320,7 +320,7 @@ public final class org/jetbrains/jewel/ui/component/LabelledTextFieldKt {
 }
 
 public final class org/jetbrains/jewel/ui/component/LazyTreeKt {
-	public static final fun LazyTree (Lorg/jetbrains/jewel/foundation/tree/Tree;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/foundation/tree/TreeState;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/foundation/tree/KeyBindingActions;Lorg/jetbrains/jewel/ui/component/styling/LazyTreeStyle;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
+	public static final fun LazyTree (Lorg/jetbrains/jewel/foundation/lazy/tree/Tree;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/foundation/lazy/tree/TreeState;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/jewel/foundation/lazy/tree/KeyBindingActions;Lorg/jetbrains/jewel/ui/component/styling/LazyTreeStyle;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
 }
 
 public final class org/jetbrains/jewel/ui/component/LinearProgressBarKt {
@@ -1298,7 +1298,7 @@ public final class org/jetbrains/jewel/ui/component/styling/LazyTreeColors {
 	public static final field $stable I
 	public static final field Companion Lorg/jetbrains/jewel/ui/component/styling/LazyTreeColors$Companion;
 	public synthetic fun <init> (JJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun contentFor-iZdlh1w (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
+	public final fun contentFor-EWxiZrY (JLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getContent-0d7_KjU ()J
 	public final fun getContentFocused-0d7_KjU ()J

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/Outline.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/Outline.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.Dp
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.state.FocusableComponentState
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.util.thenIf

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Button.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Button.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Chip.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Chip.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.isUnspecified
 import androidx.compose.ui.semantics.Role
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Dropdown.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Dropdown.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InputField.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InputField.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LazyTree.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LazyTree.kt
@@ -7,15 +7,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.takeOrElse
 import org.jetbrains.jewel.foundation.ExperimentalJewelApi
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyItemScope
+import org.jetbrains.jewel.foundation.lazy.tree.BasicLazyTree
+import org.jetbrains.jewel.foundation.lazy.tree.DefaultTreeViewKeyActions
+import org.jetbrains.jewel.foundation.lazy.tree.KeyBindingActions
+import org.jetbrains.jewel.foundation.lazy.tree.Tree
+import org.jetbrains.jewel.foundation.lazy.tree.TreeElementState
+import org.jetbrains.jewel.foundation.lazy.tree.TreeState
+import org.jetbrains.jewel.foundation.lazy.tree.rememberTreeState
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.foundation.theme.LocalContentColor
-import org.jetbrains.jewel.foundation.tree.BasicLazyTree
-import org.jetbrains.jewel.foundation.tree.DefaultTreeViewKeyActions
-import org.jetbrains.jewel.foundation.tree.KeyBindingActions
-import org.jetbrains.jewel.foundation.tree.Tree
-import org.jetbrains.jewel.foundation.tree.TreeElementState
-import org.jetbrains.jewel.foundation.tree.TreeState
-import org.jetbrains.jewel.foundation.tree.rememberTreeState
 import org.jetbrains.jewel.ui.component.styling.LazyTreeStyle
 import org.jetbrains.jewel.ui.theme.treeStyle
 

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt
@@ -61,7 +61,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.foundation.border
+import org.jetbrains.jewel.foundation.modifier.border
 import org.jetbrains.jewel.foundation.modifier.onHover
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LazyTreeStyling.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LazyTreeStyling.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import org.jetbrains.jewel.foundation.GenerateDataFunctions
-import org.jetbrains.jewel.foundation.tree.TreeElementState
+import org.jetbrains.jewel.foundation.lazy.tree.TreeElementState
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Stable