npm - roosterjs-content-model-dom - Versions diffs - 9.51.0 → 9.53.0 - Mend

roosterjs-content-model-dom 9.51.0 → 9.53.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

package/lib/formatHandlers/block/directionFormatHandler.js CHANGED Viewed

@@ -12,11 +12,13 @@ exports.directionFormatHandler = {
             format.direction = dir == 'rtl' ? 'rtl' : 'ltr';
         }
     },
-    apply: function (format, element) {
+    apply: function (format, element, context) {
         if (format.direction) {
             element.style.direction = format.direction;
         }
-        if (format.direction == 'rtl' && (0, isElementOfType_1.isElementOfType)(element, 'table')) {
+        if (format.direction == 'rtl' &&
+            (0, isElementOfType_1.isElementOfType)(element, 'table') &&
+            context.implicitFormat.direction != 'rtl') {
             element.style.justifySelf = 'flex-end';
         }
     },

package/lib/formatHandlers/block/directionFormatHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"directionFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/block/directionFormatHandler.ts"],"names":[],"mappings":";;;AAAA,kEAAiE;AAIjE;;GAEG;AACU,QAAA,sBAAsB,GAAmC;IAClE,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;QACpC,IAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,IAAI,YAAY,CAAC,SAAS,CAAC;QAE7E,IAAI,GAAG,EAAE;YACL,MAAM,CAAC,SAAS,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SACnD;IACL,CAAC;IACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO;~~QACnB~~,IAAI,MAAM,CAAC,SAAS,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;SAC9C;QAED,~~IAAI~~,MAAM,CAAC,SAAS,IAAI,KAAK,~~IAAI,~~IAAA,iCAAe,EAAC,OAAO,EAAE,OAAO,CAAC,~~EAAE~~;~~YAChE~~,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;SAC1C;IACL,CAAC;CACJ,CAAC","sourcesContent":["import { isElementOfType } from '../../domUtils/isElementOfType';\nimport type { DirectionFormat } from 'roosterjs-content-model-types';\nimport type { FormatHandler } from '../FormatHandler';\n\n/*\n @internal\n */\nexport const directionFormatHandler: FormatHandler<DirectionFormat> = {\n parse: (format, element, _, defaultStyle) => {\n const dir = element.style.direction \|\| element.dir \|\| defaultStyle.direction;\n\n if (dir) {\n format.direction = dir == 'rtl' ? 'rtl' : 'ltr';\n }\n },\n apply: (format, element) => {\n if (format.direction) {\n element.style.direction = format.direction;\n }\n\n if (format.direction == 'rtl' && isElementOfType(element, 'table')) {\n element.style.justifySelf = 'flex-end';\n }\n },\n};\n"]}
1	+ {"version":3,"file":"directionFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/block/directionFormatHandler.ts"],"names":[],"mappings":";;;AAAA,kEAAiE;AAIjE;;GAEG;AACU,QAAA,sBAAsB,GAAmC;IAClE,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;QACpC,IAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,IAAI,YAAY,CAAC,SAAS,CAAC;QAE7E,IAAI,GAAG,EAAE;YACL,MAAM,CAAC,SAAS,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SACnD;IACL,CAAC;IACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,OAAO;QAC5B,IAAI,MAAM,CAAC,SAAS,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;SAC9C;QAED,IACI,MAAM,CAAC,SAAS,IAAI,KAAK;YACzB,IAAA,iCAAe,EAAC,OAAO,EAAE,OAAO,CAAC;YACjC,OAAO,CAAC,cAAc,CAAC,SAAS,IAAI,KAAK,EAC3C;YACE,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;SAC1C;IACL,CAAC;CACJ,CAAC","sourcesContent":["import { isElementOfType } from '../../domUtils/isElementOfType';\nimport type { DirectionFormat } from 'roosterjs-content-model-types';\nimport type { FormatHandler } from '../FormatHandler';\n\n/*\n @internal\n */\nexport const directionFormatHandler: FormatHandler<DirectionFormat> = {\n parse: (format, element, _, defaultStyle) => {\n const dir = element.style.direction \|\| element.dir \|\| defaultStyle.direction;\n\n if (dir) {\n format.direction = dir == 'rtl' ? 'rtl' : 'ltr';\n }\n },\n apply: (format, element, context) => {\n if (format.direction) {\n element.style.direction = format.direction;\n }\n\n if (\n format.direction == 'rtl' &&\n isElementOfType(element, 'table') &&\n context.implicitFormat.direction != 'rtl'\n ) {\n element.style.justifySelf = 'flex-end';\n }\n },\n};\n"]}

package/lib/formatHandlers/common/borderFormatHandler.js CHANGED Viewed

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.borderFormatHandler = void 0;
 var tslib_1 = require("tslib");
 var borderKeys_1 = require("../utils/borderKeys");
+var borderValues_1 = require("../../domUtils/style/borderValues");
 // This array needs to match BorderKeys array
 var BorderWidthKeys = [
     'borderTopWidth',
@@ -31,7 +32,17 @@ exports.borderFormatHandler = {
                 width = '0px';
             }
             if (value && width != defaultWidth) {
-                format[key] = value == 'none' ? '' : value;
+                var result = value;
+                if (result.includes('initial')) {
+                    // Remove 'initial' from the last part (color) of the border value
+                    // since browsers ignore it when setting the inline style property
+                    var border = (0, borderValues_1.extractBorderValues)(value);
+                    if (border.color === 'initial') {
+                        border.color = '';
+                    }
+                    result = (0, borderValues_1.combineBorderValue)(border);
+                }
+                format[key] = result == 'none' ? '' : result;
             }
         });
         var borderRadius = element.style.borderRadius;

package/lib/formatHandlers/common/borderFormatHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"borderFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/common/borderFormatHandler.ts"],"names":[],"mappings":";;;;AAAA,kDAAiD;~~AAIjD~~,6CAA6C;AAC7C,IAAM,eAAe,GAAkC;IACnD,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,iBAAiB;CACpB,CAAC;AAEF,IAAM,gBAAgB,GAAuD;IACzE,qBAAqB;IACrB,sBAAsB;IACtB,wBAAwB;IACxB,yBAAyB;CAC5B,CAAC;AAEF,IAAM,OAAO,iFAAO,uBAAU,+BAAK,gBAAgB,SAAC,CAAC;AAErD;;GAEG;AACU,QAAA,mBAAmB,GAAgC;IAC5D,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;QACpC,uBAAU,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,CAAC;;YACtB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,IAAM,YAAY,GAAG,MAAA,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,mCAAI,KAAK,CAAC;YAC/D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9C,IAAI,KAAK,IAAI,GAAG,EAAE;gBACd,KAAK,GAAG,KAAK,CAAC;aACjB;YAED,IAAI,KAAK,IAAI,KAAK,IAAI,YAAY,EAAE;gBAChC,MAAM,CAAC,~~GAAG~~,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,~~KAAK~~,CAAC;~~aAC9C~~;QACL,CAAC,CAAC,CAAC;QAEH,IAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;QAEhD,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;SACtC;aAAM;YACH,gBAAgB,CAAC,OAAO,CAAC,UAAA,GAAG;gBACxB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEjC,IAAI,KAAK,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBACvB;YACL,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO;QACnB,OAAO,CAAC,OAAO,CAAC,UAAA,GAAG;YACf,IAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAE1B,IAAI,KAAK,EAAE;gBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aAC9B;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,YAAY,EAAE;YACrB,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpD;IACL,CAAC;CACJ,CAAC","sourcesContent":["import { BorderKeys } from '../utils/borderKeys';\nimport type { BorderFormat } from 'roosterjs-content-model-types';\nimport type { FormatHandler } from '../FormatHandler';\n\n// This array needs to match BorderKeys array\nconst BorderWidthKeys: (keyof CSSStyleDeclaration)[] = [\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n];\n\nconst BorderRadiusKeys: (keyof BorderFormat & keyof CSSStyleDeclaration)[] = [\n 'borderTopLeftRadius',\n 'borderTopRightRadius',\n 'borderBottomLeftRadius',\n 'borderBottomRightRadius',\n];\n\nconst AllKeys = [...BorderKeys, ...BorderRadiusKeys];\n\n/*\n @internal\n */\nexport const borderFormatHandler: FormatHandler<BorderFormat> = {\n parse: (format, element, _, defaultStyle) => {\n BorderKeys.forEach((key, i) => {\n const value = element.style[key];\n const defaultWidth = defaultStyle[BorderWidthKeys[i]] ?? '0px';\n let width = element.style[BorderWidthKeys[i]];\n\n if (width == '0') {\n width = '0px';\n }\n\n if (value && width != defaultWidth) {\n format[key] = ~~value~~ == 'none' ? '' : ~~value~~;\n }\n });\n\n const borderRadius = element.style.borderRadius;\n\n if (borderRadius) {\n format.borderRadius = borderRadius;\n } else {\n BorderRadiusKeys.forEach(key => {\n const value = element.style[key];\n\n if (value) {\n format[key] = value;\n }\n });\n }\n },\n apply: (format, element) => {\n AllKeys.forEach(key => {\n const value = format[key];\n\n if (value) {\n element.style[key] = value;\n }\n });\n\n if (format.borderRadius) {\n element.style.borderRadius = format.borderRadius;\n }\n },\n};\n"]}
1	+ {"version":3,"file":"borderFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/common/borderFormatHandler.ts"],"names":[],"mappings":";;;;AAAA,kDAAiD;AAEjD,kEAA4F;AAG5F,6CAA6C;AAC7C,IAAM,eAAe,GAAkC;IACnD,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,iBAAiB;CACpB,CAAC;AAEF,IAAM,gBAAgB,GAAuD;IACzE,qBAAqB;IACrB,sBAAsB;IACtB,wBAAwB;IACxB,yBAAyB;CAC5B,CAAC;AAEF,IAAM,OAAO,iFAAO,uBAAU,+BAAK,gBAAgB,SAAC,CAAC;AAErD;;GAEG;AACU,QAAA,mBAAmB,GAAgC;IAC5D,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;QACpC,uBAAU,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,CAAC;;YACtB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,IAAM,YAAY,GAAG,MAAA,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,mCAAI,KAAK,CAAC;YAC/D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9C,IAAI,KAAK,IAAI,GAAG,EAAE;gBACd,KAAK,GAAG,KAAK,CAAC;aACjB;YAED,IAAI,KAAK,IAAI,KAAK,IAAI,YAAY,EAAE;gBAChC,IAAI,MAAM,GAAG,KAAK,CAAC;gBACnB,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAC5B,kEAAkE;oBAClE,kEAAkE;oBAClE,IAAM,MAAM,GAAG,IAAA,kCAAmB,EAAC,KAAK,CAAC,CAAC;oBAC1C,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC5B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;qBACrB;oBACD,MAAM,GAAG,IAAA,iCAAkB,EAAC,MAAM,CAAC,CAAC;iBACvC;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aAChD;QACL,CAAC,CAAC,CAAC;QAEH,IAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;QAEhD,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;SACtC;aAAM;YACH,gBAAgB,CAAC,OAAO,CAAC,UAAA,GAAG;gBACxB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEjC,IAAI,KAAK,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBACvB;YACL,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO;QACnB,OAAO,CAAC,OAAO,CAAC,UAAA,GAAG;YACf,IAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAE1B,IAAI,KAAK,EAAE;gBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aAC9B;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,YAAY,EAAE;YACrB,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpD;IACL,CAAC;CACJ,CAAC","sourcesContent":["import { BorderKeys } from '../utils/borderKeys';\nimport type { BorderFormat } from 'roosterjs-content-model-types';\nimport { combineBorderValue, extractBorderValues } from '../../domUtils/style/borderValues';\nimport type { FormatHandler } from '../FormatHandler';\n\n// This array needs to match BorderKeys array\nconst BorderWidthKeys: (keyof CSSStyleDeclaration)[] = [\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n];\n\nconst BorderRadiusKeys: (keyof BorderFormat & keyof CSSStyleDeclaration)[] = [\n 'borderTopLeftRadius',\n 'borderTopRightRadius',\n 'borderBottomLeftRadius',\n 'borderBottomRightRadius',\n];\n\nconst AllKeys = [...BorderKeys, ...BorderRadiusKeys];\n\n/*\n @internal\n */\nexport const borderFormatHandler: FormatHandler<BorderFormat> = {\n parse: (format, element, _, defaultStyle) => {\n BorderKeys.forEach((key, i) => {\n const value = element.style[key];\n const defaultWidth = defaultStyle[BorderWidthKeys[i]] ?? '0px';\n let width = element.style[BorderWidthKeys[i]];\n\n if (width == '0') {\n width = '0px';\n }\n\n if (value && width != defaultWidth) {\n let result = value;\n if (result.includes('initial')) {\n // Remove 'initial' from the last part (color) of the border value\n // since browsers ignore it when setting the inline style property\n const border = extractBorderValues(value);\n if (border.color === 'initial') {\n border.color = '';\n }\n result = combineBorderValue(border);\n }\n format[key] = result == 'none' ? '' : result;\n }\n });\n\n const borderRadius = element.style.borderRadius;\n\n if (borderRadius) {\n format.borderRadius = borderRadius;\n } else {\n BorderRadiusKeys.forEach(key => {\n const value = element.style[key];\n\n if (value) {\n format[key] = value;\n }\n });\n }\n },\n apply: (format, element) => {\n AllKeys.forEach(key => {\n const value = format[key];\n\n if (value) {\n element.style[key] = value;\n }\n });\n\n if (format.borderRadius) {\n element.style.borderRadius = format.borderRadius;\n }\n },\n};\n"]}

