devexpress-reporting 23.2.0-build-000-1111 → 23.2.2-beta

package/designer/widgets/gaugeStyleEditor.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\gaugeStyleEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\gaugeStyleEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';
 import { circularValues, linearValues } from '../controls/xrGauge';

package/designer/widgets/groups.d.ts

@@ -1,9 +1,9 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\groups.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\groups.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { GroupObject } from '@devexpress/analytics-core/analytics-internal';
 export declare var groups: GroupObject;

package/designer/widgets/groups.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\groups.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\groups.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { getLocalization } from '@devexpress/analytics-core/analytics-utils';
 import { appearanceName, paletteName, pivotGridDataSourceOptions, seriesDataMember } from '../../chart/internal/meta/_chart';
 import { rotated } from '../../chart/internal/meta/_common';
@@ -26,7 +26,7 @@ import { anchorHorizontal, anchorVertical } from '../controls/metadata/propertie
 import { editOptions, textEditOptions } from '../controls/metadata/properties/editOptions';
 import { conditionObj, formatting } from '../controls/metadata/properties/formattingrules';
 import { formattingRuleLinks } from '../controls/metadata/properties/formattingRulesLink';
-import { accessibleDescription, allowMarkupText, angle, autoWidth, backColor, bookmark, bookmarkParent, borderColor, borderDashStyle, borders, borderWidth, canGrow, canPublish, canShrink, dataAdapter, dataMember, dataSource, displayName, expressionableFont, filterStringEditable, font, foreColor, imageType, keepTogether, lineStyle, lineWidth, location, multiline, name, navigateUrl, nullValueText, padding, processDuplicatesMode, processDuplicatesTarget, processNullValues, reportPrintOptions, rtl, size, summary, tag, target, text, textAlignment, textArea, textFitMode, textFormatString, textTrimming, visible, wordWrap, xlsxFormatString } from '../controls/metadata/properties/metadata';
+import { accessibleDescription, accessibleRole, allowMarkupText, angle, autoWidth, backColor, bookmark, bookmarkParent, borderColor, borderDashStyle, borders, borderWidth, canGrow, canPublish, canShrink, dataAdapter, dataMember, dataSource, displayName, expressionableFont, filterStringEditable, font, foreColor, imageType, keepTogether, lineStyle, lineWidth, location, multiline, name, navigateUrl, nullValueText, padding, processDuplicatesMode, processDuplicatesTarget, processNullValues, reportPrintOptions, rtl, size, summary, tag, target, text, textAlignment, textArea, textFitMode, textFormatString, textTrimming, visible, wordWrap, xlsxFormatString } from '../controls/metadata/properties/metadata';
 import { allScripts } from '../controls/metadata/properties/scriptMetadata';
 import { interactiveSorting } from '../controls/metadata/properties/sortingOptions';
 import { stylePriority, stylesInfo } from '../controls/metadata/properties/style';
@@ -42,7 +42,7 @@ import { pageCount, pdfSource, pdfSourceUrl } from '../controls/metadata/xrPdfCo
 import { signatureOptions } from '../controls/metadata/xrPdfSignature';
 import { imageEditOptions, imageSource, imageUrl, useImageMetadata } from '../controls/metadata/xrPicturebox';
 import { pivotGridAppearances, pivotGridOptions, prefilter } from '../controls/metadata/xrPivotgrid';
-import { bookmarkDuplicateSuppress, calculatedFields, defaultPrinterSettingsUsingInfo, drawWatermark, horizontalContentSplitting, landscape, language, margins, measureUnit, pageColor, pageHeight, pageWidth, paperKind, parametersInfo, reportExportOptionsSerializationInfo, requestParameters, rollPaper, rtlLayout, rtlReport, scriptLanguage, scriptReferencesString, showPreviewMarginLines, snapGridSize, verticalContentSplitting, watermark } from '../controls/metadata/xrReport';
+import { bookmarkDuplicateSuppress, calculatedFields, defaultPrinterSettingsUsingInfo, drawWatermark, horizontalContentSplitting, landscape, language, margins, measureUnit, pageColor, pageHeight, pageWidth, paperKind, parametersInfo, reportExportOptionsSerializationInfo, requestParameters, rollPaper, rtlLayout, rtlReport, scriptLanguage, scriptReferencesString, showPreviewMarginLines, snapGridSize, verticalContentSplitting, watermarkId, watermarks } from '../controls/metadata/xrReport';
 import { newDocumentData, rtf, textRtf } from '../controls/metadata/xrRichText';
 import { fillColor, shapeFake, stretch } from '../controls/metadata/xrShape';
 import { sparklineFake, valueMember, valueRange } from '../controls/metadata/xrSparkline';
