Skip to content

Commit a588183

Browse files
authored
Scheduler: Replace underscore-prefixed: workspaces/m_work_space.ts (#32780)
1 parent 1c51a22 commit a588183

29 files changed

Lines changed: 602 additions & 597 deletions

packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export class CompactAppointmentsHelper {
8888
getItemSettings,
8989
};
9090

91-
workSpace._createDragBehaviorBase($element, $schedulerElement, options);
91+
workSpace.createDragBehaviorBase($element, $schedulerElement, options);
9292
};
9393
}
9494

packages/devextreme/js/__internal/scheduler/m_scheduler.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
12561256
getResizableStep: () => (this._workSpace ? this._workSpace.positionHelper.getResizableStep() : 0),
12571257
getDOMElementsMetaData: () => this._workSpace?.getDOMElementsMetaData(),
12581258
getViewDataProvider: () => this._workSpace?.viewDataProvider,
1259-
isVerticalGroupedWorkSpace: () => this._workSpace._isVerticalGroupedWorkSpace(),
1259+
isVerticalGroupedWorkSpace: () => this._workSpace.isVerticalGroupedWorkSpace(),
12601260
isDateAndTimeView: () => isDateAndTimeView(this._workSpace.type),
12611261
onContentReady: () => {
12621262
this._workSpace?.option('allDayExpanded', this.isAllDayExpanded());
@@ -1280,7 +1280,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
12801280

12811281
this.recalculateWorkspace();
12821282
if (currentViewOptions.startDate) {
1283-
this.updateOption('header', 'currentDate', this._workSpace._getHeaderDate());
1283+
this.updateOption('header', 'currentDate', this._workSpace.getHeaderDate());
12841284
}
12851285
}
12861286

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

13041304
this.allowDragging() && this._workSpace.initDragBehavior(this, this.all);
1305-
this._workSpace._attachTablesEvents();
1305+
this._workSpace.attachTablesEvents();
13061306
this._workSpace.getWorkArea().append(this._appointments.$element());
13071307
}
13081308

packages/devextreme/js/__internal/scheduler/m_subscribes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ const subscribes = {
153153
};
154154
}
155155