package/lib/modelApi/common/addTextSegment.js CHANGED Viewed

@@ -7,6 +7,7 @@ var createText_1 = require("../creators/createText");
 var ensureParagraph_1 = require("./ensureParagraph");
 var hasSpacesOnly_1 = require("./hasSpacesOnly");
 var isWhiteSpacePreserved_1 = require("../../domUtils/isWhiteSpacePreserved");
+var stripInvisibleUnicode_1 = require("./stripInvisibleUnicode");
 /**
  * Add a new text segment to current paragraph
  * @param group Current BlockGroup that the paragraph belong to
@@ -22,7 +23,11 @@ function addTextSegment(group, text, context) {
         if (!(0, hasSpacesOnly_1.hasSpacesOnly)(text) ||
             ((_a = paragraph === null || paragraph === void 0 ? void 0 : paragraph.segments.length) !== null && _a !== void 0 ? _a : 0) > 0 ||
             (0, isWhiteSpacePreserved_1.isWhiteSpacePreserved)(paragraph === null || paragraph === void 0 ? void 0 : paragraph.format.whiteSpace)) {
-            textModel = (0, createText_1.createText)(text, context.segmentFormat);
+            var filteredText = context.experimentalFeatures &&
+                context.experimentalFeatures.indexOf('FilterInvisibleUnicode') > -1
+                ? (0, stripInvisibleUnicode_1.stripInvisibleUnicode)(text)
+                : text;
+            textModel = (0, createText_1.createText)(filteredText, context.segmentFormat);
             if (context.isInSelection) {
                 textModel.isSelected = true;
             }

package/lib/modelApi/common/addTextSegment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addTextSegment.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/common/addTextSegment.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAChD,2CAA0C;AAC1C,qDAAoD;AACpD,qDAAoD;AACpD,iDAAgD;AAChD,8EAA6E;~~AAO7E~~;;;;;;GAMG;AACH,SAAgB,cAAc,CAC1B,KAA6B,EAC7B,IAAY,EACZ,OAA0B;;IAE1B,IAAI,SAAuC,CAAC;IAE5C,IAAI,IAAI,EAAE;QACN,IAAM,SAAS,GAAG,IAAA,iCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAE9D,IACI,CAAC,IAAA,6BAAa,EAAC,IAAI,CAAC;YACpB,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,MAAM,mCAAI,CAAC,CAAC,GAAG,CAAC;YACrC,IAAA,6CAAqB,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC,UAAU,CAAC,EACrD;YACE,SAAS,GAAG,IAAA,uBAAU,EAAC,~~IAAI~~,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;~~YAEpD~~,IAAI,OAAO,CAAC,aAAa,EAAE;gBACvB,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;aAC/B;YAED,IAAA,6BAAa,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAElC,IAAA,uBAAU,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;SACrD;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;~~AA5BD~~,~~wCA4BC~~","sourcesContent":["import { addDecorators } from './addDecorators';\nimport { addSegment } from './addSegment';\nimport { createText } from '../creators/createText';\nimport { ensureParagraph } from './ensureParagraph';\nimport { hasSpacesOnly } from './hasSpacesOnly';\nimport { isWhiteSpacePreserved } from '../../domUtils/isWhiteSpacePreserved';\nimport type {\n ContentModelBlockGroup,\n ContentModelText,\n DomToModelContext,\n} from 'roosterjs-content-model-types';\n\n/*\n Add a new text segment to current paragraph\n * @param group Current BlockGroup that the paragraph belong to\n * @param text Text content of the text segment\n * @param context Current DOM to Model context\n * @returns A new Text segment, or undefined if the input text is empty\n */\nexport function addTextSegment(\n group: ContentModelBlockGroup,\n text: string,\n context: DomToModelContext\n): ContentModelText \| undefined {\n let textModel: ContentModelText \| undefined;\n\n if (text) {\n const paragraph = ensureParagraph(group, context.blockFormat);\n\n if (\n !hasSpacesOnly(text) \|\|\n (paragraph?.segments.length ?? 0) > 0 \|\|\n isWhiteSpacePreserved(paragraph?.format.whiteSpace)\n ) {\n textModel = createText(~~text~~, context.segmentFormat);\n\n if (context.isInSelection) {\n textModel.isSelected = true;\n }\n\n addDecorators(textModel, context);\n\n addSegment(group, textModel, context.blockFormat);\n }\n }\n\n return textModel;\n}\n"]}
1	+ {"version":3,"file":"addTextSegment.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/common/addTextSegment.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAChD,2CAA0C;AAC1C,qDAAoD;AACpD,qDAAoD;AACpD,iDAAgD;AAChD,8EAA6E;AAC7E,iEAAgE;AAOhE;;;;;;GAMG;AACH,SAAgB,cAAc,CAC1B,KAA6B,EAC7B,IAAY,EACZ,OAA0B;;IAE1B,IAAI,SAAuC,CAAC;IAE5C,IAAI,IAAI,EAAE;QACN,IAAM,SAAS,GAAG,IAAA,iCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAE9D,IACI,CAAC,IAAA,6BAAa,EAAC,IAAI,CAAC;YACpB,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,MAAM,mCAAI,CAAC,CAAC,GAAG,CAAC;YACrC,IAAA,6CAAqB,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC,UAAU,CAAC,EACrD;YACE,IAAM,YAAY,GACd,OAAO,CAAC,oBAAoB;gBAC5B,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;gBAC/D,CAAC,CAAC,IAAA,6CAAqB,EAAC,IAAI,CAAC;gBAC7B,CAAC,CAAC,IAAI,CAAC;YAEf,SAAS,GAAG,IAAA,uBAAU,EAAC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAE5D,IAAI,OAAO,CAAC,aAAa,EAAE;gBACvB,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;aAC/B;YAED,IAAA,6BAAa,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAElC,IAAA,uBAAU,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;SACrD;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAlCD,wCAkCC","sourcesContent":["import { addDecorators } from './addDecorators';\nimport { addSegment } from './addSegment';\nimport { createText } from '../creators/createText';\nimport { ensureParagraph } from './ensureParagraph';\nimport { hasSpacesOnly } from './hasSpacesOnly';\nimport { isWhiteSpacePreserved } from '../../domUtils/isWhiteSpacePreserved';\nimport { stripInvisibleUnicode } from './stripInvisibleUnicode';\nimport type {\n ContentModelBlockGroup,\n ContentModelText,\n DomToModelContext,\n} from 'roosterjs-content-model-types';\n\n/*\n Add a new text segment to current paragraph\n * @param group Current BlockGroup that the paragraph belong to\n * @param text Text content of the text segment\n * @param context Current DOM to Model context\n * @returns A new Text segment, or undefined if the input text is empty\n */\nexport function addTextSegment(\n group: ContentModelBlockGroup,\n text: string,\n context: DomToModelContext\n): ContentModelText \| undefined {\n let textModel: ContentModelText \| undefined;\n\n if (text) {\n const paragraph = ensureParagraph(group, context.blockFormat);\n\n if (\n !hasSpacesOnly(text) \|\|\n (paragraph?.segments.length ?? 0) > 0 \|\|\n isWhiteSpacePreserved(paragraph?.format.whiteSpace)\n ) {\n const filteredText =\n context.experimentalFeatures &&\n context.experimentalFeatures.indexOf('FilterInvisibleUnicode') > -1\n ? stripInvisibleUnicode(text)\n : text;\n\n textModel = createText(filteredText, context.segmentFormat);\n\n if (context.isInSelection) {\n textModel.isSelected = true;\n }\n\n addDecorators(textModel, context);\n\n addSegment(group, textModel, context.blockFormat);\n }\n }\n\n return textModel;\n}\n"]}

package/lib/modelApi/common/stripInvisibleUnicode.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+/**
+ * @internal
+ * Strip invisible unicode characters from the given string
+ * @param value The string to be processed
+ * @returns The string with invisible unicode characters removed
+ */
+export declare function stripInvisibleUnicode(value: string): string;

package/lib/modelApi/common/stripInvisibleUnicode.js ADDED Viewed

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripInvisibleUnicode = void 0;
+// According to https://embracethered.com/blog/posts/2024/hiding-and-finding-text-with-unicode-tags/
+// there are some invisible unicode characters in the range of U+E0000 to U+EFFFF, which are used for hiding text in HTML.
+// We need to strip them out before processing the pasted content, otherwise they will be treated as normal text and cause unexpected behavior.
+var INVISIBLE_UNICODE_REGEX = /[\u{E0000}-\u{EFFFF}]/gu;
+/**
+ * @internal
+ * Strip invisible unicode characters from the given string
+ * @param value The string to be processed
+ * @returns The string with invisible unicode characters removed
+ */
+function stripInvisibleUnicode(value) {
+    return value.replace(INVISIBLE_UNICODE_REGEX, '');
+}
+exports.stripInvisibleUnicode = stripInvisibleUnicode;
+//# sourceMappingURL=stripInvisibleUnicode.js.map

