Don't collapse newlines.

This causes index offset issues with any rich elements in the message. We could try to fix the offsets, or alternatively replace the collapsed newlines with spaces (to maintain the original offsets), but I don't think it's worth the effort since I'm not sure that it's a good idea to collapse newlines in the first place.

Don't collapse newlines.
This causes index offset issues with any rich elements in the message. We could try to fix the offsets, or alternatively replace the collapsed newlines with spaces (to maintain the original offsets), but I don't think it's worth the effort since I'm not sure that it's a good idea to collapse newlines in the first place.
61bb0cfa · JC Brand · 2c7b2204 · 61bb0cfa · 61bb0cfa
Commit 61bb0cfa authored Jan 18, 2021 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 7 deletions

spec/messages.js spec/messages.js +11 -1

src/shared/message/text.js src/shared/message/text.js +1 -6

No files found.
--- a/spec/messages.js
+++ b/spec/messages.js
@@ -607,7 +607,7 @@ describe("A Chat Message", function () {
            </message>`);
        _converse.connection._dataRecv(mock.createRequest(stanza));
        await new Promise(resolve => view.model.messages.once('rendered', resolve));
-        await u.waitUntil(() => view.content.querySelector('converse-chat-message:last-child .chat-msg__text').innerHTML.replace(/<!---->/g, '') === 'Hey\n\nHave you heard the news?');
+        await u.waitUntil(() => view.content.querySelector('converse-chat-message:last-child .chat-msg__text').innerHTML.replace(/<!---->/g, '') === 'Hey\n\n\nHave you heard the news?');
        stanza = u.toStanza(`
            <message from="${contact_jid}"
                     type="chat"
@@ -617,6 +617,16 @@ describe("A Chat Message", function () {
        _converse.connection._dataRecv(mock.createRequest(stanza));
        await new Promise(resolve => view.model.messages.once('rendered', resolve));
        expect(view.content.querySelector('converse-chat-message:last-child .chat-msg__text').innerHTML.replace(/<!---->/g, '')).toBe('Hey\nHave you heard\nthe news?');
+
+        stanza = u.toStanza(`
+            <message from="${contact_jid}"
+                     type="chat"
+                     to="romeo@montague.lit/orchard">
+                <body>Hey\nHave you heard\n\n\nthe news?\nhttps://conversejs.org</body>
+            </message>`);
+        _converse.connection._dataRecv(mock.createRequest(stanza));
+        await new Promise(resolve => view.model.messages.once('rendered', resolve));
+        expect(view.content.querySelector('converse-chat-message:last-child .chat-msg__text').innerHTML.replace(/<!---->/g, '')).toBe('Hey\nHave you heard\n\n\nthe news?\nhttps://conversejs.org');
        done();
    }));


--- a/src/shared/message/text.js
+++ b/src/shared/message/text.js
@@ -8,7 +8,6 @@ import { html } from 'lit-html';
 const u = converse.env.utils;

 const isString = (s) => typeof s === 'string';
-
 const tpl_mention_with_nick = (o) => html`<span class="mention mention--self badge badge-info">${o.mention}</span>`;
 const tpl_mention = (o) => html`<span class="mention">${o.mention}</span>`;

@@ -300,10 +299,6 @@ export class MessageText extends String {
        return text.startsWith('/me ');
    }

-    static replaceText (text) {
-        return convertASCII2Emoji(text.replace(/\n\n+/g, '\n\n'));
-    }
-
    /**
     * Take the annotations and return an array of text and TemplateResult
     * instances to be rendered to the DOM.
@@ -322,6 +317,6 @@ export class MessageText extends String {
                    ...list
                ];
            });
-        return list.reduce((acc, i) => isString(i) ? [...acc, MessageText.replaceText(i)] : [...acc, i], []);
+        return list.reduce((acc, i) => isString(i) ? [...acc, convertASCII2Emoji(i)] : [...acc, i], []);
    }
 }