Merge branch 'main' into rc

# Conflicts: # package.json
GetStream · Jul 12, 2024 · dc290ab · dc290ab
2 parents 5d0bcb4 + 6fcb661
commit dc290ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/v2/styles/Message/Message-layout.scss b/src/v2/styles/Message/Message-layout.scss
@@ -520,9 +520,11 @@
 }
 
 .str-chat__message-with-touch-support {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  user-select: none;
+  .str-chat__message-bubble {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    user-select: none;
+  }
 
   &.str-chat__message-menu-opened {
     .str-chat__attachments-container,

diff --git a/src/v2/styles/MessageReactions/MessageReactionsSelector-layout.scss b/src/v2/styles/MessageReactions/MessageReactionsSelector-layout.scss
@@ -7,13 +7,20 @@
   inset-block-end: 100%;
 
   &.str-chat-angular-v5__reaction-selector {
+    margin: var(--str-chat__spacing-2);
     position: static;
+    justify-content: flex-start;
 
     .str-chat__message-reactions-options {
       max-width: 100%;
-      overflow-y: auto;
-      overflow-x: hidden;
+      overflow-y: hidden;
+      overflow-x: auto;
       scrollbar-width: none;
+      padding: 0;
+
+      .str-chat__message-reactions-option {
+        flex-shrink: 0;
+      }
     }
   }
 

diff --git a/src/v2/styles/_base.scss b/src/v2/styles/_base.scss
@@ -13,6 +13,7 @@
     padding: 0 !important;
     box-shadow: none !important;
     border-color: transparent !important;
+    max-width: 100vw;
 
     .ngxp__arrow {
       display: none;