package/lib/modelApi/common/stripInvisibleUnicode.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"stripInvisibleUnicode.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/common/stripInvisibleUnicode.ts"],"names":[],"mappings":";;;AAAA,oGAAoG;AACpG,0HAA0H;AAC1H,+IAA+I;AAC/I,IAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAE1D;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,KAAa;IAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC;AAFD,sDAEC","sourcesContent":["// According to https://embracethered.com/blog/posts/2024/hiding-and-finding-text-with-unicode-tags/\n// there are some invisible unicode characters in the range of U+E0000 to U+EFFFF, which are used for hiding text in HTML.\n// We need to strip them out before processing the pasted content, otherwise they will be treated as normal text and cause unexpected behavior.\nconst INVISIBLE_UNICODE_REGEX = /[\\u{E0000}-\\u{EFFFF}]/gu;\n\n/**\n * @internal\n * Strip invisible unicode characters from the given string\n * @param value The string to be processed\n * @returns The string with invisible unicode characters removed\n */\nexport function stripInvisibleUnicode(value: string): string {\n return value.replace(INVISIBLE_UNICODE_REGEX, '');\n}\n"]}

package/lib/modelApi/creators/createSelectionMarker.js CHANGED Viewed

@@ -1,16 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSelectionMarker = void 0;
-var tslib_1 = require("tslib");
+var EmptySegmentFormat_1 = require("../../constants/EmptySegmentFormat");
+var getObjectKeys_1 = require("../../domUtils/getObjectKeys");
 /**
  * Create a ContentModelSelectionMarker model
  * @param format @optional The format of this model
  */
 function createSelectionMarker(format) {
+    var filteredFormat = {};
+    if (format) {
+        (0, getObjectKeys_1.getObjectKeys)(EmptySegmentFormat_1.EmptySegmentFormat).forEach(function (key) {
+            if (key in format) {
+                filteredFormat[key] = format[key];
+            }
+        });
+    }
     return {
         segmentType: 'SelectionMarker',
         isSelected: true,
-        format: (0, tslib_1.__assign)({}, format),
+        format: filteredFormat,
     };
 }
 exports.createSelectionMarker = createSelectionMarker;

package/lib/modelApi/creators/createSelectionMarker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createSelectionMarker.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/creators/createSelectionMarker.ts"],"names":[],"mappings":"~~;;;;AAKA~~;;;GAGG;AACH,SAAgB,qBAAqB,CACjC,MAA4C;IAE5C,OAAO;QACH,WAAW,EAAE,iBAAiB;QAC9B,UAAU,EAAE,IAAI;QAChB,MAAM,~~4BAAO~~,~~MAAM,CAAE~~;~~KACxB~~,CAAC;AACN,CAAC;~~AARD~~,~~sDAQC~~","sourcesContent":["import type {\n ContentModelSegmentFormat,\n ContentModelSelectionMarker,\n} from 'roosterjs-content-model-types';\n\n/*\n Create a ContentModelSelectionMarker model\n * @param format @optional The format of this model\n */\nexport function createSelectionMarker(\n format?: Readonly<ContentModelSegmentFormat>\n): ContentModelSelectionMarker {\n return {\n segmentType: 'SelectionMarker',\n isSelected: true,\n format: ~~{ ...format }~~,\n };\n}\n"]}
1	+ {"version":3,"file":"createSelectionMarker.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/creators/createSelectionMarker.ts"],"names":[],"mappings":";;;AAAA,yEAAwE;AACxE,8DAA6D;AAM7D;;;GAGG;AACH,SAAgB,qBAAqB,CACjC,MAA4C;IAE5C,IAAM,cAAc,GAA8B,EAAE,CAAC;IAErD,IAAI,MAAM,EAAE;QACR,IAAA,6BAAa,EAAC,uCAAkB,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG;YACzC,IAAI,GAAG,IAAI,MAAM,EAAE;gBACd,cAAc,CAAC,GAAG,CAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;aAC9C;QACL,CAAC,CAAC,CAAC;KACN;IAED,OAAO;QACH,WAAW,EAAE,iBAAiB;QAC9B,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,cAAc;KACzB,CAAC;AACN,CAAC;AAlBD,sDAkBC","sourcesContent":["import { EmptySegmentFormat } from '../../constants/EmptySegmentFormat';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport type {\n ContentModelSegmentFormat,\n ContentModelSelectionMarker,\n} from 'roosterjs-content-model-types';\n\n/*\n Create a ContentModelSelectionMarker model\n * @param format @optional The format of this model\n */\nexport function createSelectionMarker(\n format?: Readonly<ContentModelSegmentFormat>\n): ContentModelSelectionMarker {\n const filteredFormat: ContentModelSegmentFormat = {};\n\n if (format) {\n getObjectKeys(EmptySegmentFormat).forEach(key => {\n if (key in format) {\n (filteredFormat[key] as any) = format[key];\n }\n });\n }\n\n return {\n segmentType: 'SelectionMarker',\n isSelected: true,\n format: filteredFormat,\n };\n}\n"]}

package/lib/modelToDom/handlers/handleFormatContainer.js CHANGED Viewed

@@ -31,14 +31,16 @@ var handleFormatContainer = function (doc, parent, container, context, refNode)
             (0, applyFormat_1.applyFormat)(containerNode_1, context.formatAppliers.segmentOnBlock, container.format, context);
             (0, applyFormat_1.applyFormat)(containerNode_1, context.formatAppliers.container, container.format, context);
         });
-        if (container.tagName == 'pre') {
-            (0, stackFormat_1.stackFormat)(context, PreChildFormat, function () {
+        (0, stackFormat_1.stackFormat)(context, container.format.direction ? { direction: container.format.direction } : null, function () {
+            if (container.tagName == 'pre') {
+                (0, stackFormat_1.stackFormat)(context, PreChildFormat, function () {
+                    context.modelHandlers.blockGroupChildren(doc, containerNode_1, container, context);
+                });
+            }
+            else {
                 context.modelHandlers.blockGroupChildren(doc, containerNode_1, container, context);
-            });
-        }
-        else {
-            context.modelHandlers.blockGroupChildren(doc, containerNode_1, container, context);
-        }
+            }
+        });
         element = containerNode_1;
     }
     if (element) {

package/lib/modelToDom/handlers/handleFormatContainer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"handleFormatContainer.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleFormatContainer.ts"],"names":[],"mappings":";;;AAAA,oDAAmD;AACnD,yDAAkE;AAClE,wEAAuE;AACvE,oDAAmD;AASnD,IAAM,cAAc,GAAwD;IACxE,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE,KAAK;CACpB,CAAC;AAEF;;GAEG;AACI,IAAM,qBAAqB,GAA0D,UACxF,GAAa,EACb,MAAY,EACZ,SAAsC,EACtC,OAA0B,EAC1B,OAAoB;;IAEpB,IAAI,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9E,IAAI,OAAO,EAAE;QACT,OAAO,GAAG,IAAA,uCAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAEjF,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;KAC9E;SAAM,IAAI,CAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,EAAE;QACtC,IAAM,eAAa,GAAG,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC3B,SAAS,CAAC,aAAa,GAAG,eAAa,CAAC;SAC3C;QAED,MAAM,CAAC,YAAY,CAAC,eAAa,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAa,CAAC,CAAC;QAEhE,IAAA,yBAAW,EAAC,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE;YACpC,IAAA,yBAAW,EAAC,eAAa,EAAE,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACxF,IAAA,yBAAW,EACP,eAAa,EACb,OAAO,CAAC,cAAc,CAAC,cAAc,EACrC,SAAS,CAAC,MAAM,EAChB,OAAO,CACV,CAAC;YAEF,IAAA,yBAAW,EAAC,eAAa,EAAE,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;~~YAC5B~~,IAAA,yBAAW,EAAC,OAAO,EAAE,cAAc,EAAE;~~gBACjC~~,OAAO,CAAC,aAAa,CAAC,kBAAkB,~~CAAC~~,GAAG,~~EAAE~~,eAAa,~~EAAE~~,SAAS,~~EAAE~~,OAAO,~~CAAC~~,CAAC;~~YACrF~~,CAAC,CAAC,CAAC;~~SACN~~;~~aAAM~~;~~YACH~~,OAAO,CAAC,aAAa,CAAC,kBAAkB,~~CAAC~~,GAAG,~~EAAE~~,eAAa,~~EAAE~~,SAAS,~~EAAE~~,OAAO,~~CAAC~~,CAAC;~~SACpF~~;~~QAED~~,OAAO,GAAG,eAAa,CAAC;KAC3B;IAED,IAAI,OAAO,EAAE;QACT,MAAA,OAAO,CAAC,aAAa,+CAArB,OAAO,EAAiB,SAAS,EAAE,OAAO,CAAC,CAAC;KAC/C;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;~~AAnDW~~,QAAA,qBAAqB,~~yBAmDhC~~","sourcesContent":["import { applyFormat } from '../utils/applyFormat';\nimport { isBlockGroupEmpty } from '../../modelApi/common/isEmpty';\nimport { reuseCachedElement } from '../../domUtils/reuseCachedElement';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n ContentModelBlockFormat,\n ContentModelBlockHandler,\n ContentModelFormatContainer,\n ContentModelSegmentFormat,\n ModelToDomContext,\n} from 'roosterjs-content-model-types';\n\nconst PreChildFormat: ContentModelSegmentFormat & ContentModelBlockFormat = {\n fontFamily: 'monospace',\n whiteSpace: 'pre',\n};\n\n/*\n @internal\n */\nexport const handleFormatContainer: ContentModelBlockHandler<ContentModelFormatContainer> = (\n doc: Document,\n parent: Node,\n container: ContentModelFormatContainer,\n context: ModelToDomContext,\n refNode: Node \| null\n) => {\n let element = context.allowCacheElement ? container.cachedElement : undefined;\n\n if (element) {\n refNode = reuseCachedElement(parent, element, refNode, context.rewriteFromModel);\n\n context.modelHandlers.blockGroupChildren(doc, element, container, context);\n } else if (!isBlockGroupEmpty(container)) {\n const containerNode = doc.createElement(container.tagName);\n\n if (context.allowCacheElement) {\n container.cachedElement = containerNode;\n }\n\n parent.insertBefore(containerNode, refNode);\n context.rewriteFromModel.addedBlockElements.push(containerNode);\n\n stackFormat(context, container.tagName, () => {\n applyFormat(containerNode, context.formatAppliers.container, container.format, context);\n applyFormat(\n containerNode,\n context.formatAppliers.segmentOnBlock,\n container.format,\n context\n );\n\n applyFormat(containerNode, context.formatAppliers.container, container.format, context);\n });\n\n if (container.tagName == 'pre') {\n stackFormat(context, PreChildFormat, () => {\n context.modelHandlers.blockGroupChildren(doc, containerNode, container, context);\n });\n } else {\n context.modelHandlers.blockGroupChildren(doc, containerNode, container, context);\n }\n\n element = containerNode;\n }\n\n if (element) {\n context.onNodeCreated?.(container, element);\n }\n\n return refNode;\n};\n"]}
1	+ {"version":3,"file":"handleFormatContainer.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleFormatContainer.ts"],"names":[],"mappings":";;;AAAA,oDAAmD;AACnD,yDAAkE;AAClE,wEAAuE;AACvE,oDAAmD;AASnD,IAAM,cAAc,GAAwD;IACxE,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE,KAAK;CACpB,CAAC;AAEF;;GAEG;AACI,IAAM,qBAAqB,GAA0D,UACxF,GAAa,EACb,MAAY,EACZ,SAAsC,EACtC,OAA0B,EAC1B,OAAoB;;IAEpB,IAAI,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9E,IAAI,OAAO,EAAE;QACT,OAAO,GAAG,IAAA,uCAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAEjF,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;KAC9E;SAAM,IAAI,CAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,EAAE;QACtC,IAAM,eAAa,GAAG,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC3B,SAAS,CAAC,aAAa,GAAG,eAAa,CAAC;SAC3C;QAED,MAAM,CAAC,YAAY,CAAC,eAAa,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAa,CAAC,CAAC;QAEhE,IAAA,yBAAW,EAAC,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE;YACpC,IAAA,yBAAW,EAAC,eAAa,EAAE,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACxF,IAAA,yBAAW,EACP,eAAa,EACb,OAAO,CAAC,cAAc,CAAC,cAAc,EACrC,SAAS,CAAC,MAAM,EAChB,OAAO,CACV,CAAC;YAEF,IAAA,yBAAW,EAAC,eAAa,EAAE,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QAEH,IAAA,yBAAW,EACP,OAAO,EACP,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,EAC7E;YACI,IAAI,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;gBAC5B,IAAA,yBAAW,EAAC,OAAO,EAAE,cAAc,EAAE;oBACjC,OAAO,CAAC,aAAa,CAAC,kBAAkB,CACpC,GAAG,EACH,eAAa,EACb,SAAS,EACT,OAAO,CACV,CAAC;gBACN,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,OAAO,CAAC,aAAa,CAAC,kBAAkB,CACpC,GAAG,EACH,eAAa,EACb,SAAS,EACT,OAAO,CACV,CAAC;aACL;QACL,CAAC,CACJ,CAAC;QAEF,OAAO,GAAG,eAAa,CAAC;KAC3B;IAED,IAAI,OAAO,EAAE;QACT,MAAA,OAAO,CAAC,aAAa,+CAArB,OAAO,EAAiB,SAAS,EAAE,OAAO,CAAC,CAAC;KAC/C;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAnEW,QAAA,qBAAqB,yBAmEhC","sourcesContent":["import { applyFormat } from '../utils/applyFormat';\nimport { isBlockGroupEmpty } from '../../modelApi/common/isEmpty';\nimport { reuseCachedElement } from '../../domUtils/reuseCachedElement';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n ContentModelBlockFormat,\n ContentModelBlockHandler,\n ContentModelFormatContainer,\n ContentModelSegmentFormat,\n ModelToDomContext,\n} from 'roosterjs-content-model-types';\n\nconst PreChildFormat: ContentModelSegmentFormat & ContentModelBlockFormat = {\n fontFamily: 'monospace',\n whiteSpace: 'pre',\n};\n\n/*\n @internal\n */\nexport const handleFormatContainer: ContentModelBlockHandler<ContentModelFormatContainer> = (\n doc: Document,\n parent: Node,\n container: ContentModelFormatContainer,\n context: ModelToDomContext,\n refNode: Node \| null\n) => {\n let element = context.allowCacheElement ? container.cachedElement : undefined;\n\n if (element) {\n refNode = reuseCachedElement(parent, element, refNode, context.rewriteFromModel);\n\n context.modelHandlers.blockGroupChildren(doc, element, container, context);\n } else if (!isBlockGroupEmpty(container)) {\n const containerNode = doc.createElement(container.tagName);\n\n if (context.allowCacheElement) {\n container.cachedElement = containerNode;\n }\n\n parent.insertBefore(containerNode, refNode);\n context.rewriteFromModel.addedBlockElements.push(containerNode);\n\n stackFormat(context, container.tagName, () => {\n applyFormat(containerNode, context.formatAppliers.container, container.format, context);\n applyFormat(\n containerNode,\n context.formatAppliers.segmentOnBlock,\n container.format,\n context\n );\n\n applyFormat(containerNode, context.formatAppliers.container, container.format, context);\n });\n\n stackFormat(\n context,\n container.format.direction ? { direction: container.format.direction } : null,\n () => {\n if (container.tagName == 'pre') {\n stackFormat(context, PreChildFormat, () => {\n context.modelHandlers.blockGroupChildren(\n doc,\n containerNode,\n container,\n context\n );\n });\n } else {\n context.modelHandlers.blockGroupChildren(\n doc,\n containerNode,\n container,\n context\n );\n }\n }\n );\n\n element = containerNode;\n }\n\n if (element) {\n context.onNodeCreated?.(container, element);\n }\n\n return refNode;\n};\n"]}

