Update Jewel to Latest Version (0.24.2)

gradle/libs.versions.toml

@@ -4,7 +4,8 @@ agpAlpha = "8.6.1"
 anvil = "2.5.0-beta11"
 bugsnagGradle = "8.1.0"
 circuit = "0.23.1"
-compose-jb = "1.6.11"
+compose-jb = "1.7.0-beta02"
+compose-jb-stable = "1.6.11"
 coroutines = "1.9.0"
 dependencyAnalysisPlugin = "1.33.0"
 detekt = "1.23.7"
@@ -13,7 +14,7 @@ errorproneGradle = "3.0.1"
 intellij-platform = "2.0.1"
 jdk = "22"
 jvmTarget = "17"
-jewel = "0.15.2.2"
+jewel = "0.24.2"
 jna = "5.15.0"
 kaml = "0.61.0"
 kotlin = "2.0.20"
@@ -80,7 +81,7 @@ develocity-agent-adapters = "com.gradle:develocity-gradle-plugin-adapters:1.0.4"
 gradleLints = "androidx.lint:lint-gradle:1.0.0-alpha02"
 gradlePlugins-anvil = { module = "com.squareup.anvil:gradle-plugin", version.ref = "anvil" }
 gradlePlugins-bugsnag = { module = "com.bugsnag:bugsnag-android-gradle-plugin", version.ref = "bugsnagGradle" }
-gradlePlugins-compose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-jb" }
+gradlePlugins-compose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-jb-stable" }
 gradlePlugins-composeCompiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 gradlePlugins-dependencyAnalysis = { module = "com.autonomousapps:dependency-analysis-gradle-plugin", version.ref = "dependencyAnalysisPlugin" }
 gradlePlugins-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
@@ -108,8 +109,8 @@ kotlin-poet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
 ktfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" }
-jewel-bridge232 = { module = "org.jetbrains.jewel:jewel-ide-laf-bridge-232", version.ref = "jewel" }
-jewel-standalone = { module = "org.jetbrains.jewel:jewel-int-ui-standalone", version = "0.15.2" }
+jewel-bridge = { module = "org.jetbrains.jewel:jewel-ide-laf-bridge-241", version.ref = "jewel" }
+jewel-standalone = { module = "org.jetbrains.jewel:jewel-int-ui-standalone-241", version.ref = "jewel" }
 jgrapht = "org.jgrapht:jgrapht-core:1.5.2"
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
 jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }

skate-plugin/compose-playground/src/jvmMain/kotlin/slack/tooling/compose/playground/MarkdownPlayground.kt

