[jewel] Final touches for backporting to 251

(cherry picked from commit 69139d3e0cbd15a135e2e561f60d6a45b4454c64)

IJ-MR-158649

GitOrigin-RevId: b9e82f1e42830c17dc800d2bdbe6c4435d5a8431
This commit is contained in:
Jakub Senohrabek
2025-03-13 13:30:09 +01:00
committed by intellij-monorepo-bot
parent cb2f1ea670
commit 324009ee06
16 changed files with 97 additions and 171 deletions

View File

@@ -11,11 +11,29 @@ jvm_resources(
java_library(
name = "compose-foundation-desktop-junit",
visibility = ["//visibility:public"],
exports = ["@lib//:libraries-compose-foundation-desktop-compose-foundation-desktop-junit"],
runtime_deps = [
":compose-foundation-desktop_resources",
exports = [
"//libraries/compose-foundation-desktop",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:libraries-compose-foundation-desktop-junit-org-hamcrest-hamcrest-core",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-test",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-runtime-runtime",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-text",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-unit",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-annotations",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-desktop-desktop",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-runtime-runtime2",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui2",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:libraries-compose-foundation-desktop-junit-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"@lib//:kotlinx-coroutines-test",
"//libraries/skiko",
"@lib//:libraries-compose-foundation-desktop-compose-foundation-desktop-junit",
]
],
runtime_deps = [":compose-foundation-desktop-junit_resources"]
)
### auto-generated section `build intellij.libraries.compose.foundation.desktop.junit` end

View File

@@ -12,13 +12,13 @@ java_library(
name = "skiko",
visibility = ["//visibility:public"],
exports = [
"@lib//:libraries-skiko-jetbrains-skiko-awt-runtime-all",
"@lib//:libraries-skiko-jetbrains-skiko-awt-compose",
"@lib//:libraries-skiko-jetbrains-skiko-awt-runtime-all",
],
runtime_deps = [
":skiko_resources",
"@lib//:libraries-skiko-jetbrains-skiko-awt-runtime-all",
"@lib//:libraries-skiko-jetbrains-skiko-awt-compose",
"@lib//:libraries-skiko-jetbrains-skiko-awt-runtime-all",
]
)
### auto-generated section `build intellij.libraries.skiko` end

View File

@@ -48,25 +48,7 @@ jvm_library(
"@lib//:jetbrains-annotations",
"//libraries/compose-foundation-desktop",
"//libraries/skiko",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-foundation-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-foundation-org-jetbrains-annotations",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-foundation-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop-junit",
],
runtime_deps = [":foundation_resources"],
plugins = ["@lib//:compose-plugin"]
@@ -76,4 +58,4 @@ jvm_test(
name = "foundation_test",
runtime_deps = [":foundation_test_lib"]
)
### auto-generated section `build intellij.platform.jewel.foundation` end
### auto-generated section `build intellij.platform.jewel.foundation` end

View File

@@ -266,7 +266,7 @@ org.jetbrains.jewel.foundation.lazy.SelectableColumnOnKeyEvent
- onSelectNextItem(java.util.List,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState):V
- onSelectPreviousItem(java.util.List,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState):V
f:org.jetbrains.jewel.foundation.lazy.SelectableLazyColumnKt
- sf:SelectableLazyColumn(androidx.compose.ui.Modifier,org.jetbrains.jewel.foundation.lazy.SelectionMode,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState,androidx.compose.foundation.layout.PaddingValues,Z,kotlin.jvm.functions.Function1,androidx.compose.foundation.layout.Arrangement$Vertical,androidx.compose.ui.Alignment$Horizontal,androidx.compose.foundation.gestures.FlingBehavior,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I,I):V
- sf:SelectableLazyColumn(androidx.compose.ui.Modifier,org.jetbrains.jewel.foundation.lazy.SelectionMode,org.jetbrains.jewel.foundation.lazy.SelectableLazyListState,androidx.compose.foundation.layout.PaddingValues,Z,kotlin.jvm.functions.Function1,androidx.compose.foundation.layout.Arrangement$Vertical,androidx.compose.ui.Alignment$Horizontal,androidx.compose.foundation.gestures.FlingBehavior,org.jetbrains.jewel.foundation.lazy.tree.KeyActions,org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions,kotlin.jvm.functions.Function1,androidx.compose.runtime.Composer,I,I,I):V
org.jetbrains.jewel.foundation.lazy.SelectableLazyItemScope
- androidx.compose.foundation.lazy.LazyItemScope
- a:isActive():Z
@@ -316,10 +316,12 @@ f:org.jetbrains.jewel.foundation.lazy.SelectableLazyListState
- f:getLayoutInfo():androidx.compose.foundation.lazy.LazyListLayoutInfo
- f:getLazyListState():androidx.compose.foundation.lazy.LazyListState
- getSelectedKeys():java.util.Set
- f:isKeyboardNavigating():Z
- isScrollInProgress():Z
- scroll(androidx.compose.foundation.MutatePriority,kotlin.jvm.functions.Function2,kotlin.coroutines.Continuation):java.lang.Object
- f:scrollToItem(I,Z,I,kotlin.coroutines.Continuation):java.lang.Object
- bs:scrollToItem$default(org.jetbrains.jewel.foundation.lazy.SelectableLazyListState,I,Z,I,kotlin.coroutines.Continuation,I,java.lang.Object):java.lang.Object
- f:setKeyboardNavigating(Z):V
- f:setLastActiveItemIndex(java.lang.Integer):V
- setSelectedKeys(java.util.Set):V
f:org.jetbrains.jewel.foundation.lazy.SelectableLazyListStateKt

View File

@@ -66,29 +66,11 @@ jvm_test(
"@lib//:jna",
"//libraries/skiko",
"//platform/core-ui",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-ide_laf_bridge-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-annotations",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-ide_laf_bridge-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"//libraries/compose-foundation-desktop",
"//platform/editor-ui-ex:editor-ex",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop-junit",
],
runtime_deps = [":ideLafBridge_resources"],
plugins = ["@lib//:compose-plugin"]
)
### auto-generated section `build intellij.platform.jewel.ideLafBridge` end
### auto-generated section `build intellij.platform.jewel.ideLafBridge` end