package/lib/modelToDom/handlers/handleListItem.js CHANGED Viewed

@@ -52,7 +52,9 @@ var handleListItem = function (doc, parent, listItem, context, refNode) {
         // Need to apply listItemElement formats after applying metadata since the list numbers value relies on the result of metadata handling
         (0, applyFormat_1.applyFormat)(li, context.formatAppliers.listItemElement, listItem.format, context);
         (0, stackFormat_1.stackFormat)(context, listItem.formatHolder.format, function () {
-            context.modelHandlers.blockGroupChildren(doc, li, listItem, context);
+            (0, stackFormat_1.stackFormat)(context, listItem.format.direction ? { direction: listItem.format.direction } : null, function () {
+                context.modelHandlers.blockGroupChildren(doc, li, listItem, context);
+            });
         });
     }
     else {

package/lib/modelToDom/handlers/handleListItem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"handleListItem.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleListItem.ts"],"names":[],"mappings":"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~~QACzE~~,CAAC,CAAC,CAAC;KACN;SAAM;QACH,sFAAsF;QACtF,wHAAwH;QACxH,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,iDAAuB,CAAC,CAAC;QAEjD,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAErE,IAAA,eAAM,EAAC,EAAE,CAAC,CAAC;KACd;IAED,6EAA6E;IAC7E,8EAA8E;IAC9E,8CAA8C;IAC9C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACrD,IAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,IAAA,2CAAoB,EAAC,OAAO,CAAC,EAAE;YAC/B,OAAO,CAAC,YAAY,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;SAClE;KACJ;IAED,IAAI,cAAc,EAAE;QAChB,MAAA,OAAO,CAAC,aAAa,+CAArB,OAAO,EAAiB,QAAQ,EAAE,EAAE,CAAC,CAAC;KACzC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;~~AArFW~~,QAAA,cAAc,~~kBAqFzB~~","sourcesContent":["import { applyFormat } from '../utils/applyFormat';\nimport { applyMetadata } from '../utils/applyMetadata';\nimport { isGenericRoleElement } from '../../domUtils/isGenericRoleElement';\nimport { reuseCachedElement } from '../../domUtils/reuseCachedElement';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport { unwrap } from '../../domUtils/unwrap';\nimport type {\n ContentModelBlockHandler,\n ContentModelListItem,\n ModelToDomContext,\n ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\nconst HtmlRoleAttribute = 'role';\nconst PresentationRoleValue = 'presentation';\n\n/*\n @internal\n */\nexport const handleListItem: ContentModelBlockHandler<ContentModelListItem> = (\n doc: Document,\n parent: Node,\n listItem: ContentModelListItem,\n context: ModelToDomContext,\n refNode: Node \| null\n) => {\n refNode = context.modelHandlers.list(doc, parent, listItem, context, refNode);\n\n const { nodeStack } = context.listFormat;\n const leafLevel: Partial<ModelToDomListStackItem> = nodeStack?.[nodeStack.length - 1] ?? {};\n const itemRefNode = leafLevel.refNode \|\| null;\n const listParent = leafLevel.node \|\| parent;\n const level = listItem.levels[listItem.levels.length - 1];\n\n let li: HTMLLIElement;\n let isNewlyCreated = false;\n\n if (listItem.cachedElement) {\n li = listItem.cachedElement;\n\n // Check if the cached LI is used as refNode under another list level,\n // since we know we are going to move it under the current listParent,\n // we need to update the refNode of the previous list level to avoid removing it later\n for (let i = 0; i < nodeStack.length - 1; i++) {\n if (nodeStack[i].refNode === li) {\n nodeStack[i].refNode = li.nextSibling;\n }\n }\n\n leafLevel.refNode = reuseCachedElement(\n listParent,\n li,\n itemRefNode,\n context.rewriteFromModel\n );\n } else {\n li = doc.createElement('li');\n isNewlyCreated = true;\n\n // It is possible listParent is the same with parent param.\n // This happens when outdent a list item to cause it has no list level\n listParent.insertBefore(li, itemRefNode?.parentNode == listParent ? itemRefNode : null);\n context.rewriteFromModel.addedBlockElements.push(li);\n listItem.cachedElement = li;\n }\n\n if (level) {\n applyFormat(li, context.formatAppliers.segment, listItem.formatHolder.format, context);\n applyFormat(li, context.formatAppliers.listItemThread, level.format, context);\n\n // Need to apply metadata after applying listItem format since the list numbers value relies on the result of list thread handling\n applyMetadata(level, context.metadataAppliers.listItem, listItem.format, context);\n\n // Need to apply listItemElement formats after applying metadata since the list numbers value relies on the result of metadata handling\n applyFormat(li, context.formatAppliers.listItemElement, listItem.format, context);\n\n stackFormat(context, listItem.formatHolder.format, () => {\n context.modelHandlers.blockGroupChildren(doc, li, listItem, context);\n });\n } else {\n // There is no level for this list item, that means it should be moved out of the list\n // For each paragraph, make it not implicit so it will have a DIV around it, to avoid more paragraphs connected together\n listItem.blocks.forEach(setParagraphNotImplicit);\n\n context.modelHandlers.blockGroupChildren(doc, li, listItem, context);\n\n unwrap(li);\n }\n\n // Add role=\"presentation\" to all generic role elements inside the LI element\n // This is to make sure the elements are announced correctly by screen readers\n // when using arrow keys to navigate the list.\n for (let index = 0; index < li.children.length; index++) {\n const element = li.children.item(index);\n if (isGenericRoleElement(element)) {\n element.setAttribute(HtmlRoleAttribute, PresentationRoleValue);\n }\n }\n\n if (isNewlyCreated) {\n context.onNodeCreated?.(listItem, li);\n }\n\n return refNode;\n};\n"]}
1	+ {"version":3,"file":"handleListItem.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleListItem.ts"],"names":[],"mappings":"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","sourcesContent":["import { applyFormat } from '../utils/applyFormat';\nimport { applyMetadata } from '../utils/applyMetadata';\nimport { isGenericRoleElement } from '../../domUtils/isGenericRoleElement';\nimport { reuseCachedElement } from '../../domUtils/reuseCachedElement';\nimport { setParagraphNotImplicit } from '../../modelApi/block/setParagraphNotImplicit';\nimport { stackFormat } from '../utils/stackFormat';\nimport { unwrap } from '../../domUtils/unwrap';\nimport type {\n ContentModelBlockHandler,\n ContentModelListItem,\n ModelToDomContext,\n ModelToDomListStackItem,\n} from 'roosterjs-content-model-types';\n\nconst HtmlRoleAttribute = 'role';\nconst PresentationRoleValue = 'presentation';\n\n/*\n @internal\n */\nexport const handleListItem: ContentModelBlockHandler<ContentModelListItem> = (\n doc: Document,\n parent: Node,\n listItem: ContentModelListItem,\n context: ModelToDomContext,\n refNode: Node \| null\n) => {\n refNode = context.modelHandlers.list(doc, parent, listItem, context, refNode);\n\n const { nodeStack } = context.listFormat;\n const leafLevel: Partial<ModelToDomListStackItem> = nodeStack?.[nodeStack.length - 1] ?? {};\n const itemRefNode = leafLevel.refNode \|\| null;\n const listParent = leafLevel.node \|\| parent;\n const level = listItem.levels[listItem.levels.length - 1];\n\n let li: HTMLLIElement;\n let isNewlyCreated = false;\n\n if (listItem.cachedElement) {\n li = listItem.cachedElement;\n\n // Check if the cached LI is used as refNode under another list level,\n // since we know we are going to move it under the current listParent,\n // we need to update the refNode of the previous list level to avoid removing it later\n for (let i = 0; i < nodeStack.length - 1; i++) {\n if (nodeStack[i].refNode === li) {\n nodeStack[i].refNode = li.nextSibling;\n }\n }\n\n leafLevel.refNode = reuseCachedElement(\n listParent,\n li,\n itemRefNode,\n context.rewriteFromModel\n );\n } else {\n li = doc.createElement('li');\n isNewlyCreated = true;\n\n // It is possible listParent is the same with parent param.\n // This happens when outdent a list item to cause it has no list level\n listParent.insertBefore(li, itemRefNode?.parentNode == listParent ? itemRefNode : null);\n context.rewriteFromModel.addedBlockElements.push(li);\n listItem.cachedElement = li;\n }\n\n if (level) {\n applyFormat(li, context.formatAppliers.segment, listItem.formatHolder.format, context);\n applyFormat(li, context.formatAppliers.listItemThread, level.format, context);\n\n // Need to apply metadata after applying listItem format since the list numbers value relies on the result of list thread handling\n applyMetadata(level, context.metadataAppliers.listItem, listItem.format, context);\n\n // Need to apply listItemElement formats after applying metadata since the list numbers value relies on the result of metadata handling\n applyFormat(li, context.formatAppliers.listItemElement, listItem.format, context);\n\n stackFormat(context, listItem.formatHolder.format, () => {\n stackFormat(\n context,\n listItem.format.direction ? { direction: listItem.format.direction } : null,\n () => {\n context.modelHandlers.blockGroupChildren(doc, li, listItem, context);\n }\n );\n });\n } else {\n // There is no level for this list item, that means it should be moved out of the list\n // For each paragraph, make it not implicit so it will have a DIV around it, to avoid more paragraphs connected together\n listItem.blocks.forEach(setParagraphNotImplicit);\n\n context.modelHandlers.blockGroupChildren(doc, li, listItem, context);\n\n unwrap(li);\n }\n\n // Add role=\"presentation\" to all generic role elements inside the LI element\n // This is to make sure the elements are announced correctly by screen readers\n // when using arrow keys to navigate the list.\n for (let index = 0; index < li.children.length; index++) {\n const element = li.children.item(index);\n if (isGenericRoleElement(element)) {\n element.setAttribute(HtmlRoleAttribute, PresentationRoleValue);\n }\n }\n\n if (isNewlyCreated) {\n context.onNodeCreated?.(listItem, li);\n }\n\n return refNode;\n};\n"]}