@@ -34,7 +34,7 @@ import slack.tooling.markdown.ui.MarkdownContent
 fun main() = singleWindowApplication {
   var isDark by remember { mutableStateOf(false) }
   IntUiTheme(isDark) {
-    Column(Modifier.background(JewelTheme.globalColors.paneBackground)) {
+    Column(Modifier.background(JewelTheme.globalColors.panelBackground)) {
       DefaultButton(modifier = Modifier.padding(16.dp), onClick = { isDark = !isDark }) {
         Text("Toggle dark mode")
       }

skate-plugin/compose-playground/src/jvmMain/kotlin/slack/tooling/compose/playground/ProjectGenPlayground.kt

@@ -35,7 +35,7 @@ import slack.tooling.projectgen.ProjectGenUi.ProjectGenApp
 fun main() = singleWindowApplication {
   var isDark by remember { mutableStateOf(false) }
   IntUiTheme(isDark) {
-    Column(Modifier.background(JewelTheme.globalColors.paneBackground)) {
+    Column(Modifier.background(JewelTheme.globalColors.panelBackground)) {
       DefaultButton(modifier = Modifier.padding(16.dp), onClick = { isDark = !isDark }) {
         Text("Toggle dark mode")
       }

skate-plugin/project-gen/build.gradle.kts

@@ -30,6 +30,7 @@ kotlin {
     jvmMain {
       dependencies {
         implementation(compose.animation)
+        implementation(compose.components.resources)
         implementation(compose.desktop.common)
         implementation(compose.desktop.linux_arm64)
         implementation(compose.desktop.linux_x64)
@@ -42,7 +43,7 @@ kotlin {
         implementation(compose.ui)
         implementation(libs.circuit.foundation)
         implementation(libs.compose.markdown)
-        implementation(libs.jewel.bridge232)
+        implementation(libs.jewel.bridge)
         implementation(libs.kotlin.poet)
         implementation(libs.markdown)
       }

skate-plugin/project-gen/src/jvmMain/kotlin/slack/tooling/aibot/ChatColors.kt

@@ -15,21 +15,14 @@
  */
 package slack.tooling.aibot
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.graphics.Color
-import org.jetbrains.jewel.foundation.theme.JewelTheme
 
 object ChatColors {
   val promptBackground = Color(0xFF45494A)
 
-  // Color(0xFF2d2f30) responseBackground
-  val responseBackground: Color
-    @Composable @ReadOnlyComposable get() = JewelTheme.globalColors.infoContent
+  val responseBackground = Color(0xFF2d2f30)
 
-  // Color(0xFFEAEEF7) userTextColor
-  val userTextColor: Color
-    @Composable @ReadOnlyComposable get() = JewelTheme.globalColors.infoContent
+  val userTextColor = Color(0xFFEAEEF7)
 
   val responseTextColor = Color(0xFFE0EEF7)
 }

skate-plugin/project-gen/src/jvmMain/kotlin/slack/tooling/aibot/ChatWindowUi.kt

@@ -19,7 +19,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
@@ -32,11 +31,12 @@ import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.input.TextFieldLineLimits
+import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -45,12 +45,9 @@ import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.isShiftPressed
 import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.input.key.type
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.Icon
@@ -60,7 +57,7 @@ import org.jetbrains.jewel.ui.component.TextArea
 
 @Composable
 fun ChatWindowUi(state: ChatScreen.State, modifier: Modifier = Modifier) {
-  Column(modifier = modifier.fillMaxSize().background(JewelTheme.globalColors.paneBackground)) {
+  Column(modifier = modifier.fillMaxSize().background(JewelTheme.globalColors.panelBackground)) {
     LazyColumn(modifier = Modifier.weight(1f), reverseLayout = true) {
       items(state.messages.reversed()) { message ->
         Row(
@@ -80,50 +77,40 @@ fun ChatWindowUi(state: ChatScreen.State, modifier: Modifier = Modifier) {
 
 @Composable
 private fun ConversationField(modifier: Modifier = Modifier, onSendMessage: (String) -> Unit) {
-  var textValue by remember { mutableStateOf(TextFieldValue()) }
-  val isTextNotEmpty = textValue.text.isNotBlank()
+  val textState by remember { mutableStateOf(TextFieldState()) }
+  val isTextNotEmpty = textState.text.isNotBlank()
 
   fun sendMessage() {
     if (isTextNotEmpty) {
-      onSendMessage(textValue.text)
-      textValue = TextFieldValue("")
+      onSendMessage(textState.text.toString())
+      textState.clearText()
     }
   }
-
   Row(
-    modifier.padding(4.dp).height(IntrinsicSize.Min),
+    modifier = Modifier.padding(4.dp).height(100.dp),
     horizontalArrangement = Arrangement.Center,
     verticalAlignment = Alignment.Bottom,
   ) {
-    // user text input. enter sends the message and clears text
-    // shift + enter adds a new line and expands the text field
     TextArea(
-      value = textValue,
-      onValueChange = { newText -> textValue = newText },
+      state = textState,
       modifier =
-        Modifier.weight(1f).heightIn(min = 56.dp).padding(4.dp).onPreviewKeyEvent { event ->
-          when {
-            (event.key == Key.Enter || event.key == Key.NumPadEnter) &&
-              event.type == KeyEventType.KeyDown -> {
-              if (event.isShiftPressed) {
-                val newText =
-                  textValue.text.replaceRange(
-                    textValue.selection.start,
-                    textValue.selection.end,
-                    "\n",
-                  )
-                val newSelection = TextRange(textValue.selection.start + 1)
-                textValue = TextFieldValue(newText, newSelection)
-                true
-              } else {
+        Modifier.weight(1f).heightIn(min = 56.dp).onKeyEvent { event ->
+          if (event.type == KeyEventType.KeyDown) {
+            when {
+              event.key == Key.Enter && event.isShiftPressed -> {
                 sendMessage()
                 true
               }
+              else -> false
             }
-            else -> false
+          } else {
+            false
           }
         },
-      placeholder = { Text("Start your conversation") },
+      placeholder = { Text("Start your conversation...", modifier.padding(4.dp)) },
+      decorationBoxModifier = Modifier.padding(4.dp),
+      textStyle = JewelTheme.defaultTextStyle,
+      lineLimits = TextFieldLineLimits.MultiLine(Int.MAX_VALUE),
     )
     Column(Modifier.fillMaxHeight(), verticalArrangement = Arrangement.Center) {
       // button will be disabled if there is no text
@@ -137,7 +124,7 @@ private fun ConversationField(modifier: Modifier = Modifier, onSendMessage: (Str
         enabled = isTextNotEmpty,
       ) {
         Icon(
-          painter = painterResource("/drawable/send.svg"),
+          painter = PainterResource.painterResource("drawable/send.svg"),
           contentDescription = "Send",
           modifier = Modifier.size(20.dp),
         )
@@ -169,3 +156,7 @@ private fun ChatBubble(message: Message, modifier: Modifier = Modifier) {
 private fun Modifier.enabled(enabled: Boolean): Modifier {
   return this.then(if (enabled) Modifier.alpha(1.0f) else Modifier.alpha(0.38f))
 }
+
+private fun TextFieldState.clearText() {
+  edit { replace(0, length, "") }
+}

skate-plugin/project-gen/src/jvmMain/kotlin/slack/tooling/aibot/PainterResource.kt

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 Slack Technologies, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package slack.tooling.aibot
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.platform.LocalDensity
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.decodeToImageBitmap
+import org.jetbrains.compose.resources.decodeToImageVector
+import org.jetbrains.compose.resources.decodeToSvgPainter
+
+// Migration snippet copied from https://github.com/JetBrains/compose-multiplatform-core/pull/1457
+// To resolve deprecated painterResource function from upgrading compose-jb
+object PainterResource {
+  @Composable
+  fun painterResource(resourcePath: String): Painter =
+    when (resourcePath.substringAfterLast(".")) {
+      "svg" -> rememberSvgResource(resourcePath)
+      "xml" -> rememberVectorXmlResource(resourcePath)
+      else -> rememberBitmapResource(resourcePath)
+    }
+
+  @OptIn(ExperimentalResourceApi::class)
+  @Composable
+  internal fun rememberBitmapResource(path: String): Painter {
+    return remember(path) { BitmapPainter(readResourceBytes(path).decodeToImageBitmap()) }
+  }
+
+  @OptIn(ExperimentalResourceApi::class)
+  @Composable
+  internal fun rememberVectorXmlResource(path: String): Painter {
+    val density = LocalDensity.current
+    val imageVector =
+      remember(density, path) { readResourceBytes(path).decodeToImageVector(density) }
+    return rememberVectorPainter(imageVector)
+  }
+
+  @OptIn(ExperimentalResourceApi::class)
+  @Composable
+  internal fun rememberSvgResource(path: String): Painter {
+    val density = LocalDensity.current
+    return remember(density, path) { readResourceBytes(path).decodeToSvgPainter(density) }
+  }
+
+  private object ResourceLoader
+
+  private fun readResourceBytes(resourcePath: String) =
+    ResourceLoader.javaClass.classLoader.getResourceAsStream(resourcePath).readAllBytes()
+}

skate-plugin/project-gen/src/jvmMain/kotlin/slack/tooling/markdown/ui/MarkdownPanel.kt

@@ -131,7 +131,7 @@ private fun jewelMarkdownColor(
   dividerColor: Color = JewelTheme.globalColors.borders.normal,
 ): MarkdownColors {
   val (codeText, codeBackground, inlineCodeText, inlineCodeBackground) =
-    rememberCodeBackground(JewelTheme.globalColors.paneBackground, text)
+    rememberCodeBackground(JewelTheme.globalColors.panelBackground, text)
   return DefaultMarkdownColors(
     text = text,
     codeText = codeText,

skate-plugin/project-gen/src/jvmMain/kotlin/slack/tooling/projectgen/PrefixTransformation.kt

@@ -15,33 +15,12 @@
  */
 package slack.tooling.projectgen
 
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.input.OffsetMapping
-import androidx.compose.ui.text.input.TransformedText
-import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.foundation.text.input.OutputTransformation
+import androidx.compose.foundation.text.input.TextFieldBuffer
+import androidx.compose.foundation.text.input.insert
 
-class PrefixTransformation(val prefix: String) : VisualTransformation {
-  override fun filter(text: AnnotatedString): TransformedText {
-    return prefixFilter(text, prefix)
+class PrefixTransformation(private val prefix: String) : OutputTransformation {
+  override fun TextFieldBuffer.transformOutput() {
+    insert(0, prefix)
   }
 }
-
-private fun prefixFilter(number: AnnotatedString, prefix: String): TransformedText {
-
-  val out = prefix + number.text
-  val prefixOffset = prefix.length
-
-  val numberOffsetTranslator =
-    object : OffsetMapping {
-      override fun originalToTransformed(offset: Int): Int {
-        return offset + prefixOffset
-      }
-
-      override fun transformedToOriginal(offset: Int): Int {
-        if (offset <= prefixOffset - 1) return prefixOffset
-        return offset - prefixOffset
-      }
-    }
-
-  return TransformedText(AnnotatedString(out), numberOffsetTranslator)
-}

skate-plugin/project-gen/src/jvmMain/kotlin/slack/tooling/projectgen/ProjectGenPresenter.kt

@@ -187,7 +187,8 @@ internal class ProjectGenPresenter(
             add("view-binding")
           }
         },
-      androidResourcePrefix = androidResourcePrefix.value.takeIf { androidResources.isChecked },
+      androidResourcePrefix =
+        androidResourcePrefix.value.text.takeIf { androidResources.isChecked },
       dagger = dagger.isChecked,
       daggerFeatures =
         buildSet {
@@ -209,7 +210,7 @@ internal class ProjectGenPresenter(
     packageName: String,
     android: Boolean,
     androidFeatures: Set<String>,
-    androidResourcePrefix: String?,
+    androidResourcePrefix: CharSequence?,
     dagger: Boolean,
     daggerFeatures: Set<String>,
     robolectric: Boolean,