Skip to content

PivotGrid - Create FieldChooserBase only once #32364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlisherAmonulloev wants to merge 2 commits into
base: 26_1
Choose a base branch
from
Open

PivotGrid - Create FieldChooserBase only once #32364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b52f35
Create FieldChooserBase only once
AlisherAmonulloev Jan 31, 2026
fac81f9
Update m_widget.ts
AlisherAmonulloev Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,15 +1174,22 @@ class PivotGrid extends Widget {

that.$element().addClass(OVERFLOW_HIDDEN_CLASS);

that._createComponent(that.$element(), FieldChooserBase, {
const fieldChooserOptions = {
dataSource: that.getDataSource(),
encodeHtml: that.option('encodeHtml'),
allowFieldDragging: that.option('fieldPanel.allowFieldDragging'),
headerFilter: that.option('headerFilter'),
visible: that.option('visible'),
// @ts-expect-error ts-error
remoteSort: that.option('scrolling.mode') === 'virtual',
});
};

if (isFirstDrawing) {
that._createComponent(that.$element(), FieldChooserBase, fieldChooserOptions);
} else {
// @ts-expect-error dxPivotGridFieldChooserBase is registered as jQuery plugin
that.$element().dxPivotGridFieldChooserBase('instance').option(fieldChooserOptions);
}

const dataArea = that._renderDataArea(dataAreaElement);
const rowsArea = that._renderRowsArea(rowsAreaElement);
Expand Down
37 changes: 37 additions & 0 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,43 @@ QUnit.module('dxPivotGrid', {

});

QUnit.test('Reassigning dataSource keeps only one current PivotGridDataSource instance (no stale references)', function(assert) {
const baseOptions = {
store: { type: 'array', data: [] },
fields: [
{ area: 'row', dataField: 'region' },
{ area: 'column', dataField: 'date' },
{ area: 'data', dataField: 'amount', summaryType: 'sum' }
]
};

const dataSource1 = new PivotGridDataSource(baseOptions);
const dataSource2 = new PivotGridDataSource(baseOptions);
const dataSource3 = new PivotGridDataSource(baseOptions);

const pivotGrid = createPivotGrid({ dataSource: dataSource1 });
this.clock.tick(10);

assert.strictEqual(pivotGrid.getDataSource(), dataSource1, 'initial dataSource is dataSource1');
assert.strictEqual(pivotGrid.$element().dxPivotGridFieldChooserBase('instance').option('dataSource'), dataSource1, 'FieldChooserBase uses dataSource1');

const initialOptionChangedListLength = pivotGrid._eventsStrategy._events.optionChanged._list.length;

pivotGrid.option('dataSource', dataSource2);
this.clock.tick(10);

assert.strictEqual(pivotGrid.getDataSource(), dataSource2, 'current dataSource is dataSource2 after first reassignment');
assert.strictEqual(pivotGrid.$element().dxPivotGridFieldChooserBase('instance').option('dataSource'), dataSource2, 'FieldChooserBase uses dataSource2');
assert.strictEqual(pivotGrid._eventsStrategy._events.optionChanged._list.length, initialOptionChangedListLength, 'optionChanged listener count does not grow after first reassignment');

pivotGrid.option('dataSource', dataSource3);
this.clock.tick(10);

assert.strictEqual(pivotGrid.getDataSource(), dataSource3, 'current dataSource is dataSource3 after second reassignment');
assert.strictEqual(pivotGrid.$element().dxPivotGridFieldChooserBase('instance').option('dataSource'), dataSource3, 'FieldChooserBase uses current dataSource (no stale reference to dataSource1 or dataSource2)');
assert.strictEqual(pivotGrid._eventsStrategy._events.optionChanged._list.length, initialOptionChangedListLength, 'optionChanged listener count does not grow after multiple reassignments');
});

QUnit.test('not show field chooser popup on description area click when fieldChooser disabled', function(assert) {
createPivotGrid({
fieldChooser: {
Expand Down
Loading