1 files changed, 38 insertions, 9 deletions

diff --git a/src/layouts/_bubble-group.scss b/src/layouts/_message-group.scss
index e4bc666..d95c9e8 100644
--- a/src/layouts/_bubble-group.scss
+++ b/src/layouts/_message-group.scss
@@ -1,7 +1,9 @@
 @use 'iro-sass/src/index' as iro;
 @use '../functions' as fn;
 
-@include iro.props-namespace('bubble-group') {
+@use '../objects/message';
+
+@include iro.props-namespace('message-group') {
     @include iro.props-store((
         --dims: (
             --spacing-x:  fn.global-dim(--size --225),
@@ -19,16 +21,17 @@
         display:               grid;
         grid-template-columns: auto 1fr;
         grid-auto-rows:        auto;
-        grid-template-areas:   'avatar bubble' 'avatar .';
+        grid-template-areas:   'avatar message' 'avatar .';
         align-items:           flex-start;
         gap:                   0 fn.dim(--spacing-x);
         
         @include iro.bem-elem('avatar') {
             grid-area: avatar;
+            height:    0;
         }
         
-        @include iro.bem-elem('bubble') {
-            grid-column: bubble;
+        @include iro.bem-elem('message') {
+            grid-column: message;
             box-sizing:  border-box;
             min-width:   0;
             max-width:   100%;
@@ -50,7 +53,7 @@
         }
         
         @include iro.bem-modifier('right') {
-            @include iro.bem-elem('bubble') {
+            @include iro.bem-elem('message') {
                 &::before {
                     right:              calc(-1 * fn.dim(--arrow-size));
                     left:               auto;
@@ -71,7 +74,7 @@
                 justify-items: end;
             }
         
-            @include iro.bem-elem('bubble') {
+            @include iro.bem-elem('message') {
                 @include iro.bem-next-twin-elem {
                     margin-top: fn.dim(--compact --spacing-y);
                 }
@@ -80,12 +83,12 @@
         
         @include iro.bem-modifier('right') {
             grid-template-columns: 1fr auto;
-            grid-template-areas:   'bubble avatar' '. avatar';
+            grid-template-areas:   'message avatar' '. avatar';
         }
         
         @include iro.bem-modifier('no-avatar') {
             grid-template-columns: 1fr;
-            grid-template-areas:   'bubble';
+            grid-template-areas:   'message';
 
             @include iro.bem-elem('avatar') {
                 display: none;
@@ -93,7 +96,7 @@
         }
         
         @include iro.bem-modifier('arrow') {
-            @include iro.bem-elem('bubble') {
+            @include iro.bem-elem('message') {
                 &::before {
                     display: block;
                 }
@@ -105,5 +108,31 @@
                 }
             }
         }
+        
+        & + & {
+            @include iro.bem-modifier('merge') {
+                margin-top: fn.dim(--spacing-y);
+
+                @include iro.bem-elem('avatar') {
+                    visibility: hidden;
+                }
+
+                @include iro.bem-modifier('compact') {
+                    margin-top: fn.dim(--compact --spacing-y);
+                }
+
+                @include iro.bem-elem('merge-hide') {
+                    display: none;
+                }
+        
+                @include iro.bem-modifier('arrow') {
+                    @include iro.bem-elem('message') {
+                        &::before {
+                            display: none;
+                        }
+                    }
+                }
+            }
+        }
     }
 }