Skip to content

Commit 5c32ab6

Browse files
authored
PivotGrid - Column expands after datasource reload - T1246608 (DevExpress#28991)
1 parent 6acc88d commit 5c32ab6

File tree

3 files changed

+334
-142
lines changed

3 files changed

+334
-142
lines changed

packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,26 +197,30 @@ function mergeArraysByMaxValue(values1, values2) {
197197
return result;
198198
}
199199

200+
/**
201+
* @returns Maximum expanded level in the axis
202+
*/
200203
function getExpandedLevel(options, axisName) {
201-
const dimensions = options[axisName];
202-
let expandLevel = 0;
204+
const fields = options[axisName];
203205
const expandedPaths = (axisName === 'columns' ? options.columnExpandedPaths : options.rowExpandedPaths) || [];
204206

207+
let expandedLevel = 0;
208+
205209
if (options.headerName === axisName) {
206-
expandLevel = options.path.length;
210+
expandedLevel = options.path.length;
207211
} else if (options.headerName && options.headerName !== axisName && options.oppositePath) {
208-
expandLevel = options.oppositePath.length;
212+
expandedLevel = options.oppositePath.length;
209213
} else {
210214
each(expandedPaths, (_, path) => {
211-
expandLevel = Math.max(expandLevel, path.length);
215+
expandedLevel = Math.max(expandedLevel, path.length);
212216
});
213217
}
214218

215-
while (dimensions[expandLevel + 1] && dimensions[expandLevel].expanded) {
216-
expandLevel += 1;
219+
while (fields[expandedLevel + 1] && fields[expandedLevel].expanded) {
220+
expandedLevel += 1;
217221
}
218222

219-
return expandLevel;
223+
return expandedLevel;
220224
}
221225

222226
function createGroupFields(item) {

0 commit comments

Comments
 (0)