From 2e9919c62168f15691ca8b8e138aea0ea3ee0ef8 Mon Sep 17 00:00:00 2001 From: canove Date: Sat, 26 Sep 2020 15:33:01 -0300 Subject: [PATCH] feat: #14 allow multiline messages --- backend/src/controllers/MessageController.ts | 2 ++ frontend/src/components/MessageInput/index.js | 2 +- frontend/src/components/MessagesList/index.js | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/MessageController.ts b/backend/src/controllers/MessageController.ts index b2080d8..fb63e7f 100644 --- a/backend/src/controllers/MessageController.ts +++ b/backend/src/controllers/MessageController.ts @@ -43,6 +43,8 @@ export const store = async (req: Request, res: Response): Promise => { const ticket = await ShowTicketService(ticketId); + console.log(body); + let sentMessage: WbotMessage; if (media) { diff --git a/frontend/src/components/MessageInput/index.js b/frontend/src/components/MessageInput/index.js index 20dc358..c62ab8a 100644 --- a/frontend/src/components/MessageInput/index.js +++ b/frontend/src/components/MessageInput/index.js @@ -326,7 +326,7 @@ const MessageInput = () => { disabled={recording || loading} onPaste={handleInputPaste} onKeyPress={e => { - if (loading) return; + if (loading || e.shiftKey) return; else if (e.key === "Enter") { handleSendMessage(); } diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js index a310c93..5db3271 100644 --- a/frontend/src/components/MessagesList/index.js +++ b/frontend/src/components/MessagesList/index.js @@ -122,6 +122,7 @@ const useStyles = makeStyles(theme => ({ display: "block", position: "relative", + whiteSpace: "pre-wrap", backgroundColor: "#ffffff", color: "#303030", alignSelf: "flex-start", @@ -145,6 +146,7 @@ const useStyles = makeStyles(theme => ({ display: "block", position: "relative", + whiteSpace: "pre-wrap", backgroundColor: "#dcf8c6", color: "#303030", alignSelf: "flex-end",