Skip to content

GridCore dataController: fix ESLint errors in the updateItems block #34754

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
Alyar666 wants to merge 2 commits into
base: main
Choose a base branch
from
+308 −138
Open

GridCore dataController: fix ESLint errors in the updateItems block #34754

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
d70a8e5
GridCore dataController: fix ESLint errors in the updateItems block
Aug 12, 2026
7afb849
Fix comments
Aug 13, 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
251 changes: 128 additions & 123 deletions packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@
/* eslint-disable @stylistic/max-len */
/* eslint-disable @typescript-eslint/explicit-function-return-type */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
/* eslint-disable @typescript-eslint/init-declarations */
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/no-non-null-assertion */
/* eslint-disable @typescript-eslint/no-shadow */
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable consistent-return */
/* eslint-disable no-param-reassign */
/* eslint-disable no-plusplus */
import type { DataSource, Store } from '@js/common/data';
import $ from '@js/core/renderer';
import type { Callback } from '@js/core/utils/callbacks';
Expand Down Expand Up @@ -50,25 +45,38 @@ import { DataHelperMixin } from './data_helper_mixin';
import type {
BinaryDataFilterExpression,
CallbackFlags,
ChangedRows,
DataChange,
DataFilter,
DataSourceAdapterLike,
GeneratedItem,
ItemChange,
ItemProcessingOptions,
PagingChanges,
PagingDataSource,
PagingOptionName,
PagingResult,
ProcessedItem,
RefreshOptions,
RowIndexByKey,
UpdateChange,
UpdateRowChange,
UserState,
} from './types';
import { resolvePaginate, syncPaging } from './utils/paging';
import { getRefreshOptions } from './utils/refresh';
import {
getChangedRowIndices, getRowOperation, isSameGroupRowState, pushChangedRow, resetChangedRows,
getChangedRowIndices,
getDataRowIndex,
getRowKey,
getRowOperation,
indexRowsByKey,
initChangedRows,
isSameGroupRowState,
markUpdateChange,
pushChangedRow,
resetChangedRows,
updateRowCells,
} from './utils/row_changes';
import { generateRowValues } from './utils/row_values';

