Merge pull request #299 from guardian/soft-line-breaks

guardian · Oct 23, 2023 · 61775e6 · 61775e6
2 parents 12c3e6d + a7f5025
commit 61775e6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/client/src/editItem.tsx b/client/src/editItem.tsx
@@ -59,7 +59,7 @@ export const EditItem = ({ item, cancel }: EditItemProps) => {
       variables: {
         itemId: item.id,
         input: {
-          message: message || null,
+          message: message?.trim() || null,
           payload,
           type,
         },
@@ -76,7 +76,7 @@ export const EditItem = ({ item, cancel }: EditItemProps) => {
     }
   };
 
-  const canUpdate = message || payloadToBeSent;
+  const canUpdate = message?.trim() || payloadToBeSent;
 
   const ref = useRef<HTMLDivElement | null>(null);
 

diff --git a/client/src/itemInputBox.tsx b/client/src/itemInputBox.tsx
@@ -295,7 +295,10 @@ export const ItemInputBox = ({
           ((event) => {
             event.stopPropagation();
             if (isHardReturn(event)) {
-              if (!isAsGridPayloadLoading && (message || payloadToBeSent)) {
+              if (
+                !isAsGridPayloadLoading &&
+                (message?.trim() || payloadToBeSent)
+              ) {
                 sendItem();
               }
               event.preventDefault();

diff --git a/client/src/sendMessageArea.tsx b/client/src/sendMessageArea.tsx
@@ -131,7 +131,7 @@ export const SendMessageArea = ({
           variables: {
             input: {
               type: payloadToBeSent?.type || "message-only",
-              message,
+              message: message?.trim(),
               payload:
                 payloadToBeSent && JSON.stringify(payloadToBeSent.payload),
               pinboardId,
@@ -219,7 +219,7 @@ export const SendMessageArea = ({
         disabled={
           isItemSending ||
           isAsGridPayloadLoading ||
-          !(message || payloadToBeSent)
+          !(message?.trim() || payloadToBeSent)
         }
       >
         {isItemSending ? (