paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: Remove extra blank line before lists.

Browse Source 
Previously, inserting a bulleted or numbered list via the compose
box added an extra blank line before and after the list.

This commit removes the extra blank line inserted before the list.

Fixes #32607.
This commit is contained in:
Aditya Kumar Kasaudhan
2025-01-01 15:56:02 +05:30
committed by Tim Abbott
parent c44c153b9a
commit 79be013882
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/compose_ui.ts
View File

@@ -658,14 +658,10 @@ export let format_text = (
.split("\n") .split("\n")
.map((line, i) => mark(line, i)) .map((line, i) => mark(line, i))
.join("\n"); .join("\n");
// We always ensure a blank line before and after the list, as we want // We always ensure a blank line after the list, as we want
// a clean separation between the list and the rest of the text, especially // a clean separation between the list and the rest of the text, especially
// when the markdown is rendered. // when the markdown is rendered.
// Add blank line between text before and list if not already present.
if (before_lines.length > 0 && before_lines.at(-1) !== "\n") {
before_lines += "\n";
}
// Add blank line between list and rest of text if not already present. // Add blank line between list and rest of text if not already present.
if (after_lines.length > 0 && after_lines.at(0) !== "\n") { if (after_lines.length > 0 && after_lines.at(0) !== "\n") {
after_lines = "\n" + after_lines; after_lines = "\n" + after_lines;

8
web/tests/compose_ui.test.cjs
View File

@@ -696,6 +696,10 @@ run_test("format_text - bulleted and numbered lists", ({override_rewire}) => {
compose_ui.format_text($textarea, "bulleted"); compose_ui.format_text($textarea, "bulleted");
assert.equal(get_textarea_state(), "<first_item\nsecond_item>"); assert.equal(get_textarea_state(), "<first_item\nsecond_item>");
init_textarea_state("before_first\n<* first_item\n* second_item>\nafter_last");
compose_ui.format_text($textarea, "bulleted");
assert.equal(get_textarea_state(), "before_first\n<first_item\nsecond_item>\nafter_last");
// Toggling on numbered list // Toggling on numbered list
init_textarea_state("<first_item\nsecond_item>"); init_textarea_state("<first_item\nsecond_item>");
compose_ui.format_text($textarea, "numbered"); compose_ui.format_text($textarea, "numbered");
@@ -707,12 +711,12 @@ run_test("format_text - bulleted and numbered lists", ({override_rewire}) => {
init_textarea_state("before_first\nfirst_<item\nsecond>_item\nafter_last"); init_textarea_state("before_first\nfirst_<item\nsecond>_item\nafter_last");
compose_ui.format_text($textarea, "numbered"); compose_ui.format_text($textarea, "numbered");
// // Notice the blank lines inserted right before and after the list to visually demarcate it. // // Notice the blank lines inserted right after the list to visually demarcate it.
// // Had the blank line after `second_item` not been inserted, `after_last` would have been // // Had the blank line after `second_item` not been inserted, `after_last` would have been
// // (wrongly) indented as part of the list's last item too. // // (wrongly) indented as part of the list's last item too.
assert.equal( assert.equal(
get_textarea_state(), get_textarea_state(),
"before_first\n\n<1. first_item\n2. second_item>\n\nafter_last", "before_first\n<1. first_item\n2. second_item>\n\nafter_last",
); );
// Toggling off numbered list // Toggling off numbered list