devexpress-richedit 24.1.7-build-24281-0102 → 24.1.7-build-24288-0102
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.
- package/dist/dx.richedit.js +9 -6
- package/dist/dx.richedit.min.js +1 -1
- package/lib/client/formats/docx/import/color/open-xml-color-import-helper.js +2 -2
- package/lib/client/formats/docx/import/importers/styles-importer.js +2 -1
- package/lib/common/formats/html/import/html-importer.js +1 -1
- package/lib/common/model/color/color-model-info.d.ts +1 -1
- package/lib/common/model/color/color-model-info.js +2 -1
- package/lib/common/model/manipulators/text-manipulator/text-manipulator.js +1 -1
- package/lib/common/model/styles-manager.js +1 -0
- package/package.json +3 -3
package/dist/dx.richedit.js
CHANGED
@@ -11356,10 +11356,11 @@ class color_model_info_ColorModelInfo {
|
|
11356
11356
|
}
|
11357
11357
|
static get nullColor() { return color_model_info_ColorModelInfo.makeByColor(ColorHelper.AUTOMATIC_COLOR); }
|
11358
11358
|
;
|
11359
|
-
static makeByThemeColorIndex(themeColorIndex, tint = 0) {
|
11359
|
+
static makeByThemeColorIndex(themeColorIndex, tint = 0, themeValue = ThemeColorValues.None) {
|
11360
11360
|
const result = new color_model_info_ColorModelInfo();
|
11361
11361
|
result.themeColorIndex = themeColorIndex;
|
11362
11362
|
result.tint = tint;
|
11363
|
+
result.themeValue = themeValue;
|
11363
11364
|
return result;
|
11364
11365
|
}
|
11365
11366
|
static makeByColor(color, tint = 0) {
|
@@ -28870,6 +28871,7 @@ class StylesManager {
|
|
28870
28871
|
}
|
28871
28872
|
addTableCellStyleCore(oldStyle) {
|
28872
28873
|
var newStyle = oldStyle.clone();
|
28874
|
+
this.tableCellStyleNameToIndex[newStyle.styleName] = this.documentModel.tableCellStyles.push(newStyle) - 1;
|
28873
28875
|
newStyle.characterProperties = this.documentModel.cache.mergedCharacterPropertiesCache.getItem(oldStyle.characterProperties);
|
28874
28876
|
newStyle.tableCellProperties = this.documentModel.cache.tableCellPropertiesCache.getItem(oldStyle.tableCellProperties);
|
28875
28877
|
return newStyle;
|
@@ -48019,7 +48021,7 @@ class TextManipulator extends RunsBaseManipulator {
|
|
48019
48021
|
return null;
|
48020
48022
|
const historyItems = history.historyItems;
|
48021
48023
|
const result = history.currentIndex == historyItems.length - 1 ? this.getLastHistoryItemNode(historyItems, null, checkType) : null;
|
48022
|
-
return
|
48024
|
+
return (result === null || result === void 0 ? void 0 : result.empty) ? null : result;
|
48023
48025
|
}
|
48024
48026
|
getLastHistoryItemNode(historyItems, parent, checkType) {
|
48025
48027
|
for (let ind = historyItems.length - 1, item; item = historyItems[ind]; ind--) {
|
@@ -69877,7 +69879,7 @@ class HtmlImporter {
|
|
69877
69879
|
const missTag = HtmlImporter.MapMissTablePropertiesByTagNames[utils_list.ListUtils.last(this.levelInfo).tagImporter.elementTag()];
|
69878
69880
|
utils_list.ListUtils.forEach(this.currElementChildren, (childElement) => {
|
69879
69881
|
const childElemStyle = this.getStyles(childElement);
|
69880
|
-
if (
|
69882
|
+
if (childElement.nodeType !== Node.ELEMENT_NODE)
|
69881
69883
|
return;
|
69882
69884
|
for (var prop in this.getStyles(element)) {
|
69883
69885
|
if (missTag && /^(border|background|marginLeft)/gi.test(prop))
|
@@ -74920,9 +74922,10 @@ class StyleManager {
|
|
74920
74922
|
string.StringMapUtils.forEach(this.info, (info) => action(info));
|
74921
74923
|
}
|
74922
74924
|
addStyle(dest) {
|
74925
|
+
var _a;
|
74923
74926
|
if (this.currInfo.isDefault && !this.isDefaultProcessed) {
|
74924
74927
|
this.isDefaultProcessed = true;
|
74925
|
-
if (this.defaultStyle.styleName === this.currInfo.name)
|
74928
|
+
if (((_a = this.defaultStyle) === null || _a === void 0 ? void 0 : _a.styleName) === this.currInfo.name)
|
74926
74929
|
this.applyProperties(dest, this.defaultStyle);
|
74927
74930
|
else
|
74928
74931
|
this.defaultStyle = this.addToModel(this.applyProperties(dest, this.createEmpty()));
|
@@ -77725,7 +77728,7 @@ class OpenXmlColorImportHelper {
|
|
77725
77728
|
if (themeValue != ThemeColorValues.None) {
|
77726
77729
|
const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
|
77727
77730
|
return themeColorIndex != ThemeColorIndexConstants.None ?
|
77728
|
-
color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade')) :
|
77731
|
+
color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade'), themeValue) :
|
77729
77732
|
color_model_info_ColorModelInfo.makeByThemeColorIndex(DXColor.empty);
|
77730
77733
|
}
|
77731
77734
|
else {
|
@@ -77756,7 +77759,7 @@ class OpenXmlColorImportHelper {
|
|
77756
77759
|
if (themeValue != ThemeColorValues.None) {
|
77757
77760
|
const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
|
77758
77761
|
if (themeColorIndex != ThemeColorIndexConstants.None)
|
77759
|
-
return color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint);
|
77762
|
+
return color_model_info_ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint, themeValue);
|
77760
77763
|
}
|
77761
77764
|
return color_model_info_ColorModelInfo.makeByColor(data.readerHelper.getWpSTColorValue(reader, 'fill', DXColor.empty), tint);
|
77762
77765
|
}
|