Add test for CMP-7505 #2312
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi | ||
| import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl | ||
| import org.jetbrains.kotlin.gradle.dsl.JvmTarget | ||
| import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig | ||
|
|
||
| import androidx.build.AndroidXComposePlugin | ||
| import androidx.build.JetbrainsAndroidXPlugin | ||
|
|
||
| plugins { | ||
| id("AndroidXPlugin") | ||
| id("AndroidXComposePlugin") | ||
| id("kotlin-multiplatform") | ||
| // [1.4 Update] id("application") | ||
| id("JetbrainsAndroidXPlugin") | ||
| } | ||
|
|
||
| AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) | ||
| JetbrainsAndroidXPlugin.applyAndConfigure(project) | ||
|
|
||
| val skikoWasm = configurations.findByName("skikoWasm") ?: configurations.create("skikoWasm") | ||
|
|
||
| dependencies { | ||
| skikoWasm(libs.skikoWasm) | ||
| } | ||
|
|
||
| val resourcesDir = "$buildDir/resources" | ||
| val unzipTask = tasks.register("unzipWasm", Copy::class) { | ||
| destinationDir = file(resourcesDir) | ||
| from(skikoWasm.map { zipTree(it) }) | ||
| } | ||
|
|
||
| kotlin { | ||
| jvm() | ||
|
There was a problem hiding this comment. Don't we need to include iOS too? Or are there issues including it? |
||
|
|
||
| js { | ||
| outputModuleName = "compilation-tests" | ||
| browser { | ||
| commonWebpackConfig { | ||
| outputFileName = "compilation-tests.js" | ||
| } | ||
| } | ||
| binaries.executable() | ||
| } | ||
|
|
||
| @OptIn(ExperimentalWasmDsl::class) | ||
| wasmJs { | ||
| outputModuleName = "compilation-tests" | ||
| browser { | ||
| commonWebpackConfig { | ||
| outputFileName = "compilation-tests.js" | ||
| devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { | ||
| static = (static ?: mutableListOf()).apply { | ||
| // Serve sources to debug inside browser | ||
| add(project.rootDir.path) | ||
| add(project.projectDir.path) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| binaries.executable() | ||
| } | ||
|
|
||
| sourceSets { | ||
| val commonMain by getting { | ||
| dependencies { | ||
| implementation(project(":compose:foundation:foundation")) | ||
| implementation(project(":compose:foundation:foundation-layout")) | ||
| implementation(project(":compose:material3:material3")) | ||
| implementation(project(":compose:material3:material3-window-size-class")) | ||
| implementation(project(":compose:material3:adaptive:adaptive")) | ||
| implementation(project(":compose:material3:adaptive:adaptive-layout")) | ||
| implementation(project(":compose:material3:adaptive:adaptive-navigation")) | ||
| implementation(project(":compose:material:material")) | ||
| implementation(project(":compose:mpp")) | ||
| implementation(project(":compose:runtime:runtime")) | ||
| implementation(project(":compose:ui:ui")) | ||
| implementation(project(":compose:ui:ui-graphics")) | ||
| implementation(project(":compose:ui:ui-text")) | ||
| implementation(project(":compose:ui:ui-backhandler")) | ||
| implementation(project(":lifecycle:lifecycle-common")) | ||
| implementation(project(":lifecycle:lifecycle-runtime")) | ||
| implementation(project(":lifecycle:lifecycle-runtime-compose")) | ||
| implementation(project(":navigation:navigation-common")) | ||
| implementation(project(":navigation:navigation-compose")) | ||
| implementation(project(":navigation:navigation-runtime")) | ||
| implementation(libs.kotlinStdlib) | ||
| implementation(libs.kotlinCoroutinesCore) | ||
|
|
||
| implementation("org.jetbrains.compose.material:material-icons-core:1.7.3") { | ||
| // exclude dependencies, because they override local projects when we build 0.0.0-* version | ||
| // (see https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-icons-core-desktop/1.6.11/material-icons-core-desktop-1.6.11.module) | ||
| exclude("org.jetbrains.compose.runtime") | ||
| exclude("org.jetbrains.compose.ui") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| val skikoMain by creating { | ||
| dependsOn(commonMain) | ||
| dependencies { | ||
| implementation(libs.skikoCommon) | ||
| } | ||
| } | ||
|
|
||
| val jvmMain by getting { | ||
| dependsOn(skikoMain) | ||
| dependencies { | ||
| implementation(libs.skikoCurrentOs) | ||
| implementation(project(":compose:desktop:desktop")) | ||
| } | ||
| } | ||
|
|
||
| val webMain by creating { | ||
| dependsOn(skikoMain) | ||
| resources.setSrcDirs(resources.srcDirs) | ||
| resources.srcDirs(unzipTask.map { it.destinationDir }) | ||
| } | ||
|
|
||
| val jsMain by getting { | ||
| dependsOn(webMain) | ||
| } | ||
|
|
||
| val wasmJsMain by getting { | ||
| dependsOn(webMain) | ||
| } | ||
| } | ||
|
|
||
| compilerOptions { freeCompilerArgs.add("-Xpartial-linkage=disable") } | ||
| } | ||
|
|
||
| tasks.create("runDesktop", JavaExec::class.java) { | ||
| dependsOn(":compose:desktop:desktop:jar") | ||
| mainClass.set("androidx.compose.mpp.compilation-tests.MainKt") | ||
| args = listOfNotNull(project.findProperty("args")?.toString()) | ||
| systemProperty("skiko.fps.enabled", "true") | ||
| val compilation = kotlin.jvm().compilations["main"] | ||
| classpath = | ||
| compilation.output.allOutputs + | ||
| compilation.runtimeDependencyFiles | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package androidx.compose.mpp.`compilation-tests` | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Home | ||
| import androidx.compose.material.icons.filled.Search | ||
| import androidx.compose.material.icons.filled.Settings | ||
| import androidx.compose.material.icons.outlined.Home | ||
| import androidx.compose.material.icons.outlined.Search | ||
| import androidx.compose.material.icons.outlined.Settings | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.ModalWideNavigationRail | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.WideNavigationRailItem | ||
| import androidx.compose.material3.rememberWideNavigationRailState | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableIntStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.unit.dp | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| /** | ||
| * https://youtrack.jetbrains.com/issue/CMP-7505 | ||
| */ | ||
| @Composable | ||
| fun ModalNavigationRail() { | ||
| var selectedItem by remember { mutableIntStateOf(0) } | ||
| val items = listOf("Home", "Search", "Settings") | ||
| val selectedIcons = listOf(Icons.Filled.Home, Icons.Filled.Search, Icons.Filled.Settings) | ||
| val unselectedIcons = listOf(Icons.Outlined.Home, Icons.Outlined.Search, Icons.Outlined.Settings) | ||
|
|
||
| val state = rememberWideNavigationRailState() | ||
| val scope = rememberCoroutineScope() | ||
|
|
||
| Row(Modifier.fillMaxSize()) { | ||
| ModalWideNavigationRail(state = state, hideOnCollapse = true) { | ||
| items.forEachIndexed { index, item -> | ||
| WideNavigationRailItem( | ||
| railExpanded = true, | ||
| icon = { | ||
| Icon( | ||
| if (selectedItem == index) selectedIcons[index] | ||
| else unselectedIcons[index], | ||
| contentDescription = null | ||
| ) | ||
| }, | ||
| label = { Text(item) }, | ||
| selected = selectedItem == index, | ||
| onClick = { | ||
| selectedItem = index | ||
| scope.launch { state.collapse() } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { | ||
| val currentPage = items[selectedItem] | ||
| Spacer(modifier = Modifier.size(54.dp)) | ||
| Text(text = "$currentPage Page", textAlign = TextAlign.Center) | ||
| Button(onClick = { scope.launch { state.expand() } }, Modifier.padding(32.dp)) { | ||
| Text(text = "Open modal rail", textAlign = TextAlign.Center) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun App() { | ||
| ModalNavigationRail() | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package androidx.compose.mpp.`compilation-tests` | ||
|
|
||
| import androidx.compose.ui.window.Window | ||
| import androidx.compose.ui.window.application | ||
|
|
||
| fun main() = application { | ||
| Window( | ||
| onCloseRequest = ::exitApplication, | ||
| title = "compilation-tests", | ||
| ) { | ||
| App() | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package androidx.compose.mpp.`compilation-tests` | ||
|
|
||
| import androidx.compose.ui.ExperimentalComposeUiApi | ||
| import androidx.compose.ui.window.ComposeViewport | ||
|
|
||
| @OptIn(ExperimentalComposeUiApi::class) | ||
| fun main() = ComposeViewport { App() } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon.png"> | ||
| <link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png"> | ||
| <link rel="icon" type="image/png" sizes="16x16" href="./favicon-16x16.png"> | ||
| <link rel="manifest" href="./manifest.json"> | ||
| <title>compilation-tests</title> | ||
| <style> | ||
| html, | ||
| body { | ||
| width: 100%; | ||
| height: 100%; | ||
| margin: 0; | ||
| padding: 0; | ||
| overflow: hidden; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body></body> | ||
| <script src="compilation-tests.js"></script> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "name": "mpp:compilation-tests", | ||
| "short_name": "mpp:compilation-tests", | ||
| "theme_color": "#ffffff", | ||
| "background_color": "#ffffff", | ||
| "display": "standalone" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.