Skip to content

Scheduler — Replace underscore-prefixed: Remaining workspaces (strategies, view_model, cells) #32988

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
aleksei-semikozov wants to merge 3 commits into
base: 25_2
Choose a base branch
from
+223 −220
Open

Scheduler — Replace underscore-prefixed: Remaining workspaces (strategies, view_model, cells) #32988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
815909d
Scheduler - Replace underscore-prefixed members in remaining workspac…
aleksei-semikozov Mar 19, 2026
c8e9c3f
Scheduler - Keep _renderGrid as Rule 2 (used externally by m_work_spa…
aleksei-semikozov Mar 19, 2026
2933993
Scheduler - Update QUnit tests for renamed CellsSelectionState members
aleksei-semikozov Mar 19, 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
12 changes: 6 additions & 6 deletions packages/devextreme/js/__internal/scheduler/workspaces/m_cells_selection_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class CellsSelectionController {
};
}

return isDateAndTimeView(viewType) ? focusedCellPosition : this._processEdgeCell({
return isDateAndTimeView(viewType) ? focusedCellPosition : this.processEdgeCell({
nextColumnIndex,
rowIndex,
columnIndex,
Expand All @@ -115,7 +115,7 @@ export class CellsSelectionController {
});
}

_processEdgeCell(options) {
private processEdgeCell(options) {
const {
nextColumnIndex,
rowIndex,
Expand Down Expand Up @@ -167,23 +167,23 @@ export class CellsSelectionController {
const isValidMultiSelection = isMultiSelection && isMultiSelectionAllowed;

const nextFocusedCellData = isValidMultiSelection
? this._getNextCellData(currentCellData, focusedCellData)
? this.getNextCellData(currentCellData, focusedCellData)
: currentCellData;

return nextFocusedCellData;
}

_getNextCellData(nextFocusedCellData, focusedCellData, isVirtualCell?: any) {
private getNextCellData(nextFocusedCellData, focusedCellData, isVirtualCell?: any) {
if (isVirtualCell) {
return focusedCellData;
}

const isValidNextFocusedCell = this._isValidNextFocusedCell(nextFocusedCellData, focusedCellData);
const isValidNextFocusedCell = this.isValidNextFocusedCell(nextFocusedCellData, focusedCellData);

return isValidNextFocusedCell ? nextFocusedCellData : focusedCellData;
}

_isValidNextFocusedCell(nextFocusedCellData, focusedCellData) {
private isValidNextFocusedCell(nextFocusedCellData, focusedCellData) {
if (!focusedCellData) {
return true;
}
Expand Down
58 changes: 29 additions & 29 deletions packages/devextreme/js/__internal/scheduler/workspaces/m_cells_selection_state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import type ViewDataProvider from './view_model/m_view_data_provider';

export default class CellsSelectionState {
_focusedCell: any = null;
private focusedCell: any = null;

_selectedCells: any = null;
private selectedCells: any = null;

_firstSelectedCell: any = null;
private firstSelectedCell: any = null;

_prevFocusedCell: any = null;
private prevFocusedCell: any = null;

_prevFirstSelectedCell: any;
private prevFirstSelectedCell: any;

_prevSelectedCells: any = null;
private prevSelectedCells: any = null;

constructor(public viewDataProvider: ViewDataProvider) {}

getFocusedCell() {
const focusedCell = this._focusedCell;
const { focusedCell } = this;

if (!focusedCell) {
return undefined;
Expand All @@ -34,7 +34,7 @@ export default class CellsSelectionState {
setFocusedCell(rowIndex, columnIndex, isAllDay) {
if (rowIndex >= 0) {
const cell = this.viewDataProvider.getCellData(rowIndex, columnIndex, isAllDay);
this._focusedCell = cell;
this.focusedCell = cell;
}
}

Expand All @@ -54,20 +54,20 @@ export default class CellsSelectionState {
firstCellCoordinates.columnIndex,
firstCellCoordinates.allDay,
)
: this._firstSelectedCell;
: this.firstSelectedCell;
const lastCell = viewDataProvider.getCellData(lastRowIndex, lastColumnIndex, isLastCellAllDay);

this._firstSelectedCell = firstCell;
this.firstSelectedCell = firstCell;

this._selectedCells = this.viewDataProvider.getCellsBetween(firstCell, lastCell);
this.selectedCells = this.viewDataProvider.getCellsBetween(firstCell, lastCell);
}

setSelectedCellsByData(selectedCellsData) {
this._selectedCells = selectedCellsData;
this.selectedCells = selectedCellsData;
}

getSelectedCells() {
return this._selectedCells;
return this.selectedCells;
}

releaseSelectedAndFocusedCells() {
Expand All @@ -76,33 +76,33 @@ export default class CellsSelectionState {
}

releaseSelectedCells() {
this._prevSelectedCells = this._selectedCells;
this._prevFirstSelectedCell = this._firstSelectedCell;
this.prevSelectedCells = this.selectedCells;
this.prevFirstSelectedCell = this.firstSelectedCell;

this._selectedCells = null;
this._firstSelectedCell = null;
this.selectedCells = null;
this.firstSelectedCell = null;
}

releaseFocusedCell() {
this._prevFocusedCell = this._focusedCell;
this._focusedCell = null;
this.prevFocusedCell = this.focusedCell;
this.focusedCell = null;
}

restoreSelectedAndFocusedCells() {
this._selectedCells = this._selectedCells || this._prevSelectedCells;
this._focusedCell = this._focusedCell || this._prevFocusedCell;
this._firstSelectedCell = this._firstSelectedCell || this._prevFirstSelectedCell;
this.selectedCells = this.selectedCells || this.prevSelectedCells;
this.focusedCell = this.focusedCell || this.prevFocusedCell;
this.firstSelectedCell = this.firstSelectedCell || this.prevFirstSelectedCell;

this._prevSelectedCells = null;
this._prevFirstSelectedCell = null;
this._prevFocusedCell = null;
this.prevSelectedCells = null;
this.prevFirstSelectedCell = null;
this.prevFocusedCell = null;
}

clearSelectedAndFocusedCells() {
this._prevSelectedCells = null;
this._selectedCells = null;
this.prevSelectedCells = null;
this.selectedCells = null;

this._prevFocusedCell = null;
this._focusedCell = null;
this.prevFocusedCell = null;
this.focusedCell = null;
}
}
Loading
Loading