package/lib/modelToDom/handlers/handleTable.js CHANGED Viewed

@@ -107,7 +107,9 @@ var handleTable = function (doc, parent, table, context, refNode) {
                         (0, applyFormat_1.applyFormat)(td_1, context.formatAppliers.tableCellBorder, cell.format, context);
                         (0, applyFormat_1.applyFormat)(td_1, context.formatAppliers.dataset, cell.dataset, context);
                     }
-                    context.modelHandlers.blockGroupChildren(doc, td_1, cell, context);
+                    (0, stackFormat_1.stackFormat)(context, cell.format.direction ? { direction: cell.format.direction } : null, function () {
+                        context.modelHandlers.blockGroupChildren(doc, td_1, cell, context);
+                    });
                 });
                 (_f = context.onNodeCreated) === null || _f === void 0 ? void 0 : _f.call(context, cell, td_1);
             }

package/lib/modelToDom/handlers/handleTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"handleTable.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleTable.ts"],"names":[],"mappings":"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","sourcesContent":["import { applyFormat } from '../utils/applyFormat';\nimport { hasMetadata } from '../../modelApi/metadata/updateMetadata';\nimport { isBlockEmpty } from '../../modelApi/common/isEmpty';\nimport { moveChildNodes } from '../../domUtils/moveChildNodes';\nimport { reuseCachedElement } from '../../domUtils/reuseCachedElement';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n ContentModelBlockHandler,\n ContentModelTable,\n ModelToDomContext,\n TableSelection,\n} from 'roosterjs-content-model-types';\n\n/*\n @internal\n */\nexport const handleTable: ContentModelBlockHandler<ContentModelTable> = (\n doc: Document,\n parent: Node,\n table: ContentModelTable,\n context: ModelToDomContext,\n refNode: Node \| null\n) => {\n if (isBlockEmpty(table)) {\n // Empty table, do not create TABLE element and just return\n return refNode;\n }\n\n let tableNode = context.allowCacheElement ? table.cachedElement : undefined;\n\n if (tableNode) {\n refNode = reuseCachedElement(parent, tableNode, refNode, context.rewriteFromModel);\n\n moveChildNodes(tableNode);\n } else {\n tableNode = doc.createElement('table');\n\n if (context.allowCacheElement) {\n table.cachedElement = tableNode;\n }\n\n parent.insertBefore(tableNode, refNode);\n context.rewriteFromModel.addedBlockElements.push(tableNode);\n\n applyFormat(tableNode, context.formatAppliers.block, table.format, context);\n applyFormat(tableNode, context.formatAppliers.table, table.format, context);\n applyFormat(tableNode, context.formatAppliers.tableBorder, table.format, context);\n applyFormat(tableNode, context.formatAppliers.dataset, table.dataset, context);\n }\n\n context.onNodeCreated?.(table, tableNode);\n\n const tbody = doc.createElement('tbody');\n tableNode.appendChild(tbody);\n\n for (let row = 0; row < table.rows.length; row++) {\n const tableRow = table.rows[row];\n\n if (tableRow.cells.length == 0) {\n // Skip empty row\n continue;\n }\n\n const tr = (context.allowCacheElement && tableRow.cachedElement) \|\| doc.createElement('tr');\n tbody.appendChild(tr);\n moveChildNodes(tr);\n\n if (!tableRow.cachedElement) {\n if (context.allowCacheElement) {\n tableRow.cachedElement = tr;\n }\n\n applyFormat(tr, context.formatAppliers.tableRow, tableRow.format, context);\n }\n\n context.onNodeCreated?.(tableRow, tr);\n\n for (let col = 0; col < tableRow.cells.length; col++) {\n const cell = tableRow.cells[col];\n\n if (cell.isSelected) {\n const tableSelection: TableSelection = context.tableSelection \|\| {\n type: 'table',\n table: tableNode,\n firstColumn: col,\n lastColumn: col,\n firstRow: row,\n lastRow: row,\n };\n\n if (tableSelection.table == tableNode) {\n tableSelection.lastColumn = Math.max(tableSelection.lastColumn, col);\n tableSelection.lastRow = Math.max(tableSelection.lastRow, row);\n }\n\n context.tableSelection = tableSelection;\n }\n\n if (!cell.spanAbove && !cell.spanLeft) {\n const tag = cell.isHeader ? 'th' : 'td';\n const td =\n (context.allowCacheElement && cell.cachedElement) \|\| doc.createElement(tag);\n\n tr.appendChild(td);\n\n let rowSpan = 1;\n let colSpan = 1;\n let width = table.widths[col];\n let height = tableRow.height;\n\n for (; table.rows[row + rowSpan]?.cells[col]?.spanAbove; rowSpan++) {\n height += table.rows[row + rowSpan].height;\n }\n for (; tableRow.cells[col + colSpan]?.spanLeft; colSpan++) {\n width += table.widths[col + colSpan];\n }\n\n if (rowSpan > 1) {\n td.rowSpan = rowSpan;\n }\n\n if (colSpan > 1) {\n td.colSpan = colSpan;\n }\n\n if (!cell.cachedElement \|\| (cell.format.useBorderBox && hasMetadata(table))) {\n if (width > 0 && !td.style.width) {\n td.style.width = width + 'px';\n }\n\n if (height > 0 && !td.style.height) {\n td.style.height = height + 'px';\n }\n }\n\n stackFormat(context, tag, () => {\n if (!cell.cachedElement) {\n if (context.allowCacheElement) {\n cell.cachedElement = td;\n }\n\n applyFormat(td, context.formatAppliers.block, cell.format, context);\n applyFormat(td, context.formatAppliers.tableCell, cell.format, context);\n applyFormat(\n td,\n context.formatAppliers.tableCellBorder,\n cell.format,\n context\n );\n applyFormat(td, context.formatAppliers.dataset, cell.dataset, context);\n }\n\n context.modelHandlers.blockGroupChildren(doc, td, cell, context);\n });\n\n context.onNodeCreated?.(cell, td);\n }\n }\n }\n\n context.domIndexer?.onTable(tableNode, table);\n\n return refNode;\n};\n"]}
1	+ {"version":3,"file":"handleTable.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelToDom/handlers/handleTable.ts"],"names":[],"mappings":"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","sourcesContent":["import { applyFormat } from '../utils/applyFormat';\nimport { hasMetadata } from '../../modelApi/metadata/updateMetadata';\nimport { isBlockEmpty } from '../../modelApi/common/isEmpty';\nimport { moveChildNodes } from '../../domUtils/moveChildNodes';\nimport { reuseCachedElement } from '../../domUtils/reuseCachedElement';\nimport { stackFormat } from '../utils/stackFormat';\nimport type {\n ContentModelBlockHandler,\n ContentModelTable,\n ModelToDomContext,\n TableSelection,\n} from 'roosterjs-content-model-types';\n\n/*\n @internal\n */\nexport const handleTable: ContentModelBlockHandler<ContentModelTable> = (\n doc: Document,\n parent: Node,\n table: ContentModelTable,\n context: ModelToDomContext,\n refNode: Node \| null\n) => {\n if (isBlockEmpty(table)) {\n // Empty table, do not create TABLE element and just return\n return refNode;\n }\n\n let tableNode = context.allowCacheElement ? table.cachedElement : undefined;\n\n if (tableNode) {\n refNode = reuseCachedElement(parent, tableNode, refNode, context.rewriteFromModel);\n\n moveChildNodes(tableNode);\n } else {\n tableNode = doc.createElement('table');\n\n if (context.allowCacheElement) {\n table.cachedElement = tableNode;\n }\n\n parent.insertBefore(tableNode, refNode);\n context.rewriteFromModel.addedBlockElements.push(tableNode);\n\n applyFormat(tableNode, context.formatAppliers.block, table.format, context);\n applyFormat(tableNode, context.formatAppliers.table, table.format, context);\n applyFormat(tableNode, context.formatAppliers.tableBorder, table.format, context);\n applyFormat(tableNode, context.formatAppliers.dataset, table.dataset, context);\n }\n\n context.onNodeCreated?.(table, tableNode);\n\n const tbody = doc.createElement('tbody');\n tableNode.appendChild(tbody);\n\n for (let row = 0; row < table.rows.length; row++) {\n const tableRow = table.rows[row];\n\n if (tableRow.cells.length == 0) {\n // Skip empty row\n continue;\n }\n\n const tr = (context.allowCacheElement && tableRow.cachedElement) \|\| doc.createElement('tr');\n tbody.appendChild(tr);\n moveChildNodes(tr);\n\n if (!tableRow.cachedElement) {\n if (context.allowCacheElement) {\n tableRow.cachedElement = tr;\n }\n\n applyFormat(tr, context.formatAppliers.tableRow, tableRow.format, context);\n }\n\n context.onNodeCreated?.(tableRow, tr);\n\n for (let col = 0; col < tableRow.cells.length; col++) {\n const cell = tableRow.cells[col];\n\n if (cell.isSelected) {\n const tableSelection: TableSelection = context.tableSelection \|\| {\n type: 'table',\n table: tableNode,\n firstColumn: col,\n lastColumn: col,\n firstRow: row,\n lastRow: row,\n };\n\n if (tableSelection.table == tableNode) {\n tableSelection.lastColumn = Math.max(tableSelection.lastColumn, col);\n tableSelection.lastRow = Math.max(tableSelection.lastRow, row);\n }\n\n context.tableSelection = tableSelection;\n }\n\n if (!cell.spanAbove && !cell.spanLeft) {\n const tag = cell.isHeader ? 'th' : 'td';\n const td =\n (context.allowCacheElement && cell.cachedElement) \|\| doc.createElement(tag);\n\n tr.appendChild(td);\n\n let rowSpan = 1;\n let colSpan = 1;\n let width = table.widths[col];\n let height = tableRow.height;\n\n for (; table.rows[row + rowSpan]?.cells[col]?.spanAbove; rowSpan++) {\n height += table.rows[row + rowSpan].height;\n }\n for (; tableRow.cells[col + colSpan]?.spanLeft; colSpan++) {\n width += table.widths[col + colSpan];\n }\n\n if (rowSpan > 1) {\n td.rowSpan = rowSpan;\n }\n\n if (colSpan > 1) {\n td.colSpan = colSpan;\n }\n\n if (!cell.cachedElement \|\| (cell.format.useBorderBox && hasMetadata(table))) {\n if (width > 0 && !td.style.width) {\n td.style.width = width + 'px';\n }\n\n if (height > 0 && !td.style.height) {\n td.style.height = height + 'px';\n }\n }\n\n stackFormat(context, tag, () => {\n if (!cell.cachedElement) {\n if (context.allowCacheElement) {\n cell.cachedElement = td;\n }\n\n applyFormat(td, context.formatAppliers.block, cell.format, context);\n applyFormat(td, context.formatAppliers.tableCell, cell.format, context);\n applyFormat(\n td,\n context.formatAppliers.tableCellBorder,\n cell.format,\n context\n );\n applyFormat(td, context.formatAppliers.dataset, cell.dataset, context);\n }\n\n stackFormat(\n context,\n cell.format.direction ? { direction: cell.format.direction } : null,\n () => {\n context.modelHandlers.blockGroupChildren(doc, td, cell, context);\n }\n );\n });\n\n context.onNodeCreated?.(cell, td);\n }\n }\n }\n\n context.domIndexer?.onTable(tableNode, table);\n\n return refNode;\n};\n"]}

