roosterjs-content-model-dom 9.53.0 → 9.54.0

package/lib/domToModel/context/createDomToModelContext.d.ts

@@ -10,7 +10,7 @@ export declare function createDomToModelContext(editorContext?: EditorContext, .
  * @param config A full config object to define how to convert DOM tree to Content Model
  * @param editorContext Context of editor
  */
-export declare function createDomToModelContextWithConfig(config: DomToModelSettings, editorContext?: EditorContext): any;
+export declare function createDomToModelContextWithConfig(config: DomToModelSettings, editorContext?: EditorContext): DomToModelContext;
 /**
  * Create Dom to Content Model Config object
  * @param options All customizations of content model creation

package/lib/domToModel/context/createDomToModelContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDomToModelContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultProcessorMap } from './defaultProcessors';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport {\n    defaultFormatKeysPerCategory,\n    defaultFormatParsers,\n} from '../../formatHandlers/defaultFormatHandlers';\nimport type {\n    ContentModelBlockFormat,\n    DomToModelContext,\n    DomToModelDecoratorContext,\n    DomToModelFormatContext,\n    DomToModelOption,\n    DomToModelSelectionContext,\n    DomToModelSettings,\n    EditorContext,\n    FormatParser,\n    FormatParsers,\n    FormatParsersPerCategory,\n    TextFormatParser,\n} from 'roosterjs-content-model-types';\n\n/**\n * Create context object for DOM to Content Model conversion\n * @param editorContext Context of editor\n * @param options Option array to customize the DOM to Model conversion behavior\n */\nexport function createDomToModelContext(\n    editorContext?: EditorContext,\n    ...options: (DomToModelOption | undefined)[]\n): DomToModelContext {\n    return createDomToModelContextWithConfig(createDomToModelConfig(options), editorContext);\n}\n\n/**\n * Create context object for DOM to Content Model conversion with an existing configure\n * @param config A full config object to define how to convert DOM tree to Content Model\n * @param editorContext Context of editor\n */\nexport function createDomToModelContextWithConfig(\n    config: DomToModelSettings,\n    editorContext?: EditorContext\n) {\n    return Object.assign(\n        {},\n        editorContext,\n        createDomToModelSelectionContext(),\n        createDomToModelFormatContext(editorContext?.isRootRtl),\n        createDomToModelDecoratorContext(),\n        config\n    );\n}\n\nfunction createDomToModelSelectionContext(): DomToModelSelectionContext {\n    return { isInSelection: false };\n}\n\nfunction createDomToModelFormatContext(isRootRtl?: boolean): DomToModelFormatContext {\n    const blockFormat: ContentModelBlockFormat = isRootRtl ? { direction: 'rtl' } : {};\n\n    return {\n        blockFormat,\n        segmentFormat: {},\n\n        listFormat: {\n            levels: [],\n            threadItemCounts: [],\n        },\n    };\n}\n\nfunction createDomToModelDecoratorContext(): DomToModelDecoratorContext {\n    return {\n        link: {\n            format: {},\n            dataset: {},\n        },\n        code: {\n            format: {},\n        },\n        blockDecorator: {\n            format: {},\n            tagName: '',\n        },\n    };\n}\n\n/**\n * Create Dom to Content Model Config object\n * @param options All customizations of content model creation\n */\nexport function createDomToModelConfig(\n    options: (DomToModelOption | undefined)[]\n): DomToModelSettings {\n    return {\n        elementProcessors: Object.assign(\n            {},\n            defaultProcessorMap,\n            ...options.map(x => x?.processorOverride)\n        ),\n        formatParsers: buildFormatParsers(\n            options.map(x => x?.formatParserOverride),\n            options.map(x => x?.additionalFormatParsers)\n        ),\n        defaultElementProcessors: defaultProcessorMap,\n        defaultFormatParsers,\n        processNonVisibleElements: options.some(x => !!x?.processNonVisibleElements),\n    };\n}\n\n/**\n * @internal Export for test only\n * Build format parsers used by DOM to Content Model conversion\n * @param override\n * @param additionalParsersArray\n * @returns\n */\nexport function buildFormatParsers(\n    overrides: (Partial<FormatParsers> | undefined)[] = [],\n    additionalParsersArray: (Partial<FormatParsersPerCategory> | undefined)[] = []\n): FormatParsersPerCategory {\n    const combinedOverrides = Object.assign({}, ...overrides);\n\n    const result = getObjectKeys(defaultFormatKeysPerCategory).reduce(\n        (result, key) => {\n            const value = defaultFormatKeysPerCategory[key]\n                .map(\n                    formatKey =>\n                        (combinedOverrides[formatKey] === undefined\n                            ? defaultFormatParsers[formatKey]\n                            : combinedOverrides[formatKey]) as FormatParser<any>\n                )\n                .concat(\n                    ...additionalParsersArray.map(\n                        parsers => (parsers?.[key] ?? []) as FormatParser<any>[]\n                    )\n                );\n\n            result[key] = value;\n\n            return result;\n        },\n        {\n            text: [] as TextFormatParser[],\n        } as FormatParsersPerCategory\n    );\n\n    additionalParsersArray.forEach(parsers => {\n        if (parsers?.text) {\n            result.text = result.text.concat(parsers.text);\n        }\n    });\n\n    return result;\n}\n"]}
+{"version":3,"file":"createDomToModelContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext.ts"],"names":[],"mappings":";;;;AAAA,yDAA0D;AAC1D,8DAA6D;AAC7D,oFAGoD;AAgBpD;;;;GAIG;AACH,SAAgB,uBAAuB,CACnC,aAA6B;IAC7B,iBAA4C;SAA5C,UAA4C,EAA5C,qBAA4C,EAA5C,IAA4C;QAA5C,gCAA4C;;IAE5C,OAAO,iCAAiC,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;AAC7F,CAAC;AALD,0DAKC;AAED;;;;GAIG;AACH,SAAgB,iCAAiC,CAC7C,MAA0B,EAC1B,aAA6B;IAE7B,OAAO,MAAM,CAAC,MAAM,CAChB,EAAE,EACF,aAAa,EACb,gCAAgC,EAAE,EAClC,6BAA6B,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC,EACvD,gCAAgC,EAAE,EAClC,MAAM,CACT,CAAC;AACN,CAAC;AAZD,8EAYC;AAED,SAAS,gCAAgC;IACrC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;AACpC,CAAC;AAED,SAAS,6BAA6B,CAAC,SAAmB;IACtD,IAAM,WAAW,GAA4B,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnF,OAAO;QACH,WAAW,aAAA;QACX,aAAa,EAAE,EAAE;QAEjB,UAAU,EAAE;YACR,MAAM,EAAE,EAAE;YACV,gBAAgB,EAAE,EAAE;SACvB;KACJ,CAAC;AACN,CAAC;AAED,SAAS,gCAAgC;IACrC,OAAO;QACH,IAAI,EAAE;YACF,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;SACd;QACD,IAAI,EAAE;YACF,MAAM,EAAE,EAAE;SACb;QACD,cAAc,EAAE;YACZ,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;SACd;KACJ,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAClC,OAAyC;IAEzC,OAAO;QACH,iBAAiB,EAAE,MAAM,CAAC,MAAM,OAAb,MAAM,8BACrB,EAAE;YACF,uCAAmB,uBAChB,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,iBAAiB,EAApB,CAAoB,CAAC,UAC5C;QACD,aAAa,EAAE,kBAAkB,CAC7B,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,oBAAoB,EAAvB,CAAuB,CAAC,EACzC,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,uBAAuB,EAA1B,CAA0B,CAAC,CAC/C;QACD,wBAAwB,EAAE,uCAAmB;QAC7C,oBAAoB,8CAAA;QACpB,yBAAyB,EAAE,OAAO,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,yBAAyB,CAAA,EAA9B,CAA8B,CAAC;KAC/E,CAAC;AACN,CAAC;AAjBD,wDAiBC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAC9B,SAAsD,EACtD,sBAA8E;IAD9E,0BAAA,EAAA,cAAsD;IACtD,uCAAA,EAAA,2BAA8E;IAE9E,IAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,OAAb,MAAM,8BAAQ,EAAE,uBAAK,SAAS,UAAC,CAAC;IAE1D,IAAM,MAAM,GAAG,IAAA,6BAAa,EAAC,oDAA4B,CAAC,CAAC,MAAM,CAC7D,UAAC,MAAM,EAAE,GAAG;;QACR,IAAM,KAAK,GAAG,CAAA,KAAA,oDAA4B,CAAC,GAAG,CAAC;aAC1C,GAAG,CACA,UAAA,SAAS;YACL,OAAA,CAAC,iBAAiB,CAAC,SAAS,CAAC,KAAK,SAAS;gBACvC,CAAC,CAAC,4CAAoB,CAAC,SAAS,CAAC;gBACjC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAsB;QAFxD,CAEwD,CAC/D,CAAA;aACA,MAAM,8DACA,sBAAsB,CAAC,GAAG,CACzB,UAAA,OAAO,YAAI,OAAA,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,mCAAI,EAAE,CAAwB,CAAA,EAAA,CAC3D,UACJ,CAAC;QAEN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAEpB,OAAO,MAAM,CAAC;IAClB,CAAC,EACD;QACI,IAAI,EAAE,EAAwB;KACL,CAChC,CAAC;IAEF,sBAAsB,CAAC,OAAO,CAAC,UAAA,OAAO;QAClC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE;YACf,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAClD;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AArCD,gDAqCC","sourcesContent":["import { defaultProcessorMap } from './defaultProcessors';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport {\n    defaultFormatKeysPerCategory,\n    defaultFormatParsers,\n} from '../../formatHandlers/defaultFormatHandlers';\nimport type {\n    ContentModelBlockFormat,\n    DomToModelContext,\n    DomToModelDecoratorContext,\n    DomToModelFormatContext,\n    DomToModelOption,\n    DomToModelSelectionContext,\n    DomToModelSettings,\n    EditorContext,\n    FormatParser,\n    FormatParsers,\n    FormatParsersPerCategory,\n    TextFormatParser,\n} from 'roosterjs-content-model-types';\n\n/**\n * Create context object for DOM to Content Model conversion\n * @param editorContext Context of editor\n * @param options Option array to customize the DOM to Model conversion behavior\n */\nexport function createDomToModelContext(\n    editorContext?: EditorContext,\n    ...options: (DomToModelOption | undefined)[]\n): DomToModelContext {\n    return createDomToModelContextWithConfig(createDomToModelConfig(options), editorContext);\n}\n\n/**\n * Create context object for DOM to Content Model conversion with an existing configure\n * @param config A full config object to define how to convert DOM tree to Content Model\n * @param editorContext Context of editor\n */\nexport function createDomToModelContextWithConfig(\n    config: DomToModelSettings,\n    editorContext?: EditorContext\n): DomToModelContext {\n    return Object.assign(\n        {},\n        editorContext,\n        createDomToModelSelectionContext(),\n        createDomToModelFormatContext(editorContext?.isRootRtl),\n        createDomToModelDecoratorContext(),\n        config\n    );\n}\n\nfunction createDomToModelSelectionContext(): DomToModelSelectionContext {\n    return { isInSelection: false };\n}\n\nfunction createDomToModelFormatContext(isRootRtl?: boolean): DomToModelFormatContext {\n    const blockFormat: ContentModelBlockFormat = isRootRtl ? { direction: 'rtl' } : {};\n\n    return {\n        blockFormat,\n        segmentFormat: {},\n\n        listFormat: {\n            levels: [],\n            threadItemCounts: [],\n        },\n    };\n}\n\nfunction createDomToModelDecoratorContext(): DomToModelDecoratorContext {\n    return {\n        link: {\n            format: {},\n            dataset: {},\n        },\n        code: {\n            format: {},\n        },\n        blockDecorator: {\n            format: {},\n            tagName: '',\n        },\n    };\n}\n\n/**\n * Create Dom to Content Model Config object\n * @param options All customizations of content model creation\n */\nexport function createDomToModelConfig(\n    options: (DomToModelOption | undefined)[]\n): DomToModelSettings {\n    return {\n        elementProcessors: Object.assign(\n            {},\n            defaultProcessorMap,\n            ...options.map(x => x?.processorOverride)\n        ),\n        formatParsers: buildFormatParsers(\n            options.map(x => x?.formatParserOverride),\n            options.map(x => x?.additionalFormatParsers)\n        ),\n        defaultElementProcessors: defaultProcessorMap,\n        defaultFormatParsers,\n        processNonVisibleElements: options.some(x => !!x?.processNonVisibleElements),\n    };\n}\n\n/**\n * @internal Export for test only\n * Build format parsers used by DOM to Content Model conversion\n * @param override\n * @param additionalParsersArray\n * @returns\n */\nexport function buildFormatParsers(\n    overrides: (Partial<FormatParsers> | undefined)[] = [],\n    additionalParsersArray: (Partial<FormatParsersPerCategory> | undefined)[] = []\n): FormatParsersPerCategory {\n    const combinedOverrides = Object.assign({}, ...overrides);\n\n    const result = getObjectKeys(defaultFormatKeysPerCategory).reduce(\n        (result, key) => {\n            const value = defaultFormatKeysPerCategory[key]\n                .map(\n                    formatKey =>\n                        (combinedOverrides[formatKey] === undefined\n                            ? defaultFormatParsers[formatKey]\n                            : combinedOverrides[formatKey]) as FormatParser<any>\n                )\n                .concat(\n                    ...additionalParsersArray.map(\n                        parsers => (parsers?.[key] ?? []) as FormatParser<any>[]\n                    )\n                );\n\n            result[key] = value;\n\n            return result;\n        },\n        {\n            text: [] as TextFormatParser[],\n        } as FormatParsersPerCategory\n    );\n\n    additionalParsersArray.forEach(parsers => {\n        if (parsers?.text) {\n            result.text = result.text.concat(parsers.text);\n        }\n    });\n\n    return result;\n}\n"]}

package/lib/domToModel/processors/formatContainerProcessor.js

