fix: unexpected linked block container behaviour

d1snin · Oct 19, 2023 · 902fa15 · 902fa15
1 parent 9c045e6
commit 902fa15
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/beam-ui/src/jsMain/kotlin/dev/d1s/beam/ui/component/BlockComponent.kt b/beam-ui/src/jsMain/kotlin/dev/d1s/beam/ui/component/BlockComponent.kt
@@ -47,7 +47,13 @@ class BlockComponent : Component<BlockComponent.Config>(::Config), KoinComponent
         val isBare = block.metadata[MetadataKeys.UI_BLOCK_BARE]
             ?.toBooleanStrictOrNull() == true
 
+        var containerConfigured = false
+
         fun SimplePanel.configureContainer() {
+            if (!containerConfigured) {
+                applyMargin()
+            }
+
             addCssClass("w-100")
             addCssClass("d-flex")
 
@@ -59,17 +65,16 @@ class BlockComponent : Component<BlockComponent.Config>(::Config), KoinComponent
 
             maxWidth = blockSize
 
+            applyCompensator()
+
+            containerConfigured = true
         }
 
         fun SimplePanel.renderCard() {
             renderCard("flex-column justify-content-start", bare = isBare) {
                 configureContainer()
-
                 configurePadding(block)
 
-                applyMargin()
-                applyCompensator()
-
                 setOptionalBlockId(block)
 
                 renderEntities(block)
@@ -81,7 +86,6 @@ class BlockComponent : Component<BlockComponent.Config>(::Config), KoinComponent
         link?.let {
             renderFriendlyLink(url = it, external = true) {
                 configureContainer()
-
                 renderCard()
             }
         } ?: renderCard()