roosterjs 9.51.0 → 9.52.0

package/dist/rooster.js

@@ -9319,6 +9319,7 @@ function generatePasteOptionFromPlugins(editor, clipboardData, fragment, htmlFro
         pasteType: pasteType,
         domToModelOption: domToModelOption,
         containsBlockElements: !!htmlFromClipboard.containsBlockElements,
+        globalCssRules: htmlFromClipboard.globalCssRules,
     };
     return editor.triggerEvent('beforePaste', event, true /* broadcast */);
 }
@@ -33633,7 +33634,11 @@ var EditPlugin = /** @class */ (function () {
                     if (!hasCtrlOrMetaKey &&
                         !event.rawEvent.isComposing &&
                         event.rawEvent.keyCode !== DEAD_KEY) {
-                        (0, keyboardEnter_1.keyboardEnter)(editor, rawEvent, this.options.formatsToPreserveOnMerge);
+                        var shouldHandleEnterKey = this.options.shouldHandleEnterKey;
+                        var handleNormalEnter = typeof shouldHandleEnterKey === 'function'
+                            ? shouldHandleEnterKey(editor)
+                            : shouldHandleEnterKey !== false;
+                        (0, keyboardEnter_1.keyboardEnter)(editor, rawEvent, handleNormalEnter, this.options.formatsToPreserveOnMerge);
                     }
                     break;
                 default:
@@ -34628,11 +34633,11 @@ var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-mo
 /**
  * @internal
  */
-function keyboardEnter(editor, rawEvent, formatsToPreserveOnMerge) {
+function keyboardEnter(editor, rawEvent, handleNormalEnter, formatsToPreserveOnMerge) {
     if (formatsToPreserveOnMerge === void 0) { formatsToPreserveOnMerge = []; }
     var selection = editor.getDOMSelection();
     editor.formatContentModel(function (model, context) {
-        var _a;
+        var _a, _b;
         // 1. delete the expanded selection if any, then merge paragraph
         var result = (0, roosterjs_content_model_dom_1.deleteSelection)(model, [], context);
         // 2. Add line break
@@ -34643,12 +34648,14 @@ function keyboardEnter(editor, rawEvent, formatsToPreserveOnMerge) {
             var steps = rawEvent.shiftKey
                 ? []
                 : [handleAutoLink_1.handleAutoLink, handleEnterOnList_1.handleEnterOnList, deleteEmptyQuote_1.deleteEmptyQuote];
-            steps.push((0, handleEnterOnParagraph_1.handleEnterOnParagraph)(formatsToPreserveOnMerge));
+            if (handleNormalEnter || handleEnterForEntity((_a = result.insertPoint) === null || _a === void 0 ? void 0 : _a.paragraph)) {
+                steps.push((0, handleEnterOnParagraph_1.handleEnterOnParagraph)(formatsToPreserveOnMerge));
+            }
             (0, roosterjs_content_model_dom_1.runEditSteps)(steps, result);
         }
         if (result.deleteResult == 'range') {
             // We have deleted something, next input should inherit the segment format from deleted content, so set pending format here
-            context.newPendingFormat = (_a = result.insertPoint) === null || _a === void 0 ? void 0 : _a.marker.format;
+            context.newPendingFormat = (_b = result.insertPoint) === null || _b === void 0 ? void 0 : _b.marker.format;
             (0, roosterjs_content_model_dom_1.normalizeContentModel)(model);
             rawEvent.preventDefault();
             return true;
@@ -34665,6 +34672,10 @@ function keyboardEnter(editor, rawEvent, formatsToPreserveOnMerge) {
     });
 }
 exports.keyboardEnter = keyboardEnter;
+function handleEnterForEntity(paragraph) {
+    return (paragraph &&
+        (paragraph.isImplicit || paragraph.segments.some(function (x) { return x.segmentType == 'Entity'; })));
+}
 
 
 /***/ },
@@ -39045,7 +39056,7 @@ var PastePlugin = /** @class */ (function () {
         var pasteType = event.pasteType;
         switch (pasteSource) {
             case 'wordDesktop':
-                (0, processPastedContentFromWordDesktop_1.processPastedContentFromWordDesktop)(event.domToModelOption, event.htmlBefore || event.clipboardData.rawHtml || '');
+                (0, processPastedContentFromWordDesktop_1.processPastedContentFromWordDesktop)(event.domToModelOption, event.htmlBefore || event.clipboardData.rawHtml || '', event.globalCssRules);
                 break;
             case 'wacComponents':
                 (0, processPastedContentWacComponents_1.processPastedContentWacComponents)(event);
@@ -39682,13 +39693,17 @@ var removeNegativeTextIndentParser_1 = __webpack_require__(/*! ../parsers/remove
 var setProcessor_1 = __webpack_require__(/*! ../utils/setProcessor */ "./packages/roosterjs-content-model-plugins/lib/paste/utils/setProcessor.ts");
 var wordContainerParser_1 = __webpack_require__(/*! ../parsers/wordContainerParser */ "./packages/roosterjs-content-model-plugins/lib/paste/parsers/wordContainerParser.ts");
 var wordTableParser_1 = __webpack_require__(/*! ../parsers/wordTableParser */ "./packages/roosterjs-content-model-plugins/lib/paste/parsers/wordTableParser.ts");
+var removeListParagraphMargins_1 = __webpack_require__(/*! ./removeListParagraphMargins */ "./packages/roosterjs-content-model-plugins/lib/paste/WordDesktop/removeListParagraphMargins.ts");
 /**
  * @internal
  * Handles pasted content when the source is Word Desktop.
  * @param domToModelOption Options for DOM to Content Model conversion
  * @param htmlString The HTML string to process
+ * @param globalCssRules Global CSS rules extracted from the pasted document
  */
-function processPastedContentFromWordDesktop(domToModelOption, htmlString) {
+function processPastedContentFromWordDesktop(domToModelOption, htmlString, globalCssRules) {
+    if (globalCssRules === void 0) { globalCssRules = []; }
+    (0, removeListParagraphMargins_1.removeListParagraphMargins)(globalCssRules);
     var metadataMap = (0, getStyleMetadata_1.getStyleMetadata)(htmlString);
     (0, setProcessor_1.setProcessor)(domToModelOption, 'element', wordDesktopElementProcessor(metadataMap));
     (0, addParser_1.addParser)(domToModelOption, 'block', adjustPercentileLineHeightParser_1.adjustPercentileLineHeight);
@@ -39959,6 +39974,96 @@ function getBulletElement(element) {
 }
 
 
+/***/ },
+
+/***/ "./packages/roosterjs-content-model-plugins/lib/paste/WordDesktop/removeListParagraphMargins.ts"
+/*!******************************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-plugins/lib/paste/WordDesktop/removeListParagraphMargins.ts ***!
+  \******************************************************************************************************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.removeListParagraphMargins = void 0;
+/**
+ * CSS class selectors used by Word Desktop to mark list paragraph elements.
+ * Word emits global CSS rules that apply margins to these classes, which we want
+ * to suppress so that RoosterJS list indentation logic is used instead.
+ */
+var WORD_LIST_PARAGRAPH_SELECTORS = new Set([
+    'p.MsoListParagraph',
+    'p.MsoListParagraphCxSpFirst',
+    'p.MsoListParagraphCxSpMiddle',
+    'p.MsoListParagraphCxSpLast',
+    'div.MsoListParagraph',
+    'div.MsoListParagraphCxSpFirst',
+    'div.MsoListParagraphCxSpMiddle',
+    'div.MsoListParagraphCxSpLast',
+]);
+/**
+ * @internal
+ * Strips all margin-* properties from a CSS property string.
+ * Empty tokens produced by a trailing semicolon are preserved so that the
+ * resulting string still ends with ";" and remains safe to concatenate.
+ * For example, "margin-top: 0pt; color: red;" becomes " color: red;".
+ */
+function removeMarginProperties(cssText) {
+    return cssText
+        .split(';')
+        .filter(function (prop) {
+        var name = prop.split(':')[0].trim().toLowerCase();
+        // Keep empty tokens (the trailing ';' produces one) and any non-margin property.
+        return !name || !/^margin/.test(name);
+    })
+        .join(';');
+}
+/**
+ * @internal
+ * Removes margin properties from global CSS rules that target Word list paragraph
+ * classes (p.MsoListParagraph, p.MsoListParagraphCxSpFirst, etc.).
+ *
+ * Word Desktop pastes a global stylesheet that typically includes rules like:
+ *   p.MsoListParagraph { margin: 0in; margin-bottom: .0001pt; ... }
+ * These margins conflict with RoosterJS's own list indentation, causing double
+ * indentation when the CSS is converted to inline styles via convertInlineCss.
+ *
+ * When a rule's selectors are exclusively list paragraph classes the margins are
+ * removed in place.  When a rule groups list paragraph classes with other selectors
+ * the rule is split: the non-list selectors keep the original text, and a new rule
+ * is inserted for the list paragraph selectors with margins stripped.
+ *
+ * The array is mutated in place so the changes are reflected when convertInlineCss
+ * subsequently processes the same array reference.
+ */
+function removeListParagraphMargins(globalCssRules) {
+    // Iterate in reverse so that splice insertions don't shift unvisited indices.
+    for (var i = globalCssRules.length - 1; i >= 0; i--) {
+        var rule = globalCssRules[i];
+        var matchingSelectors = rule.selectors.filter(function (s) { return WORD_LIST_PARAGRAPH_SELECTORS.has(s); });
+        if (matchingSelectors.length === 0) {
+            continue;
+        }
+        var nonMatchingSelectors = rule.selectors.filter(function (s) { return !WORD_LIST_PARAGRAPH_SELECTORS.has(s); });
+        if (nonMatchingSelectors.length === 0) {
+            // All selectors target list paragraphs — strip margins directly.
+            rule.text = removeMarginProperties(rule.text);
+        }
+        else {
+            // Mixed rule: keep the non-list selectors on the original entry, then
+            // insert a new entry immediately after for the list paragraph selectors
+            // with margins removed.
+            rule.selectors = nonMatchingSelectors;
+            globalCssRules.splice(i + 1, 0, {
+                selectors: matchingSelectors,
+                text: removeMarginProperties(rule.text),
+            });
+        }
+    }
+}
+exports.removeListParagraphMargins = removeListParagraphMargins;
+
+
 /***/ },
 
 /***/ "./packages/roosterjs-content-model-plugins/lib/paste/oneNote/processPastedContentFromOneNote.ts"