package/lib-amd/formatHandlers/block/directionFormatHandler.js CHANGED Viewed

@@ -12,11 +12,13 @@ define(["require", "exports", "../../domUtils/isElementOfType"], function (requi
                 format.direction = dir == 'rtl' ? 'rtl' : 'ltr';
             }
         },
-        apply: function (format, element) {
+        apply: function (format, element, context) {
             if (format.direction) {
                 element.style.direction = format.direction;
             }
-            if (format.direction == 'rtl' && (0, isElementOfType_1.isElementOfType)(element, 'table')) {
+            if (format.direction == 'rtl' &&
+                (0, isElementOfType_1.isElementOfType)(element, 'table') &&
+                context.implicitFormat.direction != 'rtl') {
                 element.style.justifySelf = 'flex-end';
             }
         },

package/lib-amd/formatHandlers/block/directionFormatHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"directionFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/block/directionFormatHandler.ts"],"names":[],"mappings":";;;;IAIA;;OAEG;IACU,QAAA,sBAAsB,GAAmC;QAClE,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;YACpC,IAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,IAAI,YAAY,CAAC,SAAS,CAAC;YAE7E,IAAI,GAAG,EAAE;gBACL,MAAM,CAAC,SAAS,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;aACnD;QACL,CAAC;QACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO;~~YACnB~~,IAAI,MAAM,CAAC,SAAS,EAAE;gBAClB,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;aAC9C;YAED,~~IAAI~~,MAAM,CAAC,SAAS,IAAI,KAAK,~~IAAI,~~IAAA,iCAAe,EAAC,OAAO,EAAE,OAAO,CAAC,~~EAAE~~;~~gBAChE~~,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;aAC1C;QACL,CAAC;KACJ,CAAC","sourcesContent":["import { isElementOfType } from '../../domUtils/isElementOfType';\nimport type { DirectionFormat } from 'roosterjs-content-model-types';\nimport type { FormatHandler } from '../FormatHandler';\n\n/*\n @internal\n */\nexport const directionFormatHandler: FormatHandler<DirectionFormat> = {\n parse: (format, element, _, defaultStyle) => {\n const dir = element.style.direction \|\| element.dir \|\| defaultStyle.direction;\n\n if (dir) {\n format.direction = dir == 'rtl' ? 'rtl' : 'ltr';\n }\n },\n apply: (format, element) => {\n if (format.direction) {\n element.style.direction = format.direction;\n }\n\n if (format.direction == 'rtl' && isElementOfType(element, 'table')) {\n element.style.justifySelf = 'flex-end';\n }\n },\n};\n"]}
1	+ {"version":3,"file":"directionFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/block/directionFormatHandler.ts"],"names":[],"mappings":";;;;IAIA;;OAEG;IACU,QAAA,sBAAsB,GAAmC;QAClE,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;YACpC,IAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,IAAI,YAAY,CAAC,SAAS,CAAC;YAE7E,IAAI,GAAG,EAAE;gBACL,MAAM,CAAC,SAAS,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;aACnD;QACL,CAAC;QACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,OAAO;YAC5B,IAAI,MAAM,CAAC,SAAS,EAAE;gBAClB,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;aAC9C;YAED,IACI,MAAM,CAAC,SAAS,IAAI,KAAK;gBACzB,IAAA,iCAAe,EAAC,OAAO,EAAE,OAAO,CAAC;gBACjC,OAAO,CAAC,cAAc,CAAC,SAAS,IAAI,KAAK,EAC3C;gBACE,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;aAC1C;QACL,CAAC;KACJ,CAAC","sourcesContent":["import { isElementOfType } from '../../domUtils/isElementOfType';\nimport type { DirectionFormat } from 'roosterjs-content-model-types';\nimport type { FormatHandler } from '../FormatHandler';\n\n/*\n @internal\n */\nexport const directionFormatHandler: FormatHandler<DirectionFormat> = {\n parse: (format, element, _, defaultStyle) => {\n const dir = element.style.direction \|\| element.dir \|\| defaultStyle.direction;\n\n if (dir) {\n format.direction = dir == 'rtl' ? 'rtl' : 'ltr';\n }\n },\n apply: (format, element, context) => {\n if (format.direction) {\n element.style.direction = format.direction;\n }\n\n if (\n format.direction == 'rtl' &&\n isElementOfType(element, 'table') &&\n context.implicitFormat.direction != 'rtl'\n ) {\n element.style.justifySelf = 'flex-end';\n }\n },\n};\n"]}

package/lib-amd/formatHandlers/common/borderFormatHandler.js CHANGED Viewed

