Skip to content

GridCore data: Decompose _updateFocusedRowIfNeeded, delete _focusController #35273

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
bit-byte0 wants to merge 1 commit into
base: main
Choose a base branch
from
+61 −57
Open

GridCore data: Decompose _updateFocusedRowIfNeeded, delete _focusController #35273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions packages/devextreme/js/__internal/grids/data_grid/focus/m_focus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { DataController } from '@ts/grids/grid_core/data_controller/data_co
import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller';
import type { FocusDataSourceControllerExtension } from '@ts/grids/grid_core/focus/extenders/focus_data_source_controller';
import { focusModule } from '@ts/grids/grid_core/focus/focus_module';
import type { KeyboardNavigationController } from '@ts/grids/grid_core/keyboard_navigation/m_keyboard_navigation';
import type { ModuleType } from '@ts/grids/grid_core/m_types';

import type { GroupingDataControllerExtension, GroupingDataSourceAdapter } from '../grouping/m_grouping';
Expand All @@ -29,6 +30,13 @@ const data = (Base: DataControllerBase) => class FocusDataControllerExtender ext
protected declare dataSourceController: DataSourceController<GroupingDataSourceAdapter>
& FocusDataSourceControllerExtension;

protected keyboardNavigationController!: KeyboardNavigationController;

public init(): void {
this.keyboardNavigationController = this.getController('keyboardNavigation');
super.init();
}

private changeRowExpand(path, isRowClick) {
// @ts-expect-error
if (this.option('focusedRowEnabled') && Array.isArray(path) && this.isRowExpanded(path)) {
Expand Down
110 changes: 53 additions & 57 deletions packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ export class FocusController extends core.ViewController {
this._resetFocusedRow();
} else if (isRefreshWithItems || isPartialUpdateWithDeleting) {
dataController._updatePageIndexes();
dataController._updateFocusedRowIfNeeded(e, forceUpdateFocusedRow);
this.updateFocusedRowIfNeeded(e, forceUpdateFocusedRow);
} else if (isAppendOrPrepend) {
dataController._updatePageIndexes();
} else if (isPartialUpdate) {
dataController._updateFocusedRowIfNeeded(e, forceUpdateFocusedRow);
this.updateFocusedRowIfNeeded(e, forceUpdateFocusedRow);
this.resetStaleFocusedRowAfterPartialUpdate(e);
}
}
Expand All @@ -100,6 +100,57 @@ export class FocusController extends core.ViewController {
}
}

private updateFocusedRowIfNeeded(e: DataChange, forceUpdate = false): void {
const operationTypes = e.operationTypes || {};
const {
reload, fullReload, pageIndex, paging,
} = operationTypes;
const isVirtualScrolling = this.getKeyboardController()._isVirtualScrolling();
const pagingWithoutVirtualScrolling = paging && !isVirtualScrolling;
const focusedRowKey = this.option('focusedRowKey');
const isAutoNavigate = this.isAutoNavigateToFocusedRow();
const isReload = reload && pageIndex === false;
const rowIndexByKey = this.getDataController().getRowIndexByKey(focusedRowKey);

switch (true) {
case forceUpdate: {
this._focusRowByKeyOrIndex();
break;
}
case isReload && !fullReload && isDefined(focusedRowKey): {
this._navigateToRow(focusedRowKey, true)
.done((focusedRowIndex) => {
if (focusedRowIndex < 0) {
this._focusRowByIndex(undefined, operationTypes);
}
});
break;
}
case pagingWithoutVirtualScrolling && isAutoNavigate: {
const focusedRowIndex = this.option('focusedRowIndex')!;
const isValidRowIndexByKey = rowIndexByKey >= 0;
const isValidFocusedRowIndex = focusedRowIndex >= 0;
const isSameRowIndex = focusedRowIndex === rowIndexByKey;

if (isValidFocusedRowIndex && (isSameRowIndex || !isValidRowIndexByKey)) {
this._focusRowByIndex(focusedRowIndex, operationTypes);
}
break;
}
case pagingWithoutVirtualScrolling && !isAutoNavigate && (rowIndexByKey < 0): {
this.option('focusedRowIndex', -1);
break;
}
case operationTypes.fullReload: {
this._focusRowByKeyOrIndex();
break;
}
default: {
break;
}
}
}

public optionChanged(args) {
const { name, value, previousValue } = args;

Expand Down Expand Up @@ -627,7 +678,6 @@ export const columns = (Base: ModuleType<ColumnsController>) => class FocusColum

export interface FocusDataControllerExtension {
_updatePageIndexes: () => void;
_updateFocusedRowIfNeeded: (e: DataChange, forceUpdate?: boolean) => void;
}

export const focusDataControllerExtender = (
Expand All @@ -639,11 +689,8 @@ export const focusDataControllerExtender = (

protected _focusController!: FocusController;

protected keyboardNavigationController!: KeyboardNavigationController;

public init(): void {
this._focusController = this.getController('focus');
this.keyboardNavigationController = this.getController('keyboardNavigation');
super.init();
}

Expand Down Expand Up @@ -671,57 +718,6 @@ export const focusDataControllerExtender = (
return this._isPagingByRendering;
}

public _updateFocusedRowIfNeeded(e, forceUpdate = false) {
const operationTypes = e.operationTypes || {};
const {
reload, fullReload, pageIndex, paging,
} = operationTypes;
const isVirtualScrolling = this.keyboardNavigationController._isVirtualScrolling();
const pagingWithoutVirtualScrolling = paging && !isVirtualScrolling;
const focusedRowKey = this.option('focusedRowKey');
const isAutoNavigate = this._focusController.isAutoNavigateToFocusedRow();
const isReload = reload && pageIndex === false;
const rowIndexByKey = this.getRowIndexByKey(focusedRowKey);

switch (true) {
case forceUpdate: {
this._focusController._focusRowByKeyOrIndex();
break;
}
case isReload && !fullReload && isDefined(focusedRowKey): {
this._focusController._navigateToRow(focusedRowKey, true)
.done((focusedRowIndex) => {
if (focusedRowIndex < 0) {
this._focusController._focusRowByIndex(undefined, operationTypes);
}
});
break;
}
case pagingWithoutVirtualScrolling && isAutoNavigate: {
const focusedRowIndex = this.option('focusedRowIndex')!;
const isValidRowIndexByKey = rowIndexByKey >= 0;
const isValidFocusedRowIndex = focusedRowIndex >= 0;
const isSameRowIndex = focusedRowIndex === rowIndexByKey;

if (isValidFocusedRowIndex && (isSameRowIndex || !isValidRowIndexByKey)) {
this._focusController._focusRowByIndex(focusedRowIndex, operationTypes);
}
break;
}
case pagingWithoutVirtualScrolling && !isAutoNavigate && (rowIndexByKey < 0): {
this.option('focusedRowIndex', -1);
break;
}
case operationTypes.fullReload: {
this._focusController._focusRowByKeyOrIndex();
break;
}
default: {
break;
}
}
}

/**
* @extended: TreeList's focus
*/
Expand Down
Loading