@@ -55,7 +55,9 @@ var formatContainerProcessorInternal = function (group, element, context, forceF
         if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {
             formatContainer.zeroFontSize = true;
         }
-        if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {
+        if (!context.skipFormatContainerFallbackCheck &&
+            shouldFallbackToParagraph(formatContainer) &&
+            !forceFormatContainer) {
             // For DIV container that only has one paragraph child, container style can be merged into paragraph
             // and no need to have this container
             var paragraph = formatContainer.blocks[0];

package/lib/domToModel/processors/formatContainerProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatContainerProcessor.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { addBlock } from '../../modelApi/common/addBlock';\nimport { createFormatContainer } from '../../modelApi/creators/createFormatContainer';\nimport { createParagraph } from '../../modelApi/creators/createParagraph';\nimport { getDefaultStyle } from '../utils/getDefaultStyle';\nimport { parseFormat } from '../utils/parseFormat';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelFormatContainer,\n    ContentModelFormatContainerFormat,\n    ContentModelParagraph,\n    DomToModelContext,\n    ElementProcessor,\n    MarginFormat,\n    PaddingFormat,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const ContextStyles: (keyof (MarginFormat & PaddingFormat))[] = [\n    'marginLeft',\n    'marginRight',\n    'paddingLeft',\n    'paddingRight',\n];\n\n/**\n * Content Model Element Processor for format container elements (e.g., blockquote, div)\n * Processes elements that create FormatContainer blocks in the content model.\n * This processor can be used in processorOverride to customize how specific elements are processed.\n * @param group The parent block group\n * @param element The DOM element to process\n * @param context DOM to Content Model context\n */\nexport const formatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);\n};\n\n/**\n * @internal\n */\nexport const forceFormatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);\n};\n\nconst formatContainerProcessorInternal = (\n    group: ContentModelBlockGroup,\n    element: HTMLElement,\n    context: DomToModelContext,\n    forceFormatContainer: boolean\n) => {\n    stackFormat(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, () => {\n        parseFormat(element, context.formatParsers.block, context.blockFormat, context);\n        parseFormat(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);\n\n        const format: ContentModelFormatContainerFormat = {\n            ...context.blockFormat,\n        };\n\n        parseFormat(element, context.formatParsers.container, format, context);\n\n        const tagName =\n            getDefaultStyle(element).display == 'block' ? element.tagName.toLowerCase() : 'div';\n        const formatContainer = createFormatContainer(tagName, format);\n\n        // It is possible to inherit margin left/right styles from parent DIV or other containers,\n        // since we are going into a deeper level of format container now,\n        // the container will render these styles so no need to keep them in context format\n        ContextStyles.forEach(style => {\n            delete context.blockFormat[style];\n        });\n\n        context.elementProcessors.child(formatContainer, element, context);\n\n        if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {\n            formatContainer.zeroFontSize = true;\n        }\n\n        if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {\n            // For DIV container that only has one paragraph child, container style can be merged into paragraph\n            // and no need to have this container\n            const paragraph = formatContainer.blocks[0] as ContentModelParagraph;\n\n            if (formatContainer.zeroFontSize) {\n                paragraph.segmentFormat = Object.assign({}, paragraph.segmentFormat, {\n                    fontSize: '0',\n                });\n            }\n\n            Object.assign(paragraph.format, formatContainer.format);\n            setParagraphNotImplicit(paragraph);\n            addBlock(group, paragraph);\n        } else {\n            addBlock(group, formatContainer);\n        }\n    });\n\n    addBlock(group, createParagraph(true /*isImplicit*/, context.blockFormat));\n};\n\nfunction shouldFallbackToParagraph(formatContainer: ContentModelFormatContainer) {\n    const firstChild = formatContainer.blocks[0];\n\n    return (\n        formatContainer.tagName == 'div' &&\n        formatContainer.blocks.length == 1 &&\n        firstChild.blockType == 'Paragraph' &&\n        firstChild.isImplicit\n    );\n}\n"]}
+{"version":3,"file":"formatContainerProcessor.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { addBlock } from '../../modelApi/common/addBlock';\nimport { createFormatContainer } from '../../modelApi/creators/createFormatContainer';\nimport { createParagraph } from '../../modelApi/creators/createParagraph';\nimport { getDefaultStyle } from '../utils/getDefaultStyle';\nimport { parseFormat } from '../utils/parseFormat';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelFormatContainer,\n    ContentModelFormatContainerFormat,\n    ContentModelParagraph,\n    DomToModelContext,\n    ElementProcessor,\n    MarginFormat,\n    PaddingFormat,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const ContextStyles: (keyof (MarginFormat & PaddingFormat))[] = [\n    'marginLeft',\n    'marginRight',\n    'paddingLeft',\n    'paddingRight',\n];\n\n/**\n * Content Model Element Processor for format container elements (e.g., blockquote, div)\n * Processes elements that create FormatContainer blocks in the content model.\n * This processor can be used in processorOverride to customize how specific elements are processed.\n * @param group The parent block group\n * @param element The DOM element to process\n * @param context DOM to Content Model context\n */\nexport const formatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);\n};\n\n/**\n * @internal\n */\nexport const forceFormatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);\n};\n\nconst formatContainerProcessorInternal = (\n    group: ContentModelBlockGroup,\n    element: HTMLElement,\n    context: DomToModelContext,\n    forceFormatContainer: boolean\n) => {\n    stackFormat(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, () => {\n        parseFormat(element, context.formatParsers.block, context.blockFormat, context);\n        parseFormat(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);\n\n        const format: ContentModelFormatContainerFormat = {\n            ...context.blockFormat,\n        };\n\n        parseFormat(element, context.formatParsers.container, format, context);\n\n        const tagName =\n            getDefaultStyle(element).display == 'block' ? element.tagName.toLowerCase() : 'div';\n        const formatContainer = createFormatContainer(tagName, format);\n\n        // It is possible to inherit margin left/right styles from parent DIV or other containers,\n        // since we are going into a deeper level of format container now,\n        // the container will render these styles so no need to keep them in context format\n        ContextStyles.forEach(style => {\n            delete context.blockFormat[style];\n        });\n\n        context.elementProcessors.child(formatContainer, element, context);\n\n        if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {\n            formatContainer.zeroFontSize = true;\n        }\n\n        if (\n            !context.skipFormatContainerFallbackCheck &&\n            shouldFallbackToParagraph(formatContainer) &&\n            !forceFormatContainer\n        ) {\n            // For DIV container that only has one paragraph child, container style can be merged into paragraph\n            // and no need to have this container\n            const paragraph = formatContainer.blocks[0] as ContentModelParagraph;\n\n            if (formatContainer.zeroFontSize) {\n                paragraph.segmentFormat = Object.assign({}, paragraph.segmentFormat, {\n                    fontSize: '0',\n                });\n            }\n\n            Object.assign(paragraph.format, formatContainer.format);\n            setParagraphNotImplicit(paragraph);\n            addBlock(group, paragraph);\n        } else {\n            addBlock(group, formatContainer);\n        }\n    });\n\n    addBlock(group, createParagraph(true /*isImplicit*/, context.blockFormat));\n};\n\nfunction shouldFallbackToParagraph(formatContainer: ContentModelFormatContainer) {\n    const firstChild = formatContainer.blocks[0];\n\n    return (\n        formatContainer.tagName == 'div' &&\n        formatContainer.blocks.length == 1 &&\n        firstChild.blockType == 'Paragraph' &&\n        firstChild.isImplicit\n    );\n}\n"]}

package/lib/modelApi/selection/setSelection.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setSelection = void 0;
+var tslib_1 = require("tslib");
 var isGeneralSegment_1 = require("../typeCheck/isGeneralSegment");
 var mutate_1 = require("../common/mutate");
 /**
@@ -38,6 +39,7 @@ function setSelectionToBlockGroup(group, isInSelection, start, end) {
     });
 }
 function setSelectionToBlock(block, isInSelection, start, end) {
+    var _a;
     switch (block.blockType) {
         case 'BlockGroup':
             return setSelectionToBlockGroup(block, isInSelection, start, end);
@@ -58,16 +60,31 @@ function setSelectionToBlock(block, isInSelection, start, end) {
                 return isInSelection;
             });
         case 'Paragraph':
-            var segmentsToDelete_1 = [];
+            var state_1 = {
+                segmentsToDelete: [],
+                boundaryMarkers: [],
+                hasSelectedNonMarker: false,
+            };
             block.segments.forEach(function (segment, i) {
                 isInSelection = handleSelection(isInSelection, segment, start, end, function (isInSelection) {
-                    return setSelectionToSegment(block, segment, isInSelection, segmentsToDelete_1, start, end, i);
+                    return setSelectionToSegment(block, segment, isInSelection, state_1, start, end, i);
                 });
             });
-            if (segmentsToDelete_1.length > 0) {
+            if (state_1.hasSelectedNonMarker) {
+                // This paragraph contains a real (non-marker) selected segment, so any leading/trailing
+                // selection marker of the range is redundant within this paragraph and can be removed.
+                // We only do this within the same paragraph: a boundary marker at a paragraph edge must be
+                // kept to distinguish "selection starts at the beginning of this line" from "selection
+                // starts at the end of the previous line".
+                (_a = state_1.segmentsToDelete).push.apply(_a, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(state_1.boundaryMarkers), false));
+            }
+            if (state_1.segmentsToDelete.length > 0) {
                 var mutablePara = (0, mutate_1.mutateBlock)(block);
                 var index = void 0;
-                while ((index = segmentsToDelete_1.pop()) !== undefined) {
+                // Sort ascending so the pop()-based splice below always removes the highest index first,
+                // keeping the remaining indices valid (boundary markers may sit before queued deletions).
+                state_1.segmentsToDelete.sort(function (a, b) { return a - b; });
+                while ((index = state_1.segmentsToDelete.pop()) !== undefined) {
                     if (index >= 0) {
                         mutablePara.segments.splice(index, 1);
                     }
@@ -116,14 +133,23 @@ function findCell(table, cell) {
         : -1;
     return { row: row, col: col };
 }
-function setSelectionToSegment(paragraph, segment, isInSelection, segmentsToDelete, start, end, i) {
+function setSelectionToSegment(paragraph, segment, isInSelection, state, start, end, i) {
+    if (segment.segmentType != 'SelectionMarker' && isInSelection) {
+        state.hasSelectedNonMarker = true;
+    }
     switch (segment.segmentType) {
         case 'SelectionMarker':
             if (!isInSelection || (segment != start && segment != end)) {
                 // Delete the selection marker when
                 // 1. It is not in selection any more. Or
                 // 2. It is in middle of selection, so no need to have it
-                segmentsToDelete.push(i);
+                state.segmentsToDelete.push(i);
+            }
+            else {
+                // It is a leading/trailing selection marker of a range selection. Keep it for now, but
+                // remember it so it can be removed later if this same paragraph also contains a real
+                // (non-marker) selected segment, in which case the marker is redundant.
+                state.boundaryMarkers.push(i);
             }
             return isInSelection;
         case 'General':

package/lib/modelApi/selection/setSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"setSelection.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts"],"names":[],"mappings":"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","sourcesContent":["import { isGeneralSegment } from '../typeCheck/isGeneralSegment';\nimport { mutateBlock, mutateSegment } from '../common/mutate';\nimport type {\n    MutableType,\n    ReadonlyContentModelBlock,\n    ReadonlyContentModelBlockGroup,\n    ReadonlyContentModelParagraph,\n    ReadonlyContentModelSegment,\n    ReadonlyContentModelTable,\n    ReadonlySelectable,\n    ShallowMutableSelectable,\n    TableCellCoordinate,\n} from 'roosterjs-content-model-types';\n\n/**\n * Set selection into Content Model. If the Content Model already has selection, existing selection will be overwritten by the new one.\n * @param group The root level group of Content Model\n * @param start The start selected element. If not passed, existing selection of content model will be cleared\n * @param end The end selected element. If not passed, only the start element will be selected. If passed, all elements between start and end elements will be selected\n */\nexport function setSelection(\n    group: ReadonlyContentModelBlockGroup,\n    start?: ReadonlySelectable,\n    end?: ReadonlySelectable\n) {\n    setSelectionToBlockGroup(group, false /*isInSelection*/, start || null, end || null);\n}\n\nfunction setSelectionToBlockGroup(\n    group: ReadonlyContentModelBlockGroup,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    return handleSelection(isInSelection, group, start, end, isInSelection => {\n        if (isGeneralSegment(group) && needToSetSelection(group, isInSelection)) {\n            setIsSelected(mutateBlock(group), isInSelection);\n        }\n\n        const blocksToDelete: number[] = [];\n\n        group.blocks.forEach((block, i) => {\n            isInSelection = setSelectionToBlock(block, isInSelection, start, end);\n\n            if (block.blockType == 'Paragraph' && block.segments.length == 0 && block.isImplicit) {\n                blocksToDelete.push(i);\n            }\n        });\n\n        let index: number | undefined;\n\n        if (blocksToDelete.length > 0) {\n            const mutableGroup = mutateBlock(group);\n\n            while ((index = blocksToDelete.pop()) !== undefined) {\n                if (index >= 0) {\n                    mutableGroup.blocks.splice(index, 1);\n                }\n            }\n        }\n\n        return isInSelection;\n    });\n}\n\nfunction setSelectionToBlock(\n    block: ReadonlyContentModelBlock,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n) {\n    switch (block.blockType) {\n        case 'BlockGroup':\n            return setSelectionToBlockGroup(block, isInSelection, start, end);\n\n        case 'Table':\n            return setSelectionToTable(block, isInSelection, start, end);\n\n        case 'Divider':\n        case 'Entity':\n            return handleSelection(isInSelection, block, start, end, isInSelection => {\n                if (needToSetSelection(block, isInSelection)) {\n                    const mutableBlock = mutateBlock(block);\n\n                    if (isInSelection) {\n                        mutableBlock.isSelected = true;\n                    } else {\n                        delete mutableBlock.isSelected;\n                    }\n                }\n\n                return isInSelection;\n            });\n\n        case 'Paragraph':\n            const segmentsToDelete: number[] = [];\n\n            block.segments.forEach((segment, i) => {\n                isInSelection = handleSelection(\n                    isInSelection,\n                    segment,\n                    start,\n                    end,\n                    isInSelection => {\n                        return setSelectionToSegment(\n                            block,\n                            segment,\n                            isInSelection,\n                            segmentsToDelete,\n                            start,\n                            end,\n                            i\n                        );\n                    }\n                );\n            });\n\n            if (segmentsToDelete.length > 0) {\n                const mutablePara = mutateBlock(block);\n\n                let index: number | undefined;\n\n                while ((index = segmentsToDelete.pop()) !== undefined) {\n                    if (index >= 0) {\n                        mutablePara.segments.splice(index, 1);\n                    }\n                }\n            }\n\n            return isInSelection;\n\n        default:\n            return isInSelection;\n    }\n}\n\nfunction setSelectionToTable(\n    table: ReadonlyContentModelTable,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    const first = findCell(table, start);\n    const last = end ? findCell(table, end) : first;\n\n    if (!isInSelection) {\n        for (let row = 0; row < table.rows.length; row++) {\n            const currentRow = table.rows[row];\n            for (let col = 0; col < currentRow.cells.length; col++) {\n                const currentCell = table.rows[row].cells[col];\n                const isSelected =\n                    row >= first.row && row <= last.row && col >= first.col && col <= last.col;\n\n                if (needToSetSelection(currentCell, isSelected)) {\n                    setIsSelected(mutateBlock(currentCell), isSelected);\n                }\n\n                if (!isSelected) {\n                    setSelectionToBlockGroup(currentCell, false /*isInSelection*/, start, end);\n                }\n            }\n        }\n    } else {\n        table.rows.forEach(row =>\n            row.cells.forEach(cell => {\n                const wasInSelection = isInSelection;\n\n                isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);\n\n                if (wasInSelection && isInSelection) {\n                    mutateBlock(cell).isSelected = true;\n                }\n            })\n        );\n    }\n\n    return isInSelection;\n}\n\nfunction findCell(\n    table: ReadonlyContentModelTable,\n    cell: ReadonlySelectable | null\n): TableCellCoordinate {\n    let col = -1;\n    const row = cell\n        ? table.rows.findIndex(\n              row => (col = (row.cells as ReadonlyArray<ReadonlySelectable>).indexOf(cell)) >= 0\n          )\n        : -1;\n\n    return { row, col };\n}\n\nfunction setSelectionToSegment(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: ReadonlyContentModelSegment,\n    isInSelection: boolean,\n    segmentsToDelete: number[],\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    i: number\n) {\n    switch (segment.segmentType) {\n        case 'SelectionMarker':\n            if (!isInSelection || (segment != start && segment != end)) {\n                // Delete the selection marker when\n                // 1. It is not in selection any more. Or\n                // 2. It is in middle of selection, so no need to have it\n                segmentsToDelete.push(i);\n            }\n            return isInSelection;\n\n        case 'General':\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n\n            return segment != start && segment != end\n                ? setSelectionToBlockGroup(segment, isInSelection, start, end)\n                : isInSelection;\n\n        case 'Image':\n            const isSelectedAsImageSelection = start == segment && (!end || end == segment);\n\n            internalSetSelectionToSegment(\n                paragraph,\n                segment,\n                isInSelection,\n                !segment.isSelectedAsImageSelection != !isSelectedAsImageSelection\n                    ? image => (image.isSelectedAsImageSelection = isSelectedAsImageSelection)\n                    : undefined\n            );\n\n            return isInSelection;\n        default:\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n            return isInSelection;\n    }\n}\n\nfunction internalSetSelectionToSegment<T extends ReadonlyContentModelSegment>(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: T,\n    isInSelection: boolean,\n    additionAction?: (segment: MutableType<T>) => void\n) {\n    if (additionAction || needToSetSelection(segment, isInSelection)) {\n        mutateSegment(paragraph, segment, mutableSegment => {\n            setIsSelected(mutableSegment, isInSelection);\n            additionAction?.(mutableSegment);\n        });\n    }\n}\n\nfunction needToSetSelection(selectable: ReadonlySelectable, isSelected: boolean) {\n    return !selectable.isSelected != !isSelected;\n}\n\nfunction setIsSelected(selectable: ShallowMutableSelectable, value: boolean) {\n    if (value) {\n        selectable.isSelected = true;\n    } else {\n        delete selectable.isSelected;\n    }\n\n    return value;\n}\n\nfunction handleSelection(\n    isInSelection: boolean,\n    model: ReadonlyContentModelBlockGroup | ReadonlyContentModelBlock | ReadonlyContentModelSegment,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    callback: (isInSelection: boolean) => boolean\n) {\n    isInSelection = isInSelection || model == start;\n    isInSelection = callback(isInSelection);\n    return isInSelection && !!end && model != end;\n}\n"]}
+{"version":3,"file":"setSelection.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts"],"names":[],"mappings":"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","sourcesContent":["import { isGeneralSegment } from '../typeCheck/isGeneralSegment';\nimport { mutateBlock, mutateSegment } from '../common/mutate';\nimport type {\n    MutableType,\n    ReadonlyContentModelBlock,\n    ReadonlyContentModelBlockGroup,\n    ReadonlyContentModelParagraph,\n    ReadonlyContentModelSegment,\n    ReadonlyContentModelTable,\n    ReadonlySelectable,\n    ShallowMutableSelectable,\n    TableCellCoordinate,\n} from 'roosterjs-content-model-types';\n\n/**\n * Set selection into Content Model. If the Content Model already has selection, existing selection will be overwritten by the new one.\n * @param group The root level group of Content Model\n * @param start The start selected element. If not passed, existing selection of content model will be cleared\n * @param end The end selected element. If not passed, only the start element will be selected. If passed, all elements between start and end elements will be selected\n */\nexport function setSelection(\n    group: ReadonlyContentModelBlockGroup,\n    start?: ReadonlySelectable,\n    end?: ReadonlySelectable\n) {\n    setSelectionToBlockGroup(group, false /*isInSelection*/, start || null, end || null);\n}\n\nfunction setSelectionToBlockGroup(\n    group: ReadonlyContentModelBlockGroup,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    return handleSelection(isInSelection, group, start, end, isInSelection => {\n        if (isGeneralSegment(group) && needToSetSelection(group, isInSelection)) {\n            setIsSelected(mutateBlock(group), isInSelection);\n        }\n\n        const blocksToDelete: number[] = [];\n\n        group.blocks.forEach((block, i) => {\n            isInSelection = setSelectionToBlock(block, isInSelection, start, end);\n\n            if (block.blockType == 'Paragraph' && block.segments.length == 0 && block.isImplicit) {\n                blocksToDelete.push(i);\n            }\n        });\n\n        let index: number | undefined;\n\n        if (blocksToDelete.length > 0) {\n            const mutableGroup = mutateBlock(group);\n\n            while ((index = blocksToDelete.pop()) !== undefined) {\n                if (index >= 0) {\n                    mutableGroup.blocks.splice(index, 1);\n                }\n            }\n        }\n\n        return isInSelection;\n    });\n}\n\nfunction setSelectionToBlock(\n    block: ReadonlyContentModelBlock,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n) {\n    switch (block.blockType) {\n        case 'BlockGroup':\n            return setSelectionToBlockGroup(block, isInSelection, start, end);\n\n        case 'Table':\n            return setSelectionToTable(block, isInSelection, start, end);\n\n        case 'Divider':\n        case 'Entity':\n            return handleSelection(isInSelection, block, start, end, isInSelection => {\n                if (needToSetSelection(block, isInSelection)) {\n                    const mutableBlock = mutateBlock(block);\n\n                    if (isInSelection) {\n                        mutableBlock.isSelected = true;\n                    } else {\n                        delete mutableBlock.isSelected;\n                    }\n                }\n\n                return isInSelection;\n            });\n\n        case 'Paragraph':\n            const state: ParagraphSelectionState = {\n                segmentsToDelete: [],\n                boundaryMarkers: [],\n                hasSelectedNonMarker: false,\n            };\n\n            block.segments.forEach((segment, i) => {\n                isInSelection = handleSelection(\n                    isInSelection,\n                    segment,\n                    start,\n                    end,\n                    isInSelection => {\n                        return setSelectionToSegment(\n                            block,\n                            segment,\n                            isInSelection,\n                            state,\n                            start,\n                            end,\n                            i\n                        );\n                    }\n                );\n            });\n\n            if (state.hasSelectedNonMarker) {\n                // This paragraph contains a real (non-marker) selected segment, so any leading/trailing\n                // selection marker of the range is redundant within this paragraph and can be removed.\n                // We only do this within the same paragraph: a boundary marker at a paragraph edge must be\n                // kept to distinguish \"selection starts at the beginning of this line\" from \"selection\n                // starts at the end of the previous line\".\n                state.segmentsToDelete.push(...state.boundaryMarkers);\n            }\n\n            if (state.segmentsToDelete.length > 0) {\n                const mutablePara = mutateBlock(block);\n\n                let index: number | undefined;\n\n                // Sort ascending so the pop()-based splice below always removes the highest index first,\n                // keeping the remaining indices valid (boundary markers may sit before queued deletions).\n                state.segmentsToDelete.sort((a, b) => a - b);\n\n                while ((index = state.segmentsToDelete.pop()) !== undefined) {\n                    if (index >= 0) {\n                        mutablePara.segments.splice(index, 1);\n                    }\n                }\n            }\n\n            return isInSelection;\n\n        default:\n            return isInSelection;\n    }\n}\n\nfunction setSelectionToTable(\n    table: ReadonlyContentModelTable,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    const first = findCell(table, start);\n    const last = end ? findCell(table, end) : first;\n\n    if (!isInSelection) {\n        for (let row = 0; row < table.rows.length; row++) {\n            const currentRow = table.rows[row];\n            for (let col = 0; col < currentRow.cells.length; col++) {\n                const currentCell = table.rows[row].cells[col];\n                const isSelected =\n                    row >= first.row && row <= last.row && col >= first.col && col <= last.col;\n\n                if (needToSetSelection(currentCell, isSelected)) {\n                    setIsSelected(mutateBlock(currentCell), isSelected);\n                }\n\n                if (!isSelected) {\n                    setSelectionToBlockGroup(currentCell, false /*isInSelection*/, start, end);\n                }\n            }\n        }\n    } else {\n        table.rows.forEach(row =>\n            row.cells.forEach(cell => {\n                const wasInSelection = isInSelection;\n\n                isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);\n\n                if (wasInSelection && isInSelection) {\n                    mutateBlock(cell).isSelected = true;\n                }\n            })\n        );\n    }\n\n    return isInSelection;\n}\n\nfunction findCell(\n    table: ReadonlyContentModelTable,\n    cell: ReadonlySelectable | null\n): TableCellCoordinate {\n    let col = -1;\n    const row = cell\n        ? table.rows.findIndex(\n              row => (col = (row.cells as ReadonlyArray<ReadonlySelectable>).indexOf(cell)) >= 0\n          )\n        : -1;\n\n    return { row, col };\n}\n\ninterface ParagraphSelectionState {\n    // Indexes of segments to delete after the paragraph is fully processed\n    segmentsToDelete: number[];\n\n    // Indexes of leading/trailing selection markers of the range that are kept for now, but will be\n    // removed if this paragraph also contains a real (non-marker) selected segment\n    boundaryMarkers: number[];\n\n    // Whether this paragraph contains at least one selected segment that is not a selection marker\n    hasSelectedNonMarker: boolean;\n}\n\nfunction setSelectionToSegment(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: ReadonlyContentModelSegment,\n    isInSelection: boolean,\n    state: ParagraphSelectionState,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    i: number\n) {\n    if (segment.segmentType != 'SelectionMarker' && isInSelection) {\n        state.hasSelectedNonMarker = true;\n    }\n\n    switch (segment.segmentType) {\n        case 'SelectionMarker':\n            if (!isInSelection || (segment != start && segment != end)) {\n                // Delete the selection marker when\n                // 1. It is not in selection any more. Or\n                // 2. It is in middle of selection, so no need to have it\n                state.segmentsToDelete.push(i);\n            } else {\n                // It is a leading/trailing selection marker of a range selection. Keep it for now, but\n                // remember it so it can be removed later if this same paragraph also contains a real\n                // (non-marker) selected segment, in which case the marker is redundant.\n                state.boundaryMarkers.push(i);\n            }\n            return isInSelection;\n\n        case 'General':\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n\n            return segment != start && segment != end\n                ? setSelectionToBlockGroup(segment, isInSelection, start, end)\n                : isInSelection;\n\n        case 'Image':\n            const isSelectedAsImageSelection = start == segment && (!end || end == segment);\n\n            internalSetSelectionToSegment(\n                paragraph,\n                segment,\n                isInSelection,\n                !segment.isSelectedAsImageSelection != !isSelectedAsImageSelection\n                    ? image => (image.isSelectedAsImageSelection = isSelectedAsImageSelection)\n                    : undefined\n            );\n\n            return isInSelection;\n        default:\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n            return isInSelection;\n    }\n}\n\nfunction internalSetSelectionToSegment<T extends ReadonlyContentModelSegment>(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: T,\n    isInSelection: boolean,\n    additionAction?: (segment: MutableType<T>) => void\n) {\n    if (additionAction || needToSetSelection(segment, isInSelection)) {\n        mutateSegment(paragraph, segment, mutableSegment => {\n            setIsSelected(mutableSegment, isInSelection);\n            additionAction?.(mutableSegment);\n        });\n    }\n}\n\nfunction needToSetSelection(selectable: ReadonlySelectable, isSelected: boolean) {\n    return !selectable.isSelected != !isSelected;\n}\n\nfunction setIsSelected(selectable: ShallowMutableSelectable, value: boolean) {\n    if (value) {\n        selectable.isSelected = true;\n    } else {\n        delete selectable.isSelected;\n    }\n\n    return value;\n}\n\nfunction handleSelection(\n    isInSelection: boolean,\n    model: ReadonlyContentModelBlockGroup | ReadonlyContentModelBlock | ReadonlyContentModelSegment,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    callback: (isInSelection: boolean) => boolean\n) {\n    isInSelection = isInSelection || model == start;\n    isInSelection = callback(isInSelection);\n    return isInSelection && !!end && model != end;\n}\n"]}

package/lib/modelToDom/handlers/handleBlockGroupChildren.js

@@ -29,7 +29,7 @@ var handleBlockGroupChildren = function (doc, parent, group, context) {
                 (_a = context.domIndexer) === null || _a === void 0 ? void 0 : _a.onBlockEntity(childBlock, group);
             }
         });
-        cleanUpNodeStack(listFormat.nodeStack, context);
+        cleanUpNodeStack(listFormat.nodeStack, context, parent);
         // Remove all rest node if any since they don't appear in content model
         (0, cleanUpRestNodes_1.cleanUpRestNodes)(refNode, context.rewriteFromModel);
     }
