@progress/kendo-react-grid 5.14.0-dev.202305291502 → 5.14.0-dev.202305311028

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.
Files changed (55) hide show
  1. package/dist/cdn/js/kendo-react-grid.js +1 -1
  2. package/dist/es/Grid.js +6 -6
  3. package/dist/es/cells/GridCell.d.ts +2 -2
  4. package/dist/es/cells/GridCell.js +16 -4
  5. package/dist/es/cells/GridEditCell.d.ts +2 -2
  6. package/dist/es/cells/GridEditCell.js +23 -9
  7. package/dist/es/cells/GridGroupCell.d.ts +2 -2
  8. package/dist/es/cells/GridGroupCell.js +50 -24
  9. package/dist/es/cells/GridHierarchyCell.d.ts +2 -2
  10. package/dist/es/cells/GridHierarchyCell.js +25 -15
  11. package/dist/es/cells/GridSelectionCell.js +13 -3
  12. package/dist/es/footer/FooterRow.d.ts +2 -0
  13. package/dist/es/footer/FooterRow.js +22 -11
  14. package/dist/es/header/FilterRow.d.ts +2 -0
  15. package/dist/es/header/FilterRow.js +10 -2
  16. package/dist/es/header/HeaderRow.d.ts +2 -0
  17. package/dist/es/header/HeaderRow.js +14 -5
  18. package/dist/es/interfaces/GridCellProps.d.ts +5 -0
  19. package/dist/es/interfaces/GridCellsSettings.d.ts +111 -0
  20. package/dist/es/interfaces/GridCellsSettings.js +1 -0
  21. package/dist/es/interfaces/GridColumnProps.d.ts +5 -0
  22. package/dist/es/interfaces/GridProps.d.ts +5 -0
  23. package/dist/es/main.d.ts +1 -0
  24. package/dist/es/main.js +1 -0
  25. package/dist/es/package-metadata.js +1 -1
  26. package/dist/es/utils/index.d.ts +5 -0
  27. package/dist/es/utils/index.js +15 -0
  28. package/dist/npm/Grid.js +5 -5
  29. package/dist/npm/cells/GridCell.d.ts +2 -2
  30. package/dist/npm/cells/GridCell.js +16 -4
  31. package/dist/npm/cells/GridEditCell.d.ts +2 -2
  32. package/dist/npm/cells/GridEditCell.js +23 -9
  33. package/dist/npm/cells/GridGroupCell.d.ts +2 -2
  34. package/dist/npm/cells/GridGroupCell.js +50 -24
  35. package/dist/npm/cells/GridHierarchyCell.d.ts +2 -2
  36. package/dist/npm/cells/GridHierarchyCell.js +25 -15
  37. package/dist/npm/cells/GridSelectionCell.js +13 -3
  38. package/dist/npm/footer/FooterRow.d.ts +2 -0
  39. package/dist/npm/footer/FooterRow.js +21 -10
  40. package/dist/npm/header/FilterRow.d.ts +2 -0
  41. package/dist/npm/header/FilterRow.js +10 -2
  42. package/dist/npm/header/HeaderRow.d.ts +2 -0
  43. package/dist/npm/header/HeaderRow.js +14 -5
  44. package/dist/npm/interfaces/GridCellProps.d.ts +5 -0
  45. package/dist/npm/interfaces/GridCellsSettings.d.ts +111 -0
  46. package/dist/npm/interfaces/GridCellsSettings.js +3 -0
  47. package/dist/npm/interfaces/GridColumnProps.d.ts +5 -0
  48. package/dist/npm/interfaces/GridProps.d.ts +5 -0
  49. package/dist/npm/main.d.ts +1 -0
  50. package/dist/npm/main.js +1 -0
  51. package/dist/npm/package-metadata.js +1 -1
  52. package/dist/npm/utils/index.d.ts +5 -0
  53. package/dist/npm/utils/index.js +17 -1
  54. package/dist/systemjs/kendo-react-grid.js +1 -1
  55. package/package.json +18 -18
