Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
95ebb9d
refactor: remove prefix _ in m_workspace and references
sjbur Mar 4, 2026
2f2e291
fix: try to fix tests
sjbur Mar 5, 2026
adbcbe8
fix: try to fix tests
sjbur Mar 5, 2026
5548656
Revert "fix: try to fix tests"
sjbur Mar 5, 2026
bbed04e
Merge remote-tracking branch 'origin/issue-3516_26_1' into issue-3516…
sjbur Mar 5, 2026
79a2de7
Revert "refactor: remove prefix _ in m_workspace and references"
sjbur Mar 5, 2026
4f91195
fix: refactor one by one
sjbur Mar 5, 2026
6efeafe
fix: refactor one by one
sjbur Mar 5, 2026
1318895
fix: refactor one by one
sjbur Mar 5, 2026
e1cb8a1
fix: fix bug
sjbur Mar 5, 2026
30dcf32
fix: refactor one by one
sjbur Mar 5, 2026
2eed77e
fix: fix build?
sjbur Mar 5, 2026
46e34a3
fix: fix build
sjbur Mar 5, 2026
c2f5b1e
fix: refactor one by one
sjbur Mar 6, 2026
a529579
fix: refactor one by one
sjbur Mar 6, 2026
2a33297
fix: fix build
sjbur Mar 6, 2026
a5a0eaf
fix: refactor one by one
sjbur Mar 6, 2026
ef1fc1b
fix: fix error
sjbur Mar 6, 2026
5287f91
fix: fix tests
sjbur Mar 6, 2026
7ab4696
fix: fix tests
sjbur Mar 6, 2026
2f81153
fix: fix tests
sjbur Mar 6, 2026
267d725
fix: fix tests
sjbur Mar 6, 2026
aa7d43b
fix: fix bug
sjbur Mar 6, 2026
238b835
Merge branch '26_1' into issue-3516_26_1
sjbur Mar 9, 2026
a940ec6
fix: cancel some namings
sjbur Mar 11, 2026
2897c7a
refactor: add protected override to child classes
sjbur Mar 11, 2026
1f491a5
fix: fix build
sjbur Mar 11, 2026
372a17b
refactor: add protected override to child classes
sjbur Mar 11, 2026
51ebd42
refactor: undo naming
sjbur Mar 11, 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
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export class CompactAppointmentsHelper {
getItemSettings,
};

workSpace._createDragBehaviorBase($element, $schedulerElement, options);
workSpace.createDragBehaviorBase($element, $schedulerElement, options);
};
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme/js/__internal/scheduler/m_scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
getResizableStep: () => (this._workSpace ? this._workSpace.positionHelper.getResizableStep() : 0),
getDOMElementsMetaData: () => this._workSpace?.getDOMElementsMetaData(),
getViewDataProvider: () => this._workSpace?.viewDataProvider,
isVerticalGroupedWorkSpace: () => this._workSpace._isVerticalGroupedWorkSpace(),
isVerticalGroupedWorkSpace: () => this._workSpace.isVerticalGroupedWorkSpace(),
isDateAndTimeView: () => isDateAndTimeView(this._workSpace.type),
onContentReady: () => {
this._workSpace?.option('allDayExpanded', this.isAllDayExpanded());
Expand All @@ -1280,7 +1280,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {

this.recalculateWorkspace();
if (currentViewOptions.startDate) {
this.updateOption('header', 'currentDate', this._workSpace._getHeaderDate());
this.updateOption('header', 'currentDate', this._workSpace.getHeaderDate());
}
}

Expand All @@ -1302,7 +1302,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
this._workSpace = this._createComponent($workSpace, workSpaceComponent, workSpaceConfig);

this.allowDragging() && this._workSpace.initDragBehavior(this, this.all);
this._workSpace._attachTablesEvents();
this._workSpace.attachTablesEvents();
this._workSpace.getWorkArea().append(this._appointments.$element());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ const subscribes = {
};
}

