Skip to content

fix: incorrect list counter calculation (SD-1658) #1867

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
harbournick merged 5 commits into from
Jan 28, 2026
Merged

fix: incorrect list counter calculation (SD-1658) #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b343ed
feat: use translated numbering to retrieve definitions in numbering p…
Jan 28, 2026
73bac12
fix: include w:lvlRestart translator in w:lvl translator
Jan 28, 2026
63c515b
fix: restore numbering manager and fix abstract handling
Jan 28, 2026
c27cc50
fix: uncached numbering to use max prior position
Jan 28, 2026
bf8f745
Merge branch 'main' into luccas/sd-1658-bug-list-items-at-same-level-…
harbournick Jan 28, 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
38 changes: 15 additions & 23 deletions packages/super-editor/src/core/helpers/list-numbering-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,45 +349,37 @@ export const getListDefinitionDetails = ({ numId, level, listType, editor, tries
/**
* Get all list definitions grouped by numId and level.
* @param {import('../Editor').Editor} editor - The editor instance containing numbering information.
* @returns {Record<string, Record<string, {start: string|null, numFmt: string|null, lvlText: string|null, suffix: string|null, listNumberingType: string|null, customFormat: string|null, abstract: Object|null, abstractId: string|undefined}>>}
* @returns {Record<string, Record<string, {start: string|null, startOverridden: boolean, numFmt: string|null, lvlText: string|null, suffix: string|null, listNumberingType: string|null, customFormat: string|null, abstract: Object|null, abstractId: string|undefined}>>}
*/
export const getAllListDefinitions = (editor) => {
const numbering = editor?.converter?.numbering;
const numbering = editor?.converter?.translatedNumbering;
if (!numbering) return {};

const { definitions = {}, abstracts = {} } = numbering;

return Object.entries(definitions).reduce((acc, [numId, definition]) => {
if (!definition) return acc;

const abstractId = definition.elements?.find((item) => item.name === 'w:abstractNumId')?.attributes?.['w:val'];
const abstractId = definition['abstractNumId'];
const abstract = abstractId != null ? abstracts?.[abstractId] : undefined;
const levelDefinitions = abstract?.elements?.filter((item) => item.name === 'w:lvl') || [];
const levelDefinitions = abstract?.levels || {};

if (!acc[numId]) acc[numId] = {};

levelDefinitions.forEach((levelDef) => {
const ilvl = levelDef?.attributes?.['w:ilvl'];
if (ilvl == null) return;
Object.values(levelDefinitions).forEach((levelDef) => {
const ilvl = levelDef.ilvl;

const findElement = (name) => levelDef?.elements?.find((item) => item.name === name);

const startElement = findElement('w:start');
const lvlRestartElement = findElement('w:lvlRestart');
const numFmtElement = findElement('w:numFmt');
const lvlTextElement = findElement('w:lvlText');
const suffixElement = findElement('w:suff');

const numFmt = numFmtElement?.attributes?.['w:val'] ?? null;
const customFormat = numFmt === 'custom' ? (numFmtElement?.attributes?.['w:format'] ?? null) : null;
const customFormat = levelDef.numFmt?.val === 'custom' ? levelDef.numFmt.format : null;
const start = definition.lvlOverrides?.[ilvl]?.startOverride || levelDef.start;

acc[numId][ilvl] = {
start: startElement?.attributes?.['w:val'] ?? null,
restart: lvlRestartElement?.attributes?.['w:val'] ?? null,
numFmt,
lvlText: lvlTextElement?.attributes?.['w:val'] ?? null,
suffix: suffixElement?.attributes?.['w:val'] ?? null,
listNumberingType: numFmt,
start,
startOverridden: definition.lvlOverrides?.[ilvl]?.startOverride != null,
restart: levelDef.lvlRestart,
numFmt: levelDef.numFmt?.val,
lvlText: levelDef.lvlText,
suffix: levelDef.suff,
listNumberingType: levelDef.numFmt?.val,
customFormat,
abstract: abstract ?? null,
abstractId,
Expand Down
2 changes: 2 additions & 0 deletions packages/super-editor/src/core/super-converter/v3/handlers/w/lvl/lvl-translator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
createBooleanAttributeHandler,
} from '@converter/v3/handlers/utils.js';
import { translator as wLvlStartTranslator } from '../../w/start/lvlStart-translator.js';
import { translator as wLvlRestartTranslator } from '../../w/lvlRestart/lvlRestart-translator.js';
import { translator as wLvlPicBulletId } from '../../w/lvlPicBulletId/lvlPicBulletId-translator.js';
import { translator as wIsLglTranslator } from '../../w/isLgl/isLgl-translator.js';
import { translator as wPStyleTranslator } from '../../w/pStyle/pStyle-translator.js';
Expand All @@ -22,6 +23,7 @@ import { translator as wRPrTranslator } from '../../w/rpr';
/** @type {import('@translator').NodeTranslator[]} */
const propertyTranslators = [
wLvlStartTranslator,
wLvlRestartTranslator,
wLvlPicBulletId,
wIsLglTranslator,
wPStyleTranslator,
Expand Down
Loading