roosterjs-content-model-dom 0.18.0 → 0.19.0

package/lib/domToModel/processors/delimiterProcessor.d.ts

@@ -2,7 +2,7 @@ import type { ElementProcessor } from 'roosterjs-content-model-types';
 /**
  * @internal
  * @param group
- * @param element
+ * @param node
  * @param context
  */
 export declare const delimiterProcessor: ElementProcessor<Node>;

package/lib/domToModel/processors/delimiterProcessor.js

@@ -1,24 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delimiterProcessor = void 0;
-var tslib_1 = require("tslib");
-var getRegularSelectionOffsets_1 = require("../utils/getRegularSelectionOffsets");
-var childProcessor_1 = require("./childProcessor");
+var addSelectionMarker_1 = require("../utils/addSelectionMarker");
 /**
  * @internal
  * @param group
- * @param element
+ * @param node
  * @param context
  */
-var delimiterProcessor = function (group, element, context) {
-    var index = 0;
-    var _a = (0, tslib_1.__read)((0, getRegularSelectionOffsets_1.getRegularSelectionOffsets)(context, element), 2), nodeStartOffset = _a[0], nodeEndOffset = _a[1];
-    for (var child = element.firstChild; child; child = child.nextSibling) {
-        (0, childProcessor_1.handleRegularSelection)(index, context, group, nodeStartOffset, nodeEndOffset);
-        (0, exports.delimiterProcessor)(group, child, context);
-        index++;
+var delimiterProcessor = function (group, node, context) {
+    var _a, _b;
+    var range = ((_a = context.selection) === null || _a === void 0 ? void 0 : _a.type) == 'range' ? context.selection.range : null;
+    if (range) {
+        if (node.contains(range.startContainer)) {
+            context.isInSelection = true;
+            (0, addSelectionMarker_1.addSelectionMarker)(group, context);
+        }
+        if (((_b = context.selection) === null || _b === void 0 ? void 0 : _b.type) == 'range' && node.contains(range.endContainer)) {
+            if (!context.selection.range.collapsed) {
+                (0, addSelectionMarker_1.addSelectionMarker)(group, context);
+            }
+            context.isInSelection = false;
+        }
     }
-    (0, childProcessor_1.handleRegularSelection)(index, context, group, nodeStartOffset, nodeEndOffset);
 };
 exports.delimiterProcessor = delimiterProcessor;
 //# sourceMappingURL=delimiterProcessor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"delimiterProcessor.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/delimiterProcessor.ts"],"names":[],"mappings":";;;;AAAA,kFAAiF;AACjF,mDAA0D;AAG1D;;;;;GAKG;AACI,IAAM,kBAAkB,GAA2B,UAAC,KAAK,EAAE,OAAO,EAAE,OAAO;IAC9E,IAAI,KAAK,GAAG,CAAC,CAAC;IACR,IAAA,KAAA,oBAAmC,IAAA,uDAA0B,EAAC,OAAO,EAAE,OAAO,CAAC,IAAA,EAA9E,eAAe,QAAA,EAAE,aAAa,QAAgD,CAAC;IAEtF,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE;QACnE,IAAA,uCAAsB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;QAE9E,IAAA,0BAAkB,EAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1C,KAAK,EAAE,CAAC;KACX;IAED,IAAA,uCAAsB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;AAClF,CAAC,CAAC;AAZW,QAAA,kBAAkB,sBAY7B","sourcesContent":["import { getRegularSelectionOffsets } from '../utils/getRegularSelectionOffsets';\nimport { handleRegularSelection } from './childProcessor';\nimport type { ElementProcessor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * @param group\n * @param element\n * @param context\n */\nexport const delimiterProcessor: ElementProcessor<Node> = (group, element, context) => {\n    let index = 0;\n    const [nodeStartOffset, nodeEndOffset] = getRegularSelectionOffsets(context, element);\n\n    for (let child = element.firstChild; child; child = child.nextSibling) {\n        handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);\n\n        delimiterProcessor(group, child, context);\n        index++;\n    }\n\n    handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);\n};\n"]}
+{"version":3,"file":"delimiterProcessor.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/delimiterProcessor.ts"],"names":[],"mappings":";;;AAAA,kEAAiE;AAGjE;;;;;GAKG;AACI,IAAM,kBAAkB,GAA2B,UAAC,KAAK,EAAE,IAAI,EAAE,OAAO;;IAC3E,IAAM,KAAK,GAAG,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,KAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAElF,IAAI,KAAK,EAAE;QACP,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;YACrC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;YAE7B,IAAA,uCAAkB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACtC;QAED,IAAI,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,KAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACzE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE;gBACpC,IAAA,uCAAkB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aACtC;YAED,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;SACjC;KACJ;AACL,CAAC,CAAC;AAlBW,QAAA,kBAAkB,sBAkB7B","sourcesContent":["import { addSelectionMarker } from '../utils/addSelectionMarker';\nimport type { ElementProcessor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * @param group\n * @param node\n * @param context\n */\nexport const delimiterProcessor: ElementProcessor<Node> = (group, node, context) => {\n    const range = context.selection?.type == 'range' ? context.selection.range : null;\n\n    if (range) {\n        if (node.contains(range.startContainer)) {\n            context.isInSelection = true;\n\n            addSelectionMarker(group, context);\n        }\n\n        if (context.selection?.type == 'range' && node.contains(range.endContainer)) {\n            if (!context.selection.range.collapsed) {\n                addSelectionMarker(group, context);\n            }\n\n            context.isInSelection = false;\n        }\n    }\n};\n"]}

package/lib-amd/domToModel/processors/delimiterProcessor.d.ts

@@ -2,7 +2,7 @@ import type { ElementProcessor } from 'roosterjs-content-model-types';
 /**
  * @internal
  * @param group
- * @param element
+ * @param node
  * @param context
  */
 export declare const delimiterProcessor: ElementProcessor<Node>;

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

@@ -1,22 +1,28 @@
-define(["require", "exports", "tslib", "../utils/getRegularSelectionOffsets", "./childProcessor"], function (require, exports, tslib_1, getRegularSelectionOffsets_1, childProcessor_1) {
+define(["require", "exports", "../utils/addSelectionMarker"], function (require, exports, addSelectionMarker_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.delimiterProcessor = void 0;
     /**
      * @internal
      * @param group
-     * @param element
+     * @param node
      * @param context
      */
-    var delimiterProcessor = function (group, element, context) {
-        var index = 0;
-        var _a = (0, tslib_1.__read)((0, getRegularSelectionOffsets_1.getRegularSelectionOffsets)(context, element), 2), nodeStartOffset = _a[0], nodeEndOffset = _a[1];
-        for (var child = element.firstChild; child; child = child.nextSibling) {
-            (0, childProcessor_1.handleRegularSelection)(index, context, group, nodeStartOffset, nodeEndOffset);
-            (0, exports.delimiterProcessor)(group, child, context);
-            index++;
+    var delimiterProcessor = function (group, node, context) {
+        var _a, _b;
+        var range = ((_a = context.selection) === null || _a === void 0 ? void 0 : _a.type) == 'range' ? context.selection.range : null;
+        if (range) {
+            if (node.contains(range.startContainer)) {
+                context.isInSelection = true;
+                (0, addSelectionMarker_1.addSelectionMarker)(group, context);
+            }
+            if (((_b = context.selection) === null || _b === void 0 ? void 0 : _b.type) == 'range' && node.contains(range.endContainer)) {
+                if (!context.selection.range.collapsed) {
+                    (0, addSelectionMarker_1.addSelectionMarker)(group, context);
+                }
+                context.isInSelection = false;
+            }
         }
-        (0, childProcessor_1.handleRegularSelection)(index, context, group, nodeStartOffset, nodeEndOffset);
     };
     exports.delimiterProcessor = delimiterProcessor;
 });

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

@@ -1 +1 @@
-{"version":3,"file":"delimiterProcessor.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/delimiterProcessor.ts"],"names":[],"mappings":";;;;IAIA;;;;;OAKG;IACI,IAAM,kBAAkB,GAA2B,UAAC,KAAK,EAAE,OAAO,EAAE,OAAO;QAC9E,IAAI,KAAK,GAAG,CAAC,CAAC;QACR,IAAA,KAAA,oBAAmC,IAAA,uDAA0B,EAAC,OAAO,EAAE,OAAO,CAAC,IAAA,EAA9E,eAAe,QAAA,EAAE,aAAa,QAAgD,CAAC;QAEtF,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE;YACnE,IAAA,uCAAsB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;YAE9E,IAAA,0BAAkB,EAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1C,KAAK,EAAE,CAAC;SACX;QAED,IAAA,uCAAsB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;IAClF,CAAC,CAAC;IAZW,QAAA,kBAAkB,sBAY7B","sourcesContent":["import { getRegularSelectionOffsets } from '../utils/getRegularSelectionOffsets';\nimport { handleRegularSelection } from './childProcessor';\nimport type { ElementProcessor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * @param group\n * @param element\n * @param context\n */\nexport const delimiterProcessor: ElementProcessor<Node> = (group, element, context) => {\n    let index = 0;\n    const [nodeStartOffset, nodeEndOffset] = getRegularSelectionOffsets(context, element);\n\n    for (let child = element.firstChild; child; child = child.nextSibling) {\n        handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);\n\n        delimiterProcessor(group, child, context);\n        index++;\n    }\n\n    handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);\n};\n"]}
+{"version":3,"file":"delimiterProcessor.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/delimiterProcessor.ts"],"names":[],"mappings":";;;;IAGA;;;;;OAKG;IACI,IAAM,kBAAkB,GAA2B,UAAC,KAAK,EAAE,IAAI,EAAE,OAAO;;QAC3E,IAAM,KAAK,GAAG,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,KAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAElF,IAAI,KAAK,EAAE;YACP,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;gBACrC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;gBAE7B,IAAA,uCAAkB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aACtC;YAED,IAAI,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,KAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;gBACzE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE;oBACpC,IAAA,uCAAkB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;iBACtC;gBAED,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;aACjC;SACJ;IACL,CAAC,CAAC;IAlBW,QAAA,kBAAkB,sBAkB7B","sourcesContent":["import { addSelectionMarker } from '../utils/addSelectionMarker';\nimport type { ElementProcessor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * @param group\n * @param node\n * @param context\n */\nexport const delimiterProcessor: ElementProcessor<Node> = (group, node, context) => {\n    const range = context.selection?.type == 'range' ? context.selection.range : null;\n\n    if (range) {\n        if (node.contains(range.startContainer)) {\n            context.isInSelection = true;\n\n            addSelectionMarker(group, context);\n        }\n\n        if (context.selection?.type == 'range' && node.contains(range.endContainer)) {\n            if (!context.selection.range.collapsed) {\n                addSelectionMarker(group, context);\n            }\n\n            context.isInSelection = false;\n        }\n    }\n};\n"]}

package/lib-mjs/domToModel/processors/delimiterProcessor.d.ts

@@ -2,7 +2,7 @@ import type { ElementProcessor } from 'roosterjs-content-model-types';
 /**
  * @internal
  * @param group
- * @param element
+ * @param node
  * @param context
  */
 export declare const delimiterProcessor: ElementProcessor<Node>;

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

@@ -1,20 +1,24 @@
-import { __read } from "tslib";
-import { getRegularSelectionOffsets } from '../utils/getRegularSelectionOffsets';
-import { handleRegularSelection } from './childProcessor';
+import { addSelectionMarker } from '../utils/addSelectionMarker';
 /**
  * @internal
  * @param group
- * @param element
+ * @param node
  * @param context
  */
-export var delimiterProcessor = function (group, element, context) {
-    var index = 0;
-    var _a = __read(getRegularSelectionOffsets(context, element), 2), nodeStartOffset = _a[0], nodeEndOffset = _a[1];
-    for (var child = element.firstChild; child; child = child.nextSibling) {
-        handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);
-        delimiterProcessor(group, child, context);
-        index++;
+export var delimiterProcessor = function (group, node, context) {
+    var _a, _b;
+    var range = ((_a = context.selection) === null || _a === void 0 ? void 0 : _a.type) == 'range' ? context.selection.range : null;
+    if (range) {
+        if (node.contains(range.startContainer)) {
+            context.isInSelection = true;
+            addSelectionMarker(group, context);
+        }
+        if (((_b = context.selection) === null || _b === void 0 ? void 0 : _b.type) == 'range' && node.contains(range.endContainer)) {
+            if (!context.selection.range.collapsed) {
+                addSelectionMarker(group, context);
+            }
+            context.isInSelection = false;
+        }
     }
-    handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);
 };
 //# sourceMappingURL=delimiterProcessor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"delimiterProcessor.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/delimiterProcessor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAG1D;;;;;GAKG;AACH,MAAM,CAAC,IAAM,kBAAkB,GAA2B,UAAC,KAAK,EAAE,OAAO,EAAE,OAAO;IAC9E,IAAI,KAAK,GAAG,CAAC,CAAC;IACR,IAAA,KAAA,OAAmC,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,IAAA,EAA9E,eAAe,QAAA,EAAE,aAAa,QAAgD,CAAC;IAEtF,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE;QACnE,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;QAE9E,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1C,KAAK,EAAE,CAAC;KACX;IAED,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;AAClF,CAAC,CAAC","sourcesContent":["import { getRegularSelectionOffsets } from '../utils/getRegularSelectionOffsets';\nimport { handleRegularSelection } from './childProcessor';\nimport type { ElementProcessor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * @param group\n * @param element\n * @param context\n */\nexport const delimiterProcessor: ElementProcessor<Node> = (group, element, context) => {\n    let index = 0;\n    const [nodeStartOffset, nodeEndOffset] = getRegularSelectionOffsets(context, element);\n\n    for (let child = element.firstChild; child; child = child.nextSibling) {\n        handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);\n\n        delimiterProcessor(group, child, context);\n        index++;\n    }\n\n    handleRegularSelection(index, context, group, nodeStartOffset, nodeEndOffset);\n};\n"]}
+{"version":3,"file":"delimiterProcessor.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-dom/lib/domToModel/processors/delimiterProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE;;;;;GAKG;AACH,MAAM,CAAC,IAAM,kBAAkB,GAA2B,UAAC,KAAK,EAAE,IAAI,EAAE,OAAO;;IAC3E,IAAM,KAAK,GAAG,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,KAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAElF,IAAI,KAAK,EAAE;QACP,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;YACrC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;YAE7B,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACtC;QAED,IAAI,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,KAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACzE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE;gBACpC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aACtC;YAED,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;SACjC;KACJ;AACL,CAAC,CAAC","sourcesContent":["import { addSelectionMarker } from '../utils/addSelectionMarker';\nimport type { ElementProcessor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * @param group\n * @param node\n * @param context\n */\nexport const delimiterProcessor: ElementProcessor<Node> = (group, node, context) => {\n    const range = context.selection?.type == 'range' ? context.selection.range : null;\n\n    if (range) {\n        if (node.contains(range.startContainer)) {\n            context.isInSelection = true;\n\n            addSelectionMarker(group, context);\n        }\n\n        if (context.selection?.type == 'range' && node.contains(range.endContainer)) {\n            if (!context.selection.range.collapsed) {\n                addSelectionMarker(group, context);\n            }\n\n            context.isInSelection = false;\n        }\n    }\n};\n"]}

package/package.json

@@ -3,9 +3,9 @@
     "description": "Content Model for roosterjs (Under development)",
     "dependencies": {
         "tslib": "^2.3.1",
-        "roosterjs-content-model-types": "^0.18.0"
+        "roosterjs-content-model-types": "^0.19.0"
     },
-    "version": "0.18.0",
+    "version": "0.19.0",
     "main": "./lib/index.js",
     "typings": "./lib/index.d.ts",
     "license": "MIT",