@@ -38,7 +38,7 @@ var handleBlockGroupChildren = function (doc, parent, group, context) {
     }
 };
 exports.handleBlockGroupChildren = handleBlockGroupChildren;
-function cleanUpNodeStack(nodeStack, context) {
+function cleanUpNodeStack(nodeStack, context, leavingParent) {
     var _a, _b;
     if (nodeStack.length > 0) {
         // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node
@@ -46,6 +46,13 @@ function cleanUpNodeStack(nodeStack, context) {
             var node = (_b = (_a = nodeStack.pop()) === null || _a === void 0 ? void 0 : _a.refNode) !== null && _b !== void 0 ? _b : null;
             (0, cleanUpRestNodes_1.cleanUpRestNodes)(node, context.rewriteFromModel);
         }
+        if (leavingParent && nodeStack[0].node == leavingParent) {
+            // When leaving a parent node that is the same with the root of node stack
+            // It means the whole list node stack is being invalidated, so we clear it
+            while (nodeStack.length > 0) {
+                nodeStack.pop();
+            }
+        }
     }
 }
 //# sourceMappingURL=handleBlockGroupChildren.js.map

package/lib/modelToDom/handlers/handleBlockGroupChildren.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleBlockGroupChildren.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleBlockGroupChildren.ts"],"names":[],"mappings":";;;AAAA,8DAA6D;AAQ7D;;GAEG;AACI,IAAM,wBAAwB,GAAgD,UACjF,GAAa,EACb,MAAY,EACZ,KAA6B,EAC7B,OAA0B;IAElB,IAAA,UAAU,GAAK,OAAO,WAAZ,CAAa;IAC/B,IAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,IAAI,OAAO,GAAgB,MAAM,CAAC,UAAU,CAAC;IAE7C,IAAI;QACA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,KAAK;;YACnC,2CAA2C;YAC3C,wEAAwE;YACxE,sFAAsF;YACtF,+FAA+F;YAC/F,IACI,KAAK,IAAI,CAAC;gBACV,UAAU,CAAC,SAAS,IAAI,YAAY;gBACpC,UAAU,CAAC,cAAc,IAAI,UAAU,EACzC;gBACE,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAEhD,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;iBAC7B;aACJ;YAED,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAEjF,IAAI,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE;gBAClC,MAAA,OAAO,CAAC,UAAU,0CAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aACxD;QACL,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEhD,uEAAuE;QACvE,IAAA,mCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACvD;YAAS;QACN,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;KACpC;AACL,CAAC,CAAC;AA1CW,QAAA,wBAAwB,4BA0CnC;AAEF,SAAS,gBAAgB,CAAC,SAAoC,EAAE,OAA0B;;IACtF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,qFAAqF;QACrF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAM,IAAI,GAAG,MAAA,MAAA,SAAS,CAAC,GAAG,EAAE,0CAAE,OAAO,mCAAI,IAAI,CAAC;YAE9C,IAAA,mCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACpD;KACJ;AACL,CAAC","sourcesContent":["import { cleanUpRestNodes } from '../utils/cleanUpRestNodes';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelHandler,\n    ModelToDomContext,\n    ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleBlockGroupChildren: ContentModelHandler<ContentModelBlockGroup> = (\n    doc: Document,\n    parent: Node,\n    group: ContentModelBlockGroup,\n    context: ModelToDomContext\n) => {\n    const { listFormat } = context;\n    const nodeStack = listFormat.nodeStack;\n    let refNode: Node | null = parent.firstChild;\n\n    try {\n        group.blocks.forEach((childBlock, index) => {\n            // When process list, we need a node stack.\n            // When there are two continuous lists, they should share the same stack\n            // so that list items with same type/threadId can be merged into the same list element\n            // In other cases, clear the stack so that two separate lists won't share the same list element\n            if (\n                index == 0 ||\n                childBlock.blockType != 'BlockGroup' ||\n                childBlock.blockGroupType != 'ListItem'\n            ) {\n                cleanUpNodeStack(listFormat.nodeStack, context);\n\n                if (listFormat.nodeStack.length > 0) {\n                    listFormat.nodeStack = [];\n                }\n            }\n\n            refNode = context.modelHandlers.block(doc, parent, childBlock, context, refNode);\n\n            if (childBlock.blockType == 'Entity') {\n                context.domIndexer?.onBlockEntity(childBlock, group);\n            }\n        });\n\n        cleanUpNodeStack(listFormat.nodeStack, context);\n\n        // Remove all rest node if any since they don't appear in content model\n        cleanUpRestNodes(refNode, context.rewriteFromModel);\n    } finally {\n        listFormat.nodeStack = nodeStack;\n    }\n};\n\nfunction cleanUpNodeStack(nodeStack: ModelToDomListStackItem[], context: ModelToDomContext) {\n    if (nodeStack.length > 0) {\n        // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node\n        for (let i = nodeStack.length - 1; i > 0; i--) {\n            const node = nodeStack.pop()?.refNode ?? null;\n\n            cleanUpRestNodes(node, context.rewriteFromModel);\n        }\n    }\n}\n"]}
+{"version":3,"file":"handleBlockGroupChildren.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleBlockGroupChildren.ts"],"names":[],"mappings":";;;AAAA,8DAA6D;AAQ7D;;GAEG;AACI,IAAM,wBAAwB,GAAgD,UACjF,GAAa,EACb,MAAY,EACZ,KAA6B,EAC7B,OAA0B;IAElB,IAAA,UAAU,GAAK,OAAO,WAAZ,CAAa;IAC/B,IAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,IAAI,OAAO,GAAgB,MAAM,CAAC,UAAU,CAAC;IAE7C,IAAI;QACA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,KAAK;;YACnC,2CAA2C;YAC3C,wEAAwE;YACxE,sFAAsF;YACtF,+FAA+F;YAC/F,IACI,KAAK,IAAI,CAAC;gBACV,UAAU,CAAC,SAAS,IAAI,YAAY;gBACpC,UAAU,CAAC,cAAc,IAAI,UAAU,EACzC;gBACE,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAEhD,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;iBAC7B;aACJ;YAED,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAEjF,IAAI,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE;gBAClC,MAAA,OAAO,CAAC,UAAU,0CAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aACxD;QACL,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAExD,uEAAuE;QACvE,IAAA,mCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACvD;YAAS;QACN,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;KACpC;AACL,CAAC,CAAC;AA1CW,QAAA,wBAAwB,4BA0CnC;AAEF,SAAS,gBAAgB,CACrB,SAAoC,EACpC,OAA0B,EAC1B,aAAoB;;IAEpB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,qFAAqF;QACrF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAM,IAAI,GAAG,MAAA,MAAA,SAAS,CAAC,GAAG,EAAE,0CAAE,OAAO,mCAAI,IAAI,CAAC;YAE9C,IAAA,mCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACpD;QAED,IAAI,aAAa,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,EAAE;YACrD,0EAA0E;YAC1E,0EAA0E;YAC1E,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,SAAS,CAAC,GAAG,EAAE,CAAC;aACnB;SACJ;KACJ;AACL,CAAC","sourcesContent":["import { cleanUpRestNodes } from '../utils/cleanUpRestNodes';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelHandler,\n    ModelToDomContext,\n    ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleBlockGroupChildren: ContentModelHandler<ContentModelBlockGroup> = (\n    doc: Document,\n    parent: Node,\n    group: ContentModelBlockGroup,\n    context: ModelToDomContext\n) => {\n    const { listFormat } = context;\n    const nodeStack = listFormat.nodeStack;\n    let refNode: Node | null = parent.firstChild;\n\n    try {\n        group.blocks.forEach((childBlock, index) => {\n            // When process list, we need a node stack.\n            // When there are two continuous lists, they should share the same stack\n            // so that list items with same type/threadId can be merged into the same list element\n            // In other cases, clear the stack so that two separate lists won't share the same list element\n            if (\n                index == 0 ||\n                childBlock.blockType != 'BlockGroup' ||\n                childBlock.blockGroupType != 'ListItem'\n            ) {\n                cleanUpNodeStack(listFormat.nodeStack, context);\n\n                if (listFormat.nodeStack.length > 0) {\n                    listFormat.nodeStack = [];\n                }\n            }\n\n            refNode = context.modelHandlers.block(doc, parent, childBlock, context, refNode);\n\n            if (childBlock.blockType == 'Entity') {\n                context.domIndexer?.onBlockEntity(childBlock, group);\n            }\n        });\n\n        cleanUpNodeStack(listFormat.nodeStack, context, parent);\n\n        // Remove all rest node if any since they don't appear in content model\n        cleanUpRestNodes(refNode, context.rewriteFromModel);\n    } finally {\n        listFormat.nodeStack = nodeStack;\n    }\n};\n\nfunction cleanUpNodeStack(\n    nodeStack: ModelToDomListStackItem[],\n    context: ModelToDomContext,\n    leavingParent?: Node\n) {\n    if (nodeStack.length > 0) {\n        // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node\n        for (let i = nodeStack.length - 1; i > 0; i--) {\n            const node = nodeStack.pop()?.refNode ?? null;\n\n            cleanUpRestNodes(node, context.rewriteFromModel);\n        }\n\n        if (leavingParent && nodeStack[0].node == leavingParent) {\n            // When leaving a parent node that is the same with the root of node stack\n            // It means the whole list node stack is being invalidated, so we clear it\n            while (nodeStack.length > 0) {\n                nodeStack.pop();\n            }\n        }\n    }\n}\n"]}

package/lib-amd/domToModel/context/createDomToModelContext.d.ts

@@ -10,7 +10,7 @@ export declare function createDomToModelContext(editorContext?: EditorContext, .
  * @param config A full config object to define how to convert DOM tree to Content Model
  * @param editorContext Context of editor
  */
-export declare function createDomToModelContextWithConfig(config: DomToModelSettings, editorContext?: EditorContext): any;
+export declare function createDomToModelContextWithConfig(config: DomToModelSettings, editorContext?: EditorContext): DomToModelContext;
 /**
  * Create Dom to Content Model Config object
  * @param options All customizations of content model creation

package/lib-amd/domToModel/context/createDomToModelContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDomToModelContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext.ts"],"names":[],"mappings":";;;;IAqBA;;;;OAIG;IACH,SAAgB,uBAAuB,CACnC,aAA6B;QAC7B,iBAA4C;aAA5C,UAA4C,EAA5C,qBAA4C,EAA5C,IAA4C;YAA5C,gCAA4C;;QAE5C,OAAO,iCAAiC,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;IAC7F,CAAC;IALD,0DAKC;IAED;;;;OAIG;IACH,SAAgB,iCAAiC,CAC7C,MAA0B,EAC1B,aAA6B;QAE7B,OAAO,MAAM,CAAC,MAAM,CAChB,EAAE,EACF,aAAa,EACb,gCAAgC,EAAE,EAClC,6BAA6B,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC,EACvD,gCAAgC,EAAE,EAClC,MAAM,CACT,CAAC;IACN,CAAC;IAZD,8EAYC;IAED,SAAS,gCAAgC;QACrC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;IAED,SAAS,6BAA6B,CAAC,SAAmB;QACtD,IAAM,WAAW,GAA4B,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnF,OAAO;YACH,WAAW,aAAA;YACX,aAAa,EAAE,EAAE;YAEjB,UAAU,EAAE;gBACR,MAAM,EAAE,EAAE;gBACV,gBAAgB,EAAE,EAAE;aACvB;SACJ,CAAC;IACN,CAAC;IAED,SAAS,gCAAgC;QACrC,OAAO;YACH,IAAI,EAAE;gBACF,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,EAAE;aACd;YACD,IAAI,EAAE;gBACF,MAAM,EAAE,EAAE;aACb;YACD,cAAc,EAAE;gBACZ,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,EAAE;aACd;SACJ,CAAC;IACN,CAAC;IAED;;;OAGG;IACH,SAAgB,sBAAsB,CAClC,OAAyC;QAEzC,OAAO;YACH,iBAAiB,EAAE,MAAM,CAAC,MAAM,OAAb,MAAM,8BACrB,EAAE;gBACF,uCAAmB,uBAChB,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,iBAAiB,EAApB,CAAoB,CAAC,UAC5C;YACD,aAAa,EAAE,kBAAkB,CAC7B,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,oBAAoB,EAAvB,CAAuB,CAAC,EACzC,OAAO,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,uBAAuB,EAA1B,CAA0B,CAAC,CAC/C;YACD,wBAAwB,EAAE,uCAAmB;YAC7C,oBAAoB,8CAAA;YACpB,yBAAyB,EAAE,OAAO,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,yBAAyB,CAAA,EAA9B,CAA8B,CAAC;SAC/E,CAAC;IACN,CAAC;IAjBD,wDAiBC;IAED;;;;;;OAMG;IACH,SAAgB,kBAAkB,CAC9B,SAAsD,EACtD,sBAA8E;QAD9E,0BAAA,EAAA,cAAsD;QACtD,uCAAA,EAAA,2BAA8E;QAE9E,IAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,OAAb,MAAM,8BAAQ,EAAE,uBAAK,SAAS,UAAC,CAAC;QAE1D,IAAM,MAAM,GAAG,IAAA,6BAAa,EAAC,oDAA4B,CAAC,CAAC,MAAM,CAC7D,UAAC,MAAM,EAAE,GAAG;;YACR,IAAM,KAAK,GAAG,CAAA,KAAA,oDAA4B,CAAC,GAAG,CAAC;iBAC1C,GAAG,CACA,UAAA,SAAS;gBACL,OAAA,CAAC,iBAAiB,CAAC,SAAS,CAAC,KAAK,SAAS;oBACvC,CAAC,CAAC,4CAAoB,CAAC,SAAS,CAAC;oBACjC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAsB;YAFxD,CAEwD,CAC/D,CAAA;iBACA,MAAM,8DACA,sBAAsB,CAAC,GAAG,CACzB,UAAA,OAAO,YAAI,OAAA,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,mCAAI,EAAE,CAAwB,CAAA,EAAA,CAC3D,UACJ,CAAC;YAEN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAEpB,OAAO,MAAM,CAAC;QAClB,CAAC,EACD;YACI,IAAI,EAAE,EAAwB;SACL,CAChC,CAAC;QAEF,sBAAsB,CAAC,OAAO,CAAC,UAAA,OAAO;YAClC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAClD;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IArCD,gDAqCC","sourcesContent":["import { defaultProcessorMap } from './defaultProcessors';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport {\n    defaultFormatKeysPerCategory,\n    defaultFormatParsers,\n} from '../../formatHandlers/defaultFormatHandlers';\nimport type {\n    ContentModelBlockFormat,\n    DomToModelContext,\n    DomToModelDecoratorContext,\n    DomToModelFormatContext,\n    DomToModelOption,\n    DomToModelSelectionContext,\n    DomToModelSettings,\n    EditorContext,\n    FormatParser,\n    FormatParsers,\n    FormatParsersPerCategory,\n    TextFormatParser,\n} from 'roosterjs-content-model-types';\n\n/**\n * Create context object for DOM to Content Model conversion\n * @param editorContext Context of editor\n * @param options Option array to customize the DOM to Model conversion behavior\n */\nexport function createDomToModelContext(\n    editorContext?: EditorContext,\n    ...options: (DomToModelOption | undefined)[]\n): DomToModelContext {\n    return createDomToModelContextWithConfig(createDomToModelConfig(options), editorContext);\n}\n\n/**\n * Create context object for DOM to Content Model conversion with an existing configure\n * @param config A full config object to define how to convert DOM tree to Content Model\n * @param editorContext Context of editor\n */\nexport function createDomToModelContextWithConfig(\n    config: DomToModelSettings,\n    editorContext?: EditorContext\n) {\n    return Object.assign(\n        {},\n        editorContext,\n        createDomToModelSelectionContext(),\n        createDomToModelFormatContext(editorContext?.isRootRtl),\n        createDomToModelDecoratorContext(),\n        config\n    );\n}\n\nfunction createDomToModelSelectionContext(): DomToModelSelectionContext {\n    return { isInSelection: false };\n}\n\nfunction createDomToModelFormatContext(isRootRtl?: boolean): DomToModelFormatContext {\n    const blockFormat: ContentModelBlockFormat = isRootRtl ? { direction: 'rtl' } : {};\n\n    return {\n        blockFormat,\n        segmentFormat: {},\n\n        listFormat: {\n            levels: [],\n            threadItemCounts: [],\n        },\n    };\n}\n\nfunction createDomToModelDecoratorContext(): DomToModelDecoratorContext {\n    return {\n        link: {\n            format: {},\n            dataset: {},\n        },\n        code: {\n            format: {},\n        },\n        blockDecorator: {\n            format: {},\n            tagName: '',\n        },\n    };\n}\n\n/**\n * Create Dom to Content Model Config object\n * @param options All customizations of content model creation\n */\nexport function createDomToModelConfig(\n    options: (DomToModelOption | undefined)[]\n): DomToModelSettings {\n    return {\n        elementProcessors: Object.assign(\n            {},\n            defaultProcessorMap,\n            ...options.map(x => x?.processorOverride)\n        ),\n        formatParsers: buildFormatParsers(\n            options.map(x => x?.formatParserOverride),\n            options.map(x => x?.additionalFormatParsers)\n        ),\n        defaultElementProcessors: defaultProcessorMap,\n        defaultFormatParsers,\n        processNonVisibleElements: options.some(x => !!x?.processNonVisibleElements),\n    };\n}\n\n/**\n * @internal Export for test only\n * Build format parsers used by DOM to Content Model conversion\n * @param override\n * @param additionalParsersArray\n * @returns\n */\nexport function buildFormatParsers(\n    overrides: (Partial<FormatParsers> | undefined)[] = [],\n    additionalParsersArray: (Partial<FormatParsersPerCategory> | undefined)[] = []\n): FormatParsersPerCategory {\n    const combinedOverrides = Object.assign({}, ...overrides);\n\n    const result = getObjectKeys(defaultFormatKeysPerCategory).reduce(\n        (result, key) => {\n            const value = defaultFormatKeysPerCategory[key]\n                .map(\n                    formatKey =>\n                        (combinedOverrides[formatKey] === undefined\n                            ? defaultFormatParsers[formatKey]\n                            : combinedOverrides[formatKey]) as FormatParser<any>\n                )\n                .concat(\n                    ...additionalParsersArray.map(\n                        parsers => (parsers?.[key] ?? []) as FormatParser<any>[]\n                    )\n                );\n\n            result[key] = value;\n\n            return result;\n        },\n        {\n            text: [] as TextFormatParser[],\n        } as FormatParsersPerCategory\n    );\n\n    additionalParsersArray.forEach(parsers => {\n        if (parsers?.text) {\n            result.text = result.text.concat(parsers.text);\n        }\n    });\n\n    return result;\n}\n"]}
+{"version":3,"file":"createDomToModelContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultProcessorMap } from './defaultProcessors';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport {\n    defaultFormatKeysPerCategory,\n    defaultFormatParsers,\n} from '../../formatHandlers/defaultFormatHandlers';\nimport type {\n    ContentModelBlockFormat,\n    DomToModelContext,\n    DomToModelDecoratorContext,\n    DomToModelFormatContext,\n    DomToModelOption,\n    DomToModelSelectionContext,\n    DomToModelSettings,\n    EditorContext,\n    FormatParser,\n    FormatParsers,\n    FormatParsersPerCategory,\n    TextFormatParser,\n} from 'roosterjs-content-model-types';\n\n/**\n * Create context object for DOM to Content Model conversion\n * @param editorContext Context of editor\n * @param options Option array to customize the DOM to Model conversion behavior\n */\nexport function createDomToModelContext(\n    editorContext?: EditorContext,\n    ...options: (DomToModelOption | undefined)[]\n): DomToModelContext {\n    return createDomToModelContextWithConfig(createDomToModelConfig(options), editorContext);\n}\n\n/**\n * Create context object for DOM to Content Model conversion with an existing configure\n * @param config A full config object to define how to convert DOM tree to Content Model\n * @param editorContext Context of editor\n */\nexport function createDomToModelContextWithConfig(\n    config: DomToModelSettings,\n    editorContext?: EditorContext\n): DomToModelContext {\n    return Object.assign(\n        {},\n        editorContext,\n        createDomToModelSelectionContext(),\n        createDomToModelFormatContext(editorContext?.isRootRtl),\n        createDomToModelDecoratorContext(),\n        config\n    );\n}\n\nfunction createDomToModelSelectionContext(): DomToModelSelectionContext {\n    return { isInSelection: false };\n}\n\nfunction createDomToModelFormatContext(isRootRtl?: boolean): DomToModelFormatContext {\n    const blockFormat: ContentModelBlockFormat = isRootRtl ? { direction: 'rtl' } : {};\n\n    return {\n        blockFormat,\n        segmentFormat: {},\n\n        listFormat: {\n            levels: [],\n            threadItemCounts: [],\n        },\n    };\n}\n\nfunction createDomToModelDecoratorContext(): DomToModelDecoratorContext {\n    return {\n        link: {\n            format: {},\n            dataset: {},\n        },\n        code: {\n            format: {},\n        },\n        blockDecorator: {\n            format: {},\n            tagName: '',\n        },\n    };\n}\n\n/**\n * Create Dom to Content Model Config object\n * @param options All customizations of content model creation\n */\nexport function createDomToModelConfig(\n    options: (DomToModelOption | undefined)[]\n): DomToModelSettings {\n    return {\n        elementProcessors: Object.assign(\n            {},\n            defaultProcessorMap,\n            ...options.map(x => x?.processorOverride)\n        ),\n        formatParsers: buildFormatParsers(\n            options.map(x => x?.formatParserOverride),\n            options.map(x => x?.additionalFormatParsers)\n        ),\n        defaultElementProcessors: defaultProcessorMap,\n        defaultFormatParsers,\n        processNonVisibleElements: options.some(x => !!x?.processNonVisibleElements),\n    };\n}\n\n/**\n * @internal Export for test only\n * Build format parsers used by DOM to Content Model conversion\n * @param override\n * @param additionalParsersArray\n * @returns\n */\nexport function buildFormatParsers(\n    overrides: (Partial<FormatParsers> | undefined)[] = [],\n    additionalParsersArray: (Partial<FormatParsersPerCategory> | undefined)[] = []\n): FormatParsersPerCategory {\n    const combinedOverrides = Object.assign({}, ...overrides);\n\n    const result = getObjectKeys(defaultFormatKeysPerCategory).reduce(\n        (result, key) => {\n            const value = defaultFormatKeysPerCategory[key]\n                .map(\n                    formatKey =>\n                        (combinedOverrides[formatKey] === undefined\n                            ? defaultFormatParsers[formatKey]\n                            : combinedOverrides[formatKey]) as FormatParser<any>\n                )\n                .concat(\n                    ...additionalParsersArray.map(\n                        parsers => (parsers?.[key] ?? []) as FormatParser<any>[]\n                    )\n                );\n\n            result[key] = value;\n\n            return result;\n        },\n        {\n            text: [] as TextFormatParser[],\n        } as FormatParsersPerCategory\n    );\n\n    additionalParsersArray.forEach(parsers => {\n        if (parsers?.text) {\n            result.text = result.text.concat(parsers.text);\n        }\n    });\n\n    return result;\n}\n"]}

package/lib-amd/domToModel/processors/formatContainerProcessor.js

@@ -48,7 +48,9 @@ define(["require", "exports", "tslib", "../../modelApi/common/addBlock", "../../
             if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {
                 formatContainer.zeroFontSize = true;
             }
-            if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {
+            if (!context.skipFormatContainerFallbackCheck &&
+                shouldFallbackToParagraph(formatContainer) &&
+                !forceFormatContainer) {
                 // For DIV container that only has one paragraph child, container style can be merged into paragraph
                 // and no need to have this container
                 var paragraph = formatContainer.blocks[0];

package/lib-amd/domToModel/processors/formatContainerProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatContainerProcessor.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { addBlock } from '../../modelApi/common/addBlock';\nimport { createFormatContainer } from '../../modelApi/creators/createFormatContainer';\nimport { createParagraph } from '../../modelApi/creators/createParagraph';\nimport { getDefaultStyle } from '../utils/getDefaultStyle';\nimport { parseFormat } from '../utils/parseFormat';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelFormatContainer,\n    ContentModelFormatContainerFormat,\n    ContentModelParagraph,\n    DomToModelContext,\n    ElementProcessor,\n    MarginFormat,\n    PaddingFormat,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const ContextStyles: (keyof (MarginFormat & PaddingFormat))[] = [\n    'marginLeft',\n    'marginRight',\n    'paddingLeft',\n    'paddingRight',\n];\n\n/**\n * Content Model Element Processor for format container elements (e.g., blockquote, div)\n * Processes elements that create FormatContainer blocks in the content model.\n * This processor can be used in processorOverride to customize how specific elements are processed.\n * @param group The parent block group\n * @param element The DOM element to process\n * @param context DOM to Content Model context\n */\nexport const formatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);\n};\n\n/**\n * @internal\n */\nexport const forceFormatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);\n};\n\nconst formatContainerProcessorInternal = (\n    group: ContentModelBlockGroup,\n    element: HTMLElement,\n    context: DomToModelContext,\n    forceFormatContainer: boolean\n) => {\n    stackFormat(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, () => {\n        parseFormat(element, context.formatParsers.block, context.blockFormat, context);\n        parseFormat(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);\n\n        const format: ContentModelFormatContainerFormat = {\n            ...context.blockFormat,\n        };\n\n        parseFormat(element, context.formatParsers.container, format, context);\n\n        const tagName =\n            getDefaultStyle(element).display == 'block' ? element.tagName.toLowerCase() : 'div';\n        const formatContainer = createFormatContainer(tagName, format);\n\n        // It is possible to inherit margin left/right styles from parent DIV or other containers,\n        // since we are going into a deeper level of format container now,\n        // the container will render these styles so no need to keep them in context format\n        ContextStyles.forEach(style => {\n            delete context.blockFormat[style];\n        });\n\n        context.elementProcessors.child(formatContainer, element, context);\n\n        if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {\n            formatContainer.zeroFontSize = true;\n        }\n\n        if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {\n            // For DIV container that only has one paragraph child, container style can be merged into paragraph\n            // and no need to have this container\n            const paragraph = formatContainer.blocks[0] as ContentModelParagraph;\n\n            if (formatContainer.zeroFontSize) {\n                paragraph.segmentFormat = Object.assign({}, paragraph.segmentFormat, {\n                    fontSize: '0',\n                });\n            }\n\n            Object.assign(paragraph.format, formatContainer.format);\n            setParagraphNotImplicit(paragraph);\n            addBlock(group, paragraph);\n        } else {\n            addBlock(group, formatContainer);\n        }\n    });\n\n    addBlock(group, createParagraph(true /*isImplicit*/, context.blockFormat));\n};\n\nfunction shouldFallbackToParagraph(formatContainer: ContentModelFormatContainer) {\n    const firstChild = formatContainer.blocks[0];\n\n    return (\n        formatContainer.tagName == 'div' &&\n        formatContainer.blocks.length == 1 &&\n        firstChild.blockType == 'Paragraph' &&\n        firstChild.isImplicit\n    );\n}\n"]}
+{"version":3,"file":"formatContainerProcessor.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { addBlock } from '../../modelApi/common/addBlock';\nimport { createFormatContainer } from '../../modelApi/creators/createFormatContainer';\nimport { createParagraph } from '../../modelApi/creators/createParagraph';\nimport { getDefaultStyle } from '../utils/getDefaultStyle';\nimport { parseFormat } from '../utils/parseFormat';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelFormatContainer,\n    ContentModelFormatContainerFormat,\n    ContentModelParagraph,\n    DomToModelContext,\n    ElementProcessor,\n    MarginFormat,\n    PaddingFormat,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const ContextStyles: (keyof (MarginFormat & PaddingFormat))[] = [\n    'marginLeft',\n    'marginRight',\n    'paddingLeft',\n    'paddingRight',\n];\n\n/**\n * Content Model Element Processor for format container elements (e.g., blockquote, div)\n * Processes elements that create FormatContainer blocks in the content model.\n * This processor can be used in processorOverride to customize how specific elements are processed.\n * @param group The parent block group\n * @param element The DOM element to process\n * @param context DOM to Content Model context\n */\nexport const formatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);\n};\n\n/**\n * @internal\n */\nexport const forceFormatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);\n};\n\nconst formatContainerProcessorInternal = (\n    group: ContentModelBlockGroup,\n    element: HTMLElement,\n    context: DomToModelContext,\n    forceFormatContainer: boolean\n) => {\n    stackFormat(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, () => {\n        parseFormat(element, context.formatParsers.block, context.blockFormat, context);\n        parseFormat(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);\n\n        const format: ContentModelFormatContainerFormat = {\n            ...context.blockFormat,\n        };\n\n        parseFormat(element, context.formatParsers.container, format, context);\n\n        const tagName =\n            getDefaultStyle(element).display == 'block' ? element.tagName.toLowerCase() : 'div';\n        const formatContainer = createFormatContainer(tagName, format);\n\n        // It is possible to inherit margin left/right styles from parent DIV or other containers,\n        // since we are going into a deeper level of format container now,\n        // the container will render these styles so no need to keep them in context format\n        ContextStyles.forEach(style => {\n            delete context.blockFormat[style];\n        });\n\n        context.elementProcessors.child(formatContainer, element, context);\n\n        if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {\n            formatContainer.zeroFontSize = true;\n        }\n\n        if (\n            !context.skipFormatContainerFallbackCheck &&\n            shouldFallbackToParagraph(formatContainer) &&\n            !forceFormatContainer\n        ) {\n            // For DIV container that only has one paragraph child, container style can be merged into paragraph\n            // and no need to have this container\n            const paragraph = formatContainer.blocks[0] as ContentModelParagraph;\n\n            if (formatContainer.zeroFontSize) {\n                paragraph.segmentFormat = Object.assign({}, paragraph.segmentFormat, {\n                    fontSize: '0',\n                });\n            }\n\n            Object.assign(paragraph.format, formatContainer.format);\n            setParagraphNotImplicit(paragraph);\n            addBlock(group, paragraph);\n        } else {\n            addBlock(group, formatContainer);\n        }\n    });\n\n    addBlock(group, createParagraph(true /*isImplicit*/, context.blockFormat));\n};\n\nfunction shouldFallbackToParagraph(formatContainer: ContentModelFormatContainer) {\n    const firstChild = formatContainer.blocks[0];\n\n    return (\n        formatContainer.tagName == 'div' &&\n        formatContainer.blocks.length == 1 &&\n        firstChild.blockType == 'Paragraph' &&\n        firstChild.isImplicit\n    );\n}\n"]}

package/lib-amd/modelApi/selection/setSelection.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "../typeCheck/isGeneralSegment", "../common/mutate"], function (require, exports, isGeneralSegment_1, mutate_1) {
+define(["require", "exports", "tslib", "../typeCheck/isGeneralSegment", "../common/mutate"], function (require, exports, tslib_1, isGeneralSegment_1, mutate_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.setSelection = void 0;
@@ -37,6 +37,7 @@ define(["require", "exports", "../typeCheck/isGeneralSegment", "../common/mutate
         });
     }
     function setSelectionToBlock(block, isInSelection, start, end) {
+        var _a;
         switch (block.blockType) {
             case 'BlockGroup':
                 return setSelectionToBlockGroup(block, isInSelection, start, end);
@@ -57,16 +58,31 @@ define(["require", "exports", "../typeCheck/isGeneralSegment", "../common/mutate
                     return isInSelection;
                 });
             case 'Paragraph':
-                var segmentsToDelete_1 = [];
+                var state_1 = {
+                    segmentsToDelete: [],
+                    boundaryMarkers: [],
+                    hasSelectedNonMarker: false,
+                };
                 block.segments.forEach(function (segment, i) {
                     isInSelection = handleSelection(isInSelection, segment, start, end, function (isInSelection) {
-                        return setSelectionToSegment(block, segment, isInSelection, segmentsToDelete_1, start, end, i);
+                        return setSelectionToSegment(block, segment, isInSelection, state_1, start, end, i);
                     });
                 });
-                if (segmentsToDelete_1.length > 0) {
+                if (state_1.hasSelectedNonMarker) {
+                    // This paragraph contains a real (non-marker) selected segment, so any leading/trailing
+                    // selection marker of the range is redundant within this paragraph and can be removed.
+                    // We only do this within the same paragraph: a boundary marker at a paragraph edge must be
+                    // kept to distinguish "selection starts at the beginning of this line" from "selection
+                    // starts at the end of the previous line".
+                    (_a = state_1.segmentsToDelete).push.apply(_a, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(state_1.boundaryMarkers), false));
+                }
+                if (state_1.segmentsToDelete.length > 0) {
                     var mutablePara = (0, mutate_1.mutateBlock)(block);
                     var index = void 0;
-                    while ((index = segmentsToDelete_1.pop()) !== undefined) {
+                    // Sort ascending so the pop()-based splice below always removes the highest index first,
+                    // keeping the remaining indices valid (boundary markers may sit before queued deletions).
+                    state_1.segmentsToDelete.sort(function (a, b) { return a - b; });
+                    while ((index = state_1.segmentsToDelete.pop()) !== undefined) {
                         if (index >= 0) {
                             mutablePara.segments.splice(index, 1);
                         }
@@ -115,14 +131,23 @@ define(["require", "exports", "../typeCheck/isGeneralSegment", "../common/mutate
             : -1;
         return { row: row, col: col };
     }
-    function setSelectionToSegment(paragraph, segment, isInSelection, segmentsToDelete, start, end, i) {
+    function setSelectionToSegment(paragraph, segment, isInSelection, state, start, end, i) {
+        if (segment.segmentType != 'SelectionMarker' && isInSelection) {
+            state.hasSelectedNonMarker = true;
+        }
         switch (segment.segmentType) {
             case 'SelectionMarker':
                 if (!isInSelection || (segment != start && segment != end)) {
                     // Delete the selection marker when
                     // 1. It is not in selection any more. Or
                     // 2. It is in middle of selection, so no need to have it
-                    segmentsToDelete.push(i);
+                    state.segmentsToDelete.push(i);
+                }
+                else {
+                    // It is a leading/trailing selection marker of a range selection. Keep it for now, but
+                    // remember it so it can be removed later if this same paragraph also contains a real
+                    // (non-marker) selected segment, in which case the marker is redundant.
+                    state.boundaryMarkers.push(i);
                 }
                 return isInSelection;
             case 'General':

package/lib-amd/modelApi/selection/setSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"setSelection.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts"],"names":[],"mappings":"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","sourcesContent":["import { isGeneralSegment } from '../typeCheck/isGeneralSegment';\nimport { mutateBlock, mutateSegment } from '../common/mutate';\nimport type {\n    MutableType,\n    ReadonlyContentModelBlock,\n    ReadonlyContentModelBlockGroup,\n    ReadonlyContentModelParagraph,\n    ReadonlyContentModelSegment,\n    ReadonlyContentModelTable,\n    ReadonlySelectable,\n    ShallowMutableSelectable,\n    TableCellCoordinate,\n} from 'roosterjs-content-model-types';\n\n/**\n * Set selection into Content Model. If the Content Model already has selection, existing selection will be overwritten by the new one.\n * @param group The root level group of Content Model\n * @param start The start selected element. If not passed, existing selection of content model will be cleared\n * @param end The end selected element. If not passed, only the start element will be selected. If passed, all elements between start and end elements will be selected\n */\nexport function setSelection(\n    group: ReadonlyContentModelBlockGroup,\n    start?: ReadonlySelectable,\n    end?: ReadonlySelectable\n) {\n    setSelectionToBlockGroup(group, false /*isInSelection*/, start || null, end || null);\n}\n\nfunction setSelectionToBlockGroup(\n    group: ReadonlyContentModelBlockGroup,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    return handleSelection(isInSelection, group, start, end, isInSelection => {\n        if (isGeneralSegment(group) && needToSetSelection(group, isInSelection)) {\n            setIsSelected(mutateBlock(group), isInSelection);\n        }\n\n        const blocksToDelete: number[] = [];\n\n        group.blocks.forEach((block, i) => {\n            isInSelection = setSelectionToBlock(block, isInSelection, start, end);\n\n            if (block.blockType == 'Paragraph' && block.segments.length == 0 && block.isImplicit) {\n                blocksToDelete.push(i);\n            }\n        });\n\n        let index: number | undefined;\n\n        if (blocksToDelete.length > 0) {\n            const mutableGroup = mutateBlock(group);\n\n            while ((index = blocksToDelete.pop()) !== undefined) {\n                if (index >= 0) {\n                    mutableGroup.blocks.splice(index, 1);\n                }\n            }\n        }\n\n        return isInSelection;\n    });\n}\n\nfunction setSelectionToBlock(\n    block: ReadonlyContentModelBlock,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n) {\n    switch (block.blockType) {\n        case 'BlockGroup':\n            return setSelectionToBlockGroup(block, isInSelection, start, end);\n\n        case 'Table':\n            return setSelectionToTable(block, isInSelection, start, end);\n\n        case 'Divider':\n        case 'Entity':\n            return handleSelection(isInSelection, block, start, end, isInSelection => {\n                if (needToSetSelection(block, isInSelection)) {\n                    const mutableBlock = mutateBlock(block);\n\n                    if (isInSelection) {\n                        mutableBlock.isSelected = true;\n                    } else {\n                        delete mutableBlock.isSelected;\n                    }\n                }\n\n                return isInSelection;\n            });\n\n        case 'Paragraph':\n            const segmentsToDelete: number[] = [];\n\n            block.segments.forEach((segment, i) => {\n                isInSelection = handleSelection(\n                    isInSelection,\n                    segment,\n                    start,\n                    end,\n                    isInSelection => {\n                        return setSelectionToSegment(\n                            block,\n                            segment,\n                            isInSelection,\n                            segmentsToDelete,\n                            start,\n                            end,\n                            i\n                        );\n                    }\n                );\n            });\n\n            if (segmentsToDelete.length > 0) {\n                const mutablePara = mutateBlock(block);\n\n                let index: number | undefined;\n\n                while ((index = segmentsToDelete.pop()) !== undefined) {\n                    if (index >= 0) {\n                        mutablePara.segments.splice(index, 1);\n                    }\n                }\n            }\n\n            return isInSelection;\n\n        default:\n            return isInSelection;\n    }\n}\n\nfunction setSelectionToTable(\n    table: ReadonlyContentModelTable,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    const first = findCell(table, start);\n    const last = end ? findCell(table, end) : first;\n\n    if (!isInSelection) {\n        for (let row = 0; row < table.rows.length; row++) {\n            const currentRow = table.rows[row];\n            for (let col = 0; col < currentRow.cells.length; col++) {\n                const currentCell = table.rows[row].cells[col];\n                const isSelected =\n                    row >= first.row && row <= last.row && col >= first.col && col <= last.col;\n\n                if (needToSetSelection(currentCell, isSelected)) {\n                    setIsSelected(mutateBlock(currentCell), isSelected);\n                }\n\n                if (!isSelected) {\n                    setSelectionToBlockGroup(currentCell, false /*isInSelection*/, start, end);\n                }\n            }\n        }\n    } else {\n        table.rows.forEach(row =>\n            row.cells.forEach(cell => {\n                const wasInSelection = isInSelection;\n\n                isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);\n\n                if (wasInSelection && isInSelection) {\n                    mutateBlock(cell).isSelected = true;\n                }\n            })\n        );\n    }\n\n    return isInSelection;\n}\n\nfunction findCell(\n    table: ReadonlyContentModelTable,\n    cell: ReadonlySelectable | null\n): TableCellCoordinate {\n    let col = -1;\n    const row = cell\n        ? table.rows.findIndex(\n              row => (col = (row.cells as ReadonlyArray<ReadonlySelectable>).indexOf(cell)) >= 0\n          )\n        : -1;\n\n    return { row, col };\n}\n\nfunction setSelectionToSegment(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: ReadonlyContentModelSegment,\n    isInSelection: boolean,\n    segmentsToDelete: number[],\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    i: number\n) {\n    switch (segment.segmentType) {\n        case 'SelectionMarker':\n            if (!isInSelection || (segment != start && segment != end)) {\n                // Delete the selection marker when\n                // 1. It is not in selection any more. Or\n                // 2. It is in middle of selection, so no need to have it\n                segmentsToDelete.push(i);\n            }\n            return isInSelection;\n\n        case 'General':\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n\n            return segment != start && segment != end\n                ? setSelectionToBlockGroup(segment, isInSelection, start, end)\n                : isInSelection;\n\n        case 'Image':\n            const isSelectedAsImageSelection = start == segment && (!end || end == segment);\n\n            internalSetSelectionToSegment(\n                paragraph,\n                segment,\n                isInSelection,\n                !segment.isSelectedAsImageSelection != !isSelectedAsImageSelection\n                    ? image => (image.isSelectedAsImageSelection = isSelectedAsImageSelection)\n                    : undefined\n            );\n\n            return isInSelection;\n        default:\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n            return isInSelection;\n    }\n}\n\nfunction internalSetSelectionToSegment<T extends ReadonlyContentModelSegment>(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: T,\n    isInSelection: boolean,\n    additionAction?: (segment: MutableType<T>) => void\n) {\n    if (additionAction || needToSetSelection(segment, isInSelection)) {\n        mutateSegment(paragraph, segment, mutableSegment => {\n            setIsSelected(mutableSegment, isInSelection);\n            additionAction?.(mutableSegment);\n        });\n    }\n}\n\nfunction needToSetSelection(selectable: ReadonlySelectable, isSelected: boolean) {\n    return !selectable.isSelected != !isSelected;\n}\n\nfunction setIsSelected(selectable: ShallowMutableSelectable, value: boolean) {\n    if (value) {\n        selectable.isSelected = true;\n    } else {\n        delete selectable.isSelected;\n    }\n\n    return value;\n}\n\nfunction handleSelection(\n    isInSelection: boolean,\n    model: ReadonlyContentModelBlockGroup | ReadonlyContentModelBlock | ReadonlyContentModelSegment,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    callback: (isInSelection: boolean) => boolean\n) {\n    isInSelection = isInSelection || model == start;\n    isInSelection = callback(isInSelection);\n    return isInSelection && !!end && model != end;\n}\n"]}
+{"version":3,"file":"setSelection.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts"],"names":[],"mappings":"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","sourcesContent":["import { isGeneralSegment } from '../typeCheck/isGeneralSegment';\nimport { mutateBlock, mutateSegment } from '../common/mutate';\nimport type {\n    MutableType,\n    ReadonlyContentModelBlock,\n    ReadonlyContentModelBlockGroup,\n    ReadonlyContentModelParagraph,\n    ReadonlyContentModelSegment,\n    ReadonlyContentModelTable,\n    ReadonlySelectable,\n    ShallowMutableSelectable,\n    TableCellCoordinate,\n} from 'roosterjs-content-model-types';\n\n/**\n * Set selection into Content Model. If the Content Model already has selection, existing selection will be overwritten by the new one.\n * @param group The root level group of Content Model\n * @param start The start selected element. If not passed, existing selection of content model will be cleared\n * @param end The end selected element. If not passed, only the start element will be selected. If passed, all elements between start and end elements will be selected\n */\nexport function setSelection(\n    group: ReadonlyContentModelBlockGroup,\n    start?: ReadonlySelectable,\n    end?: ReadonlySelectable\n) {\n    setSelectionToBlockGroup(group, false /*isInSelection*/, start || null, end || null);\n}\n\nfunction setSelectionToBlockGroup(\n    group: ReadonlyContentModelBlockGroup,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    return handleSelection(isInSelection, group, start, end, isInSelection => {\n        if (isGeneralSegment(group) && needToSetSelection(group, isInSelection)) {\n            setIsSelected(mutateBlock(group), isInSelection);\n        }\n\n        const blocksToDelete: number[] = [];\n\n        group.blocks.forEach((block, i) => {\n            isInSelection = setSelectionToBlock(block, isInSelection, start, end);\n\n            if (block.blockType == 'Paragraph' && block.segments.length == 0 && block.isImplicit) {\n                blocksToDelete.push(i);\n            }\n        });\n\n        let index: number | undefined;\n\n        if (blocksToDelete.length > 0) {\n            const mutableGroup = mutateBlock(group);\n\n            while ((index = blocksToDelete.pop()) !== undefined) {\n                if (index >= 0) {\n                    mutableGroup.blocks.splice(index, 1);\n                }\n            }\n        }\n\n        return isInSelection;\n    });\n}\n\nfunction setSelectionToBlock(\n    block: ReadonlyContentModelBlock,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n) {\n    switch (block.blockType) {\n        case 'BlockGroup':\n            return setSelectionToBlockGroup(block, isInSelection, start, end);\n\n        case 'Table':\n            return setSelectionToTable(block, isInSelection, start, end);\n\n        case 'Divider':\n        case 'Entity':\n            return handleSelection(isInSelection, block, start, end, isInSelection => {\n                if (needToSetSelection(block, isInSelection)) {\n                    const mutableBlock = mutateBlock(block);\n\n                    if (isInSelection) {\n                        mutableBlock.isSelected = true;\n                    } else {\n                        delete mutableBlock.isSelected;\n                    }\n                }\n\n                return isInSelection;\n            });\n\n        case 'Paragraph':\n            const state: ParagraphSelectionState = {\n                segmentsToDelete: [],\n                boundaryMarkers: [],\n                hasSelectedNonMarker: false,\n            };\n\n            block.segments.forEach((segment, i) => {\n                isInSelection = handleSelection(\n                    isInSelection,\n                    segment,\n                    start,\n                    end,\n                    isInSelection => {\n                        return setSelectionToSegment(\n                            block,\n                            segment,\n                            isInSelection,\n                            state,\n                            start,\n                            end,\n                            i\n                        );\n                    }\n                );\n            });\n\n            if (state.hasSelectedNonMarker) {\n                // This paragraph contains a real (non-marker) selected segment, so any leading/trailing\n                // selection marker of the range is redundant within this paragraph and can be removed.\n                // We only do this within the same paragraph: a boundary marker at a paragraph edge must be\n                // kept to distinguish \"selection starts at the beginning of this line\" from \"selection\n                // starts at the end of the previous line\".\n                state.segmentsToDelete.push(...state.boundaryMarkers);\n            }\n\n            if (state.segmentsToDelete.length > 0) {\n                const mutablePara = mutateBlock(block);\n\n                let index: number | undefined;\n\n                // Sort ascending so the pop()-based splice below always removes the highest index first,\n                // keeping the remaining indices valid (boundary markers may sit before queued deletions).\n                state.segmentsToDelete.sort((a, b) => a - b);\n\n                while ((index = state.segmentsToDelete.pop()) !== undefined) {\n                    if (index >= 0) {\n                        mutablePara.segments.splice(index, 1);\n                    }\n                }\n            }\n\n            return isInSelection;\n\n        default:\n            return isInSelection;\n    }\n}\n\nfunction setSelectionToTable(\n    table: ReadonlyContentModelTable,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    const first = findCell(table, start);\n    const last = end ? findCell(table, end) : first;\n\n    if (!isInSelection) {\n        for (let row = 0; row < table.rows.length; row++) {\n            const currentRow = table.rows[row];\n            for (let col = 0; col < currentRow.cells.length; col++) {\n                const currentCell = table.rows[row].cells[col];\n                const isSelected =\n                    row >= first.row && row <= last.row && col >= first.col && col <= last.col;\n\n                if (needToSetSelection(currentCell, isSelected)) {\n                    setIsSelected(mutateBlock(currentCell), isSelected);\n                }\n\n                if (!isSelected) {\n                    setSelectionToBlockGroup(currentCell, false /*isInSelection*/, start, end);\n                }\n            }\n        }\n    } else {\n        table.rows.forEach(row =>\n            row.cells.forEach(cell => {\n                const wasInSelection = isInSelection;\n\n                isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);\n\n                if (wasInSelection && isInSelection) {\n                    mutateBlock(cell).isSelected = true;\n                }\n            })\n        );\n    }\n\n    return isInSelection;\n}\n\nfunction findCell(\n    table: ReadonlyContentModelTable,\n    cell: ReadonlySelectable | null\n): TableCellCoordinate {\n    let col = -1;\n    const row = cell\n        ? table.rows.findIndex(\n              row => (col = (row.cells as ReadonlyArray<ReadonlySelectable>).indexOf(cell)) >= 0\n          )\n        : -1;\n\n    return { row, col };\n}\n\ninterface ParagraphSelectionState {\n    // Indexes of segments to delete after the paragraph is fully processed\n    segmentsToDelete: number[];\n\n    // Indexes of leading/trailing selection markers of the range that are kept for now, but will be\n    // removed if this paragraph also contains a real (non-marker) selected segment\n    boundaryMarkers: number[];\n\n    // Whether this paragraph contains at least one selected segment that is not a selection marker\n    hasSelectedNonMarker: boolean;\n}\n\nfunction setSelectionToSegment(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: ReadonlyContentModelSegment,\n    isInSelection: boolean,\n    state: ParagraphSelectionState,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    i: number\n) {\n    if (segment.segmentType != 'SelectionMarker' && isInSelection) {\n        state.hasSelectedNonMarker = true;\n    }\n\n    switch (segment.segmentType) {\n        case 'SelectionMarker':\n            if (!isInSelection || (segment != start && segment != end)) {\n                // Delete the selection marker when\n                // 1. It is not in selection any more. Or\n                // 2. It is in middle of selection, so no need to have it\n                state.segmentsToDelete.push(i);\n            } else {\n                // It is a leading/trailing selection marker of a range selection. Keep it for now, but\n                // remember it so it can be removed later if this same paragraph also contains a real\n                // (non-marker) selected segment, in which case the marker is redundant.\n                state.boundaryMarkers.push(i);\n            }\n            return isInSelection;\n\n        case 'General':\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n\n            return segment != start && segment != end\n                ? setSelectionToBlockGroup(segment, isInSelection, start, end)\n                : isInSelection;\n\n        case 'Image':\n            const isSelectedAsImageSelection = start == segment && (!end || end == segment);\n\n            internalSetSelectionToSegment(\n                paragraph,\n                segment,\n                isInSelection,\n                !segment.isSelectedAsImageSelection != !isSelectedAsImageSelection\n                    ? image => (image.isSelectedAsImageSelection = isSelectedAsImageSelection)\n                    : undefined\n            );\n\n            return isInSelection;\n        default:\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n            return isInSelection;\n    }\n}\n\nfunction internalSetSelectionToSegment<T extends ReadonlyContentModelSegment>(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: T,\n    isInSelection: boolean,\n    additionAction?: (segment: MutableType<T>) => void\n) {\n    if (additionAction || needToSetSelection(segment, isInSelection)) {\n        mutateSegment(paragraph, segment, mutableSegment => {\n            setIsSelected(mutableSegment, isInSelection);\n            additionAction?.(mutableSegment);\n        });\n    }\n}\n\nfunction needToSetSelection(selectable: ReadonlySelectable, isSelected: boolean) {\n    return !selectable.isSelected != !isSelected;\n}\n\nfunction setIsSelected(selectable: ShallowMutableSelectable, value: boolean) {\n    if (value) {\n        selectable.isSelected = true;\n    } else {\n        delete selectable.isSelected;\n    }\n\n    return value;\n}\n\nfunction handleSelection(\n    isInSelection: boolean,\n    model: ReadonlyContentModelBlockGroup | ReadonlyContentModelBlock | ReadonlyContentModelSegment,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    callback: (isInSelection: boolean) => boolean\n) {\n    isInSelection = isInSelection || model == start;\n    isInSelection = callback(isInSelection);\n    return isInSelection && !!end && model != end;\n}\n"]}

package/lib-amd/modelToDom/handlers/handleBlockGroupChildren.js

@@ -29,7 +29,7 @@ define(["require", "exports", "../utils/cleanUpRestNodes"], function (require, e
                     (_a = context.domIndexer) === null || _a === void 0 ? void 0 : _a.onBlockEntity(childBlock, group);
                 }
             });
-            cleanUpNodeStack(listFormat.nodeStack, context);
+            cleanUpNodeStack(listFormat.nodeStack, context, parent);
             // Remove all rest node if any since they don't appear in content model
             (0, cleanUpRestNodes_1.cleanUpRestNodes)(refNode, context.rewriteFromModel);
         }
@@ -38,7 +38,7 @@ define(["require", "exports", "../utils/cleanUpRestNodes"], function (require, e
         }
     };
     exports.handleBlockGroupChildren = handleBlockGroupChildren;
-    function cleanUpNodeStack(nodeStack, context) {
+    function cleanUpNodeStack(nodeStack, context, leavingParent) {
         var _a, _b;
         if (nodeStack.length > 0) {
             // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node
@@ -46,6 +46,13 @@ define(["require", "exports", "../utils/cleanUpRestNodes"], function (require, e
                 var node = (_b = (_a = nodeStack.pop()) === null || _a === void 0 ? void 0 : _a.refNode) !== null && _b !== void 0 ? _b : null;
                 (0, cleanUpRestNodes_1.cleanUpRestNodes)(node, context.rewriteFromModel);
             }
+            if (leavingParent && nodeStack[0].node == leavingParent) {
+                // When leaving a parent node that is the same with the root of node stack
+                // It means the whole list node stack is being invalidated, so we clear it
+                while (nodeStack.length > 0) {
+                    nodeStack.pop();
+                }
+            }
         }
     }
 });

package/lib-amd/modelToDom/handlers/handleBlockGroupChildren.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleBlockGroupChildren.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleBlockGroupChildren.ts"],"names":[],"mappings":";;;;IAQA;;OAEG;IACI,IAAM,wBAAwB,GAAgD,UACjF,GAAa,EACb,MAAY,EACZ,KAA6B,EAC7B,OAA0B;QAElB,IAAA,UAAU,GAAK,OAAO,WAAZ,CAAa;QAC/B,IAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;QACvC,IAAI,OAAO,GAAgB,MAAM,CAAC,UAAU,CAAC;QAE7C,IAAI;YACA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,KAAK;;gBACnC,2CAA2C;gBAC3C,wEAAwE;gBACxE,sFAAsF;gBACtF,+FAA+F;gBAC/F,IACI,KAAK,IAAI,CAAC;oBACV,UAAU,CAAC,SAAS,IAAI,YAAY;oBACpC,UAAU,CAAC,cAAc,IAAI,UAAU,EACzC;oBACE,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBAEhD,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACjC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;qBAC7B;iBACJ;gBAED,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjF,IAAI,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE;oBAClC,MAAA,OAAO,CAAC,UAAU,0CAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;iBACxD;YACL,CAAC,CAAC,CAAC;YAEH,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAEhD,uEAAuE;YACvE,IAAA,mCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACvD;gBAAS;YACN,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;SACpC;IACL,CAAC,CAAC;IA1CW,QAAA,wBAAwB,4BA0CnC;IAEF,SAAS,gBAAgB,CAAC,SAAoC,EAAE,OAA0B;;QACtF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,qFAAqF;YACrF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC3C,IAAM,IAAI,GAAG,MAAA,MAAA,SAAS,CAAC,GAAG,EAAE,0CAAE,OAAO,mCAAI,IAAI,CAAC;gBAE9C,IAAA,mCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;aACpD;SACJ;IACL,CAAC","sourcesContent":["import { cleanUpRestNodes } from '../utils/cleanUpRestNodes';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelHandler,\n    ModelToDomContext,\n    ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleBlockGroupChildren: ContentModelHandler<ContentModelBlockGroup> = (\n    doc: Document,\n    parent: Node,\n    group: ContentModelBlockGroup,\n    context: ModelToDomContext\n) => {\n    const { listFormat } = context;\n    const nodeStack = listFormat.nodeStack;\n    let refNode: Node | null = parent.firstChild;\n\n    try {\n        group.blocks.forEach((childBlock, index) => {\n            // When process list, we need a node stack.\n            // When there are two continuous lists, they should share the same stack\n            // so that list items with same type/threadId can be merged into the same list element\n            // In other cases, clear the stack so that two separate lists won't share the same list element\n            if (\n                index == 0 ||\n                childBlock.blockType != 'BlockGroup' ||\n                childBlock.blockGroupType != 'ListItem'\n            ) {\n                cleanUpNodeStack(listFormat.nodeStack, context);\n\n                if (listFormat.nodeStack.length > 0) {\n                    listFormat.nodeStack = [];\n                }\n            }\n\n            refNode = context.modelHandlers.block(doc, parent, childBlock, context, refNode);\n\n            if (childBlock.blockType == 'Entity') {\n                context.domIndexer?.onBlockEntity(childBlock, group);\n            }\n        });\n\n        cleanUpNodeStack(listFormat.nodeStack, context);\n\n        // Remove all rest node if any since they don't appear in content model\n        cleanUpRestNodes(refNode, context.rewriteFromModel);\n    } finally {\n        listFormat.nodeStack = nodeStack;\n    }\n};\n\nfunction cleanUpNodeStack(nodeStack: ModelToDomListStackItem[], context: ModelToDomContext) {\n    if (nodeStack.length > 0) {\n        // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node\n        for (let i = nodeStack.length - 1; i > 0; i--) {\n            const node = nodeStack.pop()?.refNode ?? null;\n\n            cleanUpRestNodes(node, context.rewriteFromModel);\n        }\n    }\n}\n"]}
+{"version":3,"file":"handleBlockGroupChildren.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleBlockGroupChildren.ts"],"names":[],"mappings":";;;;IAQA;;OAEG;IACI,IAAM,wBAAwB,GAAgD,UACjF,GAAa,EACb,MAAY,EACZ,KAA6B,EAC7B,OAA0B;QAElB,IAAA,UAAU,GAAK,OAAO,WAAZ,CAAa;QAC/B,IAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;QACvC,IAAI,OAAO,GAAgB,MAAM,CAAC,UAAU,CAAC;QAE7C,IAAI;YACA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,KAAK;;gBACnC,2CAA2C;gBAC3C,wEAAwE;gBACxE,sFAAsF;gBACtF,+FAA+F;gBAC/F,IACI,KAAK,IAAI,CAAC;oBACV,UAAU,CAAC,SAAS,IAAI,YAAY;oBACpC,UAAU,CAAC,cAAc,IAAI,UAAU,EACzC;oBACE,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBAEhD,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACjC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;qBAC7B;iBACJ;gBAED,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjF,IAAI,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE;oBAClC,MAAA,OAAO,CAAC,UAAU,0CAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;iBACxD;YACL,CAAC,CAAC,CAAC;YAEH,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAExD,uEAAuE;YACvE,IAAA,mCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACvD;gBAAS;YACN,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;SACpC;IACL,CAAC,CAAC;IA1CW,QAAA,wBAAwB,4BA0CnC;IAEF,SAAS,gBAAgB,CACrB,SAAoC,EACpC,OAA0B,EAC1B,aAAoB;;QAEpB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,qFAAqF;YACrF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC3C,IAAM,IAAI,GAAG,MAAA,MAAA,SAAS,CAAC,GAAG,EAAE,0CAAE,OAAO,mCAAI,IAAI,CAAC;gBAE9C,IAAA,mCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;aACpD;YAED,IAAI,aAAa,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,EAAE;gBACrD,0EAA0E;gBAC1E,0EAA0E;gBAC1E,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,SAAS,CAAC,GAAG,EAAE,CAAC;iBACnB;aACJ;SACJ;IACL,CAAC","sourcesContent":["import { cleanUpRestNodes } from '../utils/cleanUpRestNodes';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelHandler,\n    ModelToDomContext,\n    ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleBlockGroupChildren: ContentModelHandler<ContentModelBlockGroup> = (\n    doc: Document,\n    parent: Node,\n    group: ContentModelBlockGroup,\n    context: ModelToDomContext\n) => {\n    const { listFormat } = context;\n    const nodeStack = listFormat.nodeStack;\n    let refNode: Node | null = parent.firstChild;\n\n    try {\n        group.blocks.forEach((childBlock, index) => {\n            // When process list, we need a node stack.\n            // When there are two continuous lists, they should share the same stack\n            // so that list items with same type/threadId can be merged into the same list element\n            // In other cases, clear the stack so that two separate lists won't share the same list element\n            if (\n                index == 0 ||\n                childBlock.blockType != 'BlockGroup' ||\n                childBlock.blockGroupType != 'ListItem'\n            ) {\n                cleanUpNodeStack(listFormat.nodeStack, context);\n\n                if (listFormat.nodeStack.length > 0) {\n                    listFormat.nodeStack = [];\n                }\n            }\n\n            refNode = context.modelHandlers.block(doc, parent, childBlock, context, refNode);\n\n            if (childBlock.blockType == 'Entity') {\n                context.domIndexer?.onBlockEntity(childBlock, group);\n            }\n        });\n\n        cleanUpNodeStack(listFormat.nodeStack, context, parent);\n\n        // Remove all rest node if any since they don't appear in content model\n        cleanUpRestNodes(refNode, context.rewriteFromModel);\n    } finally {\n        listFormat.nodeStack = nodeStack;\n    }\n};\n\nfunction cleanUpNodeStack(\n    nodeStack: ModelToDomListStackItem[],\n    context: ModelToDomContext,\n    leavingParent?: Node\n) {\n    if (nodeStack.length > 0) {\n        // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node\n        for (let i = nodeStack.length - 1; i > 0; i--) {\n            const node = nodeStack.pop()?.refNode ?? null;\n\n            cleanUpRestNodes(node, context.rewriteFromModel);\n        }\n\n        if (leavingParent && nodeStack[0].node == leavingParent) {\n            // When leaving a parent node that is the same with the root of node stack\n            // It means the whole list node stack is being invalidated, so we clear it\n            while (nodeStack.length > 0) {\n                nodeStack.pop();\n            }\n        }\n    }\n}\n"]}

package/lib-mjs/domToModel/context/createDomToModelContext.d.ts

@@ -10,7 +10,7 @@ export declare function createDomToModelContext(editorContext?: EditorContext, .
  * @param config A full config object to define how to convert DOM tree to Content Model
  * @param editorContext Context of editor
  */
-export declare function createDomToModelContextWithConfig(config: DomToModelSettings, editorContext?: EditorContext): any;
+export declare function createDomToModelContextWithConfig(config: DomToModelSettings, editorContext?: EditorContext): DomToModelContext;
 /**
  * Create Dom to Content Model Config object
  * @param options All customizations of content model creation

package/lib-mjs/domToModel/context/createDomToModelContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDomToModelContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultProcessorMap } from './defaultProcessors';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport {\n    defaultFormatKeysPerCategory,\n    defaultFormatParsers,\n} from '../../formatHandlers/defaultFormatHandlers';\nimport type {\n    ContentModelBlockFormat,\n    DomToModelContext,\n    DomToModelDecoratorContext,\n    DomToModelFormatContext,\n    DomToModelOption,\n    DomToModelSelectionContext,\n    DomToModelSettings,\n    EditorContext,\n    FormatParser,\n    FormatParsers,\n    FormatParsersPerCategory,\n    TextFormatParser,\n} from 'roosterjs-content-model-types';\n\n/**\n * Create context object for DOM to Content Model conversion\n * @param editorContext Context of editor\n * @param options Option array to customize the DOM to Model conversion behavior\n */\nexport function createDomToModelContext(\n    editorContext?: EditorContext,\n    ...options: (DomToModelOption | undefined)[]\n): DomToModelContext {\n    return createDomToModelContextWithConfig(createDomToModelConfig(options), editorContext);\n}\n\n/**\n * Create context object for DOM to Content Model conversion with an existing configure\n * @param config A full config object to define how to convert DOM tree to Content Model\n * @param editorContext Context of editor\n */\nexport function createDomToModelContextWithConfig(\n    config: DomToModelSettings,\n    editorContext?: EditorContext\n) {\n    return Object.assign(\n        {},\n        editorContext,\n        createDomToModelSelectionContext(),\n        createDomToModelFormatContext(editorContext?.isRootRtl),\n        createDomToModelDecoratorContext(),\n        config\n    );\n}\n\nfunction createDomToModelSelectionContext(): DomToModelSelectionContext {\n    return { isInSelection: false };\n}\n\nfunction createDomToModelFormatContext(isRootRtl?: boolean): DomToModelFormatContext {\n    const blockFormat: ContentModelBlockFormat = isRootRtl ? { direction: 'rtl' } : {};\n\n    return {\n        blockFormat,\n        segmentFormat: {},\n\n        listFormat: {\n            levels: [],\n            threadItemCounts: [],\n        },\n    };\n}\n\nfunction createDomToModelDecoratorContext(): DomToModelDecoratorContext {\n    return {\n        link: {\n            format: {},\n            dataset: {},\n        },\n        code: {\n            format: {},\n        },\n        blockDecorator: {\n            format: {},\n            tagName: '',\n        },\n    };\n}\n\n/**\n * Create Dom to Content Model Config object\n * @param options All customizations of content model creation\n */\nexport function createDomToModelConfig(\n    options: (DomToModelOption | undefined)[]\n): DomToModelSettings {\n    return {\n        elementProcessors: Object.assign(\n            {},\n            defaultProcessorMap,\n            ...options.map(x => x?.processorOverride)\n        ),\n        formatParsers: buildFormatParsers(\n            options.map(x => x?.formatParserOverride),\n            options.map(x => x?.additionalFormatParsers)\n        ),\n        defaultElementProcessors: defaultProcessorMap,\n        defaultFormatParsers,\n        processNonVisibleElements: options.some(x => !!x?.processNonVisibleElements),\n    };\n}\n\n/**\n * @internal Export for test only\n * Build format parsers used by DOM to Content Model conversion\n * @param override\n * @param additionalParsersArray\n * @returns\n */\nexport function buildFormatParsers(\n    overrides: (Partial<FormatParsers> | undefined)[] = [],\n    additionalParsersArray: (Partial<FormatParsersPerCategory> | undefined)[] = []\n): FormatParsersPerCategory {\n    const combinedOverrides = Object.assign({}, ...overrides);\n\n    const result = getObjectKeys(defaultFormatKeysPerCategory).reduce(\n        (result, key) => {\n            const value = defaultFormatKeysPerCategory[key]\n                .map(\n                    formatKey =>\n                        (combinedOverrides[formatKey] === undefined\n                            ? defaultFormatParsers[formatKey]\n                            : combinedOverrides[formatKey]) as FormatParser<any>\n                )\n                .concat(\n                    ...additionalParsersArray.map(\n                        parsers => (parsers?.[key] ?? []) as FormatParser<any>[]\n                    )\n                );\n\n            result[key] = value;\n\n            return result;\n        },\n        {\n            text: [] as TextFormatParser[],\n        } as FormatParsersPerCategory\n    );\n\n    additionalParsersArray.forEach(parsers => {\n        if (parsers?.text) {\n            result.text = result.text.concat(parsers.text);\n        }\n    });\n\n    return result;\n}\n"]}
+{"version":3,"file":"createDomToModelContext.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/context/createDomToModelContext.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultProcessorMap } from './defaultProcessors';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport {\n    defaultFormatKeysPerCategory,\n    defaultFormatParsers,\n} from '../../formatHandlers/defaultFormatHandlers';\nimport type {\n    ContentModelBlockFormat,\n    DomToModelContext,\n    DomToModelDecoratorContext,\n    DomToModelFormatContext,\n    DomToModelOption,\n    DomToModelSelectionContext,\n    DomToModelSettings,\n    EditorContext,\n    FormatParser,\n    FormatParsers,\n    FormatParsersPerCategory,\n    TextFormatParser,\n} from 'roosterjs-content-model-types';\n\n/**\n * Create context object for DOM to Content Model conversion\n * @param editorContext Context of editor\n * @param options Option array to customize the DOM to Model conversion behavior\n */\nexport function createDomToModelContext(\n    editorContext?: EditorContext,\n    ...options: (DomToModelOption | undefined)[]\n): DomToModelContext {\n    return createDomToModelContextWithConfig(createDomToModelConfig(options), editorContext);\n}\n\n/**\n * Create context object for DOM to Content Model conversion with an existing configure\n * @param config A full config object to define how to convert DOM tree to Content Model\n * @param editorContext Context of editor\n */\nexport function createDomToModelContextWithConfig(\n    config: DomToModelSettings,\n    editorContext?: EditorContext\n): DomToModelContext {\n    return Object.assign(\n        {},\n        editorContext,\n        createDomToModelSelectionContext(),\n        createDomToModelFormatContext(editorContext?.isRootRtl),\n        createDomToModelDecoratorContext(),\n        config\n    );\n}\n\nfunction createDomToModelSelectionContext(): DomToModelSelectionContext {\n    return { isInSelection: false };\n}\n\nfunction createDomToModelFormatContext(isRootRtl?: boolean): DomToModelFormatContext {\n    const blockFormat: ContentModelBlockFormat = isRootRtl ? { direction: 'rtl' } : {};\n\n    return {\n        blockFormat,\n        segmentFormat: {},\n\n        listFormat: {\n            levels: [],\n            threadItemCounts: [],\n        },\n    };\n}\n\nfunction createDomToModelDecoratorContext(): DomToModelDecoratorContext {\n    return {\n        link: {\n            format: {},\n            dataset: {},\n        },\n        code: {\n            format: {},\n        },\n        blockDecorator: {\n            format: {},\n            tagName: '',\n        },\n    };\n}\n\n/**\n * Create Dom to Content Model Config object\n * @param options All customizations of content model creation\n */\nexport function createDomToModelConfig(\n    options: (DomToModelOption | undefined)[]\n): DomToModelSettings {\n    return {\n        elementProcessors: Object.assign(\n            {},\n            defaultProcessorMap,\n            ...options.map(x => x?.processorOverride)\n        ),\n        formatParsers: buildFormatParsers(\n            options.map(x => x?.formatParserOverride),\n            options.map(x => x?.additionalFormatParsers)\n        ),\n        defaultElementProcessors: defaultProcessorMap,\n        defaultFormatParsers,\n        processNonVisibleElements: options.some(x => !!x?.processNonVisibleElements),\n    };\n}\n\n/**\n * @internal Export for test only\n * Build format parsers used by DOM to Content Model conversion\n * @param override\n * @param additionalParsersArray\n * @returns\n */\nexport function buildFormatParsers(\n    overrides: (Partial<FormatParsers> | undefined)[] = [],\n    additionalParsersArray: (Partial<FormatParsersPerCategory> | undefined)[] = []\n): FormatParsersPerCategory {\n    const combinedOverrides = Object.assign({}, ...overrides);\n\n    const result = getObjectKeys(defaultFormatKeysPerCategory).reduce(\n        (result, key) => {\n            const value = defaultFormatKeysPerCategory[key]\n                .map(\n                    formatKey =>\n                        (combinedOverrides[formatKey] === undefined\n                            ? defaultFormatParsers[formatKey]\n                            : combinedOverrides[formatKey]) as FormatParser<any>\n                )\n                .concat(\n                    ...additionalParsersArray.map(\n                        parsers => (parsers?.[key] ?? []) as FormatParser<any>[]\n                    )\n                );\n\n            result[key] = value;\n\n            return result;\n        },\n        {\n            text: [] as TextFormatParser[],\n        } as FormatParsersPerCategory\n    );\n\n    additionalParsersArray.forEach(parsers => {\n        if (parsers?.text) {\n            result.text = result.text.concat(parsers.text);\n        }\n    });\n\n    return result;\n}\n"]}

package/lib-mjs/domToModel/processors/formatContainerProcessor.js

@@ -50,7 +50,9 @@ var formatContainerProcessorInternal = function (group, element, context, forceF
         if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {
             formatContainer.zeroFontSize = true;
         }
-        if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {
+        if (!context.skipFormatContainerFallbackCheck &&
+            shouldFallbackToParagraph(formatContainer) &&
+            !forceFormatContainer) {
             // For DIV container that only has one paragraph child, container style can be merged into paragraph
             // and no need to have this container
             var paragraph = formatContainer.blocks[0];

package/lib-mjs/domToModel/processors/formatContainerProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatContainerProcessor.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAYnD;;GAEG;AACH,MAAM,CAAC,IAAM,aAAa,GAA6C;IACnE,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;CACjB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,wBAAwB,GAAkC,UACnE,KAAK,EACL,OAAO,EACP,OAAO;IAEP,gCAAgC,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAChG,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,IAAM,6BAA6B,GAAkC,UACxE,KAAK,EACL,OAAO,EACP,OAAO;IAEP,gCAAgC,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;AAC/F,CAAC,CAAC;AAEF,IAAM,gCAAgC,GAAG,UACrC,KAA6B,EAC7B,OAAoB,EACpB,OAA0B,EAC1B,oBAA6B;IAE7B,WAAW,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE;QACjF,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAChF,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAE3F,IAAM,MAAM,gBACL,OAAO,CAAC,WAAW,CACzB,CAAC;QAEF,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAM,OAAO,GACT,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACxF,IAAM,eAAe,GAAG,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAE/D,0FAA0F;QAC1F,kEAAkE;QAClE,mFAAmF;QACnF,aAAa,CAAC,OAAO,CAAC,UAAA,KAAK;YACvB,OAAO,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnE,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACjE,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC;SACvC;QAED,IAAI,yBAAyB,CAAC,eAAe,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACrE,oGAAoG;YACpG,qCAAqC;YACrC,IAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAA0B,CAAC;YAErE,IAAI,eAAe,CAAC,YAAY,EAAE;gBAC9B,SAAS,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,aAAa,EAAE;oBACjE,QAAQ,EAAE,GAAG;iBAChB,CAAC,CAAC;aACN;YAED,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;YACxD,uBAAuB,CAAC,SAAS,CAAC,CAAC;YACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;SAC9B;aAAM;YACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;SACpC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,SAAS,yBAAyB,CAAC,eAA4C;IAC3E,IAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE7C,OAAO,CACH,eAAe,CAAC,OAAO,IAAI,KAAK;QAChC,eAAe,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC;QAClC,UAAU,CAAC,SAAS,IAAI,WAAW;QACnC,UAAU,CAAC,UAAU,CACxB,CAAC;AACN,CAAC","sourcesContent":["import { addBlock } from '../../modelApi/common/addBlock';\nimport { createFormatContainer } from '../../modelApi/creators/createFormatContainer';\nimport { createParagraph } from '../../modelApi/creators/createParagraph';\nimport { getDefaultStyle } from '../utils/getDefaultStyle';\nimport { parseFormat } from '../utils/parseFormat';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelFormatContainer,\n    ContentModelFormatContainerFormat,\n    ContentModelParagraph,\n    DomToModelContext,\n    ElementProcessor,\n    MarginFormat,\n    PaddingFormat,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const ContextStyles: (keyof (MarginFormat & PaddingFormat))[] = [\n    'marginLeft',\n    'marginRight',\n    'paddingLeft',\n    'paddingRight',\n];\n\n/**\n * Content Model Element Processor for format container elements (e.g., blockquote, div)\n * Processes elements that create FormatContainer blocks in the content model.\n * This processor can be used in processorOverride to customize how specific elements are processed.\n * @param group The parent block group\n * @param element The DOM element to process\n * @param context DOM to Content Model context\n */\nexport const formatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);\n};\n\n/**\n * @internal\n */\nexport const forceFormatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);\n};\n\nconst formatContainerProcessorInternal = (\n    group: ContentModelBlockGroup,\n    element: HTMLElement,\n    context: DomToModelContext,\n    forceFormatContainer: boolean\n) => {\n    stackFormat(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, () => {\n        parseFormat(element, context.formatParsers.block, context.blockFormat, context);\n        parseFormat(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);\n\n        const format: ContentModelFormatContainerFormat = {\n            ...context.blockFormat,\n        };\n\n        parseFormat(element, context.formatParsers.container, format, context);\n\n        const tagName =\n            getDefaultStyle(element).display == 'block' ? element.tagName.toLowerCase() : 'div';\n        const formatContainer = createFormatContainer(tagName, format);\n\n        // It is possible to inherit margin left/right styles from parent DIV or other containers,\n        // since we are going into a deeper level of format container now,\n        // the container will render these styles so no need to keep them in context format\n        ContextStyles.forEach(style => {\n            delete context.blockFormat[style];\n        });\n\n        context.elementProcessors.child(formatContainer, element, context);\n\n        if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {\n            formatContainer.zeroFontSize = true;\n        }\n\n        if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {\n            // For DIV container that only has one paragraph child, container style can be merged into paragraph\n            // and no need to have this container\n            const paragraph = formatContainer.blocks[0] as ContentModelParagraph;\n\n            if (formatContainer.zeroFontSize) {\n                paragraph.segmentFormat = Object.assign({}, paragraph.segmentFormat, {\n                    fontSize: '0',\n                });\n            }\n\n            Object.assign(paragraph.format, formatContainer.format);\n            setParagraphNotImplicit(paragraph);\n            addBlock(group, paragraph);\n        } else {\n            addBlock(group, formatContainer);\n        }\n    });\n\n    addBlock(group, createParagraph(true /*isImplicit*/, context.blockFormat));\n};\n\nfunction shouldFallbackToParagraph(formatContainer: ContentModelFormatContainer) {\n    const firstChild = formatContainer.blocks[0];\n\n    return (\n        formatContainer.tagName == 'div' &&\n        formatContainer.blocks.length == 1 &&\n        firstChild.blockType == 'Paragraph' &&\n        firstChild.isImplicit\n    );\n}\n"]}
+{"version":3,"file":"formatContainerProcessor.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { addBlock } from '../../modelApi/common/addBlock';\nimport { createFormatContainer } from '../../modelApi/creators/createFormatContainer';\nimport { createParagraph } from '../../modelApi/creators/createParagraph';\nimport { getDefaultStyle } from '../utils/getDefaultStyle';\nimport { parseFormat } from '../utils/parseFormat';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelFormatContainer,\n    ContentModelFormatContainerFormat,\n    ContentModelParagraph,\n    DomToModelContext,\n    ElementProcessor,\n    MarginFormat,\n    PaddingFormat,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const ContextStyles: (keyof (MarginFormat & PaddingFormat))[] = [\n    'marginLeft',\n    'marginRight',\n    'paddingLeft',\n    'paddingRight',\n];\n\n/**\n * Content Model Element Processor for format container elements (e.g., blockquote, div)\n * Processes elements that create FormatContainer blocks in the content model.\n * This processor can be used in processorOverride to customize how specific elements are processed.\n * @param group The parent block group\n * @param element The DOM element to process\n * @param context DOM to Content Model context\n */\nexport const formatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);\n};\n\n/**\n * @internal\n */\nexport const forceFormatContainerProcessor: ElementProcessor<HTMLElement> = (\n    group,\n    element,\n    context\n) => {\n    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);\n};\n\nconst formatContainerProcessorInternal = (\n    group: ContentModelBlockGroup,\n    element: HTMLElement,\n    context: DomToModelContext,\n    forceFormatContainer: boolean\n) => {\n    stackFormat(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, () => {\n        parseFormat(element, context.formatParsers.block, context.blockFormat, context);\n        parseFormat(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);\n\n        const format: ContentModelFormatContainerFormat = {\n            ...context.blockFormat,\n        };\n\n        parseFormat(element, context.formatParsers.container, format, context);\n\n        const tagName =\n            getDefaultStyle(element).display == 'block' ? element.tagName.toLowerCase() : 'div';\n        const formatContainer = createFormatContainer(tagName, format);\n\n        // It is possible to inherit margin left/right styles from parent DIV or other containers,\n        // since we are going into a deeper level of format container now,\n        // the container will render these styles so no need to keep them in context format\n        ContextStyles.forEach(style => {\n            delete context.blockFormat[style];\n        });\n\n        context.elementProcessors.child(formatContainer, element, context);\n\n        if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {\n            formatContainer.zeroFontSize = true;\n        }\n\n        if (\n            !context.skipFormatContainerFallbackCheck &&\n            shouldFallbackToParagraph(formatContainer) &&\n            !forceFormatContainer\n        ) {\n            // For DIV container that only has one paragraph child, container style can be merged into paragraph\n            // and no need to have this container\n            const paragraph = formatContainer.blocks[0] as ContentModelParagraph;\n\n            if (formatContainer.zeroFontSize) {\n                paragraph.segmentFormat = Object.assign({}, paragraph.segmentFormat, {\n                    fontSize: '0',\n                });\n            }\n\n            Object.assign(paragraph.format, formatContainer.format);\n            setParagraphNotImplicit(paragraph);\n            addBlock(group, paragraph);\n        } else {\n            addBlock(group, formatContainer);\n        }\n    });\n\n    addBlock(group, createParagraph(true /*isImplicit*/, context.blockFormat));\n};\n\nfunction shouldFallbackToParagraph(formatContainer: ContentModelFormatContainer) {\n    const firstChild = formatContainer.blocks[0];\n\n    return (\n        formatContainer.tagName == 'div' &&\n        formatContainer.blocks.length == 1 &&\n        firstChild.blockType == 'Paragraph' &&\n        firstChild.isImplicit\n    );\n}\n"]}

package/lib-mjs/modelApi/selection/setSelection.js

@@ -1,3 +1,4 @@
+import { __read, __spreadArray } from "tslib";
 import { isGeneralSegment } from '../typeCheck/isGeneralSegment';
 import { mutateBlock, mutateSegment } from '../common/mutate';
 /**
@@ -34,6 +35,7 @@ function setSelectionToBlockGroup(group, isInSelection, start, end) {
     });
 }
 function setSelectionToBlock(block, isInSelection, start, end) {
+    var _a;
     switch (block.blockType) {
         case 'BlockGroup':
             return setSelectionToBlockGroup(block, isInSelection, start, end);
@@ -54,16 +56,31 @@ function setSelectionToBlock(block, isInSelection, start, end) {
                 return isInSelection;
             });
         case 'Paragraph':
-            var segmentsToDelete_1 = [];
+            var state_1 = {
+                segmentsToDelete: [],
+                boundaryMarkers: [],
+                hasSelectedNonMarker: false,
+            };
             block.segments.forEach(function (segment, i) {
                 isInSelection = handleSelection(isInSelection, segment, start, end, function (isInSelection) {
-                    return setSelectionToSegment(block, segment, isInSelection, segmentsToDelete_1, start, end, i);
+                    return setSelectionToSegment(block, segment, isInSelection, state_1, start, end, i);
                 });
             });
-            if (segmentsToDelete_1.length > 0) {
+            if (state_1.hasSelectedNonMarker) {
+                // This paragraph contains a real (non-marker) selected segment, so any leading/trailing
+                // selection marker of the range is redundant within this paragraph and can be removed.
+                // We only do this within the same paragraph: a boundary marker at a paragraph edge must be
+                // kept to distinguish "selection starts at the beginning of this line" from "selection
+                // starts at the end of the previous line".
+                (_a = state_1.segmentsToDelete).push.apply(_a, __spreadArray([], __read(state_1.boundaryMarkers), false));
+            }
+            if (state_1.segmentsToDelete.length > 0) {
                 var mutablePara = mutateBlock(block);
                 var index = void 0;
-                while ((index = segmentsToDelete_1.pop()) !== undefined) {
+                // Sort ascending so the pop()-based splice below always removes the highest index first,
+                // keeping the remaining indices valid (boundary markers may sit before queued deletions).
+                state_1.segmentsToDelete.sort(function (a, b) { return a - b; });
+                while ((index = state_1.segmentsToDelete.pop()) !== undefined) {
                     if (index >= 0) {
                         mutablePara.segments.splice(index, 1);
                     }
@@ -112,14 +129,23 @@ function findCell(table, cell) {
         : -1;
     return { row: row, col: col };
 }
-function setSelectionToSegment(paragraph, segment, isInSelection, segmentsToDelete, start, end, i) {
+function setSelectionToSegment(paragraph, segment, isInSelection, state, start, end, i) {
+    if (segment.segmentType != 'SelectionMarker' && isInSelection) {
+        state.hasSelectedNonMarker = true;
+    }
     switch (segment.segmentType) {
         case 'SelectionMarker':
             if (!isInSelection || (segment != start && segment != end)) {
                 // Delete the selection marker when
                 // 1. It is not in selection any more. Or
                 // 2. It is in middle of selection, so no need to have it
-                segmentsToDelete.push(i);
+                state.segmentsToDelete.push(i);
+            }
+            else {
+                // It is a leading/trailing selection marker of a range selection. Keep it for now, but
+                // remember it so it can be removed later if this same paragraph also contains a real
+                // (non-marker) selected segment, in which case the marker is redundant.
+                state.boundaryMarkers.push(i);
             }
             return isInSelection;
         case 'General':

package/lib-mjs/modelApi/selection/setSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"setSelection.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts"],"names":[],"mappings":"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","sourcesContent":["import { isGeneralSegment } from '../typeCheck/isGeneralSegment';\nimport { mutateBlock, mutateSegment } from '../common/mutate';\nimport type {\n    MutableType,\n    ReadonlyContentModelBlock,\n    ReadonlyContentModelBlockGroup,\n    ReadonlyContentModelParagraph,\n    ReadonlyContentModelSegment,\n    ReadonlyContentModelTable,\n    ReadonlySelectable,\n    ShallowMutableSelectable,\n    TableCellCoordinate,\n} from 'roosterjs-content-model-types';\n\n/**\n * Set selection into Content Model. If the Content Model already has selection, existing selection will be overwritten by the new one.\n * @param group The root level group of Content Model\n * @param start The start selected element. If not passed, existing selection of content model will be cleared\n * @param end The end selected element. If not passed, only the start element will be selected. If passed, all elements between start and end elements will be selected\n */\nexport function setSelection(\n    group: ReadonlyContentModelBlockGroup,\n    start?: ReadonlySelectable,\n    end?: ReadonlySelectable\n) {\n    setSelectionToBlockGroup(group, false /*isInSelection*/, start || null, end || null);\n}\n\nfunction setSelectionToBlockGroup(\n    group: ReadonlyContentModelBlockGroup,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    return handleSelection(isInSelection, group, start, end, isInSelection => {\n        if (isGeneralSegment(group) && needToSetSelection(group, isInSelection)) {\n            setIsSelected(mutateBlock(group), isInSelection);\n        }\n\n        const blocksToDelete: number[] = [];\n\n        group.blocks.forEach((block, i) => {\n            isInSelection = setSelectionToBlock(block, isInSelection, start, end);\n\n            if (block.blockType == 'Paragraph' && block.segments.length == 0 && block.isImplicit) {\n                blocksToDelete.push(i);\n            }\n        });\n\n        let index: number | undefined;\n\n        if (blocksToDelete.length > 0) {\n            const mutableGroup = mutateBlock(group);\n\n            while ((index = blocksToDelete.pop()) !== undefined) {\n                if (index >= 0) {\n                    mutableGroup.blocks.splice(index, 1);\n                }\n            }\n        }\n\n        return isInSelection;\n    });\n}\n\nfunction setSelectionToBlock(\n    block: ReadonlyContentModelBlock,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n) {\n    switch (block.blockType) {\n        case 'BlockGroup':\n            return setSelectionToBlockGroup(block, isInSelection, start, end);\n\n        case 'Table':\n            return setSelectionToTable(block, isInSelection, start, end);\n\n        case 'Divider':\n        case 'Entity':\n            return handleSelection(isInSelection, block, start, end, isInSelection => {\n                if (needToSetSelection(block, isInSelection)) {\n                    const mutableBlock = mutateBlock(block);\n\n                    if (isInSelection) {\n                        mutableBlock.isSelected = true;\n                    } else {\n                        delete mutableBlock.isSelected;\n                    }\n                }\n\n                return isInSelection;\n            });\n\n        case 'Paragraph':\n            const segmentsToDelete: number[] = [];\n\n            block.segments.forEach((segment, i) => {\n                isInSelection = handleSelection(\n                    isInSelection,\n                    segment,\n                    start,\n                    end,\n                    isInSelection => {\n                        return setSelectionToSegment(\n                            block,\n                            segment,\n                            isInSelection,\n                            segmentsToDelete,\n                            start,\n                            end,\n                            i\n                        );\n                    }\n                );\n            });\n\n            if (segmentsToDelete.length > 0) {\n                const mutablePara = mutateBlock(block);\n\n                let index: number | undefined;\n\n                while ((index = segmentsToDelete.pop()) !== undefined) {\n                    if (index >= 0) {\n                        mutablePara.segments.splice(index, 1);\n                    }\n                }\n            }\n\n            return isInSelection;\n\n        default:\n            return isInSelection;\n    }\n}\n\nfunction setSelectionToTable(\n    table: ReadonlyContentModelTable,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    const first = findCell(table, start);\n    const last = end ? findCell(table, end) : first;\n\n    if (!isInSelection) {\n        for (let row = 0; row < table.rows.length; row++) {\n            const currentRow = table.rows[row];\n            for (let col = 0; col < currentRow.cells.length; col++) {\n                const currentCell = table.rows[row].cells[col];\n                const isSelected =\n                    row >= first.row && row <= last.row && col >= first.col && col <= last.col;\n\n                if (needToSetSelection(currentCell, isSelected)) {\n                    setIsSelected(mutateBlock(currentCell), isSelected);\n                }\n\n                if (!isSelected) {\n                    setSelectionToBlockGroup(currentCell, false /*isInSelection*/, start, end);\n                }\n            }\n        }\n    } else {\n        table.rows.forEach(row =>\n            row.cells.forEach(cell => {\n                const wasInSelection = isInSelection;\n\n                isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);\n\n                if (wasInSelection && isInSelection) {\n                    mutateBlock(cell).isSelected = true;\n                }\n            })\n        );\n    }\n\n    return isInSelection;\n}\n\nfunction findCell(\n    table: ReadonlyContentModelTable,\n    cell: ReadonlySelectable | null\n): TableCellCoordinate {\n    let col = -1;\n    const row = cell\n        ? table.rows.findIndex(\n              row => (col = (row.cells as ReadonlyArray<ReadonlySelectable>).indexOf(cell)) >= 0\n          )\n        : -1;\n\n    return { row, col };\n}\n\nfunction setSelectionToSegment(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: ReadonlyContentModelSegment,\n    isInSelection: boolean,\n    segmentsToDelete: number[],\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    i: number\n) {\n    switch (segment.segmentType) {\n        case 'SelectionMarker':\n            if (!isInSelection || (segment != start && segment != end)) {\n                // Delete the selection marker when\n                // 1. It is not in selection any more. Or\n                // 2. It is in middle of selection, so no need to have it\n                segmentsToDelete.push(i);\n            }\n            return isInSelection;\n\n        case 'General':\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n\n            return segment != start && segment != end\n                ? setSelectionToBlockGroup(segment, isInSelection, start, end)\n                : isInSelection;\n\n        case 'Image':\n            const isSelectedAsImageSelection = start == segment && (!end || end == segment);\n\n            internalSetSelectionToSegment(\n                paragraph,\n                segment,\n                isInSelection,\n                !segment.isSelectedAsImageSelection != !isSelectedAsImageSelection\n                    ? image => (image.isSelectedAsImageSelection = isSelectedAsImageSelection)\n                    : undefined\n            );\n\n            return isInSelection;\n        default:\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n            return isInSelection;\n    }\n}\n\nfunction internalSetSelectionToSegment<T extends ReadonlyContentModelSegment>(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: T,\n    isInSelection: boolean,\n    additionAction?: (segment: MutableType<T>) => void\n) {\n    if (additionAction || needToSetSelection(segment, isInSelection)) {\n        mutateSegment(paragraph, segment, mutableSegment => {\n            setIsSelected(mutableSegment, isInSelection);\n            additionAction?.(mutableSegment);\n        });\n    }\n}\n\nfunction needToSetSelection(selectable: ReadonlySelectable, isSelected: boolean) {\n    return !selectable.isSelected != !isSelected;\n}\n\nfunction setIsSelected(selectable: ShallowMutableSelectable, value: boolean) {\n    if (value) {\n        selectable.isSelected = true;\n    } else {\n        delete selectable.isSelected;\n    }\n\n    return value;\n}\n\nfunction handleSelection(\n    isInSelection: boolean,\n    model: ReadonlyContentModelBlockGroup | ReadonlyContentModelBlock | ReadonlyContentModelSegment,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    callback: (isInSelection: boolean) => boolean\n) {\n    isInSelection = isInSelection || model == start;\n    isInSelection = callback(isInSelection);\n    return isInSelection && !!end && model != end;\n}\n"]}
+{"version":3,"file":"setSelection.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts"],"names":[],"mappings":"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","sourcesContent":["import { isGeneralSegment } from '../typeCheck/isGeneralSegment';\nimport { mutateBlock, mutateSegment } from '../common/mutate';\nimport type {\n    MutableType,\n    ReadonlyContentModelBlock,\n    ReadonlyContentModelBlockGroup,\n    ReadonlyContentModelParagraph,\n    ReadonlyContentModelSegment,\n    ReadonlyContentModelTable,\n    ReadonlySelectable,\n    ShallowMutableSelectable,\n    TableCellCoordinate,\n} from 'roosterjs-content-model-types';\n\n/**\n * Set selection into Content Model. If the Content Model already has selection, existing selection will be overwritten by the new one.\n * @param group The root level group of Content Model\n * @param start The start selected element. If not passed, existing selection of content model will be cleared\n * @param end The end selected element. If not passed, only the start element will be selected. If passed, all elements between start and end elements will be selected\n */\nexport function setSelection(\n    group: ReadonlyContentModelBlockGroup,\n    start?: ReadonlySelectable,\n    end?: ReadonlySelectable\n) {\n    setSelectionToBlockGroup(group, false /*isInSelection*/, start || null, end || null);\n}\n\nfunction setSelectionToBlockGroup(\n    group: ReadonlyContentModelBlockGroup,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    return handleSelection(isInSelection, group, start, end, isInSelection => {\n        if (isGeneralSegment(group) && needToSetSelection(group, isInSelection)) {\n            setIsSelected(mutateBlock(group), isInSelection);\n        }\n\n        const blocksToDelete: number[] = [];\n\n        group.blocks.forEach((block, i) => {\n            isInSelection = setSelectionToBlock(block, isInSelection, start, end);\n\n            if (block.blockType == 'Paragraph' && block.segments.length == 0 && block.isImplicit) {\n                blocksToDelete.push(i);\n            }\n        });\n\n        let index: number | undefined;\n\n        if (blocksToDelete.length > 0) {\n            const mutableGroup = mutateBlock(group);\n\n            while ((index = blocksToDelete.pop()) !== undefined) {\n                if (index >= 0) {\n                    mutableGroup.blocks.splice(index, 1);\n                }\n            }\n        }\n\n        return isInSelection;\n    });\n}\n\nfunction setSelectionToBlock(\n    block: ReadonlyContentModelBlock,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n) {\n    switch (block.blockType) {\n        case 'BlockGroup':\n            return setSelectionToBlockGroup(block, isInSelection, start, end);\n\n        case 'Table':\n            return setSelectionToTable(block, isInSelection, start, end);\n\n        case 'Divider':\n        case 'Entity':\n            return handleSelection(isInSelection, block, start, end, isInSelection => {\n                if (needToSetSelection(block, isInSelection)) {\n                    const mutableBlock = mutateBlock(block);\n\n                    if (isInSelection) {\n                        mutableBlock.isSelected = true;\n                    } else {\n                        delete mutableBlock.isSelected;\n                    }\n                }\n\n                return isInSelection;\n            });\n\n        case 'Paragraph':\n            const state: ParagraphSelectionState = {\n                segmentsToDelete: [],\n                boundaryMarkers: [],\n                hasSelectedNonMarker: false,\n            };\n\n            block.segments.forEach((segment, i) => {\n                isInSelection = handleSelection(\n                    isInSelection,\n                    segment,\n                    start,\n                    end,\n                    isInSelection => {\n                        return setSelectionToSegment(\n                            block,\n                            segment,\n                            isInSelection,\n                            state,\n                            start,\n                            end,\n                            i\n                        );\n                    }\n                );\n            });\n\n            if (state.hasSelectedNonMarker) {\n                // This paragraph contains a real (non-marker) selected segment, so any leading/trailing\n                // selection marker of the range is redundant within this paragraph and can be removed.\n                // We only do this within the same paragraph: a boundary marker at a paragraph edge must be\n                // kept to distinguish \"selection starts at the beginning of this line\" from \"selection\n                // starts at the end of the previous line\".\n                state.segmentsToDelete.push(...state.boundaryMarkers);\n            }\n\n            if (state.segmentsToDelete.length > 0) {\n                const mutablePara = mutateBlock(block);\n\n                let index: number | undefined;\n\n                // Sort ascending so the pop()-based splice below always removes the highest index first,\n                // keeping the remaining indices valid (boundary markers may sit before queued deletions).\n                state.segmentsToDelete.sort((a, b) => a - b);\n\n                while ((index = state.segmentsToDelete.pop()) !== undefined) {\n                    if (index >= 0) {\n                        mutablePara.segments.splice(index, 1);\n                    }\n                }\n            }\n\n            return isInSelection;\n\n        default:\n            return isInSelection;\n    }\n}\n\nfunction setSelectionToTable(\n    table: ReadonlyContentModelTable,\n    isInSelection: boolean,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null\n): boolean {\n    const first = findCell(table, start);\n    const last = end ? findCell(table, end) : first;\n\n    if (!isInSelection) {\n        for (let row = 0; row < table.rows.length; row++) {\n            const currentRow = table.rows[row];\n            for (let col = 0; col < currentRow.cells.length; col++) {\n                const currentCell = table.rows[row].cells[col];\n                const isSelected =\n                    row >= first.row && row <= last.row && col >= first.col && col <= last.col;\n\n                if (needToSetSelection(currentCell, isSelected)) {\n                    setIsSelected(mutateBlock(currentCell), isSelected);\n                }\n\n                if (!isSelected) {\n                    setSelectionToBlockGroup(currentCell, false /*isInSelection*/, start, end);\n                }\n            }\n        }\n    } else {\n        table.rows.forEach(row =>\n            row.cells.forEach(cell => {\n                const wasInSelection = isInSelection;\n\n                isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);\n\n                if (wasInSelection && isInSelection) {\n                    mutateBlock(cell).isSelected = true;\n                }\n            })\n        );\n    }\n\n    return isInSelection;\n}\n\nfunction findCell(\n    table: ReadonlyContentModelTable,\n    cell: ReadonlySelectable | null\n): TableCellCoordinate {\n    let col = -1;\n    const row = cell\n        ? table.rows.findIndex(\n              row => (col = (row.cells as ReadonlyArray<ReadonlySelectable>).indexOf(cell)) >= 0\n          )\n        : -1;\n\n    return { row, col };\n}\n\ninterface ParagraphSelectionState {\n    // Indexes of segments to delete after the paragraph is fully processed\n    segmentsToDelete: number[];\n\n    // Indexes of leading/trailing selection markers of the range that are kept for now, but will be\n    // removed if this paragraph also contains a real (non-marker) selected segment\n    boundaryMarkers: number[];\n\n    // Whether this paragraph contains at least one selected segment that is not a selection marker\n    hasSelectedNonMarker: boolean;\n}\n\nfunction setSelectionToSegment(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: ReadonlyContentModelSegment,\n    isInSelection: boolean,\n    state: ParagraphSelectionState,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    i: number\n) {\n    if (segment.segmentType != 'SelectionMarker' && isInSelection) {\n        state.hasSelectedNonMarker = true;\n    }\n\n    switch (segment.segmentType) {\n        case 'SelectionMarker':\n            if (!isInSelection || (segment != start && segment != end)) {\n                // Delete the selection marker when\n                // 1. It is not in selection any more. Or\n                // 2. It is in middle of selection, so no need to have it\n                state.segmentsToDelete.push(i);\n            } else {\n                // It is a leading/trailing selection marker of a range selection. Keep it for now, but\n                // remember it so it can be removed later if this same paragraph also contains a real\n                // (non-marker) selected segment, in which case the marker is redundant.\n                state.boundaryMarkers.push(i);\n            }\n            return isInSelection;\n\n        case 'General':\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n\n            return segment != start && segment != end\n                ? setSelectionToBlockGroup(segment, isInSelection, start, end)\n                : isInSelection;\n\n        case 'Image':\n            const isSelectedAsImageSelection = start == segment && (!end || end == segment);\n\n            internalSetSelectionToSegment(\n                paragraph,\n                segment,\n                isInSelection,\n                !segment.isSelectedAsImageSelection != !isSelectedAsImageSelection\n                    ? image => (image.isSelectedAsImageSelection = isSelectedAsImageSelection)\n                    : undefined\n            );\n\n            return isInSelection;\n        default:\n            internalSetSelectionToSegment(paragraph, segment, isInSelection);\n            return isInSelection;\n    }\n}\n\nfunction internalSetSelectionToSegment<T extends ReadonlyContentModelSegment>(\n    paragraph: ReadonlyContentModelParagraph,\n    segment: T,\n    isInSelection: boolean,\n    additionAction?: (segment: MutableType<T>) => void\n) {\n    if (additionAction || needToSetSelection(segment, isInSelection)) {\n        mutateSegment(paragraph, segment, mutableSegment => {\n            setIsSelected(mutableSegment, isInSelection);\n            additionAction?.(mutableSegment);\n        });\n    }\n}\n\nfunction needToSetSelection(selectable: ReadonlySelectable, isSelected: boolean) {\n    return !selectable.isSelected != !isSelected;\n}\n\nfunction setIsSelected(selectable: ShallowMutableSelectable, value: boolean) {\n    if (value) {\n        selectable.isSelected = true;\n    } else {\n        delete selectable.isSelected;\n    }\n\n    return value;\n}\n\nfunction handleSelection(\n    isInSelection: boolean,\n    model: ReadonlyContentModelBlockGroup | ReadonlyContentModelBlock | ReadonlyContentModelSegment,\n    start: ReadonlySelectable | null,\n    end: ReadonlySelectable | null,\n    callback: (isInSelection: boolean) => boolean\n) {\n    isInSelection = isInSelection || model == start;\n    isInSelection = callback(isInSelection);\n    return isInSelection && !!end && model != end;\n}\n"]}

package/lib-mjs/modelToDom/handlers/handleBlockGroupChildren.js

@@ -26,7 +26,7 @@ export var handleBlockGroupChildren = function (doc, parent, group, context) {
                 (_a = context.domIndexer) === null || _a === void 0 ? void 0 : _a.onBlockEntity(childBlock, group);
             }
         });
-        cleanUpNodeStack(listFormat.nodeStack, context);
+        cleanUpNodeStack(listFormat.nodeStack, context, parent);
         // Remove all rest node if any since they don't appear in content model
         cleanUpRestNodes(refNode, context.rewriteFromModel);
     }
@@ -34,7 +34,7 @@ export var handleBlockGroupChildren = function (doc, parent, group, context) {
         listFormat.nodeStack = nodeStack;
     }
 };
-function cleanUpNodeStack(nodeStack, context) {
+function cleanUpNodeStack(nodeStack, context, leavingParent) {
     var _a, _b;
     if (nodeStack.length > 0) {
         // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node
@@ -42,6 +42,13 @@ function cleanUpNodeStack(nodeStack, context) {
             var node = (_b = (_a = nodeStack.pop()) === null || _a === void 0 ? void 0 : _a.refNode) !== null && _b !== void 0 ? _b : null;
             cleanUpRestNodes(node, context.rewriteFromModel);
         }
+        if (leavingParent && nodeStack[0].node == leavingParent) {
+            // When leaving a parent node that is the same with the root of node stack
+            // It means the whole list node stack is being invalidated, so we clear it
+            while (nodeStack.length > 0) {
+                nodeStack.pop();
+            }
+        }
     }
 }
 //# sourceMappingURL=handleBlockGroupChildren.js.map

package/lib-mjs/modelToDom/handlers/handleBlockGroupChildren.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleBlockGroupChildren.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleBlockGroupChildren.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D;;GAEG;AACH,MAAM,CAAC,IAAM,wBAAwB,GAAgD,UACjF,GAAa,EACb,MAAY,EACZ,KAA6B,EAC7B,OAA0B;IAElB,IAAA,UAAU,GAAK,OAAO,WAAZ,CAAa;IAC/B,IAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,IAAI,OAAO,GAAgB,MAAM,CAAC,UAAU,CAAC;IAE7C,IAAI;QACA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,KAAK;;YACnC,2CAA2C;YAC3C,wEAAwE;YACxE,sFAAsF;YACtF,+FAA+F;YAC/F,IACI,KAAK,IAAI,CAAC;gBACV,UAAU,CAAC,SAAS,IAAI,YAAY;gBACpC,UAAU,CAAC,cAAc,IAAI,UAAU,EACzC;gBACE,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAEhD,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;iBAC7B;aACJ;YAED,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAEjF,IAAI,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE;gBAClC,MAAA,OAAO,CAAC,UAAU,0CAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aACxD;QACL,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEhD,uEAAuE;QACvE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACvD;YAAS;QACN,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;KACpC;AACL,CAAC,CAAC;AAEF,SAAS,gBAAgB,CAAC,SAAoC,EAAE,OAA0B;;IACtF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,qFAAqF;QACrF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAM,IAAI,GAAG,MAAA,MAAA,SAAS,CAAC,GAAG,EAAE,0CAAE,OAAO,mCAAI,IAAI,CAAC;YAE9C,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACpD;KACJ;AACL,CAAC","sourcesContent":["import { cleanUpRestNodes } from '../utils/cleanUpRestNodes';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelHandler,\n    ModelToDomContext,\n    ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleBlockGroupChildren: ContentModelHandler<ContentModelBlockGroup> = (\n    doc: Document,\n    parent: Node,\n    group: ContentModelBlockGroup,\n    context: ModelToDomContext\n) => {\n    const { listFormat } = context;\n    const nodeStack = listFormat.nodeStack;\n    let refNode: Node | null = parent.firstChild;\n\n    try {\n        group.blocks.forEach((childBlock, index) => {\n            // When process list, we need a node stack.\n            // When there are two continuous lists, they should share the same stack\n            // so that list items with same type/threadId can be merged into the same list element\n            // In other cases, clear the stack so that two separate lists won't share the same list element\n            if (\n                index == 0 ||\n                childBlock.blockType != 'BlockGroup' ||\n                childBlock.blockGroupType != 'ListItem'\n            ) {\n                cleanUpNodeStack(listFormat.nodeStack, context);\n\n                if (listFormat.nodeStack.length > 0) {\n                    listFormat.nodeStack = [];\n                }\n            }\n\n            refNode = context.modelHandlers.block(doc, parent, childBlock, context, refNode);\n\n            if (childBlock.blockType == 'Entity') {\n                context.domIndexer?.onBlockEntity(childBlock, group);\n            }\n        });\n\n        cleanUpNodeStack(listFormat.nodeStack, context);\n\n        // Remove all rest node if any since they don't appear in content model\n        cleanUpRestNodes(refNode, context.rewriteFromModel);\n    } finally {\n        listFormat.nodeStack = nodeStack;\n    }\n};\n\nfunction cleanUpNodeStack(nodeStack: ModelToDomListStackItem[], context: ModelToDomContext) {\n    if (nodeStack.length > 0) {\n        // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node\n        for (let i = nodeStack.length - 1; i > 0; i--) {\n            const node = nodeStack.pop()?.refNode ?? null;\n\n            cleanUpRestNodes(node, context.rewriteFromModel);\n        }\n    }\n}\n"]}
+{"version":3,"file":"handleBlockGroupChildren.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleBlockGroupChildren.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D;;GAEG;AACH,MAAM,CAAC,IAAM,wBAAwB,GAAgD,UACjF,GAAa,EACb,MAAY,EACZ,KAA6B,EAC7B,OAA0B;IAElB,IAAA,UAAU,GAAK,OAAO,WAAZ,CAAa;IAC/B,IAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,IAAI,OAAO,GAAgB,MAAM,CAAC,UAAU,CAAC;IAE7C,IAAI;QACA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,UAAU,EAAE,KAAK;;YACnC,2CAA2C;YAC3C,wEAAwE;YACxE,sFAAsF;YACtF,+FAA+F;YAC/F,IACI,KAAK,IAAI,CAAC;gBACV,UAAU,CAAC,SAAS,IAAI,YAAY;gBACpC,UAAU,CAAC,cAAc,IAAI,UAAU,EACzC;gBACE,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAEhD,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;iBAC7B;aACJ;YAED,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAEjF,IAAI,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE;gBAClC,MAAA,OAAO,CAAC,UAAU,0CAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aACxD;QACL,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAExD,uEAAuE;QACvE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACvD;YAAS;QACN,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;KACpC;AACL,CAAC,CAAC;AAEF,SAAS,gBAAgB,CACrB,SAAoC,EACpC,OAA0B,EAC1B,aAAoB;;IAEpB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,qFAAqF;QACrF,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAM,IAAI,GAAG,MAAA,MAAA,SAAS,CAAC,GAAG,EAAE,0CAAE,OAAO,mCAAI,IAAI,CAAC;YAE9C,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACpD;QAED,IAAI,aAAa,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,EAAE;YACrD,0EAA0E;YAC1E,0EAA0E;YAC1E,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,SAAS,CAAC,GAAG,EAAE,CAAC;aACnB;SACJ;KACJ;AACL,CAAC","sourcesContent":["import { cleanUpRestNodes } from '../utils/cleanUpRestNodes';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelHandler,\n    ModelToDomContext,\n    ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleBlockGroupChildren: ContentModelHandler<ContentModelBlockGroup> = (\n    doc: Document,\n    parent: Node,\n    group: ContentModelBlockGroup,\n    context: ModelToDomContext\n) => {\n    const { listFormat } = context;\n    const nodeStack = listFormat.nodeStack;\n    let refNode: Node | null = parent.firstChild;\n\n    try {\n        group.blocks.forEach((childBlock, index) => {\n            // When process list, we need a node stack.\n            // When there are two continuous lists, they should share the same stack\n            // so that list items with same type/threadId can be merged into the same list element\n            // In other cases, clear the stack so that two separate lists won't share the same list element\n            if (\n                index == 0 ||\n                childBlock.blockType != 'BlockGroup' ||\n                childBlock.blockGroupType != 'ListItem'\n            ) {\n                cleanUpNodeStack(listFormat.nodeStack, context);\n\n                if (listFormat.nodeStack.length > 0) {\n                    listFormat.nodeStack = [];\n                }\n            }\n\n            refNode = context.modelHandlers.block(doc, parent, childBlock, context, refNode);\n\n            if (childBlock.blockType == 'Entity') {\n                context.domIndexer?.onBlockEntity(childBlock, group);\n            }\n        });\n\n        cleanUpNodeStack(listFormat.nodeStack, context, parent);\n\n        // Remove all rest node if any since they don't appear in content model\n        cleanUpRestNodes(refNode, context.rewriteFromModel);\n    } finally {\n        listFormat.nodeStack = nodeStack;\n    }\n};\n\nfunction cleanUpNodeStack(\n    nodeStack: ModelToDomListStackItem[],\n    context: ModelToDomContext,\n    leavingParent?: Node\n) {\n    if (nodeStack.length > 0) {\n        // Clear list stack, only run to nodeStack[1] because nodeStack[0] is the parent node\n        for (let i = nodeStack.length - 1; i > 0; i--) {\n            const node = nodeStack.pop()?.refNode ?? null;\n\n            cleanUpRestNodes(node, context.rewriteFromModel);\n        }\n\n        if (leavingParent && nodeStack[0].node == leavingParent) {\n            // When leaving a parent node that is the same with the root of node stack\n            // It means the whole list node stack is being invalidated, so we clear it\n            while (nodeStack.length > 0) {\n                nodeStack.pop();\n            }\n        }\n    }\n}\n"]}

package/package.json

@@ -3,9 +3,9 @@
     "description": "Content Model for roosterjs",
     "dependencies": {
         "tslib": "^2.3.1",
-        "roosterjs-content-model-types": "^9.53.0"
+        "roosterjs-content-model-types": "^9.54.0"
     },
-    "version": "9.53.0",
+    "version": "9.54.0",
     "main": "./lib/index.js",
     "typings": "./lib/index.d.ts",
     "module": "./lib-mjs/index.js",