library: TopAppBar: Move windowInsetsPadding

Author: YuKongA

example/build.gradle.kts

@@ -59,8 +59,8 @@ kotlin {
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "uitest"
         browser {
+            outputModuleName = "uitest"
             commonWebpackConfig {
                 outputFileName = "uitest.js"
             }
@@ -69,8 +69,8 @@ kotlin {
     }
 
     js(IR) {
-        moduleName = "uitest"
         browser {
+            outputModuleName = "uitest"
             commonWebpackConfig {
                 outputFileName = "uitest.js"
             }

miuix/build.gradle.kts

@@ -4,9 +4,9 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.jetbrains.dokka)
     alias(libs.plugins.kotlin.multiplatform)
     id("module.publication")
-    id("org.jetbrains.dokka")
 }
 
 java {

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/TopAppBar.kt

@@ -119,6 +119,8 @@ fun TopAppBar(
             modifier
                 .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
                 .windowInsetsPadding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal))
+                .windowInsetsPadding(WindowInsets.statusBars.only(WindowInsetsSides.Top))
+                .windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
         } else {
             modifier
         }
@@ -174,6 +176,8 @@ fun SmallTopAppBar(
             modifier
                 .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
                 .windowInsetsPadding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal))
+                .windowInsetsPadding(WindowInsets.statusBars.only(WindowInsetsSides.Top))
+                .windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
         } else {
             modifier
         }
@@ -601,8 +605,6 @@ private fun TopAppBarLayout(
             }
         },
         modifier = Modifier
-            .windowInsetsPadding(WindowInsets.statusBars)
-            .windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
             .heightIn(max = 56.dp + TopAppBarExpandedHeight)
             .clipToBounds()
     ) { measurables, constraints ->
@@ -729,8 +731,6 @@ private fun SmallTopAppBarLayout(
             }
         },
         modifier = Modifier
-            .windowInsetsPadding(WindowInsets.statusBars)
-            .windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
             .heightIn(max = 56.dp)
     ) { measurables, constraints ->
         val navigationIconPlaceable =