@@ -53,6 +53,7 @@ import { maxNestingLevel, tocLevelDefault, tocLevels, tocTitle } from '../contro
 import { segmentWidth } from '../controls/metadata/xrZipcode';
 import { calculatedFieldExpression } from '../dataObjects/metadata/calculatedField';
 import { dataBindings } from '../dataObjects/metadata/dataBinding';
+import { action } from '../controls/metadata/properties/action';
 export var groups = {
     'Styles': {
         info: stylesInfo,
@@ -72,8 +73,8 @@ export var groups = {
             signatureOptions, sparklineFake,
             stylePriority, textAlignment, textTrimming, totalCellFormat,
             totalValueFormat, valueFormat, viewStyle, viewTheme,
-            viewType, watermark, formattingRuleLinks,
-            columnIndex, rowIndex
+            viewType, formattingRuleLinks,
+            columnIndex, rowIndex, watermarkId, watermarks
         ],
         displayName: () => getLocalization('Appearance', 'DevExpress.XtraReports.UI.XRPivotGrid.Appearance')
     },
@@ -102,14 +103,13 @@ export var groups = {
     },
     'Data': {
         info: [
-            accessibleDescription, actualValue, seriesDataMember,
+            accessibleDescription, accessibleRole, actualValue, seriesDataMember,
             checkState, checked, chartDataSource,
             dataSource, dataMember, dataAdapter, expandedInFieldsGroup, pivotGridDataSourceOptions,
             fieldName, filterStringEditable,
             imageSource, imageUrl, tickmarkCount, maximum, minimum, nullValueText, prefilter,
             runningTotal, sortFields, summary, showNewValues,
-            sortMode, sortOrder, summaryDisplayType,
-            summaryType,
+            sortMode, sortOrder, summaryDisplayType, summaryType,
             targetValue, tag, text, textArea, rtf, textRtf, newDocumentData, topValueCount, topValueShowOthers, topValueType,
             unboundExpression, unboundExpressionMode, unboundFieldName, unboundType, useNativeFormat,
             xlsxFormatString,
@@ -139,7 +139,7 @@ export var groups = {
     },
     'Navigation': {
         info: [
-            bookmark, bookmarkParent, bookmarkDuplicateSuppress, target, navigateUrl
+            action, bookmark, bookmarkParent, bookmarkDuplicateSuppress, target, navigateUrl
         ],
         displayName: () => getLocalization('Navigation', 'ASPxReportsStringId.DocumentViewer_RibbonNavigationGroupText')
     },

package/designer/widgets/imageSourceEditor.d.ts

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\imageSourceEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\imageSourceEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { IFileUploadResult } from '@devexpress/analytics-core/analytics-internal';
 import { dxFileImagePicker } from '@devexpress/analytics-core/analytics-widgets-internal';
 export declare class dxImageSourceEditor extends dxFileImagePicker {

package/designer/widgets/imageSourceEditor.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\imageSourceEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\imageSourceEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import registerComponent from 'devextreme/core/component_registrator';
 import { dxFileImagePicker } from '@devexpress/analytics-core/analytics-widgets-internal';
 import { ImageSource } from '../../common/imageSource';

package/designer/widgets/linesEditor.d.ts

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\linesEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\linesEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';
 export declare class LinesEditor extends Editor {

package/designer/widgets/linesEditor.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\linesEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\linesEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';
 export class LinesEditor extends Editor {

package/designer/widgets/nameEditor.d.ts

@@ -1,17 +1,22 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\nameEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\nameEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { IDisplayedObject } from '@devexpress/analytics-core/analytics-internal';
 import { ISerializationInfo } from '@devexpress/analytics-core/analytics-utils';
-import { Editor } from '@devexpress/analytics-core/analytics-widgets';
+import { Editor, IEditorViewModel } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';
+export interface INameEditorViewModel extends IEditorViewModel {
+    generateRules: (rules: any) => any;
+}
 export declare class NameEditor extends Editor {
+    createViewModel(): IEditorViewModel;
     constructor(info: ISerializationInfo, level: any, parentDisabled?: ko.Computed<boolean>, textToSearch?: any);
     _getEditorValidationRules(): any[];
+    _filterControls(controls: IDisplayedObject[]): IDisplayedObject[];
     generateRules(allControls: ko.ObservableArray<IDisplayedObject>): any[];
     currentValidationRules: ko.Observable<any[]>;
 }

package/designer/widgets/nameEditor.js

@@ -1,35 +1,52 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\nameEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\nameEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
+import { formatUnicorn } from '@devexpress/analytics-core/analytics-internal';
 import { getLocalization } from '@devexpress/analytics-core/analytics-utils';
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
-import * as $ from 'jquery';
+import { requiredValidationRules } from '@devexpress/analytics-core/analytics-widgets-internal';
+import { createViewModelGenerator } from '@devexpress/analytics-core/analytics-serializer-native';
 import * as ko from 'knockout';
+import * as $ from 'jquery';
+import { WatermarkModel } from '../controls/properties/watermark';
 export class NameEditor extends Editor {
     constructor(info, level, parentDisabled, textToSearch) {
         super(info, level, parentDisabled, textToSearch);
         this.currentValidationRules = ko.observable(super._getEditorValidationRules());
     }
+    createViewModel() {
+        return createViewModelGenerator(super.createViewModel())
+            .generateProperty('generateRules', (controls) => this.generateRules(controls))
+            .getViewModel();
+    }
     _getEditorValidationRules() {
         return this.currentValidationRules();
     }
+    _filterControls(controls) {
+        return controls.filter(x => !(x instanceof WatermarkModel));
+    }
     generateRules(allControls) {
-        var self = this;
-        if (self.disabled())
+        const self = this;
+        if (self._get('disabled'))
             return [];
-        this.currentValidationRules([{
+        const notUniqueMessageTemplate = getLocalization('{0} is not unique', 'ASPxReportsStringId.ReportDesigner_NameUniqueError');
+        const validationMessage = formatUnicorn(notUniqueMessageTemplate, ko.unwrap(self.displayName));
+        this.currentValidationRules([
+            {
                 type: 'custom',
+                message: validationMessage,
                 validationCallback: (options) => {
                     if (options.value == null)
                         return false;
-                    return allControls().filter(x => {
+                    const model = self._get('_model');
+                    const controls = this._filterControls(allControls());
+                    return controls.filter(x => {
                         if (ko.unwrap(x.name).toLowerCase() !== options.value.toLowerCase())
                             return false;
-                        var model = self._model();
                         if (!model || x === model)
                             return false;
                         var same = model['isSame'];
@@ -37,9 +54,11 @@ export class NameEditor extends Editor {
                             return false;
                         return true;
                     }).length === 0;
-                },
-                get message() { return getLocalization('Name is not unique', 'ASPxReportsStringId.ReportDesigner_NameUniqueError'); }
-            }].concat(super._getEditorValidationRules()));
+                }
+            },
+            ...super._getEditorValidationRules(),
+            ...requiredValidationRules
+        ]);
         return this.currentValidationRules();
     }
 }

package/designer/widgets/pivotGridCriteriaEditor.d.ts

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\pivotGridCriteriaEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\pivotGridCriteriaEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { IDisplayNameProvider, IItemsProvider, ISerializationInfo } from '@devexpress/analytics-core/analytics-utils';
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';

package/designer/widgets/pivotGridCriteriaEditor.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\pivotGridCriteriaEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\pivotGridCriteriaEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { find, getFullPath } from '@devexpress/analytics-core/analytics-internal';
 import { PathRequest } from '@devexpress/analytics-core/analytics-utils';
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
@@ -18,7 +18,7 @@ export class PivotGridCriteriaEditor extends Editor {
     _createItemsProvider(fieldListProvider) {
         return {
             getItems: (pathRequest) => {
-                var model = this._model.peek();
+                var model = this._get('_model', 'peek');
                 if (!model || pathRequest.fullPath.indexOf(Parameter.ParametersRefString) === 0)
                     return $.Deferred().resolve().promise();
                 var pivot = model['parent'];
@@ -46,7 +46,7 @@ export class PivotGridCriteriaEditor extends Editor {
         };
     }
     _getFieldName(name, isRealName = false) {
-        var model = this._model.peek();
+        var model = this._get('_model', 'peek');
         if (!model)
             return $.Deferred().resolve().promise();
         var pivot = model['parent'];

package/designer/widgets/propertyGridEditors.d.ts

@@ -1,17 +1,18 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\propertyGridEditors.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\propertyGridEditors.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { ISerializationInfo, UndoEngine } from '@devexpress/analytics-core/analytics-utils';
 import { FieldListEditor, ObjectProperties, PropertyGridEditor } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';
 import './editorTemplates';
 export declare class ContentByTypeEditor extends PropertyGridEditor {
     createObjectProperties(): ObjectProperties;
-    getViewModel(): ko.Computed<any>;
+    _getViewModel(): ko.Computed<any>;
+    hideCollapsingButton: ko.Observable<boolean>;
 }
 export declare class DataBindingsEditor extends PropertyGridEditor {
     constructor(info: ISerializationInfo, level: any, parentDisabled?: ko.Computed<boolean>, textToSearch?: any);
@@ -25,7 +26,7 @@ export declare class DataBindingEditor extends FieldListEditor {
 }
 export declare class FontEditorUndo extends PropertyGridEditor {
     constructor(info: ISerializationInfo, level: any, parentDisabled?: ko.Computed<boolean>, textToSearch?: any);
-    generateValue(undoEngine: ko.Observable<UndoEngine>): any;
+    generateValue(undoEngine: ko.Observable<UndoEngine>): ObjectProperties;
     createObjectProperties(): ObjectProperties;
     undoEngine: ko.Observable<UndoEngine>;
 }

package/designer/widgets/propertyGridEditors.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\propertyGridEditors.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\propertyGridEditors.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { getLocalization } from '@devexpress/analytics-core/analytics-utils';
 import { FieldListEditor, ObjectProperties, PropertyGridEditor } from '@devexpress/analytics-core/analytics-widgets';
 import { FontModel } from '@devexpress/analytics-core/analytics-widgets-internal';
@@ -16,10 +16,14 @@ import { formatStringEditorCustomSet } from '../utils/settings';
 import './editorTemplates';
 export class ContentByTypeEditor extends PropertyGridEditor {
     createObjectProperties() {
-        return new ObjectProperties(this.getViewModel(), undefined, this.level + 1, this.disabled, undefined, this.textToSearch);
+        return new ObjectProperties(this._getViewModel(), undefined, this.level + 1, this._get('disabled', 'wrapped'), undefined, this.textToSearch);
     }
-    getViewModel() {
+    _getViewModel() {
+        this.hideCollapsingButton = ko.observable();
         var value = ko.computed(() => {
+            const content = this.value() && this.value().content();
+            const visibleItems = (content === null || content === void 0 ? void 0 : content.getInfo) && (content === null || content === void 0 ? void 0 : content.getInfo().filter(x => !!x.editor));
+            this.hideCollapsingButton(!(visibleItems === null || visibleItems === void 0 ? void 0 : visibleItems.length));
             return this.value() && this.value().content();
         });
         this._disposables.push(value);
@@ -46,7 +50,7 @@ export class DataBindingsEditor extends PropertyGridEditor {
             return obj;
         });
         this._disposables.push(model);
-        return new ObjectProperties(model, { editors: dataBindingsSerializationInfo }, this.level + 1, this.disabled, undefined, this.textToSearch);
+        return new ObjectProperties(model, { editors: dataBindingsSerializationInfo }, this.level + 1, this._get('disabled', 'wrapped'), undefined, this.textToSearch);
     }
 }
 export class DataBindingEditor extends FieldListEditor {
@@ -75,6 +79,6 @@ export class FontEditorUndo extends PropertyGridEditor {
         this._disposables.push(undoValue);
         var model = new FontModel(undoValue);
         this._disposables.push(model);
-        return new ObjectProperties(ko.observable(model), { editors: fontInfo }, this.level + 1, this.disabled, undefined, this.textToSearch);
+        return new ObjectProperties(ko.observable(model), { editors: fontInfo }, this.level + 1, this._get('disabled', 'wrapped'), undefined, this.textToSearch);
     }
 }

package/designer/widgets/registerEditors.d.ts

@@ -1,8 +1,8 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\registerEditors.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\registerEditors.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 export declare function registerEditors(): void;

package/designer/widgets/registerEditors.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\registerEditors.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\registerEditors.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { Editor, editorTemplates as analyticsEditorTemplates } from '@devexpress/analytics-core/analytics-widgets';
 import { editorTemplates as chartEditorTemplates } from '../../chart/internal/_editorTemplates';
 import { BandLevelEditor } from '../internal/_bandLevelEditor';
@@ -27,6 +27,7 @@ import { ContentByTypeEditor, DataBindingEditor, DataBindingsEditor, FontEditorU
 import { ReportUrlEditor } from './reportUrlEditor';
 import { SummaryEditor } from './summaryEditor';
 import { ComboboxUndoEditor } from './undoEditors';
+import { WatermarkIdEditor } from './watermarkIdEditor';
 export function registerEditors() {
     designerEditorTemplates.registerEditors({
         formatEditor: { header: 'dxrd-formatstring', editorType: FormatStringEditor },
@@ -50,6 +51,7 @@ export function registerEditors() {
         formattingRule: { custom: 'dxrd-formattingRuleCollection', editorType: FormattingRuleEditor },
         toclevel: { custom: 'dxrd-levelCollection' },
         calculatedFields: { custom: 'dxrd-calculatedFields' },
+        watermarks: { custom: 'dxrd-watermarks' },
         parameters: { custom: 'dxrd-parameters' },
         reportRtlProperty: { header: 'dxrd-reportRtlProperty' },
         comboboxUndo: { header: 'dx-combobox-undo', editorType: ComboboxUndoEditor },
@@ -57,6 +59,7 @@ export function registerEditors() {
         fontUndo: { header: 'dx-emptyHeader', content: 'dx-objectEditorContentUndo', editorType: FontEditorUndo },
         chartValueBinding: { header: 'dxrd-chartValueBinding', editorType: ChartValueBindingEditor },
         name: { header: 'dxrd-name', editorType: NameEditor },
+        watermarkId: { header: 'dxrd-name', editorType: WatermarkIdEditor },
         bandLevel: { header: 'dx-numeric-undo', editorType: BandLevelEditor },
         pivotCriteria: { header: 'dxrd-pivotcriteria', editorType: PivotGridCriteriaEditor },
         fieldsCombobox: { header: 'dxrd-fields-combobox', editorType: FieldsComboboxEditor },

package/designer/widgets/reportFieldListEditor.d.ts

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\reportFieldListEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\reportFieldListEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { FieldListEditor } from '@devexpress/analytics-core/analytics-widgets';
 import * as ko from 'knockout';
 export declare class ReportFieldListEditor extends FieldListEditor {

package/designer/widgets/reportFieldListEditor.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\reportFieldListEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\reportFieldListEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { FieldListEditor } from '@devexpress/analytics-core/analytics-widgets';
 import { TreeListController } from '@devexpress/analytics-core/analytics-widgets-internal';
 import * as ko from 'knockout';
@@ -13,8 +13,9 @@ export class ReportFieldListEditor extends FieldListEditor {
         super(modelPropertyInfo, level, parentDisabled, textToSearch);
         this.treeListController = new ReportTreeListController();
         this._disposables.push(this.treeListController.selectedItemData.subscribe(newValue => {
-            if (this._model()['setDataMemberInfo'])
-                this._model()['setDataMemberInfo'](newValue);
+            const model = this._get('_model');
+            if (model['setDataMemberInfo'])
+                model['setDataMemberInfo'](newValue);
         }));
     }
 }
@@ -25,6 +26,6 @@ class ReportTreeListController extends TreeListController {
     }
     select(value) {
         super.select(value);
-        this.selectedItemData(this.selectedItem && this.selectedItem._data && this.selectedItem._data());
+        this.selectedItemData(this.selectedItem && this.selectedItem.data);
     }
 }

package/designer/widgets/reportUrlEditor.d.ts

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\reportUrlEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\reportUrlEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { ISerializationInfo } from '@devexpress/analytics-core/analytics-utils';
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
 import DataSource from 'devextreme/data/data_source';

package/designer/widgets/reportUrlEditor.js

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\reportUrlEditor.js)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\reportUrlEditor.js)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { Editor } from '@devexpress/analytics-core/analytics-widgets';
 import DataSource from 'devextreme/data/data_source';
 import * as ko from 'knockout';

package/designer/widgets/richTextFileEditor.d.ts

@@ -1,10 +1,10 @@
-/**
-* DevExpress HTML/JS Reporting (designer\widgets\richTextFileEditor.d.ts)
-* Version:  23.2.1-build-23191-1448
-* Build date: Jul 10, 2023
-* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
-* License: https://www.devexpress.com/Support/EULAs/universal.xml
-*/
+/**
+* DevExpress HTML/JS Reporting (designer\widgets\richTextFileEditor.d.ts)
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
+* Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
+* License: https://www.devexpress.com/Support/EULAs/universal.xml
+*/
 import { IFileUploadResult } from '@devexpress/analytics-core/analytics-internal';
 import { dxFileImagePicker } from '@devexpress/analytics-core/analytics-widgets-internal';
 export declare class dxRichTextFileEditor extends dxFileImagePicker {