From da113c1fa1be2ea10bcfc2ab76bb5e10bd3f60cb Mon Sep 17 00:00:00 2001
From: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Date: Thu, 28 Sep 2023 12:54:56 -0400
Subject: [PATCH] Fix typing bubble timeline scroll jumping

---
 stylesheets/_modules.scss                   |  7 +++++--
 ts/components/conversation/TypingBubble.tsx | 15 ++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 8b890ea48fd3..884dd13c9360 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1386,8 +1386,8 @@ $message-padding-horizontal: 12px;
   }
 }
 
-.module-message--typing-bubble {
-  height: 44px;
+.module-message__container-outer--typing-bubble {
+  overflow-y: clip;
 }
 
 .module-message__typing-avatar-container {
@@ -1396,6 +1396,7 @@ $message-padding-horizontal: 12px;
   flex-direction: row-reverse;
   justify-content: center;
   margin-inline-end: 8px;
+  overflow-y: clip;
 
   &--with-reactions {
     padding-bottom: 15px;
@@ -1405,6 +1406,7 @@ $message-padding-horizontal: 12px;
 .module-message__typing-avatar {
   display: flex;
   justify-content: center;
+  position: relative;
   z-index: $z-index-base;
 
   &:not(:last-child) {
@@ -1735,6 +1737,7 @@ $message-padding-horizontal: 12px;
 
 .module-message__typing-animation-container {
   height: 16px;
+  overflow-y: clip;
 
   display: flex;
   flex-direction: row;
diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index 7ad9a60e0047..555d6a680d17 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -56,14 +56,14 @@ const AVATAR_ANIMATION_PROPS: Record<'visible' | 'hidden', object> = {
     scale: 1,
     width: '28px',
     x: '0px',
-    y: '0px',
+    top: '0px',
   },
   hidden: {
     opacity: 0.5,
     scale: 0.5,
     width: '4px', // Match value of module-message__typing-avatar margin-inline-start
     x: '14px',
-    y: '30px',
+    top: '30px',
   },
 };
 
@@ -242,12 +242,12 @@ const BUBBLE_ANIMATION_PROPS: Record<'visible' | 'hidden', object> = {
   visible: {
     opacity: 1,
     scale: 1,
-    y: '0px',
+    top: '0px',
   },
   hidden: {
     opacity: 0.5,
     scale: 0.5,
-    y: '30px',
+    top: '30px',
   },
 };
 
@@ -347,13 +347,14 @@ export function TypingBubble({
       className="module-timeline__typing-bubble-container"
       style={outerDivStyle}
     >
-      <div
+      <animated.div
         className={classNames(
           'module-message',
           'module-message--incoming',
           'module-message--typing-bubble',
           isGroup ? 'module-message--group' : null
         )}
+        style={outerDivStyle}
       >
         {isGroup && (
           <TypingBubbleGroupAvatars
@@ -366,7 +367,7 @@ export function TypingBubble({
             theme={theme}
           />
         )}
-        <div className="module-message__container-outer">
+        <div className="module-message__container-outer module-message__container-outer--typing-bubble">
           <animated.div
             className={classNames(
               'module-message__container',
@@ -379,7 +380,7 @@ export function TypingBubble({
             </div>
           </animated.div>
         </div>
-      </div>
+      </animated.div>
     </animated.div>
   );
 }