@@ -1,4 +1,4 @@
-define(["require", "exports", "tslib", "../utils/borderKeys"], function (require, exports, tslib_1, borderKeys_1) {
+define(["require", "exports", "tslib", "../utils/borderKeys", "../../domUtils/style/borderValues"], function (require, exports, tslib_1, borderKeys_1, borderValues_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.borderFormatHandler = void 0;
@@ -30,7 +30,17 @@ define(["require", "exports", "tslib", "../utils/borderKeys"], function (require
                     width = '0px';
                 }
                 if (value && width != defaultWidth) {
-                    format[key] = value == 'none' ? '' : value;
+                    var result = value;
+                    if (result.includes('initial')) {
+                        // Remove 'initial' from the last part (color) of the border value
+                        // since browsers ignore it when setting the inline style property
+                        var border = (0, borderValues_1.extractBorderValues)(value);
+                        if (border.color === 'initial') {
+                            border.color = '';
+                        }
+                        result = (0, borderValues_1.combineBorderValue)(border);
+                    }
+                    format[key] = result == 'none' ? '' : result;
                 }
             });
             var borderRadius = element.style.borderRadius;

package/lib-amd/formatHandlers/common/borderFormatHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"borderFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/common/borderFormatHandler.ts"],"names":[],"mappings":";;;;~~IAIA~~,6CAA6C;IAC7C,IAAM,eAAe,GAAkC;QACnD,gBAAgB;QAChB,kBAAkB;QAClB,mBAAmB;QACnB,iBAAiB;KACpB,CAAC;IAEF,IAAM,gBAAgB,GAAuD;QACzE,qBAAqB;QACrB,sBAAsB;QACtB,wBAAwB;QACxB,yBAAyB;KAC5B,CAAC;IAEF,IAAM,OAAO,iFAAO,uBAAU,+BAAK,gBAAgB,SAAC,CAAC;IAErD;;OAEG;IACU,QAAA,mBAAmB,GAAgC;QAC5D,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;YACpC,uBAAU,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,CAAC;;gBACtB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAM,YAAY,GAAG,MAAA,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,mCAAI,KAAK,CAAC;gBAC/D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE9C,IAAI,KAAK,IAAI,GAAG,EAAE;oBACd,KAAK,GAAG,KAAK,CAAC;iBACjB;gBAED,IAAI,KAAK,IAAI,KAAK,IAAI,YAAY,EAAE;oBAChC,MAAM,CAAC,~~GAAG~~,CAAC,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,~~KAAK~~,CAAC;~~iBAC9C~~;YACL,CAAC,CAAC,CAAC;YAEH,IAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;YAEhD,IAAI,YAAY,EAAE;gBACd,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;aACtC;iBAAM;gBACH,gBAAgB,CAAC,OAAO,CAAC,UAAA,GAAG;oBACxB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAEjC,IAAI,KAAK,EAAE;wBACP,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;qBACvB;gBACL,CAAC,CAAC,CAAC;aACN;QACL,CAAC;QACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO;YACnB,OAAO,CAAC,OAAO,CAAC,UAAA,GAAG;gBACf,IAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAE1B,IAAI,KAAK,EAAE;oBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAC9B;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,YAAY,EAAE;gBACrB,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;aACpD;QACL,CAAC;KACJ,CAAC","sourcesContent":["import { BorderKeys } from '../utils/borderKeys';\nimport type { BorderFormat } from 'roosterjs-content-model-types';\nimport type { FormatHandler } from '../FormatHandler';\n\n// This array needs to match BorderKeys array\nconst BorderWidthKeys: (keyof CSSStyleDeclaration)[] = [\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n];\n\nconst BorderRadiusKeys: (keyof BorderFormat & keyof CSSStyleDeclaration)[] = [\n 'borderTopLeftRadius',\n 'borderTopRightRadius',\n 'borderBottomLeftRadius',\n 'borderBottomRightRadius',\n];\n\nconst AllKeys = [...BorderKeys, ...BorderRadiusKeys];\n\n/*\n @internal\n */\nexport const borderFormatHandler: FormatHandler<BorderFormat> = {\n parse: (format, element, _, defaultStyle) => {\n BorderKeys.forEach((key, i) => {\n const value = element.style[key];\n const defaultWidth = defaultStyle[BorderWidthKeys[i]] ?? '0px';\n let width = element.style[BorderWidthKeys[i]];\n\n if (width == '0') {\n width = '0px';\n }\n\n if (value && width != defaultWidth) {\n format[key] = ~~value~~ == 'none' ? '' : ~~value~~;\n }\n });\n\n const borderRadius = element.style.borderRadius;\n\n if (borderRadius) {\n format.borderRadius = borderRadius;\n } else {\n BorderRadiusKeys.forEach(key => {\n const value = element.style[key];\n\n if (value) {\n format[key] = value;\n }\n });\n }\n },\n apply: (format, element) => {\n AllKeys.forEach(key => {\n const value = format[key];\n\n if (value) {\n element.style[key] = value;\n }\n });\n\n if (format.borderRadius) {\n element.style.borderRadius = format.borderRadius;\n }\n },\n};\n"]}
1	+ {"version":3,"file":"borderFormatHandler.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/formatHandlers/common/borderFormatHandler.ts"],"names":[],"mappings":";;;;IAKA,6CAA6C;IAC7C,IAAM,eAAe,GAAkC;QACnD,gBAAgB;QAChB,kBAAkB;QAClB,mBAAmB;QACnB,iBAAiB;KACpB,CAAC;IAEF,IAAM,gBAAgB,GAAuD;QACzE,qBAAqB;QACrB,sBAAsB;QACtB,wBAAwB;QACxB,yBAAyB;KAC5B,CAAC;IAEF,IAAM,OAAO,iFAAO,uBAAU,+BAAK,gBAAgB,SAAC,CAAC;IAErD;;OAEG;IACU,QAAA,mBAAmB,GAAgC;QAC5D,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,YAAY;YACpC,uBAAU,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,CAAC;;gBACtB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAM,YAAY,GAAG,MAAA,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,mCAAI,KAAK,CAAC;gBAC/D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE9C,IAAI,KAAK,IAAI,GAAG,EAAE;oBACd,KAAK,GAAG,KAAK,CAAC;iBACjB;gBAED,IAAI,KAAK,IAAI,KAAK,IAAI,YAAY,EAAE;oBAChC,IAAI,MAAM,GAAG,KAAK,CAAC;oBACnB,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;wBAC5B,kEAAkE;wBAClE,kEAAkE;wBAClE,IAAM,MAAM,GAAG,IAAA,kCAAmB,EAAC,KAAK,CAAC,CAAC;wBAC1C,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;4BAC5B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;yBACrB;wBACD,MAAM,GAAG,IAAA,iCAAkB,EAAC,MAAM,CAAC,CAAC;qBACvC;oBACD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;iBAChD;YACL,CAAC,CAAC,CAAC;YAEH,IAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;YAEhD,IAAI,YAAY,EAAE;gBACd,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;aACtC;iBAAM;gBACH,gBAAgB,CAAC,OAAO,CAAC,UAAA,GAAG;oBACxB,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAEjC,IAAI,KAAK,EAAE;wBACP,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;qBACvB;gBACL,CAAC,CAAC,CAAC;aACN;QACL,CAAC;QACD,KAAK,EAAE,UAAC,MAAM,EAAE,OAAO;YACnB,OAAO,CAAC,OAAO,CAAC,UAAA,GAAG;gBACf,IAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAE1B,IAAI,KAAK,EAAE;oBACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAC9B;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,YAAY,EAAE;gBACrB,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;aACpD;QACL,CAAC;KACJ,CAAC","sourcesContent":["import { BorderKeys } from '../utils/borderKeys';\nimport type { BorderFormat } from 'roosterjs-content-model-types';\nimport { combineBorderValue, extractBorderValues } from '../../domUtils/style/borderValues';\nimport type { FormatHandler } from '../FormatHandler';\n\n// This array needs to match BorderKeys array\nconst BorderWidthKeys: (keyof CSSStyleDeclaration)[] = [\n 'borderTopWidth',\n 'borderRightWidth',\n 'borderBottomWidth',\n 'borderLeftWidth',\n];\n\nconst BorderRadiusKeys: (keyof BorderFormat & keyof CSSStyleDeclaration)[] = [\n 'borderTopLeftRadius',\n 'borderTopRightRadius',\n 'borderBottomLeftRadius',\n 'borderBottomRightRadius',\n];\n\nconst AllKeys = [...BorderKeys, ...BorderRadiusKeys];\n\n/*\n @internal\n */\nexport const borderFormatHandler: FormatHandler<BorderFormat> = {\n parse: (format, element, _, defaultStyle) => {\n BorderKeys.forEach((key, i) => {\n const value = element.style[key];\n const defaultWidth = defaultStyle[BorderWidthKeys[i]] ?? '0px';\n let width = element.style[BorderWidthKeys[i]];\n\n if (width == '0') {\n width = '0px';\n }\n\n if (value && width != defaultWidth) {\n let result = value;\n if (result.includes('initial')) {\n // Remove 'initial' from the last part (color) of the border value\n // since browsers ignore it when setting the inline style property\n const border = extractBorderValues(value);\n if (border.color === 'initial') {\n border.color = '';\n }\n result = combineBorderValue(border);\n }\n format[key] = result == 'none' ? '' : result;\n }\n });\n\n const borderRadius = element.style.borderRadius;\n\n if (borderRadius) {\n format.borderRadius = borderRadius;\n } else {\n BorderRadiusKeys.forEach(key => {\n const value = element.style[key];\n\n if (value) {\n format[key] = value;\n }\n });\n }\n },\n apply: (format, element) => {\n AllKeys.forEach(key => {\n const value = format[key];\n\n if (value) {\n element.style[key] = value;\n }\n });\n\n if (format.borderRadius) {\n element.style.borderRadius = format.borderRadius;\n }\n },\n};\n"]}

package/lib-amd/modelApi/common/addTextSegment.js CHANGED Viewed

