roosterjs 9.4.0 → 9.4.1

package/dist/rooster-amd.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for roosterjs (Version 9.4.0)
+// Type definitions for roosterjs (Version 9.4.1)
 // Generated by dts tool from roosterjs
 // Project: https://github.com/Microsoft/roosterjs
 

package/dist/rooster-amd.js

@@ -8572,7 +8572,7 @@ var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-mo
  */
 var formatContentModel = function (core, formatter, options, domToModelOptions) {
     var _a;
-    var _b = options || {}, apiName = _b.apiName, onNodeCreated = _b.onNodeCreated, getChangeData = _b.getChangeData, changeSource = _b.changeSource, rawEvent = _b.rawEvent, selectionOverride = _b.selectionOverride, scrollCaretIntoView = _b.scrollCaretIntoView;
+    var _b = options || {}, onNodeCreated = _b.onNodeCreated, getChangeData = _b.getChangeData, rawEvent = _b.rawEvent, selectionOverride = _b.selectionOverride, scrollCaretIntoView = _b.scrollCaretIntoView;
     var model = core.api.createContentModel(core, domToModelOptions, selectionOverride);
     var context = {
         newEntities: [],
@@ -8606,9 +8606,9 @@ var formatContentModel = function (core, formatter, options, domToModelOptions)
                 eventType: 'contentChanged',
                 contentModel: clearModelCache ? undefined : model,
                 selection: clearModelCache ? undefined : selection,
-                source: changeSource || roosterjs_content_model_dom_1.ChangeSource.Format,
+                source: (options === null || options === void 0 ? void 0 : options.changeSource) || roosterjs_content_model_dom_1.ChangeSource.Format,
                 data: getChangeData === null || getChangeData === void 0 ? void 0 : getChangeData(),
-                formatApiName: apiName,
+                formatApiName: options === null || options === void 0 ? void 0 : options.apiName,
                 changedEntities: getChangedEntities(context, rawEvent),
             };
             core.api.triggerEvent(core, eventData, true /*broadcast*/);
@@ -22189,6 +22189,21 @@ var mutate_1 = __webpack_require__(/*! ../common/mutate */ "./packages/roosterjs
 var normalizeContentModel_1 = __webpack_require__(/*! ../common/normalizeContentModel */ "./packages/roosterjs-content-model-dom/lib/modelApi/common/normalizeContentModel.ts");
 var normalizeTable_1 = __webpack_require__(/*! ./normalizeTable */ "./packages/roosterjs-content-model-dom/lib/modelApi/editing/normalizeTable.ts");
 var HeadingTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+// An object to provide keys of required properties of segment format, do NOT use any of its values
+var RequiredEmptySegmentFormat = {
+    backgroundColor: null,
+    fontFamily: null,
+    fontSize: null,
+    fontWeight: null,
+    italic: null,
+    letterSpacing: null,
+    lineHeight: null,
+    strikethrough: null,
+    superOrSubScriptSequence: null,
+    textColor: null,
+    underline: null,
+};
+var KeysOfSegmentFormat = (0, getObjectKeys_1.getObjectKeys)(RequiredEmptySegmentFormat);
 /**
  * Merge source model into target mode
  * @param target Target Content Model that will merge content into
@@ -22420,6 +22435,9 @@ function applyDefaultFormat(group, format, applyDefaultFormatOption) {
                         applyDefaultFormat(segment, format, applyDefaultFormatOption);
                     }
                     segment.format = mergeSegmentFormat(applyDefaultFormatOption, format, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, paragraphFormat_1), segment.format));
+                    if (segment.link) {
+                        segment.link.format = mergeSegmentFormat(applyDefaultFormatOption, getSegmentFormatInLinkFormat(format), segment.link.format);
+                    }
                 });
                 if (applyDefaultFormatOption === 'keepSourceEmphasisFormat') {
                     delete paragraph.decorator;
@@ -22433,9 +22451,26 @@ function mergeBlockFormat(applyDefaultFormatOption, block) {
         delete (0, mutate_1.mutateBlock)(block).format.backgroundColor;
     }
 }
+/**
+ * Hyperlink format type definition only contains textColor, backgroundColor and underline.
+ * So create a minimum object with the styles supported in Hyperlink to be used in merge.
+ */
+function getSegmentFormatInLinkFormat(targetFormat) {
+    var result = {};
+    if (targetFormat.textColor) {
+        result.textColor = targetFormat.textColor;
+    }
+    if (targetFormat.backgroundColor) {
+        result.backgroundColor = targetFormat.backgroundColor;
+    }
+    if (targetFormat.underline) {
+        result.underline = targetFormat.underline;
+    }
+    return result;
+}
 function mergeSegmentFormat(applyDefaultFormatOption, targetFormat, sourceFormat) {
     return applyDefaultFormatOption == 'mergeAll'
-        ? (0, tslib_1.__assign)((0, tslib_1.__assign)({}, targetFormat), sourceFormat) : (0, tslib_1.__assign)((0, tslib_1.__assign)({}, targetFormat), getSemanticFormat(sourceFormat));
+        ? (0, tslib_1.__assign)((0, tslib_1.__assign)({}, targetFormat), sourceFormat) : (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, getFormatWithoutSegmentFormat(sourceFormat)), targetFormat), getSemanticFormat(sourceFormat));
 }
 function getSemanticFormat(segmentFormat) {
     var result = {};
@@ -22451,6 +22486,15 @@ function getSemanticFormat(segmentFormat) {
     }
     return result;
 }
+/**
+ * Segment format can also contain other type of metadata, for example in Images/Hyperlink,
+ * we want to preserve these properties when merging format
+ */
+function getFormatWithoutSegmentFormat(sourceFormat) {
+    var resultFormat = (0, tslib_1.__assign)({}, sourceFormat);
+    KeysOfSegmentFormat.forEach(function (key) { return delete resultFormat[key]; });
+    return resultFormat;
+}
 
 
 /***/ }),