Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions packages/super-editor/src/core/helpers/list-numbering-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { getStyleTagFromStyleId } from '@core/super-converter/v2/importer/listIm
import { baseBulletList, baseOrderedListDef } from './baseListDefinitions';
import { updateNumberingProperties } from '@core/commands/changeListLevel';
import { findParentNode } from './findParentNode.js';
import { translator as wAbstractNumTranslator } from '@converter/v3/handlers/w/abstractNum';
import { translator as wNumTranslator } from '@converter/v3/handlers/w/num';

/**
* Generate a new list definition for the given list type.
Expand Down Expand Up @@ -114,6 +116,18 @@ export const generateNewListDefinition = ({ numId, listType, level, start, text,
const newNumDef = getBasicNumIdTag(numId, newAbstractId);
newNumbering.definitions[numId] = newNumDef;

const newTranslatedNumbering = { ...editor.converter.translatedNumbering };
if (!newTranslatedNumbering.definitions) newTranslatedNumbering.definitions = {};
if (!newTranslatedNumbering.abstracts) newTranslatedNumbering.abstracts = {};
// @ts-expect-error Remaining parameters are not needed for this translator
newTranslatedNumbering.definitions[numId] = wNumTranslator.encode({
nodes: [newNumDef],
});
// @ts-expect-error Remaining parameters are not needed for this translator
newTranslatedNumbering.abstracts[newAbstractId] = wAbstractNumTranslator.encode({
nodes: [newAbstractDef],
});
editor.converter.translatedNumbering = newTranslatedNumbering;
// Update the editor's numbering with the new definition
editor.converter.numbering = newNumbering;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ describe('getListDefinitionDetails', () => {
definitions: mockDefinitions,
abstracts: mockAbstracts,
},
translatedNumbering: {
definitions: {},
abstracts: {},
},
convertedXml: '<mock>xml</mock>',
},
emit: vi.fn(), // Add mock emit function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import bookmarkStartAttrConfigs from '@converter/v3/handlers/w/bookmark-start/at
import bookmarkEndAttrConfigs from '@converter/v3/handlers/w/bookmark-end/attributes/index.js';
import { translator as wStylesTranslator } from '@converter/v3/handlers/w/styles/index.js';
import { translator as wNumberingTranslator } from '@converter/v3/handlers/w/numbering/index.js';
import { baseNumbering } from '@converter/v2/exporter/helpers/base-list.definitions.js';

/**
* @typedef {import()} XmlNode
Expand Down Expand Up @@ -598,8 +599,7 @@ export function translateStyleDefinitions(docx) {
}

function translateNumberingDefinitions(docx) {
const numbering = docx['word/numbering.xml'];
if (!numbering) return null;
const numbering = docx['word/numbering.xml'] ?? baseNumbering;
const numberingElement = numbering.elements[0];
const parsedNumbering = wNumberingTranslator.encode({ nodes: [numberingElement] });
return parsedNumbering;
Expand Down
15 changes: 14 additions & 1 deletion packages/super-editor/src/tests/helpers/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const getMinimalTranslatedLinkedStyles = () => ({
const createMinimalConverter = () => {
const converter = new SuperConverter();
converter.translatedLinkedStyles = getMinimalTranslatedLinkedStyles();
converter.translatedNumbering = {};
converter.translatedNumbering = { definitions: {}, abstracts: {} };
return converter;
};

Expand All @@ -134,6 +134,18 @@ const ensureTranslatedLinkedStyles = (converter) => {
translated.styles.Normal.styleId ??= 'Normal';
};

const ensureTranslatedNumbering = (converter) => {
if (!converter) return;

if (!converter.translatedNumbering || typeof converter.translatedNumbering !== 'object') {
converter.translatedNumbering = { definitions: {}, abstracts: {} };
return;
}

converter.translatedNumbering.definitions ??= {};
converter.translatedNumbering.abstracts ??= {};
};

/**
* Instantiate a new test editor instance and wait for it to be ready.
*
Expand Down Expand Up @@ -198,6 +210,7 @@ export const initTestEditor = (options = {}) => {
editor.converter = restOptions.converter;
}
ensureTranslatedLinkedStyles(editor.converter);
ensureTranslatedNumbering(editor.converter);

return {
editor,
Expand Down
Loading