View File

@@ -54,26 +54,8 @@ jvm_library(
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"@lib//:platform-jewel-markdown-core-org-commonmark-commonmark",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-markdown-core-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-markdown-core-org-jetbrains-annotations",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-markdown-core-org-jetbrains-compose-runtime-runtime3",
"//libraries/compose-foundation-desktop",
"//libraries/junit4",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop-junit",
],
runtime_deps = [":jewel-markdown-core_resources"],
plugins = ["@lib//:compose-plugin"]
@@ -83,4 +65,4 @@ jvm_test(
name = "jewel-markdown-core_test",
runtime_deps = [":jewel-markdown-core_test_lib"]
)
### auto-generated section `build intellij.platform.jewel.markdown.core` end
### auto-generated section `build intellij.platform.jewel.markdown.core` end

View File

@@ -56,26 +56,8 @@ jvm_library(
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"@lib//:platform-jewel-markdown-extension-autolink-commonmark-ext-autolink",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-markdown-extension-autolink-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-annotations",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-markdown-extension-autolink-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"//libraries/compose-foundation-desktop",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop-junit",
],
runtime_deps = [":jewel-markdown-extension-autolink_resources"],
plugins = ["@lib//:compose-plugin"]
@@ -85,4 +67,4 @@ jvm_test(
name = "jewel-markdown-extension-autolink_test",
runtime_deps = [":jewel-markdown-extension-autolink_test_lib"]
)
### auto-generated section `build intellij.platform.jewel.markdown.extension.autolink` end
### auto-generated section `build intellij.platform.jewel.markdown.extension.autolink` end

View File

@@ -53,28 +53,10 @@ jvm_test(
"//platform/jewel/ui:ui_test_lib",
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-annotations",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-markdown-extension-gfm_alerts-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"//libraries/compose-foundation-desktop",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop-junit",
],
runtime_deps = [":jewel-markdown-extension-gfmAlerts_resources"],
plugins = ["@lib//:compose-plugin"]
)
### auto-generated section `build intellij.platform.jewel.markdown.extension.gfmAlerts` end
### auto-generated section `build intellij.platform.jewel.markdown.extension.gfmAlerts` end

