devexpress-richedit 24.2.2-beta → 24.2.3

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.2.2
+* Version: 24.2.3
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/index.js

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.js)
-* Version: 24.2.2
+* Version: 24.2.3
 * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/lib/client/client-rich-edit.js

@@ -61,8 +61,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFUbHhVemQxYzBSQ01HVlpTbDlrVGkxb2FYaGtVU0lLZlE9PS5INTlJcG94ZC90cWdVcE1leVdhamhubjl2NnFtMkFrQmc2MW0yU05ZUHIreFBrdnRLUm04Wm4rU08rUVQ3NEt3MVpWQ0pGeEJYV1dJRlNyRG1EZlVqYmV6N2RzTnpJbTR6S1A5M2l4amVQR0Jnb2o4eG9VSmZvNldmZzNMblpTUlNLcHFpZz09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFIaHFVV1ZWV0RGWFJVZFJTM1ZrTFU1bVQxbE5aeUlLZlE9PS5VMEV0VjZRMUNKaDR1WDIzbXZzcEl1d1prYVhDbzZKQittWFJqQTNZZ3pHOWxIL3dCQ2hNeDJ3RFdxdG1BQnpzYXdJc3hqME0yN2FDaFRCMTlJamR2L2ozRzE2Rk9zQTdJampEOTZjcGpWS29VZnkvS1I4K2dVcDFHSTEybnF3czZDWGNFdz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFIaHFVV1ZWV0RGWFJVZFJTM1ZrTFU1bVQxbE5aeUlLZlE9PS5VMEV0VjZRMUNKaDR1WDIzbXZzcEl1d1prYVhDbzZKQittWFJqQTNZZ3pHOWxIL3dCQ2hNeDJ3RFdxdG1BQnpzYXdJc3hqME0yN2FDaFRCMTlJamR2L2ozRzE2Rk9zQTdJampEOTZjcGpWS29VZnkvS1I4K2dVcDFHSTEybnF3czZDWGNFdz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/client/commands/mail-merge-command.d.ts

@@ -11,8 +11,11 @@ export declare class MailMergeCommand extends CommandBase<SimpleCommandState> {
     executeCore(_state: SimpleCommandState, options: CommandSimpleOptions<MailMergeCommandParameters>): boolean;
     prepareMergedDocument(modelManager: IModelManager, param: MailMergeCommandParameters): void;
     private getDataSource;
-    private replaceMergeFieldsInModel;
+    private replaceFieldsInModel;
+    private processFieldsInSubDocument;
     private replaceMergeFieldsInSubDocument;
+    private replaceIfFieldsInSubDocument;
+    private replaceFieldWithText;
     private getResultByFieldName;
     private insertSeparator;
     private createModelManager;

package/lib/client/commands/mail-merge-command.js

@@ -24,6 +24,7 @@ import { DocxExporter } from '../formats/docx/export/exporter';
 import { Importer } from '../formats/docx/import/importer';
 import { ImporterOptions } from '../formats/docx/import/importer-options';
 import { exportModelToBlob } from '../model-api/formats/exporter';
+import { FieldCodeParserIf } from '../../common/model/fields/parsers/field-code-parser-if';
 export class MailMergeCommand extends CommandBase {
     getState() {
         var state = new SimpleCommandState(this.isEnabled());
@@ -34,8 +35,10 @@ export class MailMergeCommand extends CommandBase {
         return true;
     }
     isEnabled() {
-        return super.isEnabled() && ControlOptions.isEnabled(this.control.modelManager.richOptions.control.fields) &&
-            this.control.modelManager.model.mainSubDocument.getDocumentEndPosition() > 1 && !!this.getDataSource();
+        return (super.isEnabled() &&
+            ControlOptions.isEnabled(this.control.modelManager.richOptions.control.fields) &&
+            this.control.modelManager.model.mainSubDocument.getDocumentEndPosition() > 1 &&
+            !!this.getDataSource());
     }
     canModify() {
         return true;
@@ -58,7 +61,7 @@ export class MailMergeCommand extends CommandBase {
                         throw new Error(Errors.InternalException);
                     const param = options.param;
                     this.prepareMergedDocument(exportModelOptions.modelManager, param);
-                    exportModelToBlob(exportModelOptions, blob => param.callback(blob));
+                    exportModelToBlob(exportModelOptions, (blob) => param.callback(blob));
                 }, 3000);
                 formatImagesImporter.import(exportModelOptions.modelManager.modelManipulator);
             }, () => { });
@@ -79,7 +82,7 @@ export class MailMergeCommand extends CommandBase {
             if (index > param.exportFrom)
                 rangeCopy.insertTo(modelManager.modelManipulator, new SubDocumentPosition(subDoc, subDoc.getDocumentEndPosition() - 1));
             const record = dataSource.items()[index];
-            this.replaceMergeFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds);
+            this.replaceFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds);
             if (index < exportToIndex)
                 this.insertSeparator(modelManager, param.mergeMode);
             lastProcessedPositionInMainSubDocument = subDoc.getDocumentEndPosition() - 1;
