Skip to content

feat(sdds-alibs/homeds): Add List Size = M variation. #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
malilex merged 1 commit into from
Apr 28, 2026
Merged

feat(sdds-alibs/homeds): Add List Size = M variation. #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 124 additions & 4 deletions tokens/plasma.homeds.compose/config-info-compose.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13358,7 +13358,8 @@
{
"name": "size",
"values": [
"s"
"s",
"m"
],
"defaultValue": "s"
},
Expand Down Expand Up @@ -13397,6 +13398,10 @@
{
"value": "s",
"codeName": "S"
},
{
"value": "m",
"codeName": "M"
}
]
},
Expand Down Expand Up @@ -13500,6 +13505,62 @@
"value": "true"
}
]
},
{
"name": "m",
"composeReference": "List.M",
"props": [
{
"name": "size",
"value": "m"
}
]
},
{
"name": "m.no-background",
"composeReference": "List.M.NoBackground",
"props": [
{
"name": "size",
"value": "m"
},
{
"name": "has-background",
"value": "false"
}
]
},
{
"name": "m.no-background.has-item-background",
"composeReference": "List.M.NoBackground.HasItemBackground",
"props": [
{
"name": "size",
"value": "m"
},
{
"name": "has-background",
"value": "false"
},
{
"name": "has-item-background",
"value": "true"
}
]
},
{
"name": "m.has-background",
"composeReference": "List.M.HasBackground",
"props": [
{
"name": "size",
"value": "m"
},
{
"name": "has-background",
"value": "true"
}
]
}
]
},
Expand All @@ -13511,7 +13572,8 @@
{
"name": "size",
"values": [
"s"
"s",
"m"
],
"defaultValue": "s"
}
Expand Down Expand Up @@ -13542,6 +13604,10 @@
{
"value": "s",
"codeName": "S"
},
{
"value": "m",
"codeName": "M"
}
]
}
Expand All @@ -13557,6 +13623,16 @@
"value": "s"
}
]
},
{
"name": "m",
"composeReference": "ListNumbered.M",
"props": [
{
"name": "size",
"value": "m"
}
]
}
]
},
Expand All @@ -13568,7 +13644,8 @@
{
"name": "size",
"values": [
"s"
"s",
"m"
],
"defaultValue": "s"
},
Expand Down Expand Up @@ -13603,6 +13680,10 @@
{
"value": "s",
"codeName": "S"
},
{
"value": "m",
"codeName": "M"
}
]
},
Expand Down Expand Up @@ -13653,6 +13734,30 @@
"value": "true"
}
]
},
{
"name": "m",
"composeReference": "ListItem.M",
"props": [
{
"name": "size",
"value": "m"
}
]
},
{
"name": "m.has-background",
"composeReference": "ListItem.M.HasBackground",
"props": [
{
"name": "size",
"value": "m"
},
{
"name": "has-background",
"value": "true"
}
]
}
]
},
Expand All @@ -13664,7 +13769,8 @@
{
"name": "size",
"values": [
"s"
"s",
"m"
],
"defaultValue": "s"
}
Expand Down Expand Up @@ -13695,6 +13801,10 @@
{
"value": "s",
"codeName": "S"
},
{
"value": "m",
"codeName": "M"
}
]
}
Expand All @@ -13710,6 +13820,16 @@
"value": "s"
}
]
},
{
"name": "m",
"composeReference": "ListNumberedItem.M",
"props": [
{
"name": "size",
"value": "m"
}
]
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion tokens/plasma.homeds.compose/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ versionMinor=19
versionPatch=0

theme-version=0.3.0
components-version=0.10.0
components-version=0.11.0

summary.key=plasmaHomeDS

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/com/sdds/plasma/homeds/integration/PlasmaHomedsAvatarVariationsCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ internal object PlasmaHomedsAvatarVariationsCompose : ComposeStyleProvider<Avata
"L" -> AvatarSize.L
"M" -> AvatarSize.M
"S" -> AvatarSize.S
else -> AvatarSize.Xxl
else -> AvatarSize.M
},
shape = when (bindings["shape"]?.toString()) {
"Default" -> AvatarShape.Default
Expand Down
6 changes: 5 additions & 1 deletion ...c/main/kotlin/com/sdds/plasma/homeds/integration/PlasmaHomedsListItemVariationsCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,31 @@ import com.sdds.plasma.homeds.styles.listitem.HasBackground
import com.sdds.plasma.homeds.styles.listitem.ListItem
import com.sdds.plasma.homeds.styles.listitem.ListItemDefaultSize
import com.sdds.plasma.homeds.styles.listitem.ListItemStyles
import com.sdds.plasma.homeds.styles.listitem.M
import com.sdds.plasma.homeds.styles.listitem.S
import com.sdds.plasma.homeds.styles.listitem.resolve
import com.sdds.sandbox.Property

internal object PlasmaHomedsListItemVariationsCompose : ComposeStyleProvider<ListItemStyle>() {
override val bindings: Set<Property<*>> =
setOf(
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S")),
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S", "M")),
Property.BooleanProperty(name = "hasBackground", value = false),
)

override val variations: Map<String, ComposeStyleReference<ListItemStyle>> =
mapOf(
"ListItem.S" to ComposeStyleReference { ListItem.S.style() },
"ListItem.S.HasBackground" to ComposeStyleReference { ListItem.S.HasBackground.style() },
"ListItem.M" to ComposeStyleReference { ListItem.M.style() },
"ListItem.M.HasBackground" to ComposeStyleReference { ListItem.M.HasBackground.style() },
)

override fun resolveStyleKey(bindings: Map<String, Any?>): String {
return ListItemStyles.Default.resolve(
size = when (bindings["size"]?.toString()) {
"S" -> ListItemDefaultSize.S
"M" -> ListItemDefaultSize.M
else -> ListItemDefaultSize.S
},
hasBackground = booleanBindingValue(bindings, "hasBackground", false),
Expand Down
5 changes: 4 additions & 1 deletion ...otlin/com/sdds/plasma/homeds/integration/PlasmaHomedsListNumberedItemVariationsCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,28 @@ import com.sdds.compose.uikit.style.style
import com.sdds.plasma.homeds.styles.listitem.ListItemListNumberedItemSize
import com.sdds.plasma.homeds.styles.listitem.ListItemStyles
import com.sdds.plasma.homeds.styles.listitem.ListNumberedItem
import com.sdds.plasma.homeds.styles.listitem.M
import com.sdds.plasma.homeds.styles.listitem.S
import com.sdds.plasma.homeds.styles.listitem.resolve
import com.sdds.sandbox.Property

internal object PlasmaHomedsListNumberedItemVariationsCompose : ComposeStyleProvider<ListItemStyle>() {
override val bindings: Set<Property<*>> =
setOf(
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S")),
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S", "M")),
)

override val variations: Map<String, ComposeStyleReference<ListItemStyle>> =
mapOf(
"ListNumberedItem.S" to ComposeStyleReference { ListNumberedItem.S.style() },
"ListNumberedItem.M" to ComposeStyleReference { ListNumberedItem.M.style() },
)

override fun resolveStyleKey(bindings: Map<String, Any?>): String {
return ListItemStyles.ListNumberedItem.resolve(
size = when (bindings["size"]?.toString()) {
"S" -> ListItemListNumberedItemSize.S
"M" -> ListItemListNumberedItemSize.M
else -> ListItemListNumberedItemSize.S
},
).key
Expand Down
5 changes: 4 additions & 1 deletion ...in/kotlin/com/sdds/plasma/homeds/integration/PlasmaHomedsListNumberedVariationsCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,28 @@ import com.sdds.compose.uikit.style.style
import com.sdds.plasma.homeds.styles.list.ListNumbered
import com.sdds.plasma.homeds.styles.list.ListNumberedSize
import com.sdds.plasma.homeds.styles.list.ListStyles
import com.sdds.plasma.homeds.styles.list.M
import com.sdds.plasma.homeds.styles.list.S
import com.sdds.plasma.homeds.styles.list.resolve
import com.sdds.sandbox.Property

internal object PlasmaHomedsListNumberedVariationsCompose : ComposeStyleProvider<ListStyle>() {
override val bindings: Set<Property<*>> =
setOf(
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S")),
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S", "M")),
)

override val variations: Map<String, ComposeStyleReference<ListStyle>> =
mapOf(
"ListNumbered.S" to ComposeStyleReference { ListNumbered.S.style() },
"ListNumbered.M" to ComposeStyleReference { ListNumbered.M.style() },
)

override fun resolveStyleKey(bindings: Map<String, Any?>): String {
return ListStyles.Numbered.resolve(
size = when (bindings["size"]?.toString()) {
"S" -> ListNumberedSize.S
"M" -> ListNumberedSize.M
else -> ListNumberedSize.S
},
).key
Expand Down
8 changes: 7 additions & 1 deletion ...n/src/main/kotlin/com/sdds/plasma/homeds/integration/PlasmaHomedsListVariationsCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.sdds.plasma.homeds.styles.list.HasItemBackground
import com.sdds.plasma.homeds.styles.list.List
import com.sdds.plasma.homeds.styles.list.ListDefaultSize
import com.sdds.plasma.homeds.styles.list.ListStyles
import com.sdds.plasma.homeds.styles.list.M
import com.sdds.plasma.homeds.styles.list.NoBackground
import com.sdds.plasma.homeds.styles.list.S
import com.sdds.plasma.homeds.styles.list.resolve
Expand All @@ -26,7 +27,7 @@ import com.sdds.sandbox.Property
internal object PlasmaHomedsListVariationsCompose : ComposeStyleProvider<ListStyle>() {
override val bindings: Set<Property<*>> =
setOf(
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S")),
Property.SingleChoiceProperty(name = "size", value = "S", variants = listOf("S", "M")),
Property.BooleanProperty(name = "hasBackground", value = false),
Property.BooleanProperty(name = "hasItemBackground", value = false),
)
Expand All @@ -37,12 +38,17 @@ internal object PlasmaHomedsListVariationsCompose : ComposeStyleProvider<ListSty
"List.S.NoBackground" to ComposeStyleReference { List.S.NoBackground.style() },
"List.S.NoBackground.HasItemBackground" to ComposeStyleReference { List.S.NoBackground.HasItemBackground.style() },
"List.S.HasBackground" to ComposeStyleReference { List.S.HasBackground.style() },
"List.M" to ComposeStyleReference { List.M.style() },
"List.M.NoBackground" to ComposeStyleReference { List.M.NoBackground.style() },
"List.M.NoBackground.HasItemBackground" to ComposeStyleReference { List.M.NoBackground.HasItemBackground.style() },
"List.M.HasBackground" to ComposeStyleReference { List.M.HasBackground.style() },
)

override fun resolveStyleKey(bindings: Map<String, Any?>): String {
return ListStyles.Default.resolve(
size = when (bindings["size"]?.toString()) {
"S" -> ListDefaultSize.S
"M" -> ListDefaultSize.M
else -> ListDefaultSize.S
},
hasBackground = booleanBindingValue(bindings, "hasBackground", false),
Expand Down
20 changes: 20 additions & 0 deletions ...a.homeds.compose/src/main/kotlin/com/sdds/plasma/homeds/styles/list/ListNumberedStyles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import com.sdds.compose.uikit.style.wrap
import com.sdds.plasma.homeds.styles.divider.Default
import com.sdds.plasma.homeds.styles.divider.Divider
import com.sdds.plasma.homeds.styles.listitem.ListNumberedItem
import com.sdds.plasma.homeds.styles.listitem.M
import com.sdds.plasma.homeds.styles.listitem.S
import kotlin.Suppress
import kotlin.jvm.JvmInline
Expand All @@ -35,6 +36,14 @@ public value class WrapperListNumberedS(
public override val builder: ListStyleBuilder,
) : WrapperListNumbered

/**
* Обертка для вариации M
*/
@JvmInline
public value class WrapperListNumberedM(
public override val builder: ListStyleBuilder,
) : WrapperListNumbered

private val ListStyleBuilder.invariantProps: ListStyleBuilder
@Composable
get() = this
Expand All @@ -50,3 +59,14 @@ public val ListNumbered.S: WrapperListNumberedS
gap(12.0.dp)
}
.wrap(::WrapperListNumberedS)

public val ListNumbered.M: WrapperListNumberedM
@Composable
@JvmName("WrapperListNumberedM")
get() = ListStyle.builder(this)
.invariantProps
.listItemStyle(ListNumberedItem.M.style())
.dimensions {
gap(12.0.dp)
}
.wrap(::WrapperListNumberedM)
Loading
Loading