156-
if (!allDay && VERTICAL_VIEW_TYPES.includes(this.currentView.type) && this._workSpace._isVerticalGroupedWorkSpace()) {
156+
if (!allDay && VERTICAL_VIEW_TYPES.includes(this.currentView.type) && this._workSpace.isVerticalGroupedWorkSpace()) {
157157
const verticalGroupBounds = this._workSpace.getGroupBounds(options.coordinates);
158158
return {
159159
left: 0,

packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class SchedulerAgenda extends WorkSpace {
8989
if (this._$groupTable) {
9090
this._$groupTable.remove();
9191
this._$groupTable = null;
92-
this._detachGroupCountClass();
92+
this.detachGroupCountClass();
9393
}
9494
} else if (!this._$groupTable) {
9595
this._initGroupTable();
@@ -112,33 +112,33 @@ class SchedulerAgenda extends WorkSpace {
112112
return false;
113113
}
114114

115-
_isVerticalGroupedWorkSpace() {
115+
protected override isVerticalGroupedWorkSpace() {
116116
return false;
117117
}
118118

119-
_getElementClass() {
119+
protected override getElementClass() {
120120
return AGENDA_CLASS;
121121
}
122122

123-
_getRowCount() {
123+
protected override getRowCount() {
124124
return this.option('agendaDuration') as number;
125125
}
126126

127127
_getCellCount() {
128128
return 1;
129129
}
130130

131-
_getTimePanelRowCount() {
131+
protected override getTimePanelRowCount() {
132132
return this.option('agendaDuration') as number;
133133
}
134134

135-
_renderAllDayPanel() { return noop(); }
135+
protected override renderAllDayPanel() { return noop(); }
136136

137-
_updateAllDayVisibility() { return noop(); }
137+
protected override updateAllDayVisibility() { return noop(); }
138138

139139
_updateAllDayHeight() { return noop(); }
140140

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

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

171171
if (this._$groupTable) {
172-
cellTemplates = this._renderGroupHeader();
172+
cellTemplates = this.renderGroupHeader();
173173
this._setGroupHeaderCellsHeight();
174174
}
175175

176-
this._renderTimePanel();
177-
this._renderDateTable();
178-
this._applyCellTemplates(cellTemplates);
176+
this.renderTimePanel();
177+
this.renderDateTable();
178+
this.applyCellTemplates(cellTemplates);
179179
this._dateTableScrollable.update();
180180
}
181181

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

189-
_setTableSizes() { return noop(); }
189+
protected override setTableSizes() { return noop(); }
190190

191-
_toggleHorizontalScrollClass() { return noop(); }
191+
protected override toggleHorizontalScrollClass() { return noop(); }
192192

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

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

200200
if (!rows.length) {
@@ -224,7 +224,7 @@ class SchedulerAgenda extends WorkSpace {
224224
return result;
225225
}
226226

227-
_attachGroupCountClass() {
227+
protected override attachGroupCountClass() {
228228
const className = getVerticalGroupCountClass(this.option('groups'));
229229
(this.$element() as any).addClass(className);
230230
}
@@ -244,11 +244,11 @@ class SchedulerAgenda extends WorkSpace {
244244
return result;
245245
}
246246

247-
_getGroupHeaderContainer() {
247+
protected override getGroupHeaderContainer() {
248248
return this._$groupTable;
249249
}
250250

251-
_makeGroupRows() {
251+
protected override makeGroupRows() {
252252
const resourceManager = this.option('getResourceManager')();
253253
const allAppointments = (this.option('getFilteredItems') as any)() as ListEntity[];
254254
const tree = reduceResourcesTree(
@@ -265,7 +265,7 @@ class SchedulerAgenda extends WorkSpace {
265265
cellTag: 'th',
266266
groupTableClass: GROUP_TABLE_CLASS,
267267
groupRowClass: GROUP_ROW_CLASS,
268-
groupCellClass: this._getGroupHeaderClass(),
268+
groupCellClass: this.getGroupHeaderClass(),
269269
groupCellCustomContent(cell: HTMLDivElement, cellTextElement: HTMLElement, index: number, node: GroupNode) {
270270
const container = domAdapter.createElement('div');
271271
container.className = getGroupHeaderContentClass;
@@ -320,11 +320,11 @@ class SchedulerAgenda extends WorkSpace {
320320
}
321321
}
322322

323-
_createWorkSpaceElements() {
324-
this._createWorkSpaceStaticElements();
323+
protected override createWorkSpaceElements() {
324+
this.createWorkSpaceStaticElements();
325325
}
326326

327-
_createWorkSpaceStaticElements() {
327+
protected override createWorkSpaceStaticElements() {
328328
this._$dateTableContainer.append(this._$dateTable);
329329
this._dateTableScrollable.$content().append(this._$dateTableScrollableContent);
330330

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

339-
_renderDateTable() {
340-
this._renderTableBody({
339+
protected override renderDateTable() {
340+
this.renderTableBody({
341341
container: getPublicElement(this._$dateTable),
342342
rowClass: DATE_TABLE_ROW_CLASS,
343-
cellClass: this._getDateTableCellClass(),
343+
cellClass: this.getDateTableCellClass(),
344344
});
345345
}
346346

347-
_attachTablesEvents() { return noop(); }
347+
protected override attachTablesEvents() { return noop(); }
348348

349-
_attachEvents() { return noop(); }
349+
protected override attachEvents() { return noop(); }
350350

351351
_cleanCellDataCache() { return noop(); }
352352

@@ -372,7 +372,7 @@ class SchedulerAgenda extends WorkSpace {
372372
}
373373

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

@@ -421,7 +421,7 @@ class SchedulerAgenda extends WorkSpace {
421421
}
422422

423423
$(options.container).append($('<tbody>').append(this._$rows));
424-
this._applyCellTemplates(cellTemplates);
424+
this.applyCellTemplates(cellTemplates);
425425
}
426426

427427
_setLastRowClass() {
@@ -432,10 +432,10 @@ class SchedulerAgenda extends WorkSpace {
432432
}
433433
}
434434

435-
_renderTimePanel() {
436-
this._renderTableBody({
435+
protected override renderTimePanel() {
436+
this.renderTableBody({
437437
container: getPublicElement(this._$timePanel),
438-
rowCount: this._getTimePanelRowCount(),
438+
rowCount: this.getTimePanelRowCount(),
439439
cellCount: 1,
440440
rowClass: TIME_PANEL_ROW_CLASS,
441441
cellClass: TIME_PANEL_CELL_CLASS,
@@ -473,7 +473,7 @@ class SchedulerAgenda extends WorkSpace {
473473
}
474474

475475
renderAgendaLayout(appointments: ListEntity[]): void {
476-
this._renderView();
476+
this.renderView();
477477

478478
const rows = agendaUtils.calculateRows(
479479
appointments,

0 commit comments

Comments
 (0)