Skip to content

Commit d45e957

Browse files
Update BlockItemModifier.kt
1 parent 0d0aa89 commit d45e957

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

libraries/block-kit/ui/src/main/kotlin/io/adventech/blockkit/ui/style/BlockItemModifier.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ internal fun Modifier.background(blockItem: BlockItem, nested: Boolean? = blockI
4141
val layoutDirection = LocalLayoutDirection.current
4242
val blocksStyle = LocalBlocksStyle.current
4343
val blockStyle = blockItem.style?.block
44+
val blockWrapperStyle = blockItem.style?.wrapper
45+
4446
val blockPaddingStyle = blockStyle?.padding
4547
val blockMarginStyle = blockStyle?.margin
4648

4749
val defaultWrapperMarginStyle = blocksStyle?.inline?.all?.wrapper?.padding?.takeUnless {
48-
blockMarginStyle != null || (blockItem.nested ?: nested) == true
50+
(blockItem.nested ?: nested) == true
4951
}
5052

51-
val styleMarginValues = Styler.padding(blockMarginStyle ?: defaultWrapperMarginStyle)
53+
val styleMarginValues = Styler.padding(blockMarginStyle ?: blockWrapperStyle?.padding ?: defaultWrapperMarginStyle)
5254

5355
return this
5456
.padding(

0 commit comments

Comments
 (0)