@@ -88,41 +91,71 @@ export class MailMergeCommand extends CommandBase {
     getDataSource() {
         return this.control.owner.dataSource;
     }
-    replaceMergeFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds) {
+    replaceFieldsInModel(modelManager, record, lastProcessedPositionInMainSubDocument, processedSubDocIds) {
         NumberMapUtils.forEach(modelManager.model.subDocuments, (subDoc) => {
-            if (!ListUtils.anyOf(processedSubDocIds, id => id === subDoc.id)) {
+            if (!ListUtils.anyOf(processedSubDocIds, (id) => id === subDoc.id)) {
                 this.replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc);
+                this.replaceIfFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc);
                 if (!subDoc.isMain())
                     processedSubDocIds.push(subDoc.id);
             }
         });
     }
-    replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc) {
+    processFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc, processField) {
         for (let i = subDoc.fields.length - 1; i >= 0; i--) {
             const field = subDoc.fields[i];
-            if (subDoc.isMain() && field.getFieldStartPosition() < lastProcessedPositionInMainSubDocument)
+            if (subDoc.isMain() && field.getFieldStartPosition() < lastProcessedPositionInMainSubDocument) {
                 return;
+            }
             const parser = FieldsWaitingForUpdate.getParser(modelManager, null, null, subDoc, field);
             if (parser) {
-                if (parser instanceof FieldCodeParserMailMerge) {
-                    const fieldName = parser.getMergeFieldName();
-                    const pos = field.getFieldStartPosition();
-                    const text = RichUtils.replaceParagraphEndCharsWithLineBreak(this.getResultByFieldName(record, fieldName));
-                    if (!StringUtils.isNullOrEmpty(text)) {
-                        const insertParams = new InsertTextManipulatorParams(new SubDocumentPosition(subDoc, pos), subDoc.getRunByPosition(pos).getCharPropsBundle(modelManager.model), RunType.TextRun, text);
-                        modelManager.modelManipulator.text.insertTextInner(insertParams);
+                try {
+                    const text = processField(parser);
+                    if (text !== null) {
+                        this.replaceFieldWithText(modelManager, subDoc, field, text);
                     }
-                    modelManager.modelManipulator.range.removeIntervalWithoutHistory(subDoc, field.getAllFieldInterval(), false);
                 }
-                parser.destructor();
+                finally {
+                    parser.destructor();
+                }
             }
         }
     }
+    replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc) {
+        const processField = (parser) => {
+            if (parser instanceof FieldCodeParserMailMerge) {
+                const fieldName = parser.getMergeFieldName();
+                return RichUtils.replaceParagraphEndCharsWithLineBreak(this.getResultByFieldName(record, fieldName));
+            }
+            return null;
+        };
+        this.processFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc, processField);
+    }
+    replaceIfFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc) {
+        const processField = (parser) => {
+            if (parser instanceof FieldCodeParserIf) {
+                parser.parseSwitchesAndArgs();
+                return parser.getResult();
+            }
+            return null;
+        };
+        this.processFieldsInSubDocument(modelManager, lastProcessedPositionInMainSubDocument, subDoc, processField);
+    }
+    replaceFieldWithText(modelManager, subDoc, field, text) {
+        if (!StringUtils.isNullOrEmpty(text)) {
+            const pos = field.getFieldStartPosition();
+            const runProps = subDoc.getRunByPosition(pos).getCharPropsBundle(modelManager.model);
+            const insertParams = new InsertTextManipulatorParams(new SubDocumentPosition(subDoc, pos), runProps, RunType.TextRun, text);
+            modelManager.modelManipulator.text.insertTextInner(insertParams);
+        }
+        modelManager.modelManipulator.range.removeIntervalWithoutHistory(subDoc, field.getAllFieldInterval(), false);
+    }
     getResultByFieldName(record, fieldName) {
         const keys = Object.keys(record);
-        for (let i = 0, key; key = keys[i]; i++)
+        for (let i = 0, key; (key = keys[i]); i++) {
             if (key.toLowerCase() == fieldName.toLowerCase())
                 return record[key] + '';
+        }
         return '';
     }
     insertSeparator(modelManager, mergeMode) {

package/lib/client/formats/docx/export/exporters/styles.d.ts

@@ -4,8 +4,13 @@ export declare class StylesExporter extends ExporterBaseWithRootElement {
     get rootElement(): string;
     get rootNSPrefix(): string;
     get rootNSValue(): string;
+    private styleNameToIndex;
+    private sortedStyleIndexes;
+    private processedStyleNames;
     protected fillWriter(): void;
     private exportDocumentDefaults;
     private exportDocumentCharacterDefaults;
     private exportDocumentParagraphDefaults;
+    private getSortedStyleIndexes;
+    private sortStyleIndexRecursive;
 }

package/lib/client/formats/docx/export/exporters/styles.js

@@ -3,13 +3,20 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { DocxNsType } from '../../utils/constants';
 import { ExporterBaseWithRootElement } from './base';
 export class StylesExporter extends ExporterBaseWithRootElement {
+    constructor() {
+        super(...arguments);
+        this.styleNameToIndex = new Map();
+        this.sortedStyleIndexes = [];
+        this.processedStyleNames = new Set();
+    }
     get filePath() { return 'word/styles.xml'; }
     get rootElement() { return 'styles'; }
     get rootNSPrefix() { return this.data.constants.namespaces[DocxNsType.WordProcessing].prefix; }
     get rootNSValue() { return this.data.constants.namespaces[DocxNsType.WordProcessing].namespace; }
     fillWriter() {
         this.exportDocumentDefaults();
-        ListUtils.forEach(this.data.model.paragraphStyles, (style, index) => this.data.parStyleExporter.export(style, index));
+        const paragraphStyleIndexes = this.getSortedStyleIndexes();
+        ListUtils.forEach(paragraphStyleIndexes, (index) => this.data.parStyleExporter.export(this.data.model.paragraphStyles[index], index));
         ListUtils.forEach(this.data.model.characterStyles, (style, index) => this.data.charStyleExporter.export(style, index));
         ListUtils.forEach(this.data.model.tableStyles, (style, index) => this.data.tblStyleExporter.export(style, index));
     }
@@ -33,4 +40,26 @@ export class StylesExporter extends ExporterBaseWithRootElement {
         this.writer.endElement();
         this.writer.endElement();
     }
+    getSortedStyleIndexes() {
+        this.styleNameToIndex = new Map();
+        this.sortedStyleIndexes = [];
+        this.processedStyleNames = new Set();
+        const styles = this.data.model.paragraphStyles;
+        styles.forEach((style, index) => this.styleNameToIndex.set(style.styleName, index));
+        for (let index = 0; index < styles.length; index++)
+            this.sortStyleIndexRecursive(index);
+        return this.sortedStyleIndexes;
+    }
+    sortStyleIndexRecursive(index) {
+        const styles = this.data.model.paragraphStyles;
+        const style = styles[index];
+        if (this.processedStyleNames.has(style.styleName))
+            return;
+        this.processedStyleNames.add(style.styleName);
+        if (style.parent) {
+            const parentIndex = this.styleNameToIndex.get(style.parent.styleName);
+            this.sortStyleIndexRecursive(parentIndex);
+        }
+        this.sortedStyleIndexes.push(index);
+    }
 }

package/lib/client/formatters-options.js

@@ -1,5 +1,5 @@
-import * as DxLocDate from 'devextreme/localization/date';
-import * as DxLocNumber from 'devextreme/localization/number';
+import * as DxLocDate from 'devextreme/common/core/localization/date';
+import * as DxLocNumber from 'devextreme/common/core/localization/number';
 export class ClientFormattersOptions {
     get locDate() { var _a; return (_a = DxLocDate.default) !== null && _a !== void 0 ? _a : DxLocDate; }
     get locNumber() { var _a; return (_a = DxLocNumber.default) !== null && _a !== void 0 ? _a : DxLocNumber; }

package/lib/client/model-api/api-utils/range-permission-finder.js

@@ -1,4 +1,5 @@
 import { IntervalAlgorithms } from '@devexpress/utils/lib/intervals/algorithms';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export function findRangePermissionsByIntervals(sourceCollection, intervals) {
     const permissions = [];
@@ -19,5 +20,6 @@ export function findRangePermissions(sourceCollection, check) {
 }
 export function findRangePermission(sourceCollection, coreInterval, userName, group) {
     const intervals = findRangePermissionsByIntervals(sourceCollection, [coreInterval]);
-    return ListUtils.elementBy(intervals, (permission) => permission.userName == userName && permission.group == group);
+    return ListUtils.elementBy(intervals, (permission) => Comparers.stringIgnoreCase(permission.userName, userName) == 0 &&
+        Comparers.stringIgnoreCase(permission.group, group) == 0);
 }

package/lib/client/model-api/collections/range-permission-collection.js

@@ -10,6 +10,7 @@ import { ModelParametersChecker } from '../api-utils/model-parameter-checker';
 import { findRangePermission, findRangePermissions, findRangePermissionsByIntervals } from '../api-utils/range-permission-finder';
 import { RangePermissionApi } from '../range-permission';
 import { Collection } from './collection';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 export class RangePermissionCollection extends Collection {
     constructor(processor, subDocument) {
         super(processor);
@@ -81,13 +82,13 @@ function findByPosition(position, canBeUndefined, sourceCollection) {
 }
 function findByUserName(value, permissions) {
     return ListUtils.map(ApiParametersChecker.check(value, 1, true, [
-        ApiParametersChecker.stringDescriptor("userName", (userName) => findRangePermissions(permissions, permission => permission.userName == userName), false),
+        ApiParametersChecker.stringDescriptor("userName", (userName) => findRangePermissions(permissions, permission => Comparers.stringIgnoreCase(permission.userName, userName) == 0), false),
         ApiParametersChecker.regExpDescriptor('regexp', (regexp) => findRangePermissions(permissions, permission => regexp.test(permission.userName)))
     ]), (b) => b);
 }
 function findByGroup(value, permissions) {
     return ListUtils.map(ApiParametersChecker.check(value, 1, true, [
-        ApiParametersChecker.stringDescriptor("group", (group) => findRangePermissions(permissions, permission => permission.group == group), false),
+        ApiParametersChecker.stringDescriptor("group", (group) => findRangePermissions(permissions, permission => Comparers.stringIgnoreCase(permission.group, group) == 0), false),
         ApiParametersChecker.regExpDescriptor('regexp', (regexp) => findRangePermissions(permissions, permission => regexp.test(permission.group)))
     ]), (b) => b);
 }

package/lib/common/formats/rtf/export/helpers/rtf-export-helper.js

@@ -4,6 +4,7 @@ import { DXColor } from '../../../../model/color/dx-color';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { RtfContentExporter } from '../exporters/rtf-content-exporter';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 export class RtfExportHelper {
     constructor() {
         this.colorCollection = [];
@@ -39,11 +40,11 @@ export class RtfExportHelper {
         return DXColor.blend(color, DXColor.white);
     }
     getUserIndex(rangePermission) {
-        let index = this.userCollection.indexOf(rangePermission.userName);
+        let index = this.userCollection.findIndex((userName) => Comparers.stringIgnoreCase(userName, rangePermission.userName) == 0);
         if (index >= 0)
             return index + 1;
         const predefinedUserGroups = RtfContentExporter.predefinedUserGroups;
-        const id = NumberMapUtils.keyBy(predefinedUserGroups, (g) => g == rangePermission.group);
+        const id = NumberMapUtils.keyBy(predefinedUserGroups, (g) => Comparers.stringIgnoreCase(g, rangePermission.group) == 0);
         return id != null ? id : 0;
     }
 }

package/lib/common/model/fields/parsers/field-code-parser-if.d.ts

@@ -3,6 +3,7 @@ import { FieldCodeParserClientUpdatingBase } from './field-code-parser-client-up
 export declare class FieldCodeParserIf extends FieldCodeParserClientUpdatingBase {
     get name(): FieldName;
     protected fillResult(): boolean;
+    getResult(): string;
     private parseParameters;
 }
 export declare class IfExpression {

package/lib/common/model/fields/parsers/field-code-parser-if.js

@@ -6,8 +6,7 @@ export class FieldCodeParserIf extends FieldCodeParserClientUpdatingBase {
         this.setInputPositionState();
         let result = null;
         try {
-            const expression = this.parseParameters(this.parameterInfoList);
-            result = expression.evaluate();
+            result = this.getResult();
         }
         catch (err) {
             if (err instanceof IfExpressionError) {
@@ -21,6 +20,10 @@ export class FieldCodeParserIf extends FieldCodeParserClientUpdatingBase {
             return true;
         }
     }
+    getResult() {
+        const expression = this.parseParameters(this.parameterInfoList);
+        return expression.evaluate();
+    }
     parseParameters(parameters) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (parameters.length > 5)

package/lib/common/model/range-permissions.js

@@ -7,8 +7,8 @@ import { BookmarkBase } from './bookmarks';
 export class RangePermission extends BookmarkBase {
     constructor(positionManager, interval, userName, group) {
         super(positionManager, interval);
-        this.userName = userName.toLowerCase();
-        this.group = group.toLowerCase();
+        this.userName = userName;
+        this.group = group;
     }
     isGranted(settings) {
         return RangePermission.allow(this.group, RangePermission.Everyone_GROUP_NAME) ||
@@ -17,7 +17,7 @@ export class RangePermission extends BookmarkBase {
             RangePermission.allow(this.group, settings.authenticationGroup);
     }
     static allow(permissionValue, settingsValue) {
-        return settingsValue != "" && permissionValue == settingsValue;
+        return settingsValue != "" && Comparers.stringIgnoreCase(permissionValue, settingsValue) == 0;
     }
     get end() { return this._interval.end - 1; }
     get length() { return this.end - this.start; }
@@ -42,7 +42,9 @@ export class RangePermission extends BookmarkBase {
         return new RangePermission(positionManager, this.interval, this.userName, this.group);
     }
     equals(obj) {
-        return super.equals(obj) && (StringUtils.isNullOrEmpty(this.userName) ? this.group == obj.group : this.userName == obj.userName);
+        return super.equals(obj) && (StringUtils.isNullOrEmpty(this.userName) ?
+            Comparers.stringIgnoreCase(obj.group, this.group) == 0 :
+            Comparers.stringIgnoreCase(obj.userName, this.userName) == 0);
     }
 }
 RangePermission.Everyone_GROUP_NAME = "Everyone".toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.2.2-beta",
+  "version": "24.2.3",
   "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.2.2-beta",
-    "devextreme-dist": "24.2.2-beta"
+    "devextreme": "24.2.3",
+    "devextreme-dist": "24.2.3"
   },
   "dependencies": {
     "jszip": "~3.10.1",