@@ -39,17 +39,28 @@ var FooterRow = /** @class */ (function (_super) {
39
39
  var _this = _super !== null && _super.apply(this, arguments) || this;
40
40
  _this._element = null;
41
41
  _this.renderCell = function (column, index) {
42
- var tdProps = {
43
- colSpan: column.colSpan !== 1 ? column.colSpan : undefined,
44
- style: column.left !== undefined
45
- ? !_this.props.isRtl
46
- ? { left: column.left, right: column.right }
47
- : { left: column.right, right: column.left }
48
- : {},
49
- className: (0, kendo_react_common_1.classNames)('k-table-td', column.locked && column.left !== undefined ? 'k-grid-footer-sticky' : '')
50
- };
42
+ var _a;
43
+ var tdProps = (_a = {
44
+ colSpan: column.colSpan !== 1 ? column.colSpan : undefined,
45
+ style: column.left !== undefined
46
+ ? !_this.props.isRtl
47
+ ? { left: column.left, right: column.right }
48
+ : { left: column.right, right: column.left }
49
+ : {},
50
+ className: (0, kendo_react_common_1.classNames)('k-table-td', column.locked && column.left !== undefined ? 'k-grid-footer-sticky' : ''),
51
+ key: index,
52
+ role: 'columnfooter'
53
+ },
54
+ _a['aria-selected'] = false,
55
+ _a['aria-colindex'] = column.ariaColumnIndex,
56
+ _a);
51
57
  var cellProps = __assign({ field: column.field, ariaColumnIndex: column.ariaColumnIndex }, tdProps);
52
- return (column.footerCell && React.createElement(column.footerCell, __assign({}, cellProps, { key: index }))) || (React.createElement("td", __assign({ key: index }, tdProps, { role: 'columnfooter', "aria-selected": false, "aria-colindex": column.ariaColumnIndex })));
58
+ var customCells = (0, utils_1.resolveCells)(_this.props.cells, column.cells);
59
+ if (customCells && customCells.footerCell) {
60
+ var CustomCell = customCells.footerCell;
61
+ return React.createElement(CustomCell, __assign({}, cellProps, { tdProps: tdProps, index: index }));
62
+ }
63
+ return (column.footerCell && React.createElement(column.footerCell, __assign({}, cellProps, { key: index }))) || (React.createElement("td", __assign({}, tdProps)));
53
64
  };
54
65
  return _this;
55
66
  }
@@ -3,6 +3,7 @@ import { CompositeFilterDescriptor, SortDescriptor } from '@progress/kendo-data-
3
3
  import { ExtendedColumnProps } from '../GridColumn';
4
4
  import { GridFilterCellProps } from '../interfaces/GridFilterCellProps';
5
5
  import { GridFilterOperators } from '../interfaces/GridFilterOperators';
6
+ import { GridCellsSettings } from '../interfaces/GridCellsSettings';
6
7
  /**
7
8
  * @hidden
8
9
  */
@@ -11,6 +12,7 @@ export declare const FILTER_ROW_CLASS = "k-table-row k-filter-row";
11
12
  * @hidden
12
13
  */
13
14
  export interface FilterRowProps {
15
+ cells?: GridCellsSettings;
14
16
  columns: ExtendedColumnProps[];
15
17
  filter?: CompositeFilterDescriptor;
16
18
  filterOperators: GridFilterOperators;
@@ -34,6 +34,7 @@ var filterCommon_1 = require("../filterCommon");
34
34
  var kendo_react_data_tools_1 = require("@progress/kendo-react-data-tools");
35
35
  var messages_1 = require("../messages");
36
36
  var kendo_react_common_1 = require("@progress/kendo-react-common");
37
+ var utils_1 = require("../utils");
37
38
  /**
38
39
  * @hidden
39
40
  */
@@ -122,9 +123,16 @@ var FilterRow = /** @class */ (function (_super) {
122
123
  ? { left: column.left, right: column.right }
123
124
  : { left: column.right, right: column.left }
124
125
  : {};
125
- return (React.createElement(kendo_react_data_tools_1.HeaderThElement, __assign({ key: key, columnId: kendo_react_data_tools_1.tableKeyboardNavigationTools.getFilterColumnId(column.id), navigatable: column.navigatable, style: style, className: (0, kendo_react_common_1.classNames)('k-table-th', _this.headerCellClassName(column.field, column.locked) || undefined), role: "columnheader" }, ariaAttrs), filterCellProps && (column.filterCell ?
126
+ var thProps = __assign({ columnId: kendo_react_data_tools_1.tableKeyboardNavigationTools.getFilterColumnId(column.id), navigatable: column.navigatable, style: style, className: (0, kendo_react_common_1.classNames)('k-table-th', _this.headerCellClassName(column.field, column.locked) || undefined), role: 'columnheader' }, ariaAttrs);
127
+ var content = (filterCellProps && (column.filterCell ?
126
128
  React.createElement(column.filterCell, __assign({}, filterCellProps)) :
127
- React.createElement(GridFilterCell_1.GridFilterCell, __assign({ size: _this.props.size }, filterCellProps)))));
129
+ React.createElement(GridFilterCell_1.GridFilterCell, __assign({ size: _this.props.size }, filterCellProps))));
130
+ var customCells = (0, utils_1.resolveCells)(_this.props.cells, column.cells);
131
+ if (customCells && customCells.filterCell) {
132
+ var CustomCell = customCells.filterCell;
133
+ return (React.createElement(CustomCell, __assign({ key: key }, filterCellProps, { thProps: thProps, index: index }), content));
134
+ }
135
+ return (React.createElement(kendo_react_data_tools_1.HeaderThElement, __assign({ key: key }, thProps), content));
128
136
  });
129
137
  return React.createElement("tr", { className: exports.FILTER_ROW_CLASS, "aria-rowindex": this.props.ariaRowIndex, role: "row" }, filterCells);
130
138
  };
@@ -8,10 +8,12 @@ import { GridColumnProps } from '../interfaces/GridColumnProps';
8
8
  import { GridHeaderCellProps } from '../interfaces/GridHeaderCellProps';
9
9
  import { GridColumnMenuProps } from '../interfaces/GridColumnMenuProps';
10
10
  import { GridFilterOperators } from '../interfaces/GridFilterOperators';
11
+ import { GridCellsSettings } from '../interfaces/GridCellsSettings';
11
12
  /**
12
13
  * @hidden
13
14
  */
14
15
  export interface HeaderRowProps extends ColumnDraggableProps {
16
+ cells?: GridCellsSettings;
15
17
  sortable?: GridSortSettings;
16
18
  sortChange?: (descriptors: SortDescriptor[], e: React.SyntheticEvent<any>) => void;
17
19
  sort?: SortDescriptor[];
@@ -37,6 +37,7 @@ var kendo_react_data_tools_1 = require("@progress/kendo-react-data-tools");
37
37
  var kendo_react_intl_1 = require("@progress/kendo-react-intl");
38
38
  var messages_1 = require("../messages");
39
39
  var kendo_svg_icons_1 = require("@progress/kendo-svg-icons");
40
+ var utils_1 = require("../utils");
40
41
  /**
41
42
  * @hidden
42
43
  */
@@ -100,7 +101,7 @@ var HeaderRow = /** @class */ (function (_super) {
100
101
  };
101
102
  var key = (column.declarationIndex >= 0) ? ++_this.index : --_this.serviceIndex;
102
103
  var HeaderCell = column.headerCell ? column.headerCell : GridHeaderCell_1.GridHeaderCell;
103
- var headerCell = (React.createElement(HeaderCell, { field: column.field, onClick: sortable && (function (e) { return _this.cellClick(e, column); }) || undefined, selectionChange: _this.props.selectionChange, title: column.title, selectionValue: column.headerSelectionValue, render: _this.props.cellRender, children: _this.sortIcon(sortIndex), columnMenuWrapperProps: {
104
+ var headerCell = (React.createElement(HeaderCell, { key: 1, field: column.field, onClick: sortable && (function (e) { return _this.cellClick(e, column); }) || undefined, selectionChange: _this.props.selectionChange, title: column.title, selectionValue: column.headerSelectionValue, render: _this.props.cellRender, children: _this.sortIcon(sortIndex), columnMenuWrapperProps: {
104
105
  column: {
105
106
  field: column.field,
106
107
  filter: column.filter
@@ -117,16 +118,24 @@ var HeaderRow = /** @class */ (function (_super) {
117
118
  onGroupChange: _this.props.groupChange,
118
119
  columnMenu: columnMenu
119
120
  } }));
120
- return (React.createElement(kendo_react_data_tools_1.HeaderThElement, __assign({}, ariaAttrs, { key: key, colSpan: column.colSpan, rowSpan: column.rowSpan, className: className, style: style, columnId: column.id, navigatable: column.navigatable, onKeyDown: sortable && (function (e) { return _this.cellKeyDown(e, column); }) || undefined, role: "columnheader" }),
121
+ var thProps = __assign(__assign({}, ariaAttrs), { key: key, colSpan: column.colSpan, rowSpan: column.rowSpan, className: className, style: style, columnId: column.id, navigatable: column.navigatable, onKeyDown: sortable && (function (e) { return _this.cellKeyDown(e, column); }) || undefined, role: 'columnheader' });
122
+ var content = [
121
123
  headerCell,
122
- _this.props.columnResize && _this.props.columnResize.resizable && column.resizable &&
123
- React.createElement(ColumnResizer_1.ColumnResizer, { key: 2, resize: function (e, element, end) {
124
+ (_this.props.columnResize && _this.props.columnResize.resizable && column.resizable
125
+ && React.createElement(ColumnResizer_1.ColumnResizer, { key: 2, resize: function (e, element, end) {
124
126
  return _this.props.columnResize &&
125
127
  _this.props.columnResize.dragHandler(e, column, element, end);
126
128
  }, autofit: function (e) {
127
129
  return _this.props.columnResize &&
128
130
  _this.props.columnResize.dblClickHandler(e, [column.id]);
129
- } })));
131
+ } }))
132
+ ];
133
+ var customCells = (0, utils_1.resolveCells)(_this.props.cells, column.cells);
134
+ if (customCells && customCells.headerCell) {
135
+ var CustomCell = customCells.headerCell;
136
+ return (React.createElement(CustomCell, { key: key, thProps: thProps, index: columnIndex }, content));
137
+ }
138
+ return (React.createElement(kendo_react_data_tools_1.HeaderThElement, __assign({}, thProps, { key: key }), content));
130
139
  }); };
131
140
  _this.cellClick = _this.cellClick.bind(_this);
132
141
  return _this;
@@ -1,4 +1,5 @@
1
1
  /// <reference types="react" />
2
+ import { GridCellsSettings } from './GridCellsSettings';
2
3
  import { GridRowType } from './GridRowType';
3
4
  import { CellProps } from '@progress/kendo-react-data-tools';
4
5
  /**
@@ -18,6 +19,10 @@ export interface GridCellProps extends Omit<CellProps, 'onChange' | 'render'> {
18
19
  * The number of rendered columns in the Grid.
19
20
  */
20
21
  columnsCount?: number;
22
+ /**
23
+ * Sets a set of cells components that the Grid will render instead of the built-in cell.
24
+ */
25
+ cells?: GridCellsSettings;
21
26
  /**
22
27
  * The type of the row.
23
28
  */
@@ -0,0 +1,111 @@
1
+ import { ComponentType } from 'react';
2
+ import { TABLE_COL_INDEX_ATTRIBUTE } from '@progress/kendo-react-data-tools';
3
+ import { GridCellProps } from './GridCellProps';
4
+ import { GridFooterCellProps } from './GridFooterCellProps';
5
+ import { GridFilterCellProps } from './GridFilterCellProps';
6
+ import { GridHeaderCellProps } from './GridHeaderCellProps';
7
+ export interface GridTdAttributes extends React.TdHTMLAttributes<HTMLTableCellElement> {
8
+ [TABLE_COL_INDEX_ATTRIBUTE]?: number;
9
+ key?: string;
10
+ }
11
+ export interface GridThAttributes extends React.ThHTMLAttributes<HTMLTableCellElement> {
12
+ columnId: string;
13
+ key?: string;
14
+ }
15
+ /**
16
+ * The properties of the default Grid Cell.
17
+ */
18
+ export interface GridCustomCellProps extends GridCellProps {
19
+ /**
20
+ * The props and attributes that are applied to the td element by default.
21
+ */
22
+ tdProps?: React.TdHTMLAttributes<HTMLTableCellElement> | null;
23
+ /**
24
+ * The props and attributes that are applied to the second td. Such element is
25
+ * rendered in very rare cases when we have grouping and sticky columns.
26
+ */
27
+ td2Props?: React.TdHTMLAttributes<HTMLTableCellElement> | null;
28
+ /**
29
+ * The default children of the table cell.
30
+ */
31
+ children?: React.ReactNode | React.ReactNode[];
32
+ }
33
+ /**
34
+ * The properties of the footer Grid Cell.
35
+ */
36
+ export interface GridCustomFooterCellProps extends GridFooterCellProps {
37
+ /**
38
+ * The props and attributes that are applied to the td element by default.
39
+ */
40
+ tdProps?: React.TdHTMLAttributes<HTMLTableCellElement> | null;
41
+ /**
42
+ * The index of the column that is rendered.
43
+ */
44
+ index?: number;
45
+ }
46
+ /**
47
+ * The properties of the filter Grid Cell.
48
+ */
49
+ export interface GridCustomFilterCellProps extends GridFilterCellProps {
50
+ /**
51
+ * The props and attributes that are applied to the td element by default.
52
+ */
53
+ thProps?: GridThAttributes | null;
54
+ /**
55
+ * The default children of the table cell.
56
+ */
57
+ children?: React.ReactNode | React.ReactNode[];
58
+ /**
59
+ * The index of the column.
60
+ */
61
+ index?: number;
62
+ }
63
+ /**
64
+ * The properties of the header Grid Cell.
65
+ */
66
+ export interface GridCustomHeaderCellProps extends GridHeaderCellProps {
67
+ /**
68
+ * The props and attributes that are applied to the td element by default.
69
+ */
70
+ thProps?: GridThAttributes | null;
71
+ /**
72
+ * The default children of the table cell.
73
+ */
74
+ children: React.ReactNode | React.ReactNode[];
75
+ /**
76
+ * The index of the column.
77
+ */
78
+ index?: number;
79
+ }
80
+ /**
81
+ * The settings of the cells prop options.
82
+ */
83
+ export interface GridCellsSettings {
84
+ headerCell?: ComponentType<GridCustomHeaderCellProps>;
85
+ filterCell?: ComponentType<GridCustomFilterCellProps>;
86
+ footerCell?: ComponentType<GridCustomFooterCellProps>;
87
+ groupHeader?: ComponentType<GridCustomCellProps>;
88
+ data?: ComponentType<GridCustomCellProps>;
89
+ groupFooter?: ComponentType<GridCustomCellProps>;
90
+ select?: {
91
+ groupHeader?: ComponentType<GridCustomCellProps>;
92
+ data?: ComponentType<GridCustomCellProps>;
93
+ groupFooter?: ComponentType<GridCustomCellProps>;
94
+ };
95
+ hierarchy?: {
96
+ groupHeader?: ComponentType<GridCustomCellProps>;
97
+ data?: ComponentType<GridCustomCellProps>;
98
+ groupFooter?: ComponentType<GridCustomCellProps>;
99
+ };
100
+ group?: {
101
+ groupHeader?: ComponentType<GridCustomCellProps>;
102
+ data?: ComponentType<GridCustomCellProps>;
103
+ groupFooter?: ComponentType<GridCustomCellProps>;
104
+ };
105
+ edit?: {
106
+ text?: ComponentType<GridCustomCellProps>;
107
+ numeric?: ComponentType<GridCustomCellProps>;
108
+ boolean?: ComponentType<GridCustomCellProps>;
109
+ date?: ComponentType<GridCustomCellProps>;
110
+ };
111
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ var kendo_react_data_tools_1 = require("@progress/kendo-react-data-tools");
@@ -6,6 +6,7 @@ import { GridColumnMenuProps } from '../interfaces/GridColumnMenuProps';
6
6
  import { GridFooterCellProps } from './GridFooterCellProps';
7
7
  import { GridColumnSortSettings } from './GridSortSettings';
8
8
  import { ColumnBaseProps } from '@progress/kendo-react-data-tools';
9
+ import { GridCellsSettings } from './GridCellsSettings';
9
10
  /**
10
11
  * The props of the GridColumn component.
11
12
  */
@@ -58,6 +59,10 @@ export interface GridColumnProps extends Omit<ColumnBaseProps, 'cell'> {
58
59
  * Defines the component that will be rendered as a cell. If not set, a `GridCell` will be rendered by default.
59
60
  */
60
61
  cell?: ComponentType<GridCellProps>;
62
+ /**
63
+ * Sets a set of cells components that the Grid will render instead of the built-in cell.
64
+ */
65
+ cells?: GridCellsSettings;
61
66
  /**
62
67
  * Defines the component that will be rendered as a filter cell. If not set, a `GridFilterCell` will be rendered by default.
63
68
  */
@@ -15,6 +15,7 @@ import { GridFilterOperators } from './GridFilterOperators';
15
15
  import { GridSelectableSettings } from './GridSelectableSettings';
16
16
  import { PagerProps } from '@progress/kendo-react-data-tools';
17
17
  import { KendoReactComponentBaseProps } from '@progress/kendo-react-common';
18
+ import { GridCellsSettings } from './GridCellsSettings';
18
19
  /**
19
20
  * Represents the props of the [KendoReact Grid component]({% slug overview_grid %}).
20
21
  */
@@ -28,6 +29,10 @@ export interface GridProps extends KendoReactComponentBaseProps {
28
29
  * Sets a class of the Grid DOM element.
29
30
  */
30
31
  className?: string;
32
+ /**
33
+ * Sets a set of custom components that the Grid will render instead of the built-in cell.
34
+ */
35
+ cells?: GridCellsSettings;
31
36
  /**
32
37
  * Sets the data of the Grid ([see example]({% slug paging_grid %})). If you use paging, the `data` option has to contain only the items for the current page.
33
38
  */
@@ -31,6 +31,7 @@ import { GridToolbarProps } from './interfaces/GridToolbarProps';
31
31
  import { GridNoRecords } from './GridNoRecords';
32
32
  import { GridNoRecordsProps } from './interfaces/GridNoRecordsProps';
33
33
  export * from './interfaces/events';
34
+ export * from './interfaces/GridCellsSettings';
34
35
  export { messages as gridMessages, pagerInfo, pagerFirstPage, pagerPreviousPage, pagerNextPage, pagerLastPage, pagerItemPerPage } from './messages';
35
36
  import { GridSortSettings } from './interfaces/GridSortSettings';
36
37
  import { GridPagerSettings } from './paging/GridPagerSettings';
package/dist/npm/main.js CHANGED
@@ -58,6 +58,7 @@ Object.defineProperty(exports, "GridToolbar", { enumerable: true, get: function
58
58
  var GridNoRecords_1 = require("./GridNoRecords");
59
59
  Object.defineProperty(exports, "GridNoRecords", { enumerable: true, get: function () { return GridNoRecords_1.GridNoRecords; } });
60
60
  __exportStar(require("./interfaces/events"), exports);
61
+ __exportStar(require("./interfaces/GridCellsSettings"), exports);
61
62
  var messages_1 = require("./messages");
62
63
  Object.defineProperty(exports, "gridMessages", { enumerable: true, get: function () { return messages_1.messages; } });
63
64
  Object.defineProperty(exports, "pagerInfo", { enumerable: true, get: function () { return messages_1.pagerInfo; } });
@@ -8,7 +8,7 @@ exports.packageMetadata = {
8
8
  name: '@progress/kendo-react-grid',
9
9
  productName: 'KendoReact',
10
10
  productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
11
- publishDate: 1685371225,
11
+ publishDate: 1685527715,
12
12
  version: '',
13
13
  licensingDocsUrl: 'https://www.telerik.com/kendo-react-ui/my-license/?utm_medium=product&utm_source=kendoreact&utm_campaign=kendo-ui-react-purchase-license-keys-warning'
14
14
  };
@@ -28,6 +28,7 @@ import { ExtendedColumnProps } from '../GridColumn';
28
28
  import { DataResult, GroupDescriptor } from '@progress/kendo-data-query';
29
29
  import { GridRowType } from '../interfaces/GridRowType';
30
30
  import { GridColumnProps } from '../interfaces/GridColumnProps';
31
+ import { GridCellsSettings } from '../interfaces/GridCellsSettings';
31
32
  /**
32
33
  * @hidden
33
34
  */
@@ -58,3 +59,7 @@ export declare const firefox: boolean;
58
59
  * @hidden
59
60
  */
60
61
  export declare const firefoxMaxHeight = 17895697;
62
+ /**
63
+ * @hidden
64
+ */
65
+ export declare const resolveCells: (gridCells?: GridCellsSettings, columnCells?: GridCellsSettings) => GridCellsSettings | undefined;
@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
22
22
  return t;
23
23
  };
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.firefoxMaxHeight = exports.firefox = exports.sanitizeColumns = exports.footerColumns = exports.autoGenerateColumns = exports.readColumns = exports.checkPropCompatibility = exports.flatData = exports.getNestedValue = void 0;
25
+ exports.resolveCells = exports.firefoxMaxHeight = exports.firefox = exports.sanitizeColumns = exports.footerColumns = exports.autoGenerateColumns = exports.readColumns = exports.checkPropCompatibility = exports.flatData = exports.getNestedValue = void 0;
26
26
  /**
27
27
  * @hidden
28
28
  */
@@ -246,3 +246,19 @@ exports.firefox = typeof window !== 'undefined' &&
246
246
  * @hidden
247
247
  */
248
248
  exports.firefoxMaxHeight = 17895697;
249
+ /**
250
+ * @hidden
251
+ */
252
+ var resolveCells = function (gridCells, columnCells) {
253
+ if (!gridCells && !columnCells) {
254
+ return undefined;
255
+ }
256
+ if (!columnCells) {
257
+ return gridCells;
258
+ }
259
+ if (!gridCells) {
260
+ return columnCells;
261
+ }
262
+ return __assign(__assign(__assign({}, gridCells), columnCells), { select: __assign(__assign({}, (gridCells.select || {})), (columnCells.select || {})), hierarchy: __assign(__assign({}, (gridCells.hierarchy || {})), (columnCells.hierarchy || {})), group: __assign(__assign({}, (gridCells.group || {})), (columnCells.group || {})), edit: __assign(__assign({}, (gridCells.edit || {})), (columnCells.edit || {})) });
263
+ };
264
+ exports.resolveCells = resolveCells;