if (!allDay && VERTICAL_VIEW_TYPES.includes(this.currentView.type) && this._workSpace._isVerticalGroupedWorkSpace()) {
if (!allDay && VERTICAL_VIEW_TYPES.includes(this.currentView.type) && this._workSpace.isVerticalGroupedWorkSpace()) {
const verticalGroupBounds = this._workSpace.getGroupBounds(options.coordinates);
return {
left: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class SchedulerAgenda extends WorkSpace {
if (this._$groupTable) {
this._$groupTable.remove();
this._$groupTable = null;
this._detachGroupCountClass();
this.detachGroupCountClass();
}
} else if (!this._$groupTable) {
this._initGroupTable();
Expand All @@ -112,33 +112,33 @@ class SchedulerAgenda extends WorkSpace {
return false;
}

_isVerticalGroupedWorkSpace() {
protected override isVerticalGroupedWorkSpace() {
return false;
}

_getElementClass() {
protected override getElementClass() {
return AGENDA_CLASS;
}

_getRowCount() {
protected override getRowCount() {
return this.option('agendaDuration') as number;
}

_getCellCount() {
return 1;
}

_getTimePanelRowCount() {
protected override getTimePanelRowCount() {
return this.option('agendaDuration') as number;
}

_renderAllDayPanel() { return noop(); }
protected override renderAllDayPanel() { return noop(); }

_updateAllDayVisibility() { return noop(); }
protected override updateAllDayVisibility() { return noop(); }

_updateAllDayHeight() { return noop(); }

_initWorkSpaceUnits() {
protected override initWorkSpaceUnits() {
this._initGroupTable();
this._$timePanel = $('<table>').attr('aria-hidden', true).addClass(TIME_PANEL_CLASS);
this._$dateTable = $('<table>').attr('aria-hidden', true).addClass(DATE_TABLE_CLASS);
Expand All @@ -153,7 +153,7 @@ class SchedulerAgenda extends WorkSpace {
}
}

_renderView() {
protected override renderView() {
this._startViewDate = agendaUtils.calculateStartViewDate(this.option('currentDate') as any, this.option('startDayHour') as any);
this._rows = [];
}
Expand All @@ -169,13 +169,13 @@ class SchedulerAgenda extends WorkSpace {
this._rows = rows;

if (this._$groupTable) {
cellTemplates = this._renderGroupHeader();
cellTemplates = this.renderGroupHeader();
this._setGroupHeaderCellsHeight();
}

this._renderTimePanel();
this._renderDateTable();
this._applyCellTemplates(cellTemplates);
this.renderTimePanel();
this.renderDateTable();
this.applyCellTemplates(cellTemplates);
this._dateTableScrollable.update();
}

Expand All @@ -186,15 +186,15 @@ class SchedulerAgenda extends WorkSpace {
this._dateTableScrollable.$content().append(this._$noDataContainer);
}

_setTableSizes() { return noop(); }
protected override setTableSizes() { return noop(); }

_toggleHorizontalScrollClass() { return noop(); }
protected override toggleHorizontalScrollClass() { return noop(); }

// eslint-disable-next-line @typescript-eslint/no-unused-vars
_createCrossScrollingConfig(argument?: any) { return noop(); }

_setGroupHeaderCellsHeight() {
const $cells = this._getGroupHeaderCells().filter((_, element) => !element.getAttribute('rowSpan'));
const $cells = this.getGroupHeaderCells().filter((_, element) => !element.getAttribute('rowSpan'));
const rows = this._removeEmptyRows(this._rows);

if (!rows.length) {
Expand Down Expand Up @@ -224,7 +224,7 @@ class SchedulerAgenda extends WorkSpace {
return result;
}

_attachGroupCountClass() {
protected override attachGroupCountClass() {
const className = getVerticalGroupCountClass(this.option('groups'));
(this.$element() as any).addClass(className);
}
Expand All @@ -244,11 +244,11 @@ class SchedulerAgenda extends WorkSpace {
return result;
}

_getGroupHeaderContainer() {
protected override getGroupHeaderContainer() {
return this._$groupTable;
}

_makeGroupRows() {
protected override makeGroupRows() {
const resourceManager = this.option('getResourceManager')();
const allAppointments = (this.option('getFilteredItems') as any)() as ListEntity[];
const tree = reduceResourcesTree(
Expand All @@ -265,7 +265,7 @@ class SchedulerAgenda extends WorkSpace {
cellTag: 'th',
groupTableClass: GROUP_TABLE_CLASS,
groupRowClass: GROUP_ROW_CLASS,
groupCellClass: this._getGroupHeaderClass(),
groupCellClass: this.getGroupHeaderClass(),
groupCellCustomContent(cell: HTMLDivElement, cellTextElement: HTMLElement, index: number, node: GroupNode) {
const container = domAdapter.createElement('div');
container.className = getGroupHeaderContentClass;
Expand Down Expand Up @@ -320,11 +320,11 @@ class SchedulerAgenda extends WorkSpace {
}
}

_createWorkSpaceElements() {
this._createWorkSpaceStaticElements();
protected override createWorkSpaceElements() {
this.createWorkSpaceStaticElements();
}

_createWorkSpaceStaticElements() {
protected override createWorkSpaceStaticElements() {
this._$dateTableContainer.append(this._$dateTable);
this._dateTableScrollable.$content().append(this._$dateTableScrollableContent);

Expand All @@ -336,17 +336,17 @@ class SchedulerAgenda extends WorkSpace {
this.$element().append(this._dateTableScrollable.$element());
}

_renderDateTable() {
this._renderTableBody({
protected override renderDateTable() {
this.renderTableBody({
container: getPublicElement(this._$dateTable),
rowClass: DATE_TABLE_ROW_CLASS,
cellClass: this._getDateTableCellClass(),
cellClass: this.getDateTableCellClass(),
});
}

_attachTablesEvents() { return noop(); }
protected override attachTablesEvents() { return noop(); }

_attachEvents() { return noop(); }
protected override attachEvents() { return noop(); }

_cleanCellDataCache() { return noop(); }

Expand All @@ -372,7 +372,7 @@ class SchedulerAgenda extends WorkSpace {
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
_renderTableBody(options: any, delayCellTemplateRendering?: any) {
protected override renderTableBody(options: any, delayCellTemplateRendering?: any) {
const cellTemplates: any[] = [];
const cellTemplateOpt = options.cellTemplate;

Expand Down Expand Up @@ -421,7 +421,7 @@ class SchedulerAgenda extends WorkSpace {
}

$(options.container).append($('<tbody>').append(this._$rows));
this._applyCellTemplates(cellTemplates);
this.applyCellTemplates(cellTemplates);
}

_setLastRowClass() {
Expand All @@ -432,10 +432,10 @@ class SchedulerAgenda extends WorkSpace {
}
}

_renderTimePanel() {
this._renderTableBody({
protected override renderTimePanel() {
this.renderTableBody({
container: getPublicElement(this._$timePanel),
rowCount: this._getTimePanelRowCount(),
rowCount: this.getTimePanelRowCount(),
cellCount: 1,
rowClass: TIME_PANEL_ROW_CLASS,
cellClass: TIME_PANEL_CELL_CLASS,
Expand Down Expand Up @@ -473,7 +473,7 @@ class SchedulerAgenda extends WorkSpace {
}

renderAgendaLayout(appointments: ListEntity[]): void {
this._renderView();
this.renderView();

const rows = agendaUtils.calculateRows(
appointments,
Expand Down
Loading
Loading