Move PlotPanel from org.jetbrains.letsPlot.skia.compose to org.jetbrains.letsPlot.compose

alshan · alshan · commit a1dd0c9afab6 · 2025-09-16T15:49:39.000-04:00
diff --git a/demo/plot/compose-android-median/src/main/kotlin/demo/plot/ComposeMedianMainActivity.kt b/demo/plot/compose-android-median/src/main/kotlin/demo/plot/ComposeMedianMainActivity.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.unit.dp
 import demo.plot.ui.DemoDropdownMenu
 import demo.plot.ui.DemoRadioGroup
 import org.jetbrains.letsPlot.Figure
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
-import org.jetbrains.letsPlot.skia.compose.PlotPanelRaw
+import org.jetbrains.letsPlot.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanelRaw
 import plotSpec.*
 
 class ComposeMedianMainActivity : ComponentActivity() {
diff --git a/demo/plot/compose-android-min/src/main/kotlin/demo/plot/ComposeMinDemoActivity.kt b/demo/plot/compose-android-min/src/main/kotlin/demo/plot/ComposeMinDemoActivity.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.DensitySpec
 
 class ComposeMinDemoActivity : ComponentActivity() {
@@ -45,7 +45,7 @@ class ComposeMinDemoActivity : ComponentActivity() {
                     Text(
                         text = """
                             Enable logging to see recompositions:
-                            org.jetbrains.letsPlot.skia.compose.PlotPanelRawKt.logRecompositions
+                            org.jetbrains.letsPlot.compose.PlotPanelRawKt.logRecompositions
                             """.trimIndent(),
                         fontSize = 10.sp,
                     )
diff --git a/demo/plot/compose-android-redraw/src/main/kotlin/demo/letsPlot/composeAndroidMin/ComposeRedrawMainActivity.kt b/demo/plot/compose-android-redraw/src/main/kotlin/demo/letsPlot/composeAndroidMin/ComposeRedrawMainActivity.kt
@@ -25,7 +25,7 @@ import org.jetbrains.letsPlot.intern.Plot
 import org.jetbrains.letsPlot.letsPlot
 import org.jetbrains.letsPlot.scale.xlim
 import org.jetbrains.letsPlot.scale.ylim
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import kotlin.math.sin
 
 class ComposeRedrawMainActivity : ComponentActivity() {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/median/AppMain.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/median/AppMain.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import demo.plot.median.ui.DemoList
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.DensitySpec
 import plotSpec.PerfSpec
 import plotSpec.PlotGridSpec
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/DensityCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/DensityCompose.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.DensitySpec
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/FrontendExceptionCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/FrontendExceptionCompose.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanelRaw
+import org.jetbrains.letsPlot.compose.PlotPanelRaw
 import plotSpec.FrontendExceptionSpec
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/IllegalArgumentCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/IllegalArgumentCompose.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.IllegalArgumentSpec
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MarkdownCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MarkdownCompose.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanelRaw
+import org.jetbrains.letsPlot.compose.PlotPanelRaw
 import plotSpec.MarkdownSpec
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MultiplePlotSizeLayoutCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MultiplePlotSizeLayoutCompose.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.BarPlotSpec
 import plotSpec.DensitySpec
 
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MultiplePlotWeightLayoutCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MultiplePlotWeightLayoutCompose.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.BarPlotSpec
 import plotSpec.DensitySpec
 
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/PieCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/PieCompose.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.PieSpec
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/PlotGridCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/PlotGridCompose.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.PlotGridSpec
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/Recomposition.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/Recomposition.kt
@@ -20,12 +20,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.DensitySpec
 
 
 // Enable logging to see recompositions:
-// org.jetbrains.letsPlot.skia.compose.util.NaiveLoggerKt.ENABLED
+// org.jetbrains.letsPlot.compose.util.NaiveLoggerKt.ENABLED
 fun main() = application {
     Window(onCloseRequest = ::exitApplication, title = "Density Plot (Compose Desktop)") {
         var counter by remember { mutableStateOf(0) }
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/pixeldensity/PixelDensityTestDemo.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/pixeldensity/PixelDensityTestDemo.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.window.application
 import org.jetbrains.letsPlot.Figure
 import org.jetbrains.letsPlot.geom.geomPoint
 import org.jetbrains.letsPlot.letsPlot
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import org.jetbrains.letsPlot.themes.flavorHighContrastDark
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/redraw/FastRedrawApp.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/redraw/FastRedrawApp.kt
@@ -24,7 +24,7 @@ import org.jetbrains.letsPlot.intern.Plot
 import org.jetbrains.letsPlot.letsPlot
 import org.jetbrains.letsPlot.scale.xlim
 import org.jetbrains.letsPlot.scale.ylim
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 
 
 fun main() = application {
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/HyperlinkCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/HyperlinkCompose.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.HyperlinkSpec
 
 @OptIn(ExperimentalLayoutApi::class)
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/MultiplePlotsWithToolbar.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/MultiplePlotsWithToolbar.kt
@@ -12,8 +12,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import org.jetbrains.letsPlot.interact.ggtb
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
-import org.jetbrains.letsPlot.skia.compose.PlotPanelRaw
+import org.jetbrains.letsPlot.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanelRaw
 import plotSpec.AutoSpec
 import plotSpec.MarkdownSpec
 
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/StrokeDashCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/StrokeDashCompose.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.StrokeDashSpec
 
 @OptIn(ExperimentalLayoutApi::class)
diff --git a/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/ToolbarCompose.kt b/demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/ToolbarCompose.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import org.jetbrains.letsPlot.interact.ggtb
 import org.jetbrains.letsPlot.intern.Plot
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import plotSpec.AutoSpec
 
 
diff --git a/demo/plot/swing/src/main/kotlin/demo/plot/interop/SwingTabbedPane.kt b/demo/plot/swing/src/main/kotlin/demo/plot/interop/SwingTabbedPane.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
 import org.jetbrains.letsPlot.Figure
 import org.jetbrains.letsPlot.geom.geomDensity
 import org.jetbrains.letsPlot.letsPlot
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import org.jetbrains.letsPlot.themes.theme
 import org.jetbrains.letsPlot.themes.elementRect
 import java.awt.BorderLayout
diff --git a/demo/plot/swing/src/main/kotlin/demo/plot/simpleViewer/SimplePlotViewer.kt b/demo/plot/swing/src/main/kotlin/demo/plot/simpleViewer/SimplePlotViewer.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposeWindow
 import androidx.compose.ui.unit.dp
 import org.jetbrains.letsPlot.Figure
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanel
 import java.awt.Dimension
 import javax.swing.SwingUtilities
 
diff --git a/demo/plot/swing/src/main/kotlin/demo/util/PlotSpecsDemoWindow.kt b/demo/plot/swing/src/main/kotlin/demo/util/PlotSpecsDemoWindow.kt
@@ -9,8 +9,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposePanel
 import org.jetbrains.letsPlot.Figure
-import org.jetbrains.letsPlot.skia.compose.PlotPanel
-import org.jetbrains.letsPlot.skia.compose.PlotPanelRaw
+import org.jetbrains.letsPlot.compose.PlotPanel
+import org.jetbrains.letsPlot.compose.PlotPanelRaw
 import java.awt.Dimension
 import java.awt.GridLayout
 import javax.swing.*
@@ -23,7 +23,7 @@ internal class PlotSpecsDemoWindow(
     maxCol: Int = 3,
     private val plotSize: Dimension? = null,
     background: ColorAwt = ColorAwt.WHITE,
-) : JFrame("$title (Skia Swing)") {
+) : JFrame("$title (Compose in Swing)") {
     private val rootPanel: JPanel
 
     init {
diff --git a/demo/svg/compose-desktop/src/main/kotlin/demo/svg/AppMain.kt b/demo/svg/compose-desktop/src/main/kotlin/demo/svg/AppMain.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.window.application
 import demo.svgModel.ClipPathSvgModel
 import demo.svgModel.OpacityDemoModel
 import demo.svgModel.SvgImageElementModel
-import org.jetbrains.letsPlot.skia.compose.SimpleSvgPanel
+import org.jetbrains.letsPlot.compose.SimpleSvgPanel
 
 fun main() = application {
     val items = listOf(
diff --git a/demo/svg/swing/src/main/kotlin/demo/svg/utils/DemoWindow.kt b/demo/svg/swing/src/main/kotlin/demo/svg/utils/DemoWindow.kt
@@ -12,7 +12,7 @@ import androidx.compose.ui.awt.ComposePanel
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import org.jetbrains.letsPlot.datamodel.svg.dom.SvgSvgElement
-import org.jetbrains.letsPlot.skia.compose.SimpleSvgPanel
+import org.jetbrains.letsPlot.compose.SimpleSvgPanel
 import java.awt.Dimension
 import java.awt.GridLayout
 import javax.swing.*
@@ -22,7 +22,7 @@ internal class DemoWindow(
     title: String,
     private val svgRoots: List<SvgSvgElement>,
     private val maxCol: Int = 2,
-) : JFrame("$title (Skia Swing)") {
+) : JFrame("$title (Compose in Swing)") {
     private val rootPanel: JPanel
 
     init {
diff --git a/future_changes.md b/future_changes.md
@@ -11,16 +11,18 @@ All artifacts were built with the following versions of dependencies:
 ### Added
 
 ### Changed
+
+- [**BREAKING**]  `PlotPanel` is moved to package `org.jetbrains.letsPlot.compose` (from `org.jetbrains.letsPlot.skia.compose`).
                              
 #### Android
 
-- Removed dependency on Skiko.
+- Removed dependency on the Skiko library.
 - 
 
 #### Desktop
 
 - Pure compose implementation.
-- The following artifacts are no longer published: 
+- The following artifacts are no longer provided: 
   - `platf-skia-awt`
   - `lets-plot-swing-skia`
 
diff --git a/lets-plot-compose/src/androidMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanelRaw.kt b/lets-plot-compose/src/androidMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanelRaw.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2023 JetBrains s.r.o.
+ * Copyright (c) 2025 JetBrains s.r.o.
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.text.BasicTextField
@@ -20,7 +20,7 @@ import org.jetbrains.letsPlot.core.util.PlotThemeHelper
 import org.jetbrains.letsPlot.core.util.sizing.SizingPolicy
 import org.jetbrains.letsPlot.raster.view.PlotCanvasFigure
 
-//import org.jetbrains.letsPlot.skia.compose.util.NaiveLogger
+//import org.jetbrains.letsPlot.compose.util.NaiveLogger
 
 //private val LOG = NaiveLogger("PlotPanel")
 private val LOG = PortableLogging.logger(name = "[PlotPanelRaw]")
diff --git a/lets-plot-compose/src/commonMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanel.kt b/lets-plot-compose/src/commonMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanel.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
diff --git a/lets-plot-compose/src/commonMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanelRaw.kt b/lets-plot-compose/src/commonMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanelRaw.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
diff --git a/lets-plot-compose/src/commonMain/kotlin/org/jetbrains/letsPlot/compose/util/NaiveLogger.kt b/lets-plot-compose/src/commonMain/kotlin/org/jetbrains/letsPlot/compose/util/NaiveLogger.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose.util
+package org.jetbrains.letsPlot.compose.util
 
 private const val ENABLED = false
 
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/PlotFigureModel.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/PlotFigureModel.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import org.jetbrains.letsPlot.core.interact.event.ToolEventDispatcher
 import org.jetbrains.letsPlot.core.plot.builder.interact.FigureImplicitInteractionSpecs
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanelRaw.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/PlotPanelRaw.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2023 JetBrains s.r.o.
+ * Copyright (c) 2025 JetBrains s.r.o.
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -27,10 +27,10 @@ import org.jetbrains.letsPlot.core.util.MonolithicCommon.processRawSpecs
 import org.jetbrains.letsPlot.core.util.PlotThemeHelper
 import org.jetbrains.letsPlot.core.util.sizing.SizingPolicy
 import org.jetbrains.letsPlot.skia.builder.MonolithicSkia
-import org.jetbrains.letsPlot.skia.compose.desktop.PlotContainer
-import org.jetbrains.letsPlot.skia.compose.desktop.SvgViewPanel
+import org.jetbrains.letsPlot.compose.desktop.PlotContainer
+import org.jetbrains.letsPlot.compose.desktop.SvgViewPanel
 
-//import org.jetbrains.letsPlot.skia.compose.util.NaiveLogger
+//import org.jetbrains.letsPlot.compose.util.NaiveLogger
 
 //private val LOG = NaiveLogger("PlotPanel")
 private val LOG = PortableLogging.logger(name = "[PlotPanelRaw]")
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/PlotToolbar.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/PlotToolbar.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/SimpleSvgPanel.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/SimpleSvgPanel.kt
@@ -3,15 +3,15 @@
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
-package org.jetbrains.letsPlot.skia.compose
+package org.jetbrains.letsPlot.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import org.jetbrains.letsPlot.datamodel.svg.dom.SvgSvgElement
-import org.jetbrains.letsPlot.skia.compose.desktop.SvgView
-import org.jetbrains.letsPlot.skia.compose.desktop.SvgViewPanel
+import org.jetbrains.letsPlot.compose.desktop.SvgView
+import org.jetbrains.letsPlot.compose.desktop.SvgViewPanel
 
 /**
  * Renders SVG content using Compose Canvas and Skia.
@@ -35,7 +35,6 @@ fun SimpleSvgPanel(
         }
     }
 
-    // Render using our pure Compose SvgView
     SvgViewPanel(
         svgView = svgView,
         modifier = modifier
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/DebouncedRunner.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/DebouncedRunner.kt
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/PlotContainer.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/PlotContainer.kt
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/SvgView.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/SvgView.kt
diff --git a/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/SvgViewPanel.kt b/lets-plot-compose/src/desktopMain/kotlin/org/jetbrains/letsPlot/compose/desktop/SvgViewPanel.kt