View File

@@ -16,6 +16,7 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
import org.jetbrains.jewel.intui.markdown.bridge.styling.create
import org.jetbrains.jewel.markdown.MarkdownMode
import org.jetbrains.jewel.markdown.extensions.LocalMarkdownBlockRenderer
import org.jetbrains.jewel.markdown.extensions.LocalMarkdownMode
import org.jetbrains.jewel.markdown.extensions.LocalMarkdownProcessor
import org.jetbrains.jewel.markdown.extensions.LocalMarkdownStyling
import org.jetbrains.jewel.markdown.processing.MarkdownProcessor
@@ -36,6 +37,7 @@ public fun ProvideMarkdownStyling(
) {
CompositionLocalProvider(
LocalMarkdownStyling provides markdownStyling,
LocalMarkdownMode provides markdownMode,
LocalMarkdownProcessor provides markdownProcessor,
LocalMarkdownBlockRenderer provides markdownBlockRenderer,
LocalCodeHighlighter provides codeHighlighter,
@@ -61,6 +63,7 @@ public fun ProvideMarkdownStyling(
ProvideMarkdownStyling(
themeName = themeName,
markdownStyling = markdownStyling,
markdownMode = markdownMode,
markdownProcessor = markdownProcessor,
markdownBlockRenderer = markdownBlockRenderer,
codeHighlighter = codeHighlighter,

View File

@@ -6,8 +6,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import org.jetbrains.jewel.intui.standalone.theme.dark
import org.jetbrains.jewel.intui.standalone.theme.light
import org.jetbrains.jewel.markdown.extensions.github.tables.GfmTableColors
import org.jetbrains.jewel.markdown.extensions.github.tables.GfmTableMetrics
import org.jetbrains.jewel.markdown.extensions.github.tables.GfmTableStyling

View File

@@ -73,6 +73,10 @@ f:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$Dropdowns
- f:getLambda-7$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function5
- f:getLambda-8$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function5
- f:getLambda-9$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function5
f:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$ScrollbarsKt
- sf:INSTANCE:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$ScrollbarsKt
- <init>():V
- f:getLambda-1$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function3
f:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$SplitLayoutsKt
- sf:INSTANCE:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$SplitLayoutsKt
- <init>():V
@@ -94,11 +98,11 @@ f:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$TextAreas
- f:getLambda-2$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-3$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-4$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-5$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-5$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function3
f:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$TextFieldsKt
- sf:INSTANCE:org.jetbrains.jewel.samples.showcase.components.ComposableSingletons$TextFieldsKt
- <init>():V
- f:getLambda-1$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-1$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function3
- f:getLambda-2$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-3$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2
- f:getLambda-4$intellij_platform_jewel_samples_showcase():kotlin.jvm.functions.Function2

View File

@@ -25,17 +25,18 @@ import org.jetbrains.jewel.samples.standalone.viewmodel.MainViewModel.components
import org.jetbrains.jewel.ui.component.styling.IconButtonMetrics
import org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility
@ExperimentalLayoutApi
public object MainViewModel {
public val componentsViewModel: ComponentsViewModel
get() {
val alwaysVisibleScrollbarVisibility = ScrollbarVisibility.AlwaysVisible.default()
val whenScrollingScrollbarVisibility = ScrollbarVisibility.WhenScrolling.default()
return ComponentsViewModel(
init {
val alwaysVisibleScrollbarVisibility = ScrollbarVisibility.AlwaysVisible.default()
val whenScrollingScrollbarVisibility = ScrollbarVisibility.WhenScrolling.default()
componentsViewModel =
ComponentsViewModel(
alwaysVisibleScrollbarVisibility = alwaysVisibleScrollbarVisibility,
whenScrollingScrollbarVisibility = whenScrollingScrollbarVisibility,
)
}
}
public fun onNavigateTo(destination: String) {
currentView = views.first { viewInfo: ViewInfo -> viewInfo.title == destination }

View File

@@ -1,7 +1,7 @@
### auto-generated section `build intellij.platform.jewel.uiTests` start
load("//build:compiler-options.bzl", "create_kotlinc_options")
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_jvm//:jvm.bzl", "jvm_test")
load("@rules_jvm//:jvm.bzl", "jvm_resources", "jvm_test")
create_kotlinc_options(
name = "custom",
@@ -14,40 +14,30 @@ create_kotlinc_options(
]
)
jvm_resources(
name = "uiTests_test_resources",
files = glob(["src/test/resources/**/*"]),
strip_prefix = "src/test/resources"
)
jvm_test(
name = "uiTests_test",
srcs = glob(["src/test/kotlin/**/*.kt", "src/test/kotlin/**/*.java"], allow_empty = True),
kotlinc_opts = ":custom",
deps = [
"@lib//:kotlin-stdlib",
"@lib//:kotlinx-coroutines-core",
"@lib//:jetbrains-annotations",
"//libraries/skiko",
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"//platform/jewel/ui",
"//platform/jewel/ui:ui_test_lib",
"//platform/jewel/int-ui/int-ui-standalone:jewel-intUi-standalone",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-ui_tests-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-ui_tests-org-jetbrains-annotations",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-ui_tests-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"//libraries/compose-foundation-desktop",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop-junit",
"@lib//:kotlin-stdlib",
],
runtime_deps = [":uiTests_test_resources"],
plugins = ["@lib//:compose-plugin"]
)
### auto-generated section `build intellij.platform.jewel.uiTests` end
### auto-generated section `build intellij.platform.jewel.uiTests` end

View File

@@ -19,6 +19,12 @@ jvm_resources(
strip_prefix = "src/main/resources"
)
jvm_resources(
name = "ui_test_resources",
files = glob(["src/test/resources/**/*"]),
strip_prefix = "src/test/resources"
)
jvm_library(
name = "ui",
module_name = "intellij.platform.jewel.ui",
@@ -58,28 +64,13 @@ jvm_library(
"//platform/jewel/foundation:foundation_test_lib",
"@lib//:platform-jewel-ui-org-jetbrains-compose-components-components-resources",
"@lib//:platform-jewel-ui-org-jetbrains-compose-components-components-resources-desktop",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-test-junit4",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-test-junit4-desktop",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-test",
"@lib//:platform-jewel-ui-org-hamcrest-hamcrest-core",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-test-desktop",
"@lib//:platform-jewel-ui-org-jetbrains-compose-runtime-runtime",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-text",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-unit",
"@lib//:platform-jewel-ui-org-jetbrains-annotations",
"@lib//:platform-jewel-ui-org-jetbrains-compose-desktop-desktop",
"@lib//:platform-jewel-ui-org-jetbrains-compose-desktop-desktop-jvm",
"@lib//:platform-jewel-ui-org-jetbrains-compose-runtime-runtime2",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui2",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-tooling-preview",
"@lib//:platform-jewel-ui-org-jetbrains-compose-ui-ui-tooling-preview-desktop",
"@lib//:platform-jewel-ui-org-jetbrains-compose-runtime-runtime3",
"//libraries/junit4",
"@lib//:kotlinx-coroutines-test",
"//libraries/compose-foundation-desktop",
"//libraries/compose-foundation-desktop-junit",
],
runtime_deps = [
":ui_resources",
":ui_test_resources",
],
runtime_deps = [":ui_resources"],
plugins = ["@lib//:compose-plugin"]
)
@@ -87,4 +78,4 @@ jvm_test(
name = "ui_test",
runtime_deps = [":ui_test_lib"]
)
### auto-generated section `build intellij.platform.jewel.ui` end
### auto-generated section `build intellij.platform.jewel.ui` end

View File

@@ -542,15 +542,15 @@ f:org.jetbrains.jewel.ui.component.RadioButtonState$Companion
- f:of-fp8g3n8(Z,Z,Z,Z,Z,Z):J
- bs:of-fp8g3n8$default(org.jetbrains.jewel.ui.component.RadioButtonState$Companion,Z,Z,Z,Z,Z,Z,I,java.lang.Object):J
f:org.jetbrains.jewel.ui.component.ScrollableContainerKt
- sf:HorizontallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- sf:HorizontallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- sf:HorizontallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- bsf:ScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- bsf:ScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- bsf:ScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,androidx.compose.foundation.ScrollState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- sf:VerticallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- sf:VerticallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- sf:VerticallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function2,androidx.compose.runtime.Composer,I,I):V
- sf:HorizontallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- sf:HorizontallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- sf:HorizontallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- bsf:ScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- bsf:ScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- bsf:ScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,androidx.compose.foundation.ScrollState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- sf:VerticallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- sf:VerticallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- sf:VerticallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
- sf:scrollbarContentSafePadding(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,androidx.compose.runtime.Composer,I,I):F
f:org.jetbrains.jewel.ui.component.ScrollbarKt
- sf:HorizontalScrollbar(androidx.compose.foundation.gestures.ScrollableState,androidx.compose.ui.Modifier,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,androidx.compose.runtime.Composer,I,I):V
@@ -2732,9 +2732,11 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$General
- sf:QuestionDialog:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:ReaderMode:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Refresh:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:RefreshAuto:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Remove:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Reset:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:RunWithCoverage:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:SelectIn:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:SeparatorH:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Settings:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Show:org.jetbrains.jewel.ui.icon.IntelliJIconKey
@@ -3240,6 +3242,9 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Profiler
- sf:ExpandNode:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Rec:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- <init>():V
f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Promo
- sf:JavaDuke:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- <init>():V
f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Providers
- sf:ActiveMQ:org.jetbrains.jewel.ui.icon.IntelliJIconKey
- sf:Apache:org.jetbrains.jewel.ui.icon.IntelliJIconKey

View File

@@ -80,7 +80,7 @@ public final class AllIconsKeys {
/** 16x16 */ public static final @NotNull IntelliJIconKey GroupByPrefix = new IntelliJIconKey("actions/GroupByPrefix.svg", "actions/GroupByPrefix.svg", AllIconsKeys.class);
/** 16x16 */ public static final @NotNull IntelliJIconKey GroupByTestProduction = new IntelliJIconKey("actions/groupByTestProduction.svg", "expui/actions/groupByTestProduction.svg", AllIconsKeys.class);
/** 16x16 */ public static final @NotNull IntelliJIconKey Help = new IntelliJIconKey("actions/help.svg", "expui/general/help.svg", AllIconsKeys.class);
/** 16x16 */ public static final @NotNull IntelliJIconKey Highlighting = new IntelliJIconKey("actions/highlighting.svg", "expui/actions/highlighting.svg", AllIconsKeys.class);
/** 16x16 */ public static final @NotNull IntelliJIconKey Highlighting = new IntelliJIconKey("actions/highlighting.svg", "actions/highlighting.svg", AllIconsKeys.class);
/** 9x5 */ public static final @NotNull IntelliJIconKey InlayDropTriangle = new IntelliJIconKey("actions/inlayDropTriangle.svg", "actions/inlayDropTriangle.svg", AllIconsKeys.class);
/** 12x12 */ public static final @NotNull IntelliJIconKey InlayGear = new IntelliJIconKey("actions/inlayGear.svg", "expui/codeInsight/inlaySettings.svg", AllIconsKeys.class);
/** 12x12 */ public static final @NotNull IntelliJIconKey InlayGlobe = new IntelliJIconKey("actions/inlayGlobe.svg", "expui/codeInsight/inlayGlobe.svg", AllIconsKeys.class);
@@ -1169,6 +1169,10 @@ public final class AllIconsKeys {
/** 12x12 */ public static final @NotNull IntelliJIconKey Rec = new IntelliJIconKey("profiler/rec.svg", "expui/profiler/rec.svg", AllIconsKeys.class);
}
public static final class Promo {
/** 14x14 */ public static final @NotNull IntelliJIconKey JavaDuke = new IntelliJIconKey("promo/javaDuke.svg", "promo/javaDuke.svg", AllIconsKeys.class);
}
public static final class Providers {
/** 16x16 */ public static final @NotNull IntelliJIconKey ActiveMQ = new IntelliJIconKey("providers/activeMQ.svg", "providers/activeMQ.svg", AllIconsKeys.class);
/** 16x16 */ public static final @NotNull IntelliJIconKey Apache = new IntelliJIconKey("providers/apache.svg", "providers/apache.svg", AllIconsKeys.class);