IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-42628 Fix wrong spacing between header and lists when a inline image is used (#26040)

Browse Source 
* Fix wrong spacing between header and lists when a inline image is used

* Fix test
This commit is contained in:
Daniel Espino García 2024-01-30 09:42:41 +01:00 committed by GitHub
parent 61b1f26411
commit 60df49652e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webapp/channels/src/utils/markdown/index.test.ts
View File

@ -44,8 +44,7 @@ x^2 + y^2 = z^2
const input = `- a
- b
- c`;
const expected = `<ul className="markdown__list">
<li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ul>`;
const expected = '<ul className="markdown__list"><li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ul>';
const output = format(input);
expect(output).toBe(expected);
@ -55,8 +54,7 @@ x^2 + y^2 = z^2
const input = `1. a
2. b
3. c`;
const expected = `<ol className="markdown__list" style="counter-reset: list 0">
<li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ol>`;
const expected = '<ol className="markdown__list" style="counter-reset: list 0"><li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ol>';
const output = format(input);
expect(output).toBe(expected);
@ -66,8 +64,7 @@ x^2 + y^2 = z^2
const input = `0. a
1. b
2. c`;
const expected = `<ol className="markdown__list" style="counter-reset: list -1">
<li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ol>`;
const expected = '<ol className="markdown__list" style="counter-reset: list -1"><li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ol>';
const output = format(input);
expect(output).toBe(expected);
@ -77,8 +74,7 @@ x^2 + y^2 = z^2
const input = `999. a
1. b
1. c`;
const expected = `<ol className="markdown__list" style="counter-reset: list 998">
<li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ol>`;
const expected = '<ol className="markdown__list" style="counter-reset: list 998"><li><span>a</span></li><li><span>b</span></li><li><span>c</span></li></ol>';
const output = format(input);
expect(output).toBe(expected);

2
webapp/channels/src/utils/markdown/renderer.tsx
View File

@ -235,7 +235,7 @@ export default class Renderer extends marked.Renderer {
// style it properly. We need to use a CSS counter to tell the ::before elements which numbers to show.
output += ` style="counter-reset: list ${start - 1}"`;
}
output += `>\n${content}</${type}>`;
output += `>${content}</${type}>`;
return output;
}