Skip to content

Commit 6e170ef

Browse files
committed
Partially fix Badge
1 parent e7fb54d commit 6e170ef

File tree

4 files changed

+17
-15
lines changed
  • demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo
  • material3/src
    • commonMain/kotlin/com/huanshankeji/compose/material3
    • composeUiMain/kotlin/com/huanshankeji/compose/material3
    • jsMain/kotlin/com/huanshankeji/compose/material3

4 files changed

+17
-15
lines changed

demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Material3.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,9 @@ fun Material3(/*modifier: Modifier = Modifier*/
306306

307307
// Badge
308308
Row {
309-
Badge {
310-
TaglessText("3")
311-
}
312-
Badge {
313-
TaglessText("New")
314-
}
309+
// not shown at the right position
310+
Badge(content = "3")
311+
Badge(content = "New")
315312
}
316313

317314
// Chips - showing all 4 types as per M3 design

material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Badge.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ import com.huanshankeji.compose.ui.Modifier
1111
* @see <a href="https://m3.material.io/components/badge/overview">Material Design badge</a>
1212
* @see androidx.compose.material3.Badge
1313
*/
14+
@Deprecated(
15+
"This component is not displayed correctly on JS DOM. " +
16+
"It seems to be displayed with absolute position. " +
17+
"See https://github.com/material-components/material-web/blob/main/labs/badge/internal/_badge.scss#L40."
18+
)
1419
@Composable
1520
expect fun Badge(
1621
modifier: Modifier = Modifier,
17-
content: @Composable (() -> Unit)? = null
22+
content: String
1823
)
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.huanshankeji.compose.material3
22

3+
import androidx.compose.material3.Text
34
import androidx.compose.runtime.Composable
45
import com.huanshankeji.compose.ui.Modifier
56

67
@Composable
78
actual fun Badge(
89
modifier: Modifier,
9-
content: @Composable (() -> Unit)?
10+
content: String
1011
) =
1112
androidx.compose.material3.Badge(
12-
modifier.platformModifier,
13-
content = content?.let { { it() } }
14-
)
13+
modifier.platformModifier
14+
) { Text(content) }
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.huanshankeji.compose.material3
22

33
import androidx.compose.runtime.Composable
4-
import com.huanshankeji.compose.html.material3.MdBadge
54
import com.huanshankeji.compose.html.material3.MaterialWebLabsApi
5+
import com.huanshankeji.compose.html.material3.MdBadge
66
import com.huanshankeji.compose.ui.Modifier
77
import com.huanshankeji.compose.ui.toAttrs
88

99
@MaterialWebLabsApi
1010
@Composable
1111
actual fun Badge(
1212
modifier: Modifier,
13-
content: @Composable (() -> Unit)?
13+
content: String
1414
) =
1515
MdBadge(
16-
attrs = modifier.toAttrs(),
17-
content = content?.let { { it() } }
16+
content,
17+
modifier.toAttrs()
1818
)

0 commit comments

Comments
 (0)