From 3f399b1329493c1051480ad14f784d6b5e1ea707 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Fri, 14 Jul 2023 11:09:02 -0700
Subject: [PATCH] getStringFromNode: Add parent/nextSibling for fewer newlines

---
 ts/components/conversation/Message.tsx        | 11 ++++++--
 .../conversation/MessageBodyReadMore.tsx      |  3 +++
 ts/quill/signal-clipboard/util.ts             | 26 +++++++++++++------
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index a780a58b6a..2a2ccfff06 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -741,8 +741,14 @@ export class Message extends React.PureComponent<Props, State> {
   }
 
   private canRenderStickerLikeEmoji(): boolean {
-    const { text, quote, storyReplyContext, attachments, previews } =
-      this.props;
+    const {
+      attachments,
+      bodyRanges,
+      previews,
+      quote,
+      storyReplyContext,
+      text,
+    } = this.props;
 
     return Boolean(
       text &&
@@ -751,6 +757,7 @@ export class Message extends React.PureComponent<Props, State> {
         !quote &&
         !storyReplyContext &&
         (!attachments || !attachments.length) &&
+        (!bodyRanges || !bodyRanges.length) &&
         (!previews || !previews.length)
     );
   }
diff --git a/ts/components/conversation/MessageBodyReadMore.tsx b/ts/components/conversation/MessageBodyReadMore.tsx
index b20fa842e8..cf7bdcafe2 100644
--- a/ts/components/conversation/MessageBodyReadMore.tsx
+++ b/ts/components/conversation/MessageBodyReadMore.tsx
@@ -58,6 +58,8 @@ export function MessageBodyReadMore({
     BUFFER
   );
 
+  const disableJumbomoji = bodyRanges?.length ? true : undefined;
+
   const onIncreaseTextLength = hasReadMore
     ? () => {
         messageExpanded(id, maxLength + INCREMENT_COUNT);
@@ -68,6 +70,7 @@ export function MessageBodyReadMore({
     <MessageBody
       bodyRanges={bodyRanges}
       direction={direction}
+      disableJumbomoji={disableJumbomoji}
       disableLinks={disableLinks}
       i18n={i18n}
       isSpoilerExpanded={isSpoilerExpanded}
diff --git a/ts/quill/signal-clipboard/util.ts b/ts/quill/signal-clipboard/util.ts
index c4d2601da4..35ab000b8a 100644
--- a/ts/quill/signal-clipboard/util.ts
+++ b/ts/quill/signal-clipboard/util.ts
@@ -56,7 +56,11 @@ export function createEventHandler({
   };
 }
 
-function getStringFromNode(node: Node): string {
+function getStringFromNode(
+  node: Node,
+  parent?: Node,
+  nextSibling?: Node
+): string {
   if (node.nodeType === Node.TEXT_NODE) {
     if (node.textContent === QUILL_EMBED_GUARD) {
       return '';
@@ -75,20 +79,26 @@ function getStringFromNode(node: Node): string {
   ) {
     return element.ariaLabel || '';
   }
-  if (element.nodeName === 'BR') {
+  if (nextSibling && element.nodeName === 'BR') {
     return '\n';
   }
-  if (element.childNodes.length === 0) {
+  const childCount = element.childNodes.length;
+  if (childCount === 0) {
     return element.textContent || '';
   }
   let result = '';
-  for (const child of element.childNodes) {
-    result += getStringFromNode(child);
+  for (let i = 0; i < childCount; i += 1) {
+    const child = element.childNodes[i];
+    const nextChild = element.childNodes[i + 1];
+    result += getStringFromNode(child, node, nextChild);
   }
+
   if (
-    element.nodeName === 'P' ||
-    element.nodeName === 'DIV' ||
-    element.nodeName === 'TIME'
+    parent &&
+    parent.childNodes.length > 1 &&
+    (element.nodeName === 'P' ||
+      element.nodeName === 'DIV' ||
+      element.nodeName === 'TIME')
   ) {
     if (result.length > 0 && !result.endsWith('\n\n')) {
       result += '\n';