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
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ export const handleList: ContentModelBlockHandler<ContentModelListItem> = (
const lastParent = nodeStack[nodeStack.length - 1].node;

lastParent.insertBefore(newList, layer == 0 ? refNode : null);
nodeStack.push({ node: newList, ...level });
nodeStack.push({
node: newList,
listType: level.listType,
format: { ...level.format },
dataset: { ...level.dataset },
});

applyFormat(newList, context.formatAppliers.listLevelThread, level.format, context);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { createListLevel } from '../../../lib/modelApi/creators/createListLevel'
import { createModelToDomContext } from '../../../lib/modelToDom/context/createModelToDomContext';
import { expectHtml } from '../../testUtils';
import { handleList } from '../../../lib/modelToDom/handlers/handleList';
import { listLevelMetadataApplier } from 'roosterjs-content-model-core/lib/override/listMetadataApplier';
import { NumberingListType } from '../../../lib/constants/NumberingListType';

describe('handleList without format handlers', () => {
Expand Down Expand Up @@ -510,4 +511,66 @@ describe('handleList handles metadata', () => {
expect(onNodeCreated.calls.argsFor(1)[0]).toBe(listLevel1);
expect(onNodeCreated.calls.argsFor(1)[1]).toBe(parent.querySelector('ul'));
});

it('List style type is changed by metadata, node stack should not be changed', () => {
const listItem: ContentModelListItem = {
blockType: 'BlockGroup',
blockGroupType: 'ListItem',
blocks: [
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Br',
format: {},
},
],
format: {},
},
],
levels: [
{
listType: 'UL',
format: {},
dataset: {
editingInfo: '{"applyListStyleFromLevel":true}',
},
},
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: false,
format: {},
},
format: {},
};

context = createModelToDomContext(undefined, {
metadataAppliers: {
listLevel: listLevelMetadataApplier,
},
});

handleList(document, parent, listItem, context, null);

expectHtml(parent.outerHTML, [
'<div><ul data-editing-info="{&quot;applyListStyleFromLevel&quot;:true}" style="list-style-type: disc;"></ul></div>',
'<div><ul style="list-style-type: disc;" data-editing-info="{&quot;applyListStyleFromLevel&quot;:true}"></ul></div>',
]);
expect(context.listFormat).toEqual({
threadItemCounts: [],
nodeStack: [
{
node: parent,
},
{
node: parent.firstChild as HTMLElement,
listType: 'UL',
dataset: { editingInfo: '{"applyListStyleFromLevel":true}' },
format: {},
},
],
});
expect(listItem.levels[0].format.listStyleType).toBe('disc');
});
});
Loading