Skip to content

Commit 9956c96

Browse files
committed
move static method to utils
1 parent 0f833f3 commit 9956c96

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type { RowsView } from '../../grid_core/views/m_rows_view';
2424
import AggregateCalculator from '../m_aggregate_calculator';
2525
import gridCore from '../m_core';
2626
import dataSourceAdapterProvider from '../m_data_source_adapter';
27-
import { getSummaryCellIndex } from './utils';
27+
import { getColumnFromMap, getSummaryCellIndex } from './utils';
2828

2929
const DATAGRID_TOTAL_FOOTER_CLASS = 'dx-datagrid-total-footer';
3030
const DATAGRID_SUMMARY_ITEM_CLASS = 'dx-datagrid-summary-item';
@@ -554,13 +554,6 @@ const data = (Base: ModuleType<DataController>) => class SummaryDataControllerEx
554554
return columnMap;
555555
}
556556

557-
private static _getColumnFromMap(
558-
identifier: string | number | undefined,
559-
columnMap: Map<string | number, Column>,
560-
): Column | undefined {
561-
return identifier !== undefined ? columnMap.get(identifier) : undefined;
562-
}
563-
564557
private _calculateSummaryCells(
565558
summaryItems,
566559
aggregates,
@@ -575,11 +568,11 @@ const data = (Base: ModuleType<DataController>) => class SummaryDataControllerEx
575568

576569
each(summaryItems, (summaryIndex, summaryItem) => {
577570
const column = columnMap
578-
? SummaryDataControllerExtender._getColumnFromMap(summaryItem.column, columnMap)
571+
? getColumnFromMap(summaryItem.column, columnMap)
579572
: that._columnsController.columnOption(summaryItem.column);
580573
const showInColumn = (summaryItem.showInColumn
581574
&& (columnMap
582-
? SummaryDataControllerExtender._getColumnFromMap(summaryItem.showInColumn, columnMap)
575+
? getColumnFromMap(summaryItem.showInColumn, columnMap)
583576
: that._columnsController.columnOption(summaryItem.showInColumn)))
584577
|| column;
585578
const columnIndex = calculateTargetColumnIndex(summaryItem, showInColumn);

packages/devextreme/js/__internal/grids/data_grid/summary/utils.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,10 @@ export function getSummaryCellIndex(
1818

1919
return !isDefined(column.groupIndex) ? cellIndex : -1;
2020
}
21+
22+
export function getColumnFromMap(
23+
identifier: string | number | undefined,
24+
columnMap: Map<string | number, Column>,
25+
): Column | undefined {
26+
return identifier !== undefined ? columnMap.get(identifier) : undefined;
27+
}

0 commit comments

Comments
 (0)