Skip to content

fix: consecutive numbering fails after indented sub-bullets #7447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnMcLear merged 2 commits into from
Apr 4, 2026
+45 −1
Merged

fix: consecutive numbering fails after indented sub-bullets #7447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4358bd7
fix: consecutive numbering fails after indented sub-bullets
JohnMcLear Apr 4, 2026
726813f
test: assert sub-bullet indent and remove redundant waitForTimeout
JohnMcLear Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/static/js/ace2_inner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,7 +2314,7 @@ function Ace2Inner(editorInfo, cssManagers) {
listType = /([a-z]+)([0-9]+)/.exec(listType);
curLevel = Number(listType[2]);
const curType = listType[1];
if (isNaN(curLevel) || listType[0] === 'indent') {
if (isNaN(curLevel) || listType[1] === 'indent') {
return line;
} else if (curLevel === level) {
// Reset position when switching between list types at the same level
Expand Down
44 changes: 44 additions & 0 deletions src/tests/frontend-new/specs/ordered_list.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,50 @@ test.describe('ordered_list.js', function () {
await expect(fifthLine.locator('ol')).toHaveAttribute('start', '3', {timeout: 5000});
});

// Regression test for https://github.com/ether/etherpad-lite/issues/5718
test('issue #5718 consecutive numbering works after indented sub-bullets', async function ({page}) {
const padBody = await getPadBody(page);
await clearPadContent(page);

// Create a bullet point
const $insertUnorderedButton = page.locator('.buttonicon-insertunorderedlist');
await $insertUnorderedButton.click({force: true});
await writeToPad(page, 'Bullet item');
await page.keyboard.press('Enter');

// Indent to create a sub-bullet
await page.keyboard.press('Tab');
await writeToPad(page, 'Sub-bullet');

// Verify the sub-bullet is actually indented (level 2)
const subBulletLine = padBody.locator('div').nth(1);
await expect(subBulletLine.locator('.list-bullet2')).toHaveCount(1, {timeout: 5000});

await page.keyboard.press('Enter');

// De-indent back to level 1
await page.keyboard.press('Shift+Tab');

// Switch to numbered list
const $insertOrderedButton = page.locator('.buttonicon-insertorderedlist');
await $insertOrderedButton.click({force: true});
await writeToPad(page, 'Number 1');
await page.keyboard.press('Enter');
await writeToPad(page, 'Number 2');
await page.keyboard.press('Enter');
await writeToPad(page, 'Number 3');

// Lines 3, 4, 5 should be numbered 1, 2, 3
const line3 = padBody.locator('div').nth(2);
await expect(line3.locator('ol')).toHaveAttribute('start', '1', {timeout: 5000});

const line4 = padBody.locator('div').nth(3);
await expect(line4.locator('ol')).toHaveAttribute('start', '2', {timeout: 5000});

const line5 = padBody.locator('div').nth(4);
await expect(line5.locator('ol')).toHaveAttribute('start', '3', {timeout: 5000});
});

test.describe('Pressing Tab in an OL increases and decreases indentation', function () {

test('indent and de-indent list item with keypress', async function ({page}) {
Expand Down
Loading