devexpress-richedit 24.1.7-build-24274-0102 → 24.1.7-build-24288-0102

package/lib/client/formats/docx/import/color/open-xml-color-import-helper.js

@@ -11,7 +11,7 @@ export class OpenXmlColorImportHelper {
         if (themeValue != ThemeColorValues.None) {
             const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
             return themeColorIndex != ThemeColorIndexConstants.None ?
-                ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade')) :
+                ColorModelInfo.makeByThemeColorIndex(themeColorIndex, OpenXmlColorImportHelper.getTint(data, reader, 'themeTint', 'themeShade'), themeValue) :
                 ColorModelInfo.makeByThemeColorIndex(DXColor.empty);
         }
         else {
@@ -42,7 +42,7 @@ export class OpenXmlColorImportHelper {
         if (themeValue != ThemeColorValues.None) {
             const themeColorIndex = ThemeColorIndexCalculator.calculateThemeColorIndex(themeValue);
             if (themeColorIndex != ThemeColorIndexConstants.None)
-                return ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint);
+                return ColorModelInfo.makeByThemeColorIndex(themeColorIndex, tint, themeValue);
         }
         return ColorModelInfo.makeByColor(data.readerHelper.getWpSTColorValue(reader, 'fill', DXColor.empty), tint);
     }

package/lib/client/formats/docx/import/importers/styles-importer.js

@@ -77,9 +77,10 @@ export class StyleManager {
         StringMapUtils.forEach(this.info, (info) => action(info));
     }
     addStyle(dest) {
+        var _a;
         if (this.currInfo.isDefault && !this.isDefaultProcessed) {
             this.isDefaultProcessed = true;
-            if (this.defaultStyle.styleName === this.currInfo.name)
+            if (((_a = this.defaultStyle) === null || _a === void 0 ? void 0 : _a.styleName) === this.currInfo.name)
                 this.applyProperties(dest, this.defaultStyle);
             else
                 this.defaultStyle = this.addToModel(this.applyProperties(dest, this.createEmpty()));

package/lib/common/formats/html/import/html-importer.js

@@ -191,7 +191,7 @@ export class HtmlImporter {
         const missTag = HtmlImporter.MapMissTablePropertiesByTagNames[ListUtils.last(this.levelInfo).tagImporter.elementTag()];
         ListUtils.forEach(this.currElementChildren, (childElement) => {
             const childElemStyle = this.getStyles(childElement);
-            if (!Object.keys(childElemStyle).length)
+            if (childElement.nodeType !== Node.ELEMENT_NODE)
                 return;
             for (var prop in this.getStyles(element)) {
                 if (missTag && /^(border|background|marginLeft)/gi.test(prop))

package/lib/common/model/color/color-model-info.d.ts

@@ -9,7 +9,7 @@ export declare class ColorModelInfo implements ICloneable<ColorModelInfo>, ISupp
     static readonly auto: ColorModelInfo;
     static readonly autoColor: ColorModelInfo;
     static readonly noColor: ColorModelInfo;
-    static makeByThemeColorIndex(themeColorIndex: number, tint?: number): ColorModelInfo;
+    static makeByThemeColorIndex(themeColorIndex: number, tint?: number, themeValue?: ThemeColorValues): ColorModelInfo;
     static makeByColor(color: number, tint?: number): ColorModelInfo;
     static makeByColorIndex(colorIndex: number, tint?: number): ColorModelInfo;
     static makeByColorHash(hash: string, tint?: number): ColorModelInfo;

package/lib/common/model/color/color-model-info.js

@@ -15,10 +15,11 @@ export class ColorModelInfo {
     }
     static get nullColor() { return ColorModelInfo.makeByColor(ColorHelper.AUTOMATIC_COLOR); }
     ;
-    static makeByThemeColorIndex(themeColorIndex, tint = 0) {
+    static makeByThemeColorIndex(themeColorIndex, tint = 0, themeValue = ThemeColorValues.None) {
         const result = new ColorModelInfo();
         result.themeColorIndex = themeColorIndex;
         result.tint = tint;
+        result.themeValue = themeValue;
         return result;
     }
     static makeByColor(color, tint = 0) {

package/lib/common/model/manipulators/text-manipulator/text-manipulator.js

@@ -39,7 +39,7 @@ export class TextManipulator extends RunsBaseManipulator {
             return null;
         const historyItems = history.historyItems;
         const result = history.currentIndex == historyItems.length - 1 ? this.getLastHistoryItemNode(historyItems, null, checkType) : null;
-        return !result.empty ? result : null;
+        return (result === null || result === void 0 ? void 0 : result.empty) ? null : result;
     }
     getLastHistoryItemNode(historyItems, parent, checkType) {
         for (let ind = historyItems.length - 1, item; item = historyItems[ind]; ind--) {

package/lib/common/model/styles-manager.js

@@ -123,6 +123,7 @@ export class StylesManager {
     }
     addTableCellStyleCore(oldStyle) {
         var newStyle = oldStyle.clone();
+        this.tableCellStyleNameToIndex[newStyle.styleName] = this.documentModel.tableCellStyles.push(newStyle) - 1;
         newStyle.characterProperties = this.documentModel.cache.mergedCharacterPropertiesCache.getItem(oldStyle.characterProperties);
         newStyle.tableCellProperties = this.documentModel.cache.tableCellPropertiesCache.getItem(oldStyle.tableCellProperties);
         return newStyle;

package/lib/common/selection/input-position.js

@@ -1,3 +1,4 @@
+import { Section } from '../model/section/section';
 import { SectionPropertyDescriptor } from '../model/section/section-property-descriptor';
 import { InputPositionBase } from './input-position-base';
 import { SearchUtils } from '@devexpress/utils/lib/utils/search';
@@ -18,13 +19,23 @@ export class InputPosition extends InputPositionBase {
     }
     getMergedSectionPropertiesRaw() {
         if (!this.mergedSectionPropertiesRaw) {
-            var interval = this.intervalsInfo.interval;
-            var intervalStartPosition = interval.start;
-            var intervalEndPosition = interval.end;
-            var sections = this.model.sections;
-            var sectionIndex = SearchUtils.normedInterpolationIndexOf(sections, (s) => s.startLogPosition.value, intervalStartPosition);
+            let sectionIndex;
+            let intervalEndPosition;
+            const sections = this.model.sections;
+            const pageIndex = this.selection.pageIndex;
+            if (pageIndex < 0) {
+                const interval = this.intervalsInfo.interval;
+                const intervalStartPosition = interval.start;
+                intervalEndPosition = interval.end;
+                sectionIndex = SearchUtils.normedInterpolationIndexOf(sections, (s) => s.startLogPosition.value, intervalStartPosition);
+            }
+            else {
+                const layoutPage = this.selection.layout.pages[pageIndex];
+                sectionIndex = Section.getPageSectionIndex(layoutPage, sections);
+                intervalEndPosition = layoutPage.getEndPosition();
+            }
             this.mergedSectionPropertiesRaw = sections[sectionIndex++].sectionProperties.clone();
-            for (var section; (section = sections[sectionIndex]) && (section.startLogPosition.value < intervalEndPosition); sectionIndex++)
+            for (let section; (section = sections[sectionIndex]) && (section.startLogPosition.value < intervalEndPosition); sectionIndex++)
                 InputPositionBase.mergePropertiesRaw(this.mergedSectionPropertiesRaw, section.sectionProperties, SectionPropertyDescriptor.ALL_FIELDS);
         }
         return this.mergedSectionPropertiesRaw;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.7-build-24274-0102",
+  "version": "24.1.7-build-24288-0102",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,8 +14,8 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.1.7-build-24272-1937",
-    "devextreme-dist": "24.1.7-build-24272-1937"
+    "devextreme": "24.1.7-build-24286-1936",
+    "devextreme-dist": "24.1.7-build-24286-1936"
   },
   "dependencies": {
     "jszip": "~3.10.1",