@@ -1,4 +1,4 @@
-define(["require", "exports", "./addDecorators", "./addSegment", "../creators/createText", "./ensureParagraph", "./hasSpacesOnly", "../../domUtils/isWhiteSpacePreserved"], function (require, exports, addDecorators_1, addSegment_1, createText_1, ensureParagraph_1, hasSpacesOnly_1, isWhiteSpacePreserved_1) {
+define(["require", "exports", "./addDecorators", "./addSegment", "../creators/createText", "./ensureParagraph", "./hasSpacesOnly", "../../domUtils/isWhiteSpacePreserved", "./stripInvisibleUnicode"], function (require, exports, addDecorators_1, addSegment_1, createText_1, ensureParagraph_1, hasSpacesOnly_1, isWhiteSpacePreserved_1, stripInvisibleUnicode_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.addTextSegment = void 0;
@@ -17,7 +17,11 @@ define(["require", "exports", "./addDecorators", "./addSegment", "../creators/cr
             if (!(0, hasSpacesOnly_1.hasSpacesOnly)(text) ||
                 ((_a = paragraph === null || paragraph === void 0 ? void 0 : paragraph.segments.length) !== null && _a !== void 0 ? _a : 0) > 0 ||
                 (0, isWhiteSpacePreserved_1.isWhiteSpacePreserved)(paragraph === null || paragraph === void 0 ? void 0 : paragraph.format.whiteSpace)) {
-                textModel = (0, createText_1.createText)(text, context.segmentFormat);
+                var filteredText = context.experimentalFeatures &&
+                    context.experimentalFeatures.indexOf('FilterInvisibleUnicode') > -1
+                    ? (0, stripInvisibleUnicode_1.stripInvisibleUnicode)(text)
+                    : text;
+                textModel = (0, createText_1.createText)(filteredText, context.segmentFormat);
                 if (context.isInSelection) {
                     textModel.isSelected = true;
                 }

package/lib-amd/modelApi/common/addTextSegment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addTextSegment.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/common/addTextSegment.ts"],"names":[],"mappings":";;;;~~IAYA~~;;;;;;OAMG;IACH,SAAgB,cAAc,CAC1B,KAA6B,EAC7B,IAAY,EACZ,OAA0B;;QAE1B,IAAI,SAAuC,CAAC;QAE5C,IAAI,IAAI,EAAE;YACN,IAAM,SAAS,GAAG,IAAA,iCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAE9D,IACI,CAAC,IAAA,6BAAa,EAAC,IAAI,CAAC;gBACpB,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,MAAM,mCAAI,CAAC,CAAC,GAAG,CAAC;gBACrC,IAAA,6CAAqB,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC,UAAU,CAAC,EACrD;gBACE,SAAS,GAAG,IAAA,uBAAU,EAAC,~~IAAI~~,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;~~gBAEpD~~,IAAI,OAAO,CAAC,aAAa,EAAE;oBACvB,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;iBAC/B;gBAED,IAAA,6BAAa,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAElC,IAAA,uBAAU,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;aACrD;SACJ;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;~~IA5BD~~,~~wCA4BC~~","sourcesContent":["import { addDecorators } from './addDecorators';\nimport { addSegment } from './addSegment';\nimport { createText } from '../creators/createText';\nimport { ensureParagraph } from './ensureParagraph';\nimport { hasSpacesOnly } from './hasSpacesOnly';\nimport { isWhiteSpacePreserved } from '../../domUtils/isWhiteSpacePreserved';\nimport type {\n ContentModelBlockGroup,\n ContentModelText,\n DomToModelContext,\n} from 'roosterjs-content-model-types';\n\n/*\n Add a new text segment to current paragraph\n * @param group Current BlockGroup that the paragraph belong to\n * @param text Text content of the text segment\n * @param context Current DOM to Model context\n * @returns A new Text segment, or undefined if the input text is empty\n */\nexport function addTextSegment(\n group: ContentModelBlockGroup,\n text: string,\n context: DomToModelContext\n): ContentModelText \| undefined {\n let textModel: ContentModelText \| undefined;\n\n if (text) {\n const paragraph = ensureParagraph(group, context.blockFormat);\n\n if (\n !hasSpacesOnly(text) \|\|\n (paragraph?.segments.length ?? 0) > 0 \|\|\n isWhiteSpacePreserved(paragraph?.format.whiteSpace)\n ) {\n textModel = createText(~~text~~, context.segmentFormat);\n\n if (context.isInSelection) {\n textModel.isSelected = true;\n }\n\n addDecorators(textModel, context);\n\n addSegment(group, textModel, context.blockFormat);\n }\n }\n\n return textModel;\n}\n"]}
1	+ {"version":3,"file":"addTextSegment.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/common/addTextSegment.ts"],"names":[],"mappings":";;;;IAaA;;;;;;OAMG;IACH,SAAgB,cAAc,CAC1B,KAA6B,EAC7B,IAAY,EACZ,OAA0B;;QAE1B,IAAI,SAAuC,CAAC;QAE5C,IAAI,IAAI,EAAE;YACN,IAAM,SAAS,GAAG,IAAA,iCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAE9D,IACI,CAAC,IAAA,6BAAa,EAAC,IAAI,CAAC;gBACpB,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,MAAM,mCAAI,CAAC,CAAC,GAAG,CAAC;gBACrC,IAAA,6CAAqB,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC,UAAU,CAAC,EACrD;gBACE,IAAM,YAAY,GACd,OAAO,CAAC,oBAAoB;oBAC5B,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;oBAC/D,CAAC,CAAC,IAAA,6CAAqB,EAAC,IAAI,CAAC;oBAC7B,CAAC,CAAC,IAAI,CAAC;gBAEf,SAAS,GAAG,IAAA,uBAAU,EAAC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;gBAE5D,IAAI,OAAO,CAAC,aAAa,EAAE;oBACvB,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;iBAC/B;gBAED,IAAA,6BAAa,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAElC,IAAA,uBAAU,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;aACrD;SACJ;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAlCD,wCAkCC","sourcesContent":["import { addDecorators } from './addDecorators';\nimport { addSegment } from './addSegment';\nimport { createText } from '../creators/createText';\nimport { ensureParagraph } from './ensureParagraph';\nimport { hasSpacesOnly } from './hasSpacesOnly';\nimport { isWhiteSpacePreserved } from '../../domUtils/isWhiteSpacePreserved';\nimport { stripInvisibleUnicode } from './stripInvisibleUnicode';\nimport type {\n ContentModelBlockGroup,\n ContentModelText,\n DomToModelContext,\n} from 'roosterjs-content-model-types';\n\n/*\n Add a new text segment to current paragraph\n * @param group Current BlockGroup that the paragraph belong to\n * @param text Text content of the text segment\n * @param context Current DOM to Model context\n * @returns A new Text segment, or undefined if the input text is empty\n */\nexport function addTextSegment(\n group: ContentModelBlockGroup,\n text: string,\n context: DomToModelContext\n): ContentModelText \| undefined {\n let textModel: ContentModelText \| undefined;\n\n if (text) {\n const paragraph = ensureParagraph(group, context.blockFormat);\n\n if (\n !hasSpacesOnly(text) \|\|\n (paragraph?.segments.length ?? 0) > 0 \|\|\n isWhiteSpacePreserved(paragraph?.format.whiteSpace)\n ) {\n const filteredText =\n context.experimentalFeatures &&\n context.experimentalFeatures.indexOf('FilterInvisibleUnicode') > -1\n ? stripInvisibleUnicode(text)\n : text;\n\n textModel = createText(filteredText, context.segmentFormat);\n\n if (context.isInSelection) {\n textModel.isSelected = true;\n }\n\n addDecorators(textModel, context);\n\n addSegment(group, textModel, context.blockFormat);\n }\n }\n\n return textModel;\n}\n"]}

package/lib-amd/modelApi/common/stripInvisibleUnicode.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+/**
+ * @internal
+ * Strip invisible unicode characters from the given string
+ * @param value The string to be processed
+ * @returns The string with invisible unicode characters removed
+ */
+export declare function stripInvisibleUnicode(value: string): string;

package/lib-amd/modelApi/common/stripInvisibleUnicode.js ADDED Viewed

@@ -0,0 +1,20 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.stripInvisibleUnicode = void 0;
+    // According to https://embracethered.com/blog/posts/2024/hiding-and-finding-text-with-unicode-tags/
+    // there are some invisible unicode characters in the range of U+E0000 to U+EFFFF, which are used for hiding text in HTML.
+    // We need to strip them out before processing the pasted content, otherwise they will be treated as normal text and cause unexpected behavior.
+    var INVISIBLE_UNICODE_REGEX = /[\u{E0000}-\u{EFFFF}]/gu;
+    /**
+     * @internal
+     * Strip invisible unicode characters from the given string
+     * @param value The string to be processed
+     * @returns The string with invisible unicode characters removed
+     */
+    function stripInvisibleUnicode(value) {
+        return value.replace(INVISIBLE_UNICODE_REGEX, '');
+    }
+    exports.stripInvisibleUnicode = stripInvisibleUnicode;
+});
+//# sourceMappingURL=stripInvisibleUnicode.js.map

package/lib-amd/modelApi/common/stripInvisibleUnicode.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"stripInvisibleUnicode.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/common/stripInvisibleUnicode.ts"],"names":[],"mappings":";;;;IAAA,oGAAoG;IACpG,0HAA0H;IAC1H,+IAA+I;IAC/I,IAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAE1D;;;;;OAKG;IACH,SAAgB,qBAAqB,CAAC,KAAa;QAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAFD,sDAEC","sourcesContent":["// According to https://embracethered.com/blog/posts/2024/hiding-and-finding-text-with-unicode-tags/\n// there are some invisible unicode characters in the range of U+E0000 to U+EFFFF, which are used for hiding text in HTML.\n// We need to strip them out before processing the pasted content, otherwise they will be treated as normal text and cause unexpected behavior.\nconst INVISIBLE_UNICODE_REGEX = /[\\u{E0000}-\\u{EFFFF}]/gu;\n\n/**\n * @internal\n * Strip invisible unicode characters from the given string\n * @param value The string to be processed\n * @returns The string with invisible unicode characters removed\n */\nexport function stripInvisibleUnicode(value: string): string {\n return value.replace(INVISIBLE_UNICODE_REGEX, '');\n}\n"]}

package/lib-amd/modelApi/creators/createSelectionMarker.js CHANGED Viewed

@@ -1,4 +1,4 @@
-define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
+define(["require", "exports", "../../constants/EmptySegmentFormat", "../../domUtils/getObjectKeys"], function (require, exports, EmptySegmentFormat_1, getObjectKeys_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createSelectionMarker = void 0;
@@ -7,10 +7,18 @@ define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
      * @param format @optional The format of this model
      */
     function createSelectionMarker(format) {
+        var filteredFormat = {};
+        if (format) {
+            (0, getObjectKeys_1.getObjectKeys)(EmptySegmentFormat_1.EmptySegmentFormat).forEach(function (key) {
+                if (key in format) {
+                    filteredFormat[key] = format[key];
+                }
+            });
+        }
         return {
             segmentType: 'SelectionMarker',
             isSelected: true,
-            format: (0, tslib_1.__assign)({}, format),
+            format: filteredFormat,
         };
     }
     exports.createSelectionMarker = createSelectionMarker;

package/lib-amd/modelApi/creators/createSelectionMarker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createSelectionMarker.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/creators/createSelectionMarker.ts"],"names":[],"mappings":";;;;~~IAKA~~;;;OAGG;IACH,SAAgB,qBAAqB,CACjC,MAA4C;QAE5C,OAAO;YACH,WAAW,EAAE,iBAAiB;YAC9B,UAAU,EAAE,IAAI;YAChB,MAAM,~~4BAAO~~,~~MAAM,CAAE~~;~~SACxB~~,CAAC;IACN,CAAC;~~IARD~~,~~sDAQC~~","sourcesContent":["import type {\n ContentModelSegmentFormat,\n ContentModelSelectionMarker,\n} from 'roosterjs-content-model-types';\n\n/*\n Create a ContentModelSelectionMarker model\n * @param format @optional The format of this model\n */\nexport function createSelectionMarker(\n format?: Readonly<ContentModelSegmentFormat>\n): ContentModelSelectionMarker {\n return {\n segmentType: 'SelectionMarker',\n isSelected: true,\n format: ~~{ ...format }~~,\n };\n}\n"]}
1	+ {"version":3,"file":"createSelectionMarker.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-dom/lib/modelApi/creators/createSelectionMarker.ts"],"names":[],"mappings":";;;;IAOA;;;OAGG;IACH,SAAgB,qBAAqB,CACjC,MAA4C;QAE5C,IAAM,cAAc,GAA8B,EAAE,CAAC;QAErD,IAAI,MAAM,EAAE;YACR,IAAA,6BAAa,EAAC,uCAAkB,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG;gBACzC,IAAI,GAAG,IAAI,MAAM,EAAE;oBACd,cAAc,CAAC,GAAG,CAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBAC9C;YACL,CAAC,CAAC,CAAC;SACN;QAED,OAAO;YACH,WAAW,EAAE,iBAAiB;YAC9B,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,cAAc;SACzB,CAAC;IACN,CAAC;IAlBD,sDAkBC","sourcesContent":["import { EmptySegmentFormat } from '../../constants/EmptySegmentFormat';\nimport { getObjectKeys } from '../../domUtils/getObjectKeys';\nimport type {\n ContentModelSegmentFormat,\n ContentModelSelectionMarker,\n} from 'roosterjs-content-model-types';\n\n/*\n Create a ContentModelSelectionMarker model\n * @param format @optional The format of this model\n */\nexport function createSelectionMarker(\n format?: Readonly<ContentModelSegmentFormat>\n): ContentModelSelectionMarker {\n const filteredFormat: ContentModelSegmentFormat = {};\n\n if (format) {\n getObjectKeys(EmptySegmentFormat).forEach(key => {\n if (key in format) {\n (filteredFormat[key] as any) = format[key];\n }\n });\n }\n\n return {\n segmentType: 'SelectionMarker',\n isSelected: true,\n format: filteredFormat,\n };\n}\n"]}

package/lib-amd/modelToDom/handlers/handleFormatContainer.js CHANGED Viewed

@@ -28,14 +28,16 @@ define(["require", "exports", "../utils/applyFormat", "../../modelApi/common/isE
                 (0, applyFormat_1.applyFormat)(containerNode_1, context.formatAppliers.segmentOnBlock, container.format, context);
                 (0, applyFormat_1.applyFormat)(containerNode_1, context.formatAppliers.container, container.format, context);
             });
-            if (container.tagName == 'pre') {
-                (0, stackFormat_1.stackFormat)(context, PreChildFormat, function () {
+            (0, stackFormat_1.stackFormat)(context, container.format.direction ? { direction: container.format.direction } : null, function () {
+                if (container.tagName == 'pre') {
+                    (0, stackFormat_1.stackFormat)(context, PreChildFormat, function () {
+                        context.modelHandlers.blockGroupChildren(doc, containerNode_1, container, context);
+                    });
+                }
+                else {
                     context.modelHandlers.blockGroupChildren(doc, containerNode_1, container, context);
-                });
-            }
-            else {
-                context.modelHandlers.blockGroupChildren(doc, containerNode_1, container, context);
-            }
+                }
+            });
             element = containerNode_1;
         }
         if (element) {