Expand Down Expand Up @@ -161,7 +169,7 @@ export class DataController extends DataHelperMixin(modules.Controller) {

private _loadErrorHandler!: (e: unknown) => void;

private changingHandlerProxy!: (e: unknown) => void;
private changingHandlerProxy!: (e: ChangedEvent) => void;

private _dataPushedHandler!: (changes: unknown) => void;

Expand Down Expand Up @@ -817,7 +825,7 @@ export class DataController extends DataHelperMixin(modules.Controller) {
this.applyChangeUpdate(change);
} else if (change.changeType === 'refresh') {
if (this.items().length && change.repaintChangesOnly) {
this._applyChangesOnly(change);
this.applyChangesOnly(change);
} else {
this._applyChangeFull(change);
}
Expand Down Expand Up @@ -1054,123 +1062,120 @@ export class DataController extends DataHelperMixin(modules.Controller) {
return true;
}

/**
* @extended: editing
*/
protected _applyChangesOnly(change) {
const rowIndices: any[] = [];
const columnIndices: any[] = [];
const changeTypes: string[] = [];
const items: any[] = [];
const newIndexByKey = {};
const isLiveUpdate = change?.isLiveUpdate ?? true;

function getRowKey(row) {
if (row) {
return `${row.rowType},${JSON.stringify(row.key)}`;
private applyItemChange(
itemChange: ItemChange,
isLiveUpdate: boolean,
): UpdateRowChange | undefined {
const { index } = itemChange;

switch (itemChange.type) {
case 'update': {
const newItem = itemChange.data;
const columnIndices = this._partialUpdateRow(
itemChange.oldItem,
newItem,
index,
isLiveUpdate,
);

this._items[index] = newItem;

return {
changeType: 'update', rowIndex: index, item: newItem, columnIndices,
};
}

return undefined;
case 'insert':
this._items.splice(index, 0, itemChange.data);
return { changeType: 'insert', rowIndex: index, item: itemChange.data };
case 'remove':
this._items.splice(index, 1);
return { changeType: 'remove', rowIndex: index, item: itemChange.oldItem };
default:
return undefined;
}
}

const isItemEquals = (item1, item2) => {
private findItemChanges(
oldItems: ProcessedItem[],
newItems: ProcessedItem[],
): ItemChange[] | undefined {
const isItemEquals = (item1: ProcessedItem, item2: ProcessedItem): boolean => {
if (!this._isItemEquals(item1, item2)) {
return false;
}

if (item1.cells) {
item1.update?.(item2);
item1.cells.forEach((cell) => {
if (cell?.update) {
cell.update(item2, true);
}
});
}
updateRowCells(item1, item2);

return true;
};

const currentItems = this._items;
const oldItems = currentItems.slice();

change.items.forEach((item, index) => {
const key = getRowKey(item);
newIndexByKey[key!] = index;
item.rowIndex = index;
});

const result = findChanges({
return findChanges({
oldItems,
newItems: change.items,
newItems,
getKey: getRowKey,
isItemEquals,
});
}

private applyItemChanges(itemChanges: ItemChange[], isLiveUpdate: boolean): ChangedRows {
const changedRows = initChangedRows();

itemChanges.forEach((itemChange) => {
const changedRow = this.applyItemChange(itemChange, isLiveUpdate);

if (changedRow) {
pushChangedRow(changedRows, changedRow);
}
});

return changedRows;
}

private getRowIndexCorrection(
rowIndex: number,
oldItems: ProcessedItem[],
newIndexByKey: RowIndexByKey,
): number {
const oldRowIndexOffset = this._rowIndexOffset || 0;
const rowIndexOffset = this.getRowIndexOffset();
const oldItem = oldItems[rowIndex - oldRowIndexOffset];
const newVisibleRowIndex = oldItem ? newIndexByKey[getRowKey(oldItem)] : undefined;

return newVisibleRowIndex === undefined ? 0 : newVisibleRowIndex + rowIndexOffset - rowIndex;
}

/**
* @extended: editing
*/
protected applyChangesOnly(change: DataChange): void {
const newItems = change.items ?? [];
const oldItems = this._items.slice();
const newIndexByKey = indexRowsByKey(newItems);
const itemChanges = this.findItemChanges(oldItems, newItems);

if (!result) {
if (!itemChanges) {
this._applyChangeFull(change);
return;
}

result.forEach((change) => {
switch (change.type) {
case 'update': {
const { index } = change;
const newItem = change.data;
const { oldItem } = change;
const changedColumnIndices = this._partialUpdateRow(oldItem, newItem, index, isLiveUpdate);

rowIndices.push(index);
changeTypes.push('update');
items.push(newItem);
currentItems[index] = newItem;
columnIndices.push(changedColumnIndices);
break;
}
case 'insert':
rowIndices.push(change.index);
changeTypes.push('insert');
items.push(change.data);
columnIndices.push(undefined);
currentItems.splice(change.index, 0, change.data);
break;
case 'remove':
rowIndices.push(change.index);
changeTypes.push('remove');
currentItems.splice(change.index, 1);
items.push(change.oldItem);
columnIndices.push(undefined);
break;
default:
break;
}
});
const changedRows = this.applyItemChanges(itemChanges, change.isLiveUpdate ?? true);

markUpdateChange(change, changedRows);

change.repaintChangesOnly = true;
change.changeType = 'update';
change.rowIndices = rowIndices;
change.columnIndices = columnIndices;
change.changeTypes = changeTypes;
change.items = items;
if (oldItems.length) {
change.isLiveUpdate = true;
}

this._correctRowIndices((rowIndex) => {
const oldRowIndexOffset = this._rowIndexOffset || 0;
const rowIndexOffset = this.getRowIndexOffset();
const oldItem = oldItems[rowIndex - oldRowIndexOffset];
const key = getRowKey(oldItem);
const newVisibleRowIndex = newIndexByKey[key!];

return newVisibleRowIndex >= 0 ? newVisibleRowIndex + rowIndexOffset - rowIndex : 0;
});
this.correctRowIndices(
(rowIndex) => this.getRowIndexCorrection(rowIndex, oldItems, newIndexByKey),
);
}

/**
* @extended: keyboard_navigation
*/
// eslint-disable-next-line @typescript-eslint/no-unused-vars
protected _correctRowIndices(rowIndex: any): any { }
protected correctRowIndices(getRowIndexCorrection: (rowIndex: number) => number): void { }

/**
* @extend: virtual_scrolling
Expand All @@ -1197,7 +1202,8 @@ export class DataController extends DataHelperMixin(modules.Controller) {
return cachedProcessedItems;
}

// change.items at this stage is defined only if virtualScrolling + legacyScrollingMode enabled
// change.items at this stage is defined only if virtualScrolling
// + legacyScrollingMode enabled
const dataItems = this._beforeProcessItems(change.items ?? dataSource.items());
const processedItems = this._processItems(dataItems, change);

Expand Down Expand Up @@ -1233,32 +1239,25 @@ export class DataController extends DataHelperMixin(modules.Controller) {
}
}

private changingHandler(e) {
private changingHandler(e: ChangedEvent): void {
const rows = this.getVisibleRows();
const dataSource = this.dataSource();

if (dataSource) {
e.changes.forEach((change) => {
if (change.type === 'insert' && change.index >= 0) {
let dataIndex = 0;

for (let i = 0; i < change.index; i++) {
const row = rows[i];
if (row && (row.rowType === 'data' || row.rowType === 'group')) {
dataIndex++;
}
}

change.index = dataIndex;
}
});
if (!dataSource) {
return;
}

e.changes?.forEach((change) => {
if (change.type === 'insert' && change.index !== undefined && change.index >= 0) {
change.index = getDataRowIndex(rows, change.index);
}
});
}

public updateItems(
change: DataChange = { changeType: 'refresh' },
isDataChanged?: boolean,
) {
): void {
change.isFirstRender = !this.changed.fired();

if (this._repaintChangesOnly !== undefined) {
Expand All @@ -1267,10 +1266,11 @@ export class DataController extends DataHelperMixin(modules.Controller) {
} else if (change.changes) {
change.repaintChangesOnly = this.option('repaintChangesOnly');
} else if (isDataChanged) {
const operationTypes = this.dataSource().operationTypes();
const operationTypes: OperationTypes | undefined = this.dataSource().operationTypes();

change.isDataChanged = true;
change.repaintChangesOnly = operationTypes && !operationTypes.grouping && !operationTypes.filtering && this.option('repaintChangesOnly');
change.repaintChangesOnly = operationTypes && !operationTypes.grouping
&& !operationTypes.filtering && this.option('repaintChangesOnly');

if (this.needUpdateDimensions(operationTypes)) {
change.needUpdateDimensions = true;
Expand All @@ -1289,35 +1289,40 @@ export class DataController extends DataHelperMixin(modules.Controller) {
this._fireChanged(change);
}

protected needUpdateDimensions(operationTypes: OperationTypes) {
return operationTypes && (
operationTypes.reload || operationTypes.paging || operationTypes.groupExpanding
/**
* @extended: TreeList's data_controller
*/
protected needUpdateDimensions(operationTypes?: OperationTypes): boolean {
return Boolean(
operationTypes?.reload || operationTypes?.paging || operationTypes?.groupExpanding,
);
}

public loadingOperationTypes() {
public loadingOperationTypes(): OperationTypes {
const dataSource = this.dataSource();
const operationTypes: OperationTypes | undefined = dataSource?.loadingOperationTypes();

return dataSource?.loadingOperationTypes() || {};
return operationTypes ?? {};
}

/**
* @extended: virtual_scrolling, focus
*/
protected _fireChanged(change) {
deferRender(() => {
protected _fireChanged(change: DataChange): void {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
deferRender((): void => {
this.changed.fire(change);
});
}

/**
* @extended: state_storing
*/
public isLoading() {
public isLoading(): boolean {
return this._isLoading || this._isCustomLoading;
}

private _fireLoadingChanged() {
private _fireLoadingChanged(): void {
this.loadingChanged.fire(this.isLoading(), this._loadingText);
}

Expand Down
Loading