Move other bits to core and foundation packages

JetBrains · Oct 21, 2023 · 83d01dd · 83d01dd
1 parent da43d5a
commit 83d01dd
Show file tree

Hide file tree

Showing 155 changed files with 2,385 additions and 2,360 deletions.
diff --git a/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts b/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts
@@ -13,7 +13,7 @@ apiValidation {
 }
 
 poko {
-    pokoAnnotation.set("org.jetbrains.jewel.GenerateDataFunctions")
+    pokoAnnotation.set("org.jetbrains.jewel.foundation.GenerateDataFunctions")
 }
 
 tasks {

diff --git a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
@@ -32,7 +32,7 @@ internal object IntUiThemeDescriptorReader {
             addImport(colorClassName.packageName, colorClassName.simpleName)
 
             addType(TypeSpec.objectBuilder(className).apply {
-                addSuperinterface(ClassName.bestGuess("org.jetbrains.jewel.ThemeDescriptor"))
+                addSuperinterface(ClassName.bestGuess("org.jetbrains.jewel.core.ThemeDescriptor"))
 
                 addProperty(
                     PropertySpec.builder("isDark", Boolean::class, KModifier.OVERRIDE)
@@ -52,9 +52,9 @@ internal object IntUiThemeDescriptorReader {
         }.build()
 
     private val colorPaletteClassName =
-        ClassName.bestGuess("org.jetbrains.jewel.ThemeColorPalette")
+        ClassName.bestGuess("org.jetbrains.jewel.core.ThemeColorPalette")
     private val iconDataClassName =
-        ClassName.bestGuess("org.jetbrains.jewel.ThemeIconData")
+        ClassName.bestGuess("org.jetbrains.jewel.core.ThemeIconData")
 
     private fun TypeSpec.Builder.readColors(colors: Map<String, String>) {
         val colorGroups = colors.entries.groupBy {

diff --git a/core/api/core.api b/core/api/core.api
diff --git a/...rg/jetbrains/jewel/ClassLoaderProvider.kt → ...tbrains/jewel/core/ClassLoaderProvider.kt b/...rg/jetbrains/jewel/ClassLoaderProvider.kt → ...tbrains/jewel/core/ClassLoaderProvider.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 interface ClassLoaderProvider {
 

diff --git a/...n/org/jetbrains/jewel/ComponentStyling.kt → .../jetbrains/jewel/core/ComponentStyling.kt b/...n/org/jetbrains/jewel/ComponentStyling.kt → .../jetbrains/jewel/core/ComponentStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.foundation.LocalContextMenuRepresentation
 import androidx.compose.runtime.Composable
@@ -13,6 +13,7 @@ import org.jetbrains.jewel.core.component.styling.TabStyle
 import org.jetbrains.jewel.core.component.styling.TextAreaStyle
 import org.jetbrains.jewel.core.component.styling.TextFieldStyle
 import org.jetbrains.jewel.core.component.styling.TooltipStyle
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Stable
 @GenerateDataFunctions

diff --git a/...kotlin/org/jetbrains/jewel/ContextMenu.kt → ...n/org/jetbrains/jewel/core/ContextMenu.kt b/...kotlin/org/jetbrains/jewel/ContextMenu.kt → ...n/org/jetbrains/jewel/core/ContextMenu.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.foundation.ContextMenuItem
 import androidx.compose.foundation.ContextMenuRepresentation

diff --git a/...rg/jetbrains/jewel/DisabledColorFilter.kt → ...tbrains/jewel/core/DisabledColorFilter.kt b/...rg/jetbrains/jewel/DisabledColorFilter.kt → ...tbrains/jewel/core/DisabledColorFilter.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix

diff --git a/...otlin/org/jetbrains/jewel/GlobalColors.kt → .../org/jetbrains/jewel/core/GlobalColors.kt b/...otlin/org/jetbrains/jewel/GlobalColors.kt → .../org/jetbrains/jewel/core/GlobalColors.kt
@@ -1,8 +1,9 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Immutable
 @GenerateDataFunctions

diff --git a/...tlin/org/jetbrains/jewel/GlobalMetrics.kt → ...org/jetbrains/jewel/core/GlobalMetrics.kt b/...tlin/org/jetbrains/jewel/GlobalMetrics.kt → ...org/jetbrains/jewel/core/GlobalMetrics.kt
@@ -1,8 +1,9 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Immutable
 @GenerateDataFunctions

diff --git a/...kotlin/org/jetbrains/jewel/GroupHeader.kt → ...n/org/jetbrains/jewel/core/GroupHeader.kt b/...kotlin/org/jetbrains/jewel/GroupHeader.kt → ...n/org/jetbrains/jewel/core/GroupHeader.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.runtime.Composable

diff --git a/.../kotlin/org/jetbrains/jewel/JewelTheme.kt → ...in/org/jetbrains/jewel/core/JewelTheme.kt b/.../kotlin/org/jetbrains/jewel/JewelTheme.kt → ...in/org/jetbrains/jewel/core/JewelTheme.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider

diff --git a/...kotlin/org/jetbrains/jewel/MenuManager.kt → ...n/org/jetbrains/jewel/core/MenuManager.kt b/...kotlin/org/jetbrains/jewel/MenuManager.kt → ...n/org/jetbrains/jewel/core/MenuManager.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.input.InputMode

diff --git a/...otlin/org/jetbrains/jewel/NoIndication.kt → .../org/jetbrains/jewel/core/NoIndication.kt b/...otlin/org/jetbrains/jewel/NoIndication.kt → .../org/jetbrains/jewel/core/NoIndication.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.foundation.Indication
 import androidx.compose.foundation.IndicationInstance

diff --git a/...kotlin/org/jetbrains/jewel/Orientation.kt → ...n/org/jetbrains/jewel/core/Orientation.kt b/...kotlin/org/jetbrains/jewel/Orientation.kt → ...n/org/jetbrains/jewel/core/Orientation.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 /**
  * Class to define possible directions.

diff --git a/...ain/kotlin/org/jetbrains/jewel/Outline.kt → ...otlin/org/jetbrains/jewel/core/Outline.kt b/...ain/kotlin/org/jetbrains/jewel/Outline.kt → ...otlin/org/jetbrains/jewel/core/Outline.kt
@@ -1,13 +1,13 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.Dp
-import org.jetbrains.jewel.core.state.FocusableComponentState
+import org.jetbrains.jewel.core.util.thenIf
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.border
-import org.jetbrains.jewel.util.thenIf
+import org.jetbrains.jewel.foundation.state.FocusableComponentState
 
 enum class Outline {
     None,

diff --git a/.../org/jetbrains/jewel/ThemeColorPalette.kt → ...jetbrains/jewel/core/ThemeColorPalette.kt b/.../org/jetbrains/jewel/ThemeColorPalette.kt → ...jetbrains/jewel/core/ThemeColorPalette.kt
@@ -1,7 +1,8 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 private val colorKeyRegex: Regex
     get() = "([a-z]+)(\\d+)".toRegex(RegexOption.IGNORE_CASE)

diff --git a/...in/org/jetbrains/jewel/ThemeDefinition.kt → ...g/jetbrains/jewel/core/ThemeDefinition.kt b/...in/org/jetbrains/jewel/ThemeDefinition.kt → ...g/jetbrains/jewel/core/ThemeDefinition.kt
@@ -1,8 +1,9 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Immutable
 @GenerateDataFunctions

diff --git a/...in/org/jetbrains/jewel/ThemeDescriptor.kt → ...g/jetbrains/jewel/core/ThemeDescriptor.kt b/...in/org/jetbrains/jewel/ThemeDescriptor.kt → ...g/jetbrains/jewel/core/ThemeDescriptor.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Immutable
 

diff --git a/...tlin/org/jetbrains/jewel/ThemeIconData.kt → ...org/jetbrains/jewel/core/ThemeIconData.kt b/...tlin/org/jetbrains/jewel/ThemeIconData.kt → ...org/jetbrains/jewel/core/ThemeIconData.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel
+package org.jetbrains.jewel.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/Button.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Button.kt
@@ -27,17 +27,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
-import org.jetbrains.jewel.JewelTheme
+import org.jetbrains.jewel.core.JewelTheme
 import org.jetbrains.jewel.core.component.styling.ButtonStyle
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Active
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Enabled
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Focused
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Hovered
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Pressed
-import org.jetbrains.jewel.core.state.FocusableComponentState
-import org.jetbrains.jewel.focusOutline
+import org.jetbrains.jewel.core.focusOutline
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.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
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Hovered
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Pressed
+import org.jetbrains.jewel.foundation.state.FocusableComponentState
 
 @Composable
 fun DefaultButton(

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/Checkbox.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Checkbox.kt
@@ -29,28 +29,28 @@ import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.state.ToggleableState
 import androidx.compose.ui.text.TextStyle
-import org.jetbrains.jewel.JewelTheme
-import org.jetbrains.jewel.LocalSwingCompatMode
-import org.jetbrains.jewel.Outline
+import org.jetbrains.jewel.core.JewelTheme
+import org.jetbrains.jewel.core.LocalSwingCompatMode
+import org.jetbrains.jewel.core.Outline
 import org.jetbrains.jewel.core.component.styling.CheckboxColors
 import org.jetbrains.jewel.core.component.styling.CheckboxIcons
 import org.jetbrains.jewel.core.component.styling.CheckboxMetrics
 import org.jetbrains.jewel.core.component.styling.LocalCheckboxStyle
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Active
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Enabled
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Focused
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Hovered
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Indeterminate
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Pressed
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Selected
-import org.jetbrains.jewel.core.state.ToggleableComponentState
-import org.jetbrains.jewel.core.state.ToggleableComponentState.Companion.readToggleableState
+import org.jetbrains.jewel.core.outline
+import org.jetbrains.jewel.core.painter.PainterHint
+import org.jetbrains.jewel.core.painter.PainterSuffixHint
+import org.jetbrains.jewel.core.painter.hints.Selected
+import org.jetbrains.jewel.core.painter.hints.Stateful
 import org.jetbrains.jewel.foundation.Stroke
-import org.jetbrains.jewel.outline
-import org.jetbrains.jewel.painter.PainterHint
-import org.jetbrains.jewel.painter.PainterSuffixHint
-import org.jetbrains.jewel.painter.hints.Selected
-import org.jetbrains.jewel.painter.hints.Stateful
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Hovered
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Indeterminate
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Pressed
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Selected
+import org.jetbrains.jewel.foundation.state.ToggleableComponentState
+import org.jetbrains.jewel.foundation.state.ToggleableComponentState.Companion.readToggleableState
 
 @Composable
 fun Checkbox(

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/Chip.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Chip.kt
@@ -25,19 +25,19 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.isUnspecified
 import androidx.compose.ui.semantics.Role
-import org.jetbrains.jewel.JewelTheme
+import org.jetbrains.jewel.core.JewelTheme
 import org.jetbrains.jewel.core.component.styling.ChipStyle
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Active
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Enabled
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Focused
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Hovered
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Pressed
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Selected
-import org.jetbrains.jewel.core.state.FocusableComponentState
-import org.jetbrains.jewel.core.state.SelectableComponentState
-import org.jetbrains.jewel.focusOutline
+import org.jetbrains.jewel.core.focusOutline
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.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
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Hovered
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Pressed
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Selected
+import org.jetbrains.jewel.foundation.state.FocusableComponentState
+import org.jetbrains.jewel.foundation.state.SelectableComponentState
 
 @Composable
 fun Chip(

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/CircularProgressIndicator.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/CircularProgressIndicator.kt
@@ -17,9 +17,9 @@ import androidx.compose.ui.res.loadSvgPainter
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.delay
-import org.jetbrains.jewel.JewelTheme
+import org.jetbrains.jewel.core.JewelTheme
 import org.jetbrains.jewel.core.component.styling.CircularProgressStyle
-import org.jetbrains.jewel.util.toRgbaHexString
+import org.jetbrains.jewel.core.util.toRgbaHexString
 
 @Composable
 fun CircularProgressIndicator(

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/Divider.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Divider.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.takeOrElse
-import org.jetbrains.jewel.JewelTheme
-import org.jetbrains.jewel.Orientation
+import org.jetbrains.jewel.core.JewelTheme
+import org.jetbrains.jewel.core.Orientation
 import org.jetbrains.jewel.core.component.styling.DividerStyle
 
 @Composable

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/Dropdown.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Dropdown.kt
@@ -36,25 +36,25 @@ import androidx.compose.ui.platform.LocalInputModeManager
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
-import org.jetbrains.jewel.JewelTheme
-import org.jetbrains.jewel.LocalMenuManager
-import org.jetbrains.jewel.MenuManager
-import org.jetbrains.jewel.Outline
+import org.jetbrains.jewel.core.JewelTheme
+import org.jetbrains.jewel.core.LocalMenuManager
+import org.jetbrains.jewel.core.MenuManager
+import org.jetbrains.jewel.core.Outline
 import org.jetbrains.jewel.core.component.styling.DropdownStyle
 import org.jetbrains.jewel.core.component.styling.LocalMenuStyle
 import org.jetbrains.jewel.core.component.styling.MenuStyle
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Active
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Enabled
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Focused
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Hovered
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Pressed
-import org.jetbrains.jewel.core.state.FocusableComponentState
-import org.jetbrains.jewel.focusOutline
+import org.jetbrains.jewel.core.focusOutline
+import org.jetbrains.jewel.core.outline
+import org.jetbrains.jewel.core.painter.hints.Stateful
+import org.jetbrains.jewel.core.util.thenIf
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.border
-import org.jetbrains.jewel.outline
-import org.jetbrains.jewel.painter.hints.Stateful
-import org.jetbrains.jewel.util.thenIf
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Hovered
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Pressed
+import org.jetbrains.jewel.foundation.state.FocusableComponentState
 
 @Composable
 fun Dropdown(

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/Icon.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/Icon.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
-import org.jetbrains.jewel.painter.rememberResourcePainterProvider
+import org.jetbrains.jewel.core.painter.rememberResourcePainterProvider
 import org.xml.sax.InputSource
 import java.io.InputStream
 

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/IconButton.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/IconButton.kt
@@ -21,8 +21,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
-import org.jetbrains.jewel.JewelTheme
-import org.jetbrains.jewel.NoIndication
+import org.jetbrains.jewel.core.JewelTheme
+import org.jetbrains.jewel.core.NoIndication
 import org.jetbrains.jewel.core.component.styling.IconButtonStyle
 
 @Composable

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/InputField.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/InputField.kt
@@ -22,19 +22,19 @@ import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
-import org.jetbrains.jewel.Outline
+import org.jetbrains.jewel.core.Outline
 import org.jetbrains.jewel.core.component.styling.InputFieldStyle
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Active
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Enabled
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Focused
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Hovered
-import org.jetbrains.jewel.core.state.CommonStateBitMask.Pressed
-import org.jetbrains.jewel.core.state.FocusableComponentState
-import org.jetbrains.jewel.focusOutline
+import org.jetbrains.jewel.core.focusOutline
+import org.jetbrains.jewel.core.outline
+import org.jetbrains.jewel.core.util.thenIf
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.border
-import org.jetbrains.jewel.outline
-import org.jetbrains.jewel.util.thenIf
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Active
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Enabled
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Focused
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Hovered
+import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Pressed
+import org.jetbrains.jewel.foundation.state.FocusableComponentState
 
 @Composable
 internal fun InputField(

diff --git a/core/src/main/kotlin/org/jetbrains/jewel/core/component/LabelledTextField.kt b/core/src/main/kotlin/org/jetbrains/jewel/core/component/LabelledTextField.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.offset
-import org.jetbrains.jewel.JewelTheme
-import org.jetbrains.jewel.Outline
+import org.jetbrains.jewel.core.JewelTheme
+import org.jetbrains.jewel.core.Outline
 import org.jetbrains.jewel.core.component.styling.LabelledTextFieldStyle
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ apiValidation { @@
     }
     poko {
-        pokoAnnotation.set("org.jetbrains.jewel.GenerateDataFunctions")
+        pokoAnnotation.set("org.jetbrains.jewel.foundation.GenerateDataFunctions")
     }
     tasks {
@@ Expand Down @@