Merge branch '21_1' of https://github.com/DevExpress/DevExtreme into …

…21_1

.github/workflows/testcafe_tests.yml

@@ -6,7 +6,8 @@ jobs:
   testcafe:
     strategy:
       matrix:
-        ARGS: [ --componentFolder=dataGrid --quarantineMode=true, --componentFolder=scheduler --quarantineMode=true, --componentFolder=editors, --componentFolder=navigation ]
+        # --componentFolder=scheduler --quarantineMode=true, 
+        ARGS: [ --componentFolder=dataGrid --quarantineMode=true, --componentFolder=editors, --componentFolder=navigation ]
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -42,6 +43,7 @@ jobs:
         all_args="--concurrency 2 --browsers=chrome:headless ${ARGS}"
         echo "$all_args"
         npm run test-testcafe -- $all_args
+
     - name: Copy screenshots artifacts
       if: ${{ failure() }}
       uses: actions/upload-artifact@v2

js/excel_exporter.d.ts

@@ -1,12 +1,17 @@
 import { DxPromise } from './core/utils/deferred';
 import dxDataGrid, { Column } from './ui/data_grid';
-import dxPivotGrid, { dxPivotGridPivotGridCell } from './ui/pivot_grid';
+import dxPivotGrid, { Cell } from './ui/pivot_grid';
 import { ExportLoadPanel } from './exporter/export_load_panel';
 
 /**
- * @docid
+ * @public
  * @namespace DevExpress.excelExporter
- * @type object
+ */
+export type DataGridCell = ExcelDataGridCell;
+
+/**
+ * @namespace DevExpress.excelExporter
+ * @deprecated Use DataGridCell instead
  */
 export interface ExcelDataGridCell {
     /**
@@ -57,11 +62,16 @@ export interface ExcelDataGridCell {
 }
 
 /**
- * @docid
+ * @public
+ * @namespace DevExpress.excelExporter
+ */
+export type PivotGridCell = ExcelPivotGridCell;
+
+/**
  * @namespace DevExpress.excelExporter
- * @inherits dxPivotGridPivotGridCell
+ * @deprecated Use PivotGridCell instead
  */
-export interface ExcelPivotGridCell extends dxPivotGridPivotGridCell {
+export interface ExcelPivotGridCell extends Cell {
     /**
      * @docid
      * @public
@@ -211,7 +221,7 @@ export interface ExcelExportPivotGridProps extends ExcelExportBaseProps {
      * @type_function_param1_field2 excelCell:Object
      * @public
      */
-    customizeCell?: ((options: { pivotCell?: ExcelPivotGridCell, excelCell?: any}) => void);
+    customizeCell?: ((options: { pivotCell?: PivotGridCell, excelCell?: any}) => void);
 }
 
 /**

js/excel_exporter.js

@@ -6,6 +6,12 @@ import { exportPivotGrid } from './exporter/exceljs/export_pivot_grid';
 * @section utils
 */
 
+/**
+ * @name ExcelPivotGridCell
+ * @namespace DevExpress.excelExporter
+ * @inherits dxPivotGridPivotGridCell
+ */
+
 export {
     exportDataGrid,
     exportPivotGrid

js/ui/accordion.d.ts

@@ -81,10 +81,11 @@ export interface dxAccordionOptions extends CollectionWidgetOptions<dxAccordion>
     collapsible?: boolean;
     /**
      * @docid
+     * @type string | Array<string | dxAccordionItem | any> | Store | DataSource | DataSourceOptions
      * @default null
      * @public
      */
-    dataSource?: string | Array<string | dxAccordionItem | any> | Store | DataSource | DataSourceOptions;
+    dataSource?: string | Array<string | Item | any> | Store | DataSource | DataSourceOptions;
     /**
      * @docid
      * @default true
@@ -132,10 +133,11 @@ export interface dxAccordionOptions extends CollectionWidgetOptions<dxAccordion>
     itemTitleTemplate?: template | ((itemData: any, itemIndex: number, itemElement: DxElement) => string | UserDefinedElement);
     /**
      * @docid
+     * @type Array<string | dxAccordionItem | any>
      * @fires dxAccordionOptions.onOptionChanged
      * @public
      */
-    items?: Array<string | dxAccordionItem | any>;
+    items?: Array<string | Item | any>;
     /**
      * @docid
      * @default false
@@ -206,10 +208,14 @@ export default class dxAccordion extends CollectionWidget {
 }
 
 /**
- * @docid
- * @inherits CollectionWidgetItem
+ * @public
+ * @namespace DevExpress.ui.dxAccordion
+ */
+export type Item = dxAccordionItem;
+
+/**
+ * @deprecated Use Item instead
  * @namespace DevExpress.ui
- * @type object
  */
 export interface dxAccordionItem extends CollectionWidgetItem {
     /**

js/ui/accordion.js

@@ -436,3 +436,9 @@ const Accordion = CollectionWidget.inherit({
 registerComponent('dxAccordion', Accordion);
 
 export default Accordion;
+
+/**
+ * @name dxAccordionItem
+ * @inherits CollectionWidgetItem
+ * @type object
+ */

js/ui/action_sheet.d.ts

@@ -68,16 +68,18 @@ export interface dxActionSheetOptions extends CollectionWidgetOptions<dxActionSh
     cancelText?: string;
     /**
      * @docid
+     * @type string | Array<string | dxActionSheetItem | any> | Store | DataSource | DataSourceOptions
      * @default null
      * @public
      */
-    dataSource?: string | Array<string | dxActionSheetItem | any> | Store | DataSource | DataSourceOptions;
+    dataSource?: string | Array<string | Item | any> | Store | DataSource | DataSourceOptions;
     /**
      * @docid
+     * @type Array<string | dxActionSheetItem | any>
      * @fires dxActionSheetOptions.onOptionChanged
      * @public
      */
-    items?: Array<string | dxActionSheetItem | any>;
+    items?: Array<string | Item | any>;
     /**
      * @docid
      * @default null
@@ -163,10 +165,14 @@ export default class dxActionSheet extends CollectionWidget {
 }
 
 /**
- * @docid
- * @inherits CollectionWidgetItem
+ * @public
+ * @namespace DevExpress.ui.dxActionSheet
+ */
+export type Item = dxActionSheetItem;
+
+/**
+ * @deprecated Use Item instead
  * @namespace DevExpress.ui
- * @type object
  */
 export interface dxActionSheetItem extends CollectionWidgetItem {
     /**

js/ui/action_sheet.js

@@ -406,3 +406,9 @@ const ActionSheet = CollectionWidget.inherit({
 registerComponent('dxActionSheet', ActionSheet);
 
 export default ActionSheet;
+
+/**
+ * @name dxActionSheetItem
+ * @inherits CollectionWidgetItem
+ * @type object
+ */

js/ui/box.d.ts

@@ -66,10 +66,11 @@ export interface dxBoxOptions extends CollectionWidgetOptions<dxBox> {
     crossAlign?: 'center' | 'end' | 'start' | 'stretch';
     /**
      * @docid
+     * @type string | Array<string | dxBoxItem | any> | Store | DataSource | DataSourceOptions
      * @default null
      * @public
      */
-    dataSource?: string | Array<string | dxBoxItem | any> | Store | DataSource | DataSourceOptions;
+    dataSource?: string | Array<string | Item | any> | Store | DataSource | DataSourceOptions;
     /**
      * @docid
      * @type Enums.BoxDirection
@@ -79,10 +80,11 @@ export interface dxBoxOptions extends CollectionWidgetOptions<dxBox> {
     direction?: 'col' | 'row';
     /**
      * @docid
+     * @type Array<string | dxBoxItem | any>
      * @fires dxBoxOptions.onOptionChanged
      * @public
      */
-    items?: Array<string | dxBoxItem | any>;
+    items?: Array<string | Item | any>;
 }
 /**
  * @docid
@@ -97,10 +99,14 @@ export default class dxBox extends CollectionWidget {
 }
 
 /**
- * @docid
- * @inherits CollectionWidgetItem
+ * @public
+ * @namespace DevExpress.ui.dxBox
+ */
+export type Item = dxBoxItem;
+
+/**
+ * @deprecated Use Item instead
  * @namespace DevExpress.ui
- * @type object
  */
 export interface dxBoxItem extends CollectionWidgetItem {
     /**

js/ui/box.js

@@ -706,3 +706,9 @@ Box.ItemClass = BoxItem;
 registerComponent('dxBox', Box);
 
 export default Box;
+
+/**
+ * @name dxBoxItem
+ * @inherits CollectionWidgetItem
+ * @type object
+ */

js/ui/button_group.d.ts

@@ -70,9 +70,10 @@ export interface dxButtonGroupOptions extends WidgetOptions<dxButtonGroup> {
     hoverStateEnabled?: boolean;
     /**
      * @docid
+     * @type Array<dxButtonGroupItem>
      * @public
      */
-    items?: Array<dxButtonGroupItem>;
+    items?: Array<Item>;
     /**
      * @docid
      * @default 'text'
@@ -148,10 +149,14 @@ export default class dxButtonGroup extends Widget {
 }
 
 /**
- * @docid
- * @inherits CollectionWidgetItem
+ * @public
+ * @namespace DevExpress.ui.dxButtonGroup
+ */
+export type Item = dxButtonGroupItem;
+
+/**
+ * @deprecated Use Item instead
  * @namespace DevExpress.ui
- * @type object
  */
 export interface dxButtonGroupItem extends CollectionWidgetItem {
     /**

js/ui/button_group.js

@@ -237,3 +237,10 @@ const ButtonGroup = Widget.inherit({
 registerComponent('dxButtonGroup', ButtonGroup);
 
 export default ButtonGroup;
+
+
+/**
+ * @name dxButtonGroupItem
+ * @inherits CollectionWidgetItem
+ * @type object
+ */

js/ui/context_menu.d.ts

@@ -95,15 +95,17 @@ export interface dxContextMenuOptions extends dxMenuBaseOptions<dxContextMenu> {
     closeOnOutsideClick?: boolean | ((event: DxEvent) => boolean);
     /**
      * @docid
+     * @type string | Array<dxContextMenuItem> | Store | DataSource | DataSourceOptions
      * @default null
      * @public
      */
-    dataSource?: string | Array<dxContextMenuItem> | Store | DataSource | DataSourceOptions;
+    dataSource?: string | Array<Item> | Store | DataSource | DataSourceOptions;
     /**
      * @docid
+     * @type Array<dxContextMenuItem>
      * @public
      */
-    items?: Array<dxContextMenuItem>;
+    items?: Array<Item>;
     /**
      * @docid
      * @default null
@@ -244,10 +246,14 @@ export default class dxContextMenu extends dxMenuBase {
 }
 
 /**
- * @docid
- * @inherits dxMenuBaseItem
+ * @public
+ * @namespace DevExpress.ui.dxContextMenu
+ */
+export type Item = dxContextMenuItem;
+
+/**
+ * @deprecated Use Item instead
  * @namespace DevExpress.ui
- * @type object
  */
 export interface dxContextMenuItem extends dxMenuBaseItem {
     /**

js/ui/context_menu.js

@@ -1,3 +1,9 @@
 import ContextMenu from './context_menu/ui.context_menu';
 
 export default ContextMenu;
+
+/**
+ * @name dxContextMenuItem
+ * @inherits dxMenuBaseItem
+ * @type object
+ */

js/ui/data_grid.d.ts

@@ -28,7 +28,7 @@ import {
 } from '../events/index';
 
 import {
-    ExcelDataGridCell
+    DataGridCell as ExcelCell
 } from '../excel_exporter';
 
 import {
@@ -3686,7 +3686,7 @@ export interface ExcelCellInfo {
   font?: ExcelFont;
   readonly value?: string | number | Date;
   numberFormat?: string;
-  gridCell?: ExcelDataGridCell;
+  gridCell?: ExcelCell;
 }
 
 export interface Export {
@@ -3900,6 +3900,7 @@ export interface CustomSummaryInfo {
   readonly groupIndex?: number;
 }
 
+/** @public */
 export interface Summary {
   /**
    * @docid dxDataGridOptions.summary.calculateCustomSummary