diff --git a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts index e13db784c4cf..f48ea7f329ee 100644 --- a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts +++ b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts @@ -89,7 +89,7 @@ export class CompactAppointmentsHelper { getItemSettings, }; - workSpace._createDragBehaviorBase($element, $schedulerElement, options); + workSpace.createDragBehaviorBase($element, $schedulerElement, options); }; } diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index 71112c6772fe..4498d2ecc839 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -1164,7 +1164,7 @@ class Scheduler extends SchedulerOptionsBaseWidget { _initMarkupCore() { this._readyToRenderAppointments = hasWindow(); - this._workSpace && this._cleanWorkspace(); + this._workSpace && this.cleanWorkSpace(); this._renderWorkSpace(); this._appointments.option({ @@ -1253,7 +1253,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()); @@ -1297,12 +1297,12 @@ 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()); this._recalculateWorkspace(); if (currentViewOptions.startDate) { - this._updateOption('header', 'currentDate', this._workSpace._getHeaderDate()); + this._updateOption('header', 'currentDate', this._workSpace.getHeaderDate()); } } @@ -1418,7 +1418,7 @@ class Scheduler extends SchedulerOptionsBaseWidget { } _refreshWorkSpace(): void { - this._cleanWorkspace(); + this.cleanWorkSpace(); delete this._workSpace; @@ -1433,7 +1433,7 @@ class Scheduler extends SchedulerOptionsBaseWidget { } } - _cleanWorkspace() { + cleanWorkSpace() { this._appointments.$element().detach(); this._workSpace._dispose(); this._workSpace.$element().remove(); diff --git a/packages/devextreme/js/__internal/scheduler/m_subscribes.ts b/packages/devextreme/js/__internal/scheduler/m_subscribes.ts index b7729a458ae8..7c2da2efc39a 100644 --- a/packages/devextreme/js/__internal/scheduler/m_subscribes.ts +++ b/packages/devextreme/js/__internal/scheduler/m_subscribes.ts @@ -167,7 +167,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, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/m_appointments_layout_manager.ts b/packages/devextreme/js/__internal/scheduler/view_model/m_appointments_layout_manager.ts index 0fe6d2aa2e9b..872769d26fee 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/m_appointments_layout_manager.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/m_appointments_layout_manager.ts @@ -74,10 +74,10 @@ class AppointmentLayoutManager { const DOMMetaData = workspace.getDOMElementsMetaData(); const allDayHeight = getAllDayHeight( workspace.option('showAllDayPanel'), - workspace._isVerticalGroupedWorkSpace(), + workspace.isVerticalGroupedWorkSpace(), DOMMetaData, ); - const rowCount = workspace._getRowCount(); + const rowCount = workspace.getRowCount(); const { positionHelper, viewDataProvider } = workspace; const visibleDayDuration = viewDataProvider.getVisibleDayDuration( workspace.option('startDayHour'), @@ -119,7 +119,7 @@ class AppointmentLayoutManager { allowResizing: this.instance._allowResizing(), allowAllDayResizing: this.instance._allowAllDayResizing(), startViewDate: workspace.getStartViewDate(), - groupOrientation: workspace._getRealGroupOrientation(), + groupOrientation: workspace.getRealGroupOrientation(), cellWidth: getCellWidth(DOMMetaData), cellHeight: getCellHeight(DOMMetaData), allDayHeight, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts index 8fae5e0ef063..8e9400878e28 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts @@ -91,7 +91,7 @@ class SchedulerAgenda extends WorkSpace { if (this._$groupTable) { this._$groupTable.remove(); this._$groupTable = null; - this._detachGroupCountClass(); + this.detachGroupCountClass(); } } else if (!this._$groupTable) { this._initGroupTable(); @@ -114,11 +114,11 @@ class SchedulerAgenda extends WorkSpace { return false; } - _isVerticalGroupedWorkSpace() { + protected override isVerticalGroupedWorkSpace() { return false; } - _getElementClass() { + protected override getElementClass() { return AGENDA_CLASS; } @@ -126,7 +126,7 @@ class SchedulerAgenda extends WorkSpace { return agendaUtils.calculateStartViewDate(this.option('currentDate') as any, this.option('startDayHour') as any); } - _getRowCount() { + protected override getRowCount() { return this.option('agendaDuration') as number; } @@ -134,17 +134,17 @@ class SchedulerAgenda extends WorkSpace { 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 = $('').attr('aria-hidden', true).addClass(TIME_PANEL_CLASS); this._$dateTable = $('
').attr('aria-hidden', true).addClass(DATE_TABLE_CLASS); @@ -159,10 +159,10 @@ class SchedulerAgenda extends WorkSpace { } } - _renderView() { + protected override renderView() { this._startViewDate = this._calculateStartViewDate(); this._rows = []; - this._initPositionHelper(); + this.initPositionHelper(); } _recalculateAgenda(rows) { @@ -176,14 +176,14 @@ class SchedulerAgenda extends WorkSpace { this._rows = rows; if (this._$groupTable) { - cellTemplates = this._renderGroupHeader(); + cellTemplates = this.renderGroupHeader(); this._setGroupHeaderCellsHeight(); } - this._renderTimePanel(); - this._renderDateTable(); + this.renderTimePanel(); + this.renderDateTable(); (this.invoke as any)('onAgendaReady', rows); - this._applyCellTemplates(cellTemplates); + this.applyCellTemplates(cellTemplates); this._dateTableScrollable.update(); } @@ -194,15 +194,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) { @@ -232,7 +232,7 @@ class SchedulerAgenda extends WorkSpace { return result; } - _attachGroupCountClass() { + protected override attachGroupCountClass() { const className = getVerticalGroupCountClass(this.option('groups')); (this.$element() as any).addClass(className); } @@ -252,11 +252,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)(); const tree = reduceResourcesTree( @@ -273,7 +273,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; @@ -328,11 +328,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); @@ -344,17 +344,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(); } @@ -380,7 +380,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; @@ -429,7 +429,7 @@ class SchedulerAgenda extends WorkSpace { } $(options.container).append($('').append(this._$rows)); - this._applyCellTemplates(cellTemplates); + this.applyCellTemplates(cellTemplates); } _setLastRowClass() { @@ -440,10 +440,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, @@ -491,7 +491,7 @@ class SchedulerAgenda extends WorkSpace { onDataSourceChanged(appointments?: SafeAppointment[]) { super.onDataSourceChanged(); - this._renderView(); + this.renderView(); const rows = this._calculateRows(appointments); this._recalculateAgenda(rows); diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts index 89679e7d539c..ea81ee4b221b 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts @@ -47,15 +47,15 @@ class SchedulerTimeline extends SchedulerWorkSpace { return this._$sidebarTable ? getOuterWidth(this._$sidebarTable) : 0; } - _getTotalRowCount(groupCount) { + protected override getTotalRowCount(groupCount) { if (this._isHorizontalGroupedWorkSpace()) { - return this._getRowCount(); + return this.getRowCount(); } groupCount = groupCount || 1; - return this._getRowCount() * groupCount; + return this.getRowCount() * groupCount; } - _getFormat(): any { + protected override getFormat(): any { return 'shorttime'; } @@ -67,8 +67,8 @@ class SchedulerTimeline extends SchedulerWorkSpace { return getBoundingRect((this.$element() as any).get(0)).height; } - _dateTableScrollableConfig() { - const config = super._dateTableScrollableConfig(); + protected override dateTableScrollableConfig() { + const config = super.dateTableScrollableConfig(); const timelineConfig = { direction: HORIZONTAL, }; @@ -76,12 +76,12 @@ class SchedulerTimeline extends SchedulerWorkSpace { return this.option('crossScrollingEnabled') ? config : extend(config, timelineConfig); } - _needCreateCrossScrolling() { + protected override needCreateCrossScrolling() { return true; } - _headerScrollableConfig() { - const config = super._headerScrollableConfig(); + protected override headerScrollableConfig() { + const config = super.headerScrollableConfig(); return extend(config, { scrollByContent: true, @@ -92,14 +92,14 @@ class SchedulerTimeline extends SchedulerWorkSpace { return false; } - _getGroupHeaderContainer() { + protected override getGroupHeaderContainer() { if (this._isHorizontalGroupedWorkSpace()) { return this._$thead; } return this._$sidebarTable; } - _insertAllDayRowsIntoDateTable() { + protected override insertAllDayRowsIntoDateTable() { return false; } @@ -136,13 +136,13 @@ class SchedulerTimeline extends SchedulerWorkSpace { let duration = (timeDiff - differenceInDays * toMs('day') - (this.option('startDayHour') as any) * toMs('hour')) / this.getCellDuration(); if (today.getHours() > (this.option('endDayHour') as any)) { - duration = this._getCellCountInDay(); + duration = this.getCellCountInDay(); } if (duration < 0) { duration = 0; } - return differenceInDays * this._getCellCountInDay() + duration; + return differenceInDays * this.getCellCountInDay() + duration; } getIndicationWidth() { @@ -164,8 +164,8 @@ class SchedulerTimeline extends SchedulerWorkSpace { return false; } - _setTableSizes() { - super._setTableSizes(); + protected override setTableSizes() { + super.setTableSizes(); const minHeight = this._getWorkSpaceMinHeight(); setHeight(this._$sidebarTable, minHeight); @@ -186,7 +186,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { return minHeight; } - _getCellCoordinatesByIndex(index) { + protected override getCellCoordinatesByIndex(index) { return { columnIndex: index % this._getCellCount(), rowIndex: 0, @@ -203,7 +203,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { .eq(indexes.columnIndex); } - _getWorkSpaceWidth() { + protected override getWorkSpaceWidth() { return getOuterWidth(this._$dateTable, true); } @@ -211,7 +211,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { return dateUtils.trimTime(new Date(this.getStartViewDate())); } - _getIntervalBetween(currentDate, allDay) { + protected override getIntervalBetween(currentDate, allDay) { const startDayHour = this.option('startDayHour'); const endDayHour = this.option('endDayHour'); const firstViewDate = this.getStartViewDate(); @@ -223,7 +223,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { const fullDays = Math.floor(fullInterval / toMs('day')); const tailDuration = fullInterval - (fullDays * toMs('day')); let tailDelta = 0; - const cellCount = this._getCellCountInDay() * (fullDays - this._getWeekendsCount(fullDays)); + const cellCount = this.getCellCountInDay() * (fullDays - this.getWeekendsCount(fullDays)); const gapBeforeAppt = apptStart - dateUtils.trimTime(new Date(currentDate)).getTime(); let result = cellCount * (this.option('hoursInterval') as any) * toMs('hour'); @@ -254,7 +254,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { } // eslint-disable-next-line @typescript-eslint/no-unused-vars - _getWeekendsCount(argument?: any) { + protected override getWeekendsCount(argument?: any) { return 0; } @@ -283,7 +283,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { date = date || new Date(this.option('currentDate')); date.setHours(hours, minutes, 0, 0); - const coordinates = this._getScrollCoordinates(date); + const coordinates = this.getScrollCoordinates(date); const scrollable = this.getScrollable(); const offset = this.option('rtlEnabled') ? getBoundingRect(this.getScrollableContainer().get(0)).width : 0; @@ -300,7 +300,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { renderRTimeTable() {} - _renderGroupAllDayPanel() {} + protected override renderGroupAllDayPanel() {} // eslint-disable-next-line @typescript-eslint/no-unused-vars generateRenderOptions(argument?: any) { @@ -325,11 +325,11 @@ class SchedulerTimeline extends SchedulerWorkSpace { .addClass(GROUP_TABLE_CLASS); } - _getDefaultGroupStrategy() { + protected override getDefaultGroupStrategy() { return 'vertical'; } - _toggleGroupingDirectionClass() { + protected override toggleGroupingDirectionClass() { (this.$element() as any).toggleClass(HORIZONTAL_GROUPED_WORKSPACE_CLASS, this._isHorizontalGroupedWorkSpace()); } @@ -339,22 +339,22 @@ class SchedulerTimeline extends SchedulerWorkSpace { }); } - _createWorkSpaceElements() { - this._createWorkSpaceScrollableElements(); + protected override createWorkSpaceElements() { + this.createWorkSpaceScrollableElements(); } - _updateAllDayVisibility() { return noop(); } + protected override updateAllDayVisibility() { return noop(); } _updateAllDayHeight() { return noop(); } - _getDateHeaderTemplate() { + protected override getDateHeaderTemplate() { return this.option('timeCellTemplate'); } - _renderView() { + protected override renderView() { let groupCellTemplates; if (!this.isRenovatedRender()) { - groupCellTemplates = this._renderGroupHeader(); + groupCellTemplates = this.renderGroupHeader(); } this.renderWorkSpace(); @@ -367,18 +367,18 @@ class SchedulerTimeline extends SchedulerWorkSpace { this._$sidebarTable.appendTo(this._sidebarScrollable.$content()); - if (this.isRenovatedRender() && this._isVerticalGroupedWorkSpace()) { + if (this.isRenovatedRender() && this.isVerticalGroupedWorkSpace()) { this.renderRGroupPanel(); } this.updateHeaderEmptyCellWidth(); - this._applyCellTemplates(groupCellTemplates); + this.applyCellTemplates(groupCellTemplates); } - _setHorizontalGroupHeaderCellsHeight() { return noop(); } + protected override setHorizontalGroupHeaderCellsHeight() { return noop(); } - _getTimePanelCells() { + protected override getTimePanelCells() { return (this.$element() as any) .find(`.${HEADER_PANEL_CELL_CLASS}:not(.${HEADER_PANEL_WEEK_CELL_CLASS})`); } @@ -387,7 +387,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { const columnCountPerGroup = this._getCellCount(); const today = this._getToday(); const index = this.getCellIndexByDate(today); - const { columnIndex: currentTimeColumnIndex } = this._getCellCoordinatesByIndex(index); + const { columnIndex: currentTimeColumnIndex } = this.getCellCoordinatesByIndex(index); if (currentTimeColumnIndex === undefined) { return []; @@ -405,21 +405,21 @@ class SchedulerTimeline extends SchedulerWorkSpace { // These methods should be deleted when we get rid of old render // -------------- - _renderTimePanel() { return noop(); } + protected override renderTimePanel() { return noop(); } - _renderAllDayPanel() { return noop(); } + protected override renderAllDayPanel() { return noop(); } - _createAllDayPanelElements() { return noop(); } + protected override createAllDayPanelElements() { return noop(); } - _renderDateHeader() { - const $headerRow = super._renderDateHeader(); + protected override renderDateHeader() { + const $headerRow = super.renderDateHeader(); if (this._needRenderWeekHeader()) { const firstViewDate = new Date(this.getStartViewDate()); let currentDate = new Date(firstViewDate); const $cells: any[] = []; const groupCount = this._getGroupCount(); - const cellCountInDay = this._getCellCountInDay(); + const cellCountInDay = this.getCellCountInDay(); const colSpan = this.isGroupedByDate() ? cellCountInDay * groupCount : cellCountInDay; @@ -441,7 +441,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { model: { text, date: new Date(currentDate), - ...this._getGroupsForDateHeaderTemplate(templateIndex, colSpan), + ...this.getGroupsForDateHeaderTemplate(templateIndex, colSpan), }, container: $th, index: templateIndex, @@ -490,7 +490,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { } } - _makeGroupRows(groups, groupByDate) { + protected override makeGroupRows(groups, groupByDate) { const tableCreatorStrategy = this.option('groupOrientation') === 'vertical' ? tableCreator.VERTICAL : tableCreator.HORIZONTAL; return tableCreator.makeGroupedTable( @@ -499,12 +499,12 @@ class SchedulerTimeline extends SchedulerWorkSpace { { groupRowClass: GROUP_ROW_CLASS, groupHeaderRowClass: GROUP_ROW_CLASS, - groupHeaderClass: this._getGroupHeaderClass.bind(this), + groupHeaderClass: this.getGroupHeaderClass.bind(this), groupHeaderContentClass: GROUP_HEADER_CONTENT_CLASS, }, this._getCellCount() || 1, this.option('resourceCellTemplate'), - this._getTotalRowCount(this._getGroupCount()), + this.getTotalRowCount(this._getGroupCount()), groupByDate, ); } @@ -513,7 +513,7 @@ class SchedulerTimeline extends SchedulerWorkSpace { // TODO Old render: delete these methods with the old render. _setCurrentTimeCells(): void { - const timePanelCells = this._getTimePanelCells(); + const timePanelCells = this.getTimePanelCells(); const currentTimeCellIndices = this._getCurrentTimePanelCellIndices(); currentTimeCellIndices.forEach((timePanelCellIndex) => { timePanelCells.eq(timePanelCellIndex) diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts index 6bfe83908d05..f27ec597212c 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts @@ -8,12 +8,12 @@ const TIMELINE_CLASS = 'dx-scheduler-timeline-day'; class SchedulerTimelineDay extends SchedulerTimeline { get type() { return VIEWS.TIMELINE_DAY; } - _getElementClass() { + protected override getElementClass() { return TIMELINE_CLASS; } _needRenderWeekHeader() { - return this._isWorkSpaceWithCount(); + return this.isWorkSpaceWithCount(); } } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts index 78b3a8d04e13..25a9f16bf3a8 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts @@ -16,17 +16,17 @@ class SchedulerTimelineMonth extends SchedulerTimeline { get renovatedHeaderPanelComponent() { return HeaderPanelComponent; } - _renderView() { - super._renderView(); + protected override renderView() { + super.renderView(); - this._updateScrollable(); + this.updateScrollable(); } - _getElementClass() { + protected override getElementClass() { return TIMELINE_CLASS; } - _getDateHeaderTemplate() { + protected override getDateHeaderTemplate() { return this.option('dateCellTemplate'); } @@ -38,18 +38,18 @@ class SchedulerTimelineMonth extends SchedulerTimeline { return true; } - _getFormat() { + protected override getFormat() { return formatWeekdayAndDay; } - _getIntervalBetween(currentDate) { + protected override getIntervalBetween(currentDate) { const firstViewDate = this.getStartViewDate(); const timeZoneOffset = dateUtils.getTimezonesDifference(firstViewDate, currentDate); return currentDate.getTime() - (firstViewDate.getTime() - (this.option('startDayHour') as any) * 3600000) - timeZoneOffset; } - _getViewStartByOptions() { + protected override getViewStartByOptions() { return monthUtils.getViewStartByOptions( this.option('startDate') as any, this.option('currentDate') as any, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts index c2a78f0fed29..8e03bf0018d4 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts @@ -9,7 +9,7 @@ const TIMELINE_CLASS = 'dx-scheduler-timeline-week'; export default class SchedulerTimelineWeek extends SchedulerTimeline { get type() { return VIEWS.TIMELINE_WEEK; } - _getElementClass() { + protected override getElementClass() { return TIMELINE_CLASS; } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts index aa98995aa062..4c89a5f5abaa 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts @@ -16,10 +16,10 @@ class SchedulerTimelineWorkWeek extends SchedulerTimelineWeek { // @ts-expect-error super(...args); - this._getWeekendsCount = getWeekendsCount; + this.getWeekendsCount = getWeekendsCount; } - _getElementClass() { + protected override getElementClass() { return TIMELINE_CLASS; } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts index 51e0be120c2c..0281d62b1406 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -359,7 +359,7 @@ class SchedulerWorkSpace extends Widget { }; } - const groupIndex = this._getGroupIndexByGroupValues(groups); + const groupIndex = this.getGroupIndexByGroupValues(groups); return { ...selectedCell, @@ -383,7 +383,7 @@ class SchedulerWorkSpace extends Widget { } get isAllDayPanelVisible() { - return this._isShowAllDayPanel() && this.supportAllDayRow(); + return this.isShowAllDayPanel() && this.supportAllDayRow(); } get verticalGroupTableClass() { return WORKSPACE_VERTICAL_GROUP_TABLE_CLASS; } @@ -423,10 +423,10 @@ class SchedulerWorkSpace extends Widget { e.preventDefault(); e.stopPropagation(); - const selectedCells = this._getSelectedCellsData(); + const selectedCells = this.getSelectedCellsData(); if (selectedCells?.length) { - const selectedCellsElement = selectedCells.map((cellData) => this._getCellByData(cellData)).filter((cell) => Boolean(cell)); + const selectedCellsElement = selectedCells.map((cellData) => this.getCellByData(cellData)).filter((cell) => Boolean(cell)); e.target = selectedCellsElement; this._showPopup = true; @@ -441,10 +441,10 @@ class SchedulerWorkSpace extends Widget { const focusedCellData = this.cellsSelectionState.getFocusedCell()?.cellData; if (focusedCellData) { - const isAllDayPanelCell = focusedCellData.allDay && !this._isVerticalGroupedWorkSpace(); + const isAllDayPanelCell = focusedCellData.allDay && !this.isVerticalGroupedWorkSpace(); const isMultiSelection = e.shiftKey; const isMultiSelectionAllowed = this.option('allowMultipleCellSelection'); - const isRTL = this._isRTL(); + const isRTL = this.isRTL(); const groupCount = this._getGroupCount(); const isGroupedByDate = this.isGroupedByDate(); const isHorizontalGrouping = this._isHorizontalGroupedWorkSpace(); @@ -472,7 +472,7 @@ class SchedulerWorkSpace extends Widget { focusedCellData, }); - this._processNextSelectedCell( + this.processNextSelectedCell( nextCellData, focusedCellData, isMultiSelection && isMultiSelectionAllowed, @@ -499,17 +499,17 @@ class SchedulerWorkSpace extends Widget { }); } - _isRTL() { + private isRTL() { return this.option('rtlEnabled'); } - _moveToCell($cell, isMultiSelection) { + private moveToCell($cell, isMultiSelection) { if (!isDefined($cell) || !$cell.length) { return; } const isMultiSelectionAllowed = this.option('allowMultipleCellSelection'); - const currentCellData = this._getFullCellData($cell); + const currentCellData = this.getFullCellData($cell); const focusedCellData = this.cellsSelectionState.getFocusedCell().cellData; const nextFocusedCellData = this.cellsSelectionController.moveToCell({ @@ -520,14 +520,14 @@ class SchedulerWorkSpace extends Widget { isVirtualCell: $cell.hasClass(VIRTUAL_CELL_CLASS), }); - this._processNextSelectedCell( + this.processNextSelectedCell( nextFocusedCellData, focusedCellData, isMultiSelectionAllowed && isMultiSelection, ); } - _processNextSelectedCell(nextCellData, focusedCellData, isMultiSelection) { + private processNextSelectedCell(nextCellData, focusedCellData, isMultiSelection) { const nextCellPosition = this.viewDataProvider.findCellPositionInMap({ startDate: nextCellData.startDate, groupIndex: nextCellData.groupIndex, @@ -536,18 +536,18 @@ class SchedulerWorkSpace extends Widget { }); if (!this.viewDataProvider.isSameCell(focusedCellData, nextCellData)) { - const $cell = nextCellData.allDay && !this._isVerticalGroupedWorkSpace() - ? this._dom_getAllDayPanelCell(nextCellPosition.columnIndex) - : this._dom_getDateCell(nextCellPosition); + const $cell = nextCellData.allDay && !this.isVerticalGroupedWorkSpace() + ? this.dom_getAllDayPanelCell(nextCellPosition.columnIndex) + : this.dom_getDateCell(nextCellPosition); const isNextCellAllDay = nextCellData.allDay; - this._setSelectedCellsStateAndUpdateSelection(isNextCellAllDay, nextCellPosition, isMultiSelection, $cell); + this.setSelectedCellsStateAndUpdateSelection(isNextCellAllDay, nextCellPosition, isMultiSelection, $cell); this._dateTableScrollable.scrollToElement($cell); } } - _setSelectedCellsStateAndUpdateSelection(isAllDay, cellPosition, isMultiSelection, $nextFocusedCell) { + private setSelectedCellsStateAndUpdateSelection(isAllDay, cellPosition, isMultiSelection, $nextFocusedCell) { const nextCellCoordinates = { rowIndex: cellPosition.rowIndex, columnIndex: cellPosition.columnIndex, @@ -567,10 +567,10 @@ class SchedulerWorkSpace extends Widget { } this.updateCellsSelection(); - this._updateSelectedCellDataOption(this._getSelectedCellsData(), $nextFocusedCell); + this.updateSelectedCellDataOption(this.getSelectedCellsData(), $nextFocusedCell); } - _hasAllDayClass($cell) { + private hasAllDayClass($cell) { return $cell.hasClass(ALL_DAY_TABLE_CELL_CLASS); } @@ -593,7 +593,7 @@ class SchedulerWorkSpace extends Widget { const cellCoordinates = { columnIndex: 0, rowIndex: 0, - allDay: this._isVerticalGroupedWorkSpace() && this.isAllDayPanelVisible, + allDay: this.isVerticalGroupedWorkSpace() && this.isAllDayPanelVisible, }; this.cellsSelectionState.setFocusedCell( cellCoordinates.rowIndex, @@ -604,7 +604,7 @@ class SchedulerWorkSpace extends Widget { } this.updateCellsSelection(); - this._updateSelectedCellDataOption(this._getSelectedCellsData()); + this.updateSelectedCellDataOption(this.getSelectedCellsData()); } } @@ -624,24 +624,25 @@ class SchedulerWorkSpace extends Widget { return this.$element(); } - _isVerticalGroupedWorkSpace() { // TODO move to the Model + protected isVerticalGroupedWorkSpace() { // TODO move to the Model return Boolean(this.option('groups')?.length) && this.option('groupOrientation') === 'vertical'; } + // TODO: make it private. Being used as public method by external code. _isHorizontalGroupedWorkSpace() { return Boolean(this.option('groups')?.length) && this.option('groupOrientation') === 'horizontal'; } - _isWorkSpaceWithCount() { + protected isWorkSpaceWithCount() { return this.option('intervalCount') as any > 1; } - _isWorkspaceWithOddCells() { + private isWorkspaceWithOddCells() { return this.option('hoursInterval') === 0.5 && !this.isVirtualScrolling(); } - _getRealGroupOrientation() { - return this._isVerticalGroupedWorkSpace() + private getRealGroupOrientation() { + return this.isVerticalGroupedWorkSpace() ? 'vertical' : 'horizontal'; } @@ -651,7 +652,7 @@ class SchedulerWorkSpace extends Widget { this._$allDayTitle = $('
').appendTo(this._$headerPanelEmptyCell); } - _dateTableScrollableConfig() { + protected dateTableScrollableConfig() { let config: any = { useKeyboard: false, bounceEnabled: false, @@ -679,7 +680,7 @@ class SchedulerWorkSpace extends Widget { }, }; - if (this._needCreateCrossScrolling()) { + if (this.needCreateCrossScrolling()) { config = extend(config, this._createCrossScrollingConfig(config)); } @@ -700,6 +701,7 @@ class SchedulerWorkSpace extends Widget { return config; } + // TODO: make it private. Being used as public method by external code. _createCrossScrollingConfig({ onScroll }): any { return { direction: 'both', @@ -715,7 +717,7 @@ class SchedulerWorkSpace extends Widget { }; } - _headerScrollableConfig() { + protected headerScrollableConfig() { return { useKeyboard: false, showScrollbar: 'never', @@ -733,17 +735,17 @@ class SchedulerWorkSpace extends Widget { this.cache.clear(); if (visible) { - this._updateGroupTableHeight(); + this.updateGroupTableHeight(); } - if (visible && this._needCreateCrossScrolling()) { - this._setTableSizes(); + if (visible && this.needCreateCrossScrolling()) { + this.setTableSizes(); } } - _setTableSizes() { + protected setTableSizes() { this.cache.clear(); - this._attachTableClasses(); + this.attachTableClasses(); let cellWidth = this.getCellWidth(); @@ -754,7 +756,7 @@ class SchedulerWorkSpace extends Widget { const minWidth = this.getWorkSpaceMinWidth(); const groupCount = this._getGroupCount(); - const totalCellCount = this._getTotalCellCount(groupCount); + const totalCellCount = this.getTotalCellCount(groupCount); let width = cellWidth * totalCellCount; @@ -768,11 +770,11 @@ class SchedulerWorkSpace extends Widget { setWidth(this._$allDayTable, width); } - this._attachHeaderTableClasses(); + this.attachHeaderTableClasses(); - this._updateGroupTableHeight(); + this.updateGroupTableHeight(); - this._updateScrollable(); + this.updateScrollable(); } getWorkSpaceMinWidth() { @@ -787,23 +789,23 @@ class SchedulerWorkSpace extends Widget { } if (this.option('crossScrollingEnabled')) { - this._setTableSizes(); + this.setTableSizes(); } this.updateHeaderEmptyCellWidth(); - this._updateScrollable(); + this.updateScrollable(); this.cache.clear(); } - _needCreateCrossScrolling() { + protected needCreateCrossScrolling() { return this.option('crossScrollingEnabled'); } - _getElementClass() { return noop(); } + protected getElementClass() { return noop(); } - _getRowCount() { + protected getRowCount() { return this.viewDataProvider.getRowCount({ intervalCount: this.option('intervalCount'), currentDate: this.option('currentDate'), @@ -814,6 +816,7 @@ class SchedulerWorkSpace extends Widget { }); } + // TODO: make it private. Being used as public method by external code. _getCellCount() { return this.viewDataProvider.getCellCount({ intervalCount: this.option('intervalCount'), @@ -829,21 +832,21 @@ class SchedulerWorkSpace extends Widget { return this.renovatedRenderSupported() && this.option('renovateRender'); } - _isVirtualModeOn() { + private isVirtualModeOn() { return this.option('scrolling.mode') === 'virtual'; } isVirtualScrolling() { - return this.isRenovatedRender() && this._isVirtualModeOn(); + return this.isRenovatedRender() && this.isVirtualModeOn(); } - _initVirtualScrolling() { + private initVirtualScrolling() { if (this.virtualScrollingDispatcher) { this.virtualScrollingDispatcher.dispose(); this.virtualScrollingDispatcher = null; } - this.virtualScrollingDispatcher = new VirtualScrollingDispatcher(this._getVirtualScrollingDispatcherOptions()); + this.virtualScrollingDispatcher = new VirtualScrollingDispatcher(this.getVirtualScrollingDispatcherOptions()); this.virtualScrollingDispatcher.attachScrollableEvents(); this.renderer = new VirtualScrollingRenderer(this); } @@ -865,7 +868,7 @@ class SchedulerWorkSpace extends Widget { const groupOrientation = groupCount > 0 ? this.option('groupOrientation') - : this._getDefaultGroupStrategy(); + : this.getDefaultGroupStrategy(); const options = { groupByDate: this.option('groupByDate'), @@ -878,7 +881,7 @@ class SchedulerWorkSpace extends Widget { isAllDayPanelVisible: this.isAllDayPanelVisible, selectedCells: this.cellsSelectionState.getSelectedCells(), focusedCell: this.cellsSelectionState.getFocusedCell(), - headerCellTextFormat: this._getFormat(), + headerCellTextFormat: this.getFormat(), getDateForHeaderText: (_, date) => date, viewOffset: this.option('viewOffset'), startDayHour: this.option('startDayHour'), @@ -900,14 +903,14 @@ class SchedulerWorkSpace extends Widget { renovatedRenderSupported() { return true; } - _updateGroupTableHeight() { - if (this._isVerticalGroupedWorkSpace() && hasWindow()) { - this._setHorizontalGroupHeaderCellsHeight(); + private updateGroupTableHeight() { + if (this.isVerticalGroupedWorkSpace() && hasWindow()) { + this.setHorizontalGroupHeaderCellsHeight(); } } updateHeaderEmptyCellWidth() { - if (hasWindow() && this._isRenderHeaderPanelEmptyCell()) { + if (hasWindow() && this.isRenderHeaderPanelEmptyCell()) { const timePanelWidth = this.getTimePanelWidth(); const groupPanelWidth = this.getGroupTableWidth(); @@ -917,66 +920,66 @@ class SchedulerWorkSpace extends Widget { updateHeaderPanelScrollbarPadding() { if (hasWindow() && this._$headerPanelContainer) { - const scrollbarWidth = this._getScrollbarWidth(); + const scrollbarWidth = this.getScrollbarWidth(); this._$headerPanelContainer.css('paddingRight', `${scrollbarWidth}px`); } } - _getScrollbarWidth() { + private getScrollbarWidth() { const containerElement = $(this._dateTableScrollable.container()).get(0) as HTMLElement; const scrollbarWidth = containerElement.offsetWidth - containerElement.clientWidth; return scrollbarWidth; } - _isGroupsSpecified(groupValues?: GroupValues) { + private isGroupsSpecified(groupValues?: GroupValues) { return this.option('groups')?.length && groupValues; } - _getGroupIndexByGroupValues(groupValues?: RawGroupValues | GroupValues) { + private getGroupIndexByGroupValues(groupValues?: RawGroupValues | GroupValues) { return groupValues && getAppointmentGroupIndex( getSafeGroupValues(groupValues), this.resourceManager.groupsLeafs, )[0]; } - _getViewStartByOptions() { + protected getViewStartByOptions() { return getViewStartByOptions( this.option('startDate'), this.option('currentDate'), this._getIntervalDuration(), - this.option('startDate') ? this._calculateViewStartDate() : undefined, + this.option('startDate') ? this.calculateViewStartDate() : undefined, ); } - _getIntervalDuration() { + protected _getIntervalDuration() { return this.viewDataProvider.getIntervalDuration(this.option('intervalCount')); } - _getHeaderDate() { + protected getHeaderDate() { return this.getStartViewDate(); } - _calculateViewStartDate() { + protected calculateViewStartDate() { return calculateViewStartDate(this.option('startDate')); } - _firstDayOfWeek() { + protected firstDayOfWeek() { return this.viewDataProvider.getFirstDayOfWeek(this.option('firstDayOfWeek')); } - _attachEvents() { - this._createSelectionChangedAction(); - this._attachClickEvent(); - this._attachContextMenuEvent(); + protected attachEvents() { + this.createSelectionChangedAction(); + this.attachClickEvent(); + this.attachContextMenuEvent(); } - _attachClickEvent() { + private attachClickEvent() { const that = this; const pointerDownAction = this._createAction((e) => { - that._pointerDownHandler(e.event); + that.pointerDownHandler(e.event); }); - this._createCellClickAction(); + this.createCellClickAction(); const cellSelector = `.${DATE_TABLE_CELL_CLASS},.${ALL_DAY_TABLE_CELL_CLASS}`; const $element = this.$element(); @@ -996,25 +999,25 @@ class SchedulerWorkSpace extends Widget { }); } - _createCellClickAction() { + private createCellClickAction() { this._cellClickAction = this._createActionByOption('onCellClick', { - afterExecute: (e) => this._cellClickHandler(e.args[0].event), + afterExecute: (e) => this.cellClickHandler(e.args[0].event), }); } - _createSelectionChangedAction() { + private createSelectionChangedAction() { this._selectionChangedAction = this._createActionByOption('onSelectionChanged'); } // eslint-disable-next-line @typescript-eslint/no-unused-vars - _cellClickHandler(argument?: any) { + private cellClickHandler(argument?: any) { if (this._showPopup) { delete this._showPopup; - this._handleSelectedCellsClick(); + this.handleSelectedCellsClick(); } } - _pointerDownHandler(e) { + private pointerDownHandler(e) { const $target = $(e.target); if (!$target.hasClass(DATE_TABLE_CELL_CLASS) && !$target.hasClass(ALL_DAY_TABLE_CELL_CLASS)) { @@ -1026,14 +1029,14 @@ class SchedulerWorkSpace extends Widget { if ($target.hasClass(DATE_TABLE_FOCUSED_CELL_CLASS)) { this._showPopup = true; } else { - const cellCoordinates = this._getCoordinatesByCell($target); - const isAllDayCell = this._hasAllDayClass($target); - this._setSelectedCellsStateAndUpdateSelection(isAllDayCell, cellCoordinates, false, $target); + const cellCoordinates = this.getCoordinatesByCell($target); + const isAllDayCell = this.hasAllDayClass($target); + this.setSelectedCellsStateAndUpdateSelection(isAllDayCell, cellCoordinates, false, $target); } } - _handleSelectedCellsClick() { - const selectedCells = this._getSelectedCellsData(); + private handleSelectedCellsClick() { + const selectedCells = this.getSelectedCellsData(); const firstCellData = selectedCells[0]; const lastCellData = selectedCells[selectedCells.length - 1]; @@ -1052,55 +1055,55 @@ class SchedulerWorkSpace extends Widget { (this.option('onSelectedCellsClick') as any)(result, lastCellData.groups); } - _attachContextMenuEvent() { - this._createContextMenuAction(); + private attachContextMenuEvent() { + this.createContextMenuAction(); const cellSelector = `.${DATE_TABLE_CELL_CLASS},.${ALL_DAY_TABLE_CELL_CLASS}`; const $element = this.$element(); const eventName = addNamespace(contextMenuEventName, this.NAME); eventsEngine.off($element, eventName, cellSelector); - eventsEngine.on($element, eventName, cellSelector, this._contextMenuHandler.bind(this)); + eventsEngine.on($element, eventName, cellSelector, this.contextMenuHandler.bind(this)); } - _contextMenuHandler(e) { + private contextMenuHandler(e) { const $cell = $(e.target); this._contextMenuAction({ event: e, cellElement: getPublicElement($cell), cellData: this.getCellData($cell) }); this._contextMenuHandled = true; } - _createContextMenuAction() { + private createContextMenuAction() { this._contextMenuAction = this._createActionByOption('onCellContextMenu'); } - _getGroupHeaderContainer() { - if (this._isVerticalGroupedWorkSpace()) { + protected getGroupHeaderContainer() { + if (this.isVerticalGroupedWorkSpace()) { return this._$groupTable; } return this._$thead; } - _getDateHeaderContainer() { + private getDateHeaderContainer() { return this._$thead; } - _getCalculateHeaderCellRepeatCount() { + private getCalculateHeaderCellRepeatCount() { return this._groupedStrategy.calculateHeaderCellRepeatCount(); } - _updateScrollable() { + protected updateScrollable() { this._dateTableScrollable.update(); this._headerScrollable?.update(); this._sidebarScrollable?.update(); this.updateHeaderPanelScrollbarPadding(); } - _getTimePanelRowCount() { - return this._getCellCountInDay(); + protected getTimePanelRowCount() { + return this.getCellCountInDay(); } - _getCellCountInDay() { + protected getCellCountInDay() { const hoursInterval = this.option('hoursInterval'); const startDayHour = this.option('startDayHour'); const endDayHour = this.option('endDayHour'); @@ -1108,11 +1111,11 @@ class SchedulerWorkSpace extends Widget { return this.viewDataProvider.getCellCountInDay(startDayHour, endDayHour, hoursInterval); } - _getTotalCellCount(groupCount) { + private getTotalCellCount(groupCount) { return this._groupedStrategy.getTotalCellCount(groupCount); } - _getTotalRowCount(groupCount, includeAllDayPanelRows?: any) { + protected getTotalRowCount(groupCount, includeAllDayPanelRows?: any) { let result = this._groupedStrategy.getTotalRowCount(groupCount); if (includeAllDayPanelRows && this.isAllDayPanelVisible) { @@ -1122,7 +1125,7 @@ class SchedulerWorkSpace extends Widget { return result; } - _getGroupIndex(rowIndex, columnIndex) { + private getGroupIndex(rowIndex, columnIndex) { return this._groupedStrategy.getGroupIndex(rowIndex, columnIndex); } @@ -1136,25 +1139,26 @@ class SchedulerWorkSpace extends Widget { ); } + // TODO: make it private. Being used as public method by external code. _getGroupCount() { return this.resourceManager.groupCount(); } - _attachTablesEvents() { + protected attachTablesEvents() { const element = this.$element(); - this._attachDragEvents(element); - this._attachPointerEvents(element); + this.attachDragEvents(element); + this.attachPointerEvents(element); } - _detachDragEvents(element) { + private detachDragEvents(element) { (eventsEngine.off as any)(element, DragEventNames.ENTER); (eventsEngine.off as any)(element, DragEventNames.LEAVE); (eventsEngine.off as any)(element, DragEventNames.DROP); } - _attachDragEvents(element) { - this._detachDragEvents(element); + private attachDragEvents(element) { + this.detachDragEvents(element); const onDragEnter = (e) => { if (!this.preventDefaultDragging) { @@ -1169,7 +1173,7 @@ class SchedulerWorkSpace extends Widget { } }; - const onCheckDropTarget = (target, event) => !this._isOutsideScrollable(target, event); + const onCheckDropTarget = (target, event) => !this.isOutsideScrollable(target, event); (eventsEngine.on as any)( element, @@ -1195,7 +1199,7 @@ class SchedulerWorkSpace extends Widget { }); } - _attachPointerEvents(element) { + private attachPointerEvents(element) { let isPointerDown = false; (eventsEngine.off as any)(element, SCHEDULER_CELL_DXPOINTERMOVE_EVENT_NAME); @@ -1217,12 +1221,12 @@ class SchedulerWorkSpace extends Widget { if (isPointerDown && this._dateTableScrollable && !this._dateTableScrollable.option('scrollByContent')) { e.preventDefault(); e.stopPropagation(); - this._moveToCell($(e.target), true); + this.moveToCell($(e.target), true); } }); } - _getFormat() { return abstract(); } + protected getFormat() { return abstract(); } getWorkArea() { return this._$dateTableContainer; @@ -1268,9 +1272,9 @@ class SchedulerWorkSpace extends Widget { return this._groupedStrategy.getLeftOffset(); } - _getCellCoordinatesByIndex(index) { - const columnIndex = Math.floor(index / this._getRowCount()); - const rowIndex = index - this._getRowCount() * columnIndex; + protected getCellCoordinatesByIndex(index) { + const columnIndex = Math.floor(index / this.getRowCount()); + const rowIndex = index - this.getRowCount() * columnIndex; return { columnIndex, @@ -1280,25 +1284,25 @@ class SchedulerWorkSpace extends Widget { // TODO: necessary for old render // eslint-disable-next-line @typescript-eslint/no-unused-vars - _getDateGenerationOptions(isOldRender = false) { + protected getDateGenerationOptions(isOldRender = false) { return { startDayHour: this.option('startDayHour'), endDayHour: this.option('endDayHour'), interval: this.viewDataProvider.viewDataGenerator?.getInterval(this.option('hoursInterval')), startViewDate: this.getStartViewDate(), - firstDayOfWeek: this._firstDayOfWeek(), + firstDayOfWeek: this.firstDayOfWeek(), }; } // TODO: refactor current time indicator - _getIntervalBetween(currentDate, allDay) { + protected getIntervalBetween(currentDate, allDay) { const firstViewDate = this.getStartViewDate(); const startDayTime = (this.option('startDayHour') as any) * HOUR_MS; const timeZoneOffset = dateUtils.getTimezonesDifference(firstViewDate, currentDate); const fullInterval = currentDate.getTime() - firstViewDate.getTime() - timeZoneOffset; - const days = this._getDaysOfInterval(fullInterval, startDayTime); - const weekendsCount = this._getWeekendsCount(days); + const days = this.getDaysOfInterval(fullInterval, startDayTime); + const weekendsCount = this.getWeekendsCount(days); let result = (days - weekendsCount) * DAY_MS; if (!allDay) { @@ -1312,25 +1316,25 @@ class SchedulerWorkSpace extends Widget { } // eslint-disable-next-line @typescript-eslint/no-unused-vars - _getWeekendsCount(argument?: any) { + protected getWeekendsCount(argument?: any) { return 0; } - _getDaysOfInterval(fullInterval, startDayTime) { + private getDaysOfInterval(fullInterval, startDayTime) { return Math.floor((fullInterval + startDayTime) / DAY_MS); } - _updateIndex(index) { - return index * this._getRowCount(); + protected updateIndex(index) { + return index * this.getRowCount(); } getDroppableCell() { - return this._getDateTables().find(`.${DATE_TABLE_DROPPABLE_CELL_CLASS}`); + return this.getDateTables().find(`.${DATE_TABLE_DROPPABLE_CELL_CLASS}`); } - _getWorkSpaceWidth() { + protected getWorkSpaceWidth() { return this.cache.memo('workspaceWidth', () => { - if (this._needCreateCrossScrolling()) { + if (this.needCreateCrossScrolling()) { return getBoundingRect(this._$dateTable.get(0)).width; } const totalWidth = getBoundingRect((this.$element() as any).get(0)).width; @@ -1341,12 +1345,12 @@ class SchedulerWorkSpace extends Widget { }); } - _getCellByCoordinates(cellCoordinates, groupIndex, inAllDayRow) { + protected _getCellByCoordinates(cellCoordinates, groupIndex, inAllDayRow) { const indexes = this._groupedStrategy.prepareCellIndexes(cellCoordinates, groupIndex, inAllDayRow); - return this._dom_getDateCell(indexes); + return this.dom_getDateCell(indexes); } - _dom_getDateCell(position) { + private dom_getDateCell(position) { return this._$dateTable .find(`tr:not(.${VIRTUAL_ROW_CLASS})`) .eq(position.rowIndex) @@ -1354,13 +1358,13 @@ class SchedulerWorkSpace extends Widget { .eq(position.columnIndex); } - _dom_getAllDayPanelCell(columnIndex) { + private dom_getAllDayPanelCell(columnIndex) { return this._$allDayPanel .find('tr').eq(0) .find('td').eq(columnIndex); } - _getCells(allDay?: any, direction?: any) { + protected getCells(allDay?: any, direction?: any) { const cellClass = allDay ? ALL_DAY_TABLE_CELL_CLASS : DATE_TABLE_CELL_CLASS; if (direction === 'vertical') { let result: any = []; @@ -1374,7 +1378,7 @@ class SchedulerWorkSpace extends Widget { return (this.$element() as any).find(`.${cellClass}`); } - _getFirstAndLastDataTableCell() { + private getFirstAndLastDataTableCell() { const selector = this.isVirtualScrolling() ? `.${DATE_TABLE_CELL_CLASS}, .${VIRTUAL_CELL_CLASS}` : `.${DATE_TABLE_CELL_CLASS}`; @@ -1383,8 +1387,8 @@ class SchedulerWorkSpace extends Widget { return [$cells[0], $cells[$cells.length - 1]]; } - _getAllCells(allDay) { - if (this._isVerticalGroupedWorkSpace()) { + private getAllCells(allDay) { + if (this.isVerticalGroupedWorkSpace()) { return this._$dateTable.find(`td:not(.${VIRTUAL_CELL_CLASS})`); } @@ -1395,16 +1399,16 @@ class SchedulerWorkSpace extends Widget { return (this.$element() as any).find(`.${cellClass}`); } - _setHorizontalGroupHeaderCellsHeight() { + protected setHorizontalGroupHeaderCellsHeight() { const { height } = getBoundingRect(this._$dateTable.get(0)); setOuterHeight(this._$groupTable, height); } - _getGroupHeaderCells() { + protected getGroupHeaderCells() { return (this.$element() as any).find(`.${GROUP_HEADER_CLASS}`); } - _getScrollCoordinates(date, groupIndex?: any, allDay?: any) { + protected getScrollCoordinates(date, groupIndex?: any, allDay?: any) { const currentDate = date || new Date(this.option('currentDate')); const cell = this.viewDataProvider.findGlobalCellPosition(currentDate, groupIndex, allDay, true); @@ -1424,7 +1428,7 @@ class SchedulerWorkSpace extends Widget { ); } - _isOutsideScrollable(target, event) { + private isOutsideScrollable(target, event) { const $dateTableScrollableElement = this._dateTableScrollable.$element(); const scrollableSize = getBoundingRect($dateTableScrollableElement.get(0)); const window = getWindow(); @@ -1447,7 +1451,7 @@ class SchedulerWorkSpace extends Widget { return false; } - protected _normalizeCellData(cellData) { + private normalizeCellData(cellData) { return extend(true, {}, { startDate: cellData.startDate, endDate: cellData.endDate, @@ -1459,41 +1463,41 @@ class SchedulerWorkSpace extends Widget { }); } - protected _getSelectedCellsData() { + private getSelectedCellsData() { const selected = this.cellsSelectionState.getSelectedCells(); - return selected?.map(this._normalizeCellData.bind(this)); + return selected?.map(this.normalizeCellData.bind(this)); } getCellData($cell) { - const cellData = this._getFullCellData($cell) ?? {}; + const cellData = this.getFullCellData($cell) ?? {}; - return this._normalizeCellData(cellData); + return this.normalizeCellData(cellData); } - _getFullCellData($cell) { + private getFullCellData($cell) { const currentCell = $cell[0]; if (currentCell) { - return this._getDataByCell($cell); + return this.getDataByCell($cell); } return undefined; } - _getVirtualRowOffset() { + private getVirtualRowOffset() { return this.virtualScrollingDispatcher.virtualRowOffset; } - _getVirtualCellOffset() { + private getVirtualCellOffset() { return this.virtualScrollingDispatcher.virtualCellOffset; } - _getDataByCell($cell) { + private getDataByCell($cell) { const rowIndex = $cell.parent().index() - this.virtualScrollingDispatcher.topVirtualRowsCount; const columnIndex = $cell.index() - this.virtualScrollingDispatcher.leftVirtualCellsCount; const { viewDataProvider } = this; - const isAllDayCell = this._hasAllDayClass($cell); + const isAllDayCell = this.hasAllDayClass($cell); const cellData = viewDataProvider.getCellData(rowIndex, columnIndex, isAllDayCell); @@ -1514,12 +1518,12 @@ class SchedulerWorkSpace extends Widget { ? 24 * 60 * 60 * 1000 : viewDataGenerator.getInterval(this.option('hoursInterval')); const startViewDateOffset = getStartViewDateTimeOffset(this.getStartViewDate(), this.option('startDayHour') as any); - const dateTimeStamp = this._getIntervalBetween(date, inAllDayRow) + startViewDateOffset; + const dateTimeStamp = this.getIntervalBetween(date, inAllDayRow) + startViewDateOffset; let index = Math.floor(dateTimeStamp / timeInterval); if (inAllDayRow) { - index = this._updateIndex(index); + index = this.updateIndex(index); } if (index < 0) { @@ -1566,7 +1570,7 @@ class SchedulerWorkSpace extends Widget { getAllDayHeight() { return getAllDayHeight( this.option('showAllDayPanel'), - this._isVerticalGroupedWorkSpace(), + this.isVerticalGroupedWorkSpace(), this.getDOMElementsMetaData(), ); } @@ -1588,7 +1592,7 @@ class SchedulerWorkSpace extends Widget { getCellIndexByCoordinates(coordinates, allDay) { const { horizontalScrollingState, verticalScrollingState } = this.virtualScrollingDispatcher; - const cellCount = horizontalScrollingState?.itemCount ?? this._getTotalCellCount(this._getGroupCount()); + const cellCount = horizontalScrollingState?.itemCount ?? this.getTotalCellCount(this._getGroupCount()); const cellWidth = this.getCellWidth(); const cellHeight = allDay ? this.getAllDayHeight() : this.getCellHeight(); @@ -1600,7 +1604,7 @@ class SchedulerWorkSpace extends Widget { let leftIndex = (coordinates.left - leftCoordinateOffset) / cellWidth; leftIndex = Math.floor(leftIndex + CELL_INDEX_CALCULATION_EPSILON); - if (this._isRTL()) { + if (this.isRTL()) { leftIndex = cellCount - leftIndex - 1; } @@ -1647,19 +1651,19 @@ class SchedulerWorkSpace extends Widget { ? this.getGroupBoundsVertical(coordinates.groupIndex) : this.getGroupBoundsHorizontal(coordinates); - return this._isRTL() + return this.isRTL() ? this.getGroupBoundsRtlCorrection(groupBounds) : groupBounds; } getGroupBoundsVertical(groupIndex) { - const $firstAndLastCells = this._getFirstAndLastDataTableCell(); + const $firstAndLastCells = this.getFirstAndLastDataTableCell(); return this._groupedStrategy.getGroupBoundsOffset(groupIndex, $firstAndLastCells); } getGroupBoundsHorizontal(coordinates) { const cellCount = this._getCellCount(); - const $cells = this._getCells(); + const $cells = this.getCells(); const cellWidth = this.getCellWidth(); const { groupedDataMap } = this.viewDataProvider; @@ -1678,11 +1682,11 @@ class SchedulerWorkSpace extends Widget { } needRecalculateResizableArea() { - return this._isVerticalGroupedWorkSpace() && this.getScrollable().scrollTop() !== 0; + return this.isVerticalGroupedWorkSpace() && this.getScrollable().scrollTop() !== 0; } getCellByCoordinates(coordinates, allDay) { - const $cells = this._getCells(allDay); + const $cells = this.getCells(allDay); const cellIndex = this.getCellIndexByCoordinates(coordinates, allDay); return $cells.eq(cellIndex); @@ -1718,9 +1722,9 @@ class SchedulerWorkSpace extends Widget { } needUpdateScrollPosition(date, appointmentGroupValues?: GroupValues, inAllDayRow = false) { - const cells = this._getCellsInViewport(inAllDayRow); - const groupIndex = this._isGroupsSpecified(appointmentGroupValues) - ? this._getGroupIndexByGroupValues(appointmentGroupValues) + const cells = this.getCellsInViewport(inAllDayRow); + const groupIndex = this.isGroupsSpecified(appointmentGroupValues) + ? this.getGroupIndexByGroupValues(appointmentGroupValues) : 0; const time = date.getTime(); const trimmedTime = dateUtils.trimTime(date).getTime(); @@ -1745,11 +1749,11 @@ class SchedulerWorkSpace extends Widget { }, true); } - _getCellsInViewport(inAllDayRow) { + private getCellsInViewport(inAllDayRow) { const $scrollable = this.getScrollable().$element(); const cellHeight = this.getCellHeight(); const cellWidth = this.getCellWidth(); - const totalColumnCount = this._getTotalCellCount(this._getGroupCount()); + const totalColumnCount = this.getTotalCellCount(this._getGroupCount()); const scrollableScrollTop = this.getScrollableScrollTop(); const scrollableScrollLeft = this.getScrollableScrollLeft(); @@ -1770,7 +1774,7 @@ class SchedulerWorkSpace extends Widget { const rowCount = Math.floor(fullScrolledRowCount + getHeight($scrollable) / cellHeight); const columnCount = Math.floor(fullScrolledColumnCount + getWidth($scrollable) / cellWidth); - const $cells = this._getAllCells(inAllDayRow); + const $cells = this.getAllCells(inAllDayRow); const result: any = []; $cells.each(function (index) { @@ -1790,13 +1794,13 @@ class SchedulerWorkSpace extends Widget { } scrollToTime(hours, minutes, date) { - if (!this._isValidScrollDate(date)) { + if (!this.isValidScrollDate(date)) { return; } date = date || new Date(this.option('currentDate')); date.setHours(hours, minutes, 0, 0); - const coordinates = this._getScrollCoordinates(date); + const coordinates = this.getScrollCoordinates(date); const scrollable = this.getScrollable(); @@ -1807,16 +1811,16 @@ class SchedulerWorkSpace extends Widget { } scrollTo(date, groupValues?: RawGroupValues | GroupValues, allDay = false, throwWarning = true) { - if (!this._isValidScrollDate(date, throwWarning)) { + if (!this.isValidScrollDate(date, throwWarning)) { return; } const groupIndex = this._getGroupCount() && groupValues - ? this._getGroupIndexByGroupValues(groupValues) + ? this.getGroupIndexByGroupValues(groupValues) : 0; const isScrollToAllDay = allDay && this.isAllDayPanelVisible; - const coordinates = this._getScrollCoordinates(date, groupIndex, isScrollToAllDay); + const coordinates = this.getScrollCoordinates(date, groupIndex, isScrollToAllDay); if (!coordinates) { return; @@ -1838,7 +1842,7 @@ class SchedulerWorkSpace extends Widget { const left = coordinates.left - scrollable.scrollLeft() - xShift - offset; let top = coordinates.top - scrollable.scrollTop() - yShift; - if (isScrollToAllDay && !this._isVerticalGroupedWorkSpace()) { + if (isScrollToAllDay && !this.isVerticalGroupedWorkSpace()) { top = 0; } @@ -1851,7 +1855,7 @@ class SchedulerWorkSpace extends Widget { } } - _isValidScrollDate(date, throwWarning = true) { + private isValidScrollDate(date, throwWarning = true) { const viewOffset = this.option('viewOffset') as number; const min = new Date(this.getStartViewDate().getTime() + viewOffset); const max = new Date(this.getEndViewDate().getTime() + viewOffset); @@ -1873,11 +1877,11 @@ class SchedulerWorkSpace extends Widget { $cell?.removeClass(DATE_TABLE_DROPPABLE_CELL_CLASS); } - _getCoordinatesByCell($cell) { + private getCoordinatesByCell($cell) { const columnIndex = $cell.index() - this.virtualScrollingDispatcher.leftVirtualCellsCount; let rowIndex = $cell.parent().index(); - const isAllDayCell = this._hasAllDayClass($cell); - const isVerticalGrouping = this._isVerticalGroupedWorkSpace(); + const isAllDayCell = this.hasAllDayClass($cell); + const isVerticalGrouping = this.isVerticalGroupedWorkSpace(); if (!(isAllDayCell && !isVerticalGrouping)) { rowIndex -= this.virtualScrollingDispatcher.topVirtualRowsCount; @@ -1886,15 +1890,15 @@ class SchedulerWorkSpace extends Widget { return { rowIndex, columnIndex }; } - _isShowAllDayPanel() { + private isShowAllDayPanel() { return this.option('showAllDayPanel'); } - _getTimePanelCells() { + protected getTimePanelCells() { return (this.$element() as any).find(`.${TIME_PANEL_CELL_CLASS}`); } - _getRDateTableProps() { + protected getRDateTableProps() { return { viewData: this.viewDataProvider.viewData, viewContext: this.getR1ComponentsViewContext(), @@ -1915,12 +1919,12 @@ class SchedulerWorkSpace extends Widget { } // eslint-disable-next-line @typescript-eslint/no-unused-vars - _updateSelectedCellDataOption(selectedCellData, $nextFocusedCell?: any) { + private updateSelectedCellDataOption(selectedCellData, $nextFocusedCell?: any) { this.option('selectedCellData', selectedCellData); this._selectionChangedAction({ selectedCellData }); } - _getCellByData(cellData) { + private getCellByData(cellData) { const { startDate, groupIndex, allDay, index, } = cellData; @@ -1936,26 +1940,26 @@ class SchedulerWorkSpace extends Widget { return undefined; } - return allDay && !this._isVerticalGroupedWorkSpace() - ? this._dom_getAllDayPanelCell(position.columnIndex) - : this._dom_getDateCell(position); + return allDay && !this.isVerticalGroupedWorkSpace() + ? this.dom_getAllDayPanelCell(position.columnIndex) + : this.dom_getDateCell(position); } // Must replace all DOM manipulations getDOMElementsMetaData() { return this.cache.memo('cellElementsMeta', () => ({ - dateTableCellsMeta: this._getDateTableDOMElementsInfo(), - allDayPanelCellsMeta: this._getAllDayPanelDOMElementsInfo(), + dateTableCellsMeta: this.getDateTableDOMElementsInfo(), + allDayPanelCellsMeta: this.getAllDayPanelDOMElementsInfo(), })); } - _getDateTableDOMElementsInfo() { - const dateTableCells = this._getAllCells(false); + getDateTableDOMElementsInfo() { + const dateTableCells = this.getAllCells(false); if (!dateTableCells.length || !hasWindow()) { return [[{}]]; } - const dateTable = this._getDateTable(); + const dateTable = this.getDateTable(); // We should use getBoundingClientRect in renovation const dateTableRect = getBoundingRect(dateTable.get(0)); @@ -1970,17 +1974,17 @@ class SchedulerWorkSpace extends Widget { result.push([]); } - this._addCellMetaData(result[rowIndex], cell, dateTableRect); + this.addCellMetaData(result[rowIndex], cell, dateTableRect); }); return result; } - _getAllDayPanelDOMElementsInfo() { + private getAllDayPanelDOMElementsInfo() { const result = []; - if (this.isAllDayPanelVisible && !this._isVerticalGroupedWorkSpace() && hasWindow()) { - const allDayCells = this._getAllCells(true); + if (this.isAllDayPanelVisible && !this.isVerticalGroupedWorkSpace() && hasWindow()) { + const allDayCells = this.getAllCells(true); if (!allDayCells.length) { return [{}]; @@ -1990,14 +1994,14 @@ class SchedulerWorkSpace extends Widget { const allDayPanelRect = getBoundingRect(allDayAppointmentContainer.get(0)); allDayCells.each((_, cell) => { - this._addCellMetaData(result, cell, allDayPanelRect); + this.addCellMetaData(result, cell, allDayPanelRect); }); } return result; } - _addCellMetaData(cellMetaDataArray, cell, parentRect) { + private addCellMetaData(cellMetaDataArray, cell, parentRect) { const cellRect = getBoundingRect(cell); cellMetaDataArray.push({ @@ -2009,10 +2013,10 @@ class SchedulerWorkSpace extends Widget { } // TODO: remove along with old render - _oldRender_getAllDayCellData(groupIndex) { + private oldRender_getAllDayCellData(groupIndex) { return (cell, rowIndex, columnIndex) => { const validColumnIndex = columnIndex % this._getCellCount(); - const options = this._getDateGenerationOptions(true); + const options = this.getDateGenerationOptions(true); let startDate = this.viewDataProvider.viewDataGenerator.getDateByCellIndices( options as any, rowIndex, @@ -2077,7 +2081,7 @@ class SchedulerWorkSpace extends Widget { this._$dateTable, DateTableComponent, 'renovatedDateTable', - this._getRDateTableProps(), + this.getRDateTableProps(), ); } @@ -2095,16 +2099,16 @@ class SchedulerWorkSpace extends Widget { }; if (this.option('groups')?.length) { - this._attachGroupCountClass(); + this.attachGroupCountClass(); utils.renovation.renderComponent( this, - this._getGroupHeaderContainer(), + this.getGroupHeaderContainer(), GroupPanelComponent, 'renovatedGroupPanel', options, ); } else { - this._detachGroupCountClass(); + this.detachGroupCountClass(); } } @@ -2112,7 +2116,7 @@ class SchedulerWorkSpace extends Widget { const visible = this.isAllDayPanelVisible && !this.isGroupedAllDayPanel(); if (visible) { - this._updateAllDayVisibility(); + this.updateAllDayVisibility(); const options = { viewData: this.viewDataProvider.viewData, @@ -2126,8 +2130,8 @@ class SchedulerWorkSpace extends Widget { utils.renovation.renderComponent(this, this._$allDayTitle, AllDayPanelTitleComponent, 'renovatedAllDayPanelTitle', {}); } - this._updateAllDayVisibility(); - this._updateScrollable(); + this.updateAllDayVisibility(); + this.updateScrollable(); } renderRTimeTable() { @@ -2147,9 +2151,9 @@ class SchedulerWorkSpace extends Widget { renderRHeaderPanel(isRenderDateHeader = true) { if (this.option('groups')?.length) { - this._attachGroupCountClass(); + this.attachGroupCountClass(); } else { - this._detachGroupCountClass(); + this.detachGroupCountClass(); } utils.renovation.renderComponent( @@ -2184,14 +2188,14 @@ class SchedulerWorkSpace extends Widget { const $rootElement = $(scheduler.element()); - this._createDragBehavior(this.getWorkArea(), $rootElement); - if (!this._isVerticalGroupedWorkSpace()) { - this._createDragBehavior(this._$allDayPanel, $rootElement); + this.createDragBehavior(this.getWorkArea(), $rootElement); + if (!this.isVerticalGroupedWorkSpace()) { + this.createDragBehavior(this._$allDayPanel, $rootElement); } } } - _createDragBehavior($targetElement, $rootElement) { + private createDragBehavior($targetElement, $rootElement) { const getItemData = (itemElement, appointments) => appointments._getItemData(itemElement); const getItemSettings = ($itemElement) => $itemElement.data(APPOINTMENT_SETTINGS_KEY); @@ -2200,10 +2204,10 @@ class SchedulerWorkSpace extends Widget { getItemSettings, }; - this._createDragBehaviorBase($targetElement, $rootElement, options); + this.createDragBehaviorBase($targetElement, $rootElement, options); } - _createDragBehaviorBase(targetElement, rootElement, options) { + protected createDragBehaviorBase(targetElement, rootElement, options) { const container = (this.$element() as any).find(`.${FIXED_CONTAINER_CLASS}`); const disableDefaultDragging = () => { @@ -2226,7 +2230,7 @@ class SchedulerWorkSpace extends Widget { enableDefaultDragging, disableDefaultDragging, () => this.getDroppableCell(), - () => this._getDateTables(), + () => this.getDateTables(), () => this.removeDroppableCellClass(), () => this.getCellWidth(), options, @@ -2237,8 +2241,8 @@ class SchedulerWorkSpace extends Widget { // We do not need these methods in renovation // -------------- - _isRenderHeaderPanelEmptyCell() { - return this._isVerticalGroupedWorkSpace(); + protected isRenderHeaderPanelEmptyCell() { + return this.isVerticalGroupedWorkSpace(); } _dispose() { @@ -2308,59 +2312,59 @@ class SchedulerWorkSpace extends Widget { case 'firstDayOfWeek': case 'currentDate': case 'startDate': - this._cleanWorkSpace(); + this.cleanWorkSpace(); break; case 'groups': this._cleanView(); - this._removeAllDayElements(); - this._initGrouping(); + this.removeAllDayElements(); + this.initGrouping(); this.repaint(); break; case 'groupOrientation': - this._initGroupedStrategy(); - this._createAllDayPanelElements(); - this._removeAllDayElements(); - this._cleanWorkSpace(); - this._toggleGroupByDateClass(); + this.initGroupedStrategy(); + this.createAllDayPanelElements(); + this.removeAllDayElements(); + this.cleanWorkSpace(); + this.toggleGroupByDateClass(); break; case 'showAllDayPanel': - if (this._isVerticalGroupedWorkSpace()) { + if (this.isVerticalGroupedWorkSpace()) { this._cleanView(); - this._removeAllDayElements(); - this._initGrouping(); + this.removeAllDayElements(); + this.initGrouping(); this.repaint(); } else if (!this.isRenovatedRender()) { - this._updateAllDayVisibility(); - this._updateScrollable(); + this.updateAllDayVisibility(); + this.updateScrollable(); } else { this.renderWorkSpace(); } break; case 'allDayExpanded': - this._updateAllDayExpansion(); - this._attachTablesEvents(); - this._updateScrollable(); + this.updateAllDayExpansion(); + this.attachTablesEvents(); + this.updateScrollable(); break; case 'onSelectionChanged': - this._createSelectionChangedAction(); + this.createSelectionChangedAction(); break; case 'onCellClick': - this._createCellClickAction(); + this.createCellClickAction(); break; case 'onCellContextMenu': - this._attachContextMenuEvent(); + this.attachContextMenuEvent(); break; case 'intervalCount': - this._cleanWorkSpace(); - this._toggleWorkSpaceCountClass(); + this.cleanWorkSpace(); + this.toggleWorkSpaceCountClass(); break; case 'groupByDate': - this._cleanWorkSpace(); - this._toggleGroupByDateClass(); + this.cleanWorkSpace(); + this.toggleGroupByDateClass(); break; case 'crossScrollingEnabled': - this._toggleHorizontalScrollClass(); - this._dateTableScrollable.option(this._dateTableScrollableConfig()); + this.toggleHorizontalScrollClass(); + this._dateTableScrollable.option(this.dateTableScrollableConfig()); break; case 'allDayPanelMode': this.updateShowAllDayPanel(); @@ -2395,12 +2399,12 @@ class SchedulerWorkSpace extends Widget { (this.option('onShowAllDayPanel') as any)(!isHiddenAllDayPanel); } - _getVirtualScrollingDispatcherOptions() { + private getVirtualScrollingDispatcherOptions() { return { getCellHeight: this.getCellHeight.bind(this), getCellWidth: this.getCellWidth.bind(this), getCellMinWidth: this.getCellMinWidth.bind(this), - isRTL: this._isRTL.bind(this), + isRTL: this.isRTL.bind(this), getSchedulerHeight: () => this.option('schedulerHeight'), getSchedulerWidth: () => this.option('schedulerWidth'), getViewHeight: () => ((this.$element() as any).height ? (this.$element() as any).height() : getHeight(this.$element())), @@ -2414,20 +2418,20 @@ class SchedulerWorkSpace extends Widget { updateRender: this.updateRender.bind(this), updateGrid: this.updateGrid.bind(this), getGroupCount: this._getGroupCount.bind(this), - isVerticalGrouping: this._isVerticalGroupedWorkSpace.bind(this), - getTotalRowCount: this._getTotalRowCount.bind(this), - getTotalCellCount: this._getTotalCellCount.bind(this), + isVerticalGrouping: this.isVerticalGroupedWorkSpace.bind(this), + getTotalRowCount: this.getTotalRowCount.bind(this), + getTotalCellCount: this.getTotalCellCount.bind(this), }; } - _cleanWorkSpace() { + protected cleanWorkSpace() { this._cleanView(); - this._toggleGroupedClass(); - this._toggleWorkSpaceWithOddCells(); + this.toggleGroupedClass(); + this.toggleWorkSpaceWithOddCells(); this.virtualScrollingDispatcher.updateDimensions(true); - this._renderView(); - this.option('crossScrollingEnabled') && this._setTableSizes(); + this.renderView(); + this.option('crossScrollingEnabled') && this.setTableSizes(); this.cache.clear(); } @@ -2439,19 +2443,19 @@ class SchedulerWorkSpace extends Widget { // @ts-expect-error super._init(); - this._initGrouping(); + this.initGrouping(); - this._toggleHorizontalScrollClass(); - this._toggleWorkSpaceCountClass(); - this._toggleGroupByDateClass(); - this._toggleWorkSpaceWithOddCells(); + this.toggleHorizontalScrollClass(); + this.toggleWorkSpaceCountClass(); + this.toggleGroupByDateClass(); + this.toggleWorkSpaceWithOddCells(); (this.$element() as any) .addClass(COMPONENT_CLASS) - .addClass(this._getElementClass()); + .addClass(this.getElementClass()); } - _initPositionHelper() { + protected initPositionHelper() { this.positionHelper = new PositionHelper({ key: this.option('key'), viewDataProvider: this.viewDataProvider, @@ -2462,28 +2466,28 @@ class SchedulerWorkSpace extends Widget { isGroupedByDate: this.isGroupedByDate(), rtlEnabled: this.option('rtlEnabled'), startViewDate: this.getStartViewDate(), - isVerticalGrouping: this._isVerticalGroupedWorkSpace(), + isVerticalGrouping: this.isVerticalGroupedWorkSpace(), groupCount: this._getGroupCount(), isVirtualScrolling: this.isVirtualScrolling(), getDOMMetaDataCallback: this.getDOMElementsMetaData.bind(this), }); } - _initGrouping() { - this._initGroupedStrategy(); - this._toggleGroupingDirectionClass(); - this._toggleGroupByDateClass(); + private initGrouping() { + this.initGroupedStrategy(); + this.toggleGroupingDirectionClass(); + this.toggleGroupByDateClass(); } isVerticalOrientation() { const orientation = this.option('groups')?.length ? this.option('groupOrientation') - : this._getDefaultGroupStrategy(); + : this.getDefaultGroupStrategy(); return orientation === 'vertical'; } - _initGroupedStrategy() { + private initGroupedStrategy() { const Strategy = this.isVerticalOrientation() ? VerticalGroupedStrategy : HorizontalGroupedStrategy; @@ -2491,44 +2495,44 @@ class SchedulerWorkSpace extends Widget { this._groupedStrategy = new Strategy(this); } - _getDefaultGroupStrategy() { + protected getDefaultGroupStrategy() { return 'horizontal'; } - _toggleHorizontalScrollClass() { + protected toggleHorizontalScrollClass() { (this.$element() as any).toggleClass(WORKSPACE_WITH_BOTH_SCROLLS_CLASS, this.option('crossScrollingEnabled')); } - _toggleGroupByDateClass() { + private toggleGroupByDateClass() { (this.$element() as any).toggleClass(WORKSPACE_WITH_GROUP_BY_DATE_CLASS, this.isGroupedByDate()); } - _toggleWorkSpaceCountClass() { - (this.$element() as any).toggleClass(WORKSPACE_WITH_COUNT_CLASS, this._isWorkSpaceWithCount()); + private toggleWorkSpaceCountClass() { + (this.$element() as any).toggleClass(WORKSPACE_WITH_COUNT_CLASS, this.isWorkSpaceWithCount()); } - _toggleWorkSpaceWithOddCells() { - (this.$element() as any).toggleClass(WORKSPACE_WITH_ODD_CELLS_CLASS, this._isWorkspaceWithOddCells()); + protected toggleWorkSpaceWithOddCells() { + (this.$element() as any).toggleClass(WORKSPACE_WITH_ODD_CELLS_CLASS, this.isWorkspaceWithOddCells()); } - _toggleGroupingDirectionClass() { - (this.$element() as any).toggleClass(VERTICAL_GROUPED_WORKSPACE_CLASS, this._isVerticalGroupedWorkSpace()); + protected toggleGroupingDirectionClass() { + (this.$element() as any).toggleClass(VERTICAL_GROUPED_WORKSPACE_CLASS, this.isVerticalGroupedWorkSpace()); } - _getDateTableCellClass(rowIndex?: any, columnIndex?: any) { + protected getDateTableCellClass(rowIndex?: any, columnIndex?: any) { const cellClass = `${DATE_TABLE_CELL_CLASS} ${HORIZONTAL_SIZES_CLASS} ${VERTICAL_SIZES_CLASS}`; return this._groupedStrategy .addAdditionalGroupCellClasses(cellClass, columnIndex + 1, rowIndex, columnIndex); } - _getGroupHeaderClass(i?: any) { + protected getGroupHeaderClass(i?: any) { const cellClass = GROUP_HEADER_CLASS; return this._groupedStrategy.addAdditionalGroupCellClasses(cellClass, i + 1); } - _initWorkSpaceUnits() { + protected initWorkSpaceUnits() { this._$headerPanelContainer = $('
').addClass('dx-scheduler-header-panel-container'); this._$headerTablesContainer = $('
').addClass('dx-scheduler-header-tables-container'); this._$headerPanel = $('
').attr('aria-hidden', true); @@ -2541,12 +2545,12 @@ class SchedulerWorkSpace extends Widget { this._$dateTableScrollableContent = $('
').addClass('dx-scheduler-date-table-scrollable-content'); this._$sidebarScrollableContent = $('
').addClass('dx-scheduler-side-bar-scrollable-content'); - this._initAllDayPanelElements(); + this.initAllDayPanelElements(); if (this.isRenovatedRender()) { this.createRAllDayPanelElements(); } else { - this._createAllDayPanelElements(); + this.createAllDayPanelElements(); } this._$timePanel = $('
').addClass(TIME_PANEL_CLASS).attr('aria-hidden', true); @@ -2555,32 +2559,32 @@ class SchedulerWorkSpace extends Widget { this._$groupTable = $('
').addClass(WORKSPACE_VERTICAL_GROUP_TABLE_CLASS); } - _initAllDayPanelElements() { + private initAllDayPanelElements() { this._allDayTitles = []; this._allDayTables = []; this._allDayPanels = []; } - _initDateTableScrollable() { + private initDateTableScrollable() { const $dateTableScrollable = $('
').addClass(SCHEDULER_DATE_TABLE_SCROLLABLE_CLASS); // @ts-expect-error - this._dateTableScrollable = this._createComponent($dateTableScrollable, Scrollable, this._dateTableScrollableConfig()); + this._dateTableScrollable = this._createComponent($dateTableScrollable, Scrollable, this.dateTableScrollableConfig()); this._scrollSync.dateTable = getMemoizeScrollTo(() => this._dateTableScrollable); } - _createWorkSpaceElements() { + protected createWorkSpaceElements() { if (this.option('crossScrollingEnabled')) { - this._createWorkSpaceScrollableElements(); + this.createWorkSpaceScrollableElements(); } else { - this._createWorkSpaceStaticElements(); + this.createWorkSpaceStaticElements(); } } - _createWorkSpaceStaticElements() { + protected createWorkSpaceStaticElements() { this._$dateTableContainer.append(this._$dateTable); - if (this._isVerticalGroupedWorkSpace()) { + if (this.isVerticalGroupedWorkSpace()) { this._$dateTableContainer.append(this._$allDayContainer); this._$dateTableScrollableContent.append( this._$groupTable, @@ -2603,7 +2607,7 @@ class SchedulerWorkSpace extends Widget { this._$allDayPanel?.append(this._$allDayContainer, this._$allDayTable); } - this._appendHeaderPanelEmptyCellIfNecessary(); + this.appendHeaderPanelEmptyCellIfNecessary(); this._$headerPanelContainer.append(this._$headerTablesContainer); this.$element() @@ -2612,21 +2616,21 @@ class SchedulerWorkSpace extends Widget { .append(this._dateTableScrollable.$element()); } - _createWorkSpaceScrollableElements() { + protected createWorkSpaceScrollableElements() { this.$element().append(this._$fixedContainer); this._$flexContainer = $('
').addClass('dx-scheduler-work-space-flex-container'); - this._createHeaderScrollable(); + this.createHeaderScrollable(); this._headerScrollable.$content().append(this._$headerPanel); - this._appendHeaderPanelEmptyCellIfNecessary(); + this.appendHeaderPanelEmptyCellIfNecessary(); this._$headerPanelContainer.append(this._$headerTablesContainer); this.$element().append(this._$headerPanelContainer); this.$element().append(this._$flexContainer); - this._createSidebarScrollable(); + this.createSidebarScrollable(); this._$flexContainer.append(this._dateTableScrollable.$element()); this._$dateTableContainer.append(this._$dateTable); @@ -2634,7 +2638,7 @@ class SchedulerWorkSpace extends Widget { this._dateTableScrollable.$content().append(this._$dateTableScrollableContent); - if (this._isVerticalGroupedWorkSpace()) { + if (this.isVerticalGroupedWorkSpace()) { this._$dateTableContainer.append(this._$allDayContainer); this._$sidebarScrollableContent.append(this._$groupTable, this._$timePanel); } else { @@ -2646,21 +2650,21 @@ class SchedulerWorkSpace extends Widget { this._sidebarScrollable.$content().append(this._$sidebarScrollableContent); } - _appendHeaderPanelEmptyCellIfNecessary() { - this._isRenderHeaderPanelEmptyCell() && this._$headerPanelContainer.append(this._$headerPanelEmptyCell); + private appendHeaderPanelEmptyCellIfNecessary() { + this.isRenderHeaderPanelEmptyCell() && this._$headerPanelContainer.append(this._$headerPanelEmptyCell); } - _createHeaderScrollable() { + private createHeaderScrollable() { const $headerScrollable = $('
') .addClass(SCHEDULER_HEADER_SCROLLABLE_CLASS) .appendTo(this._$headerTablesContainer); // @ts-expect-error - this._headerScrollable = this._createComponent($headerScrollable, Scrollable, this._headerScrollableConfig()); + this._headerScrollable = this._createComponent($headerScrollable, Scrollable, this.headerScrollableConfig()); this._scrollSync.header = getMemoizeScrollTo(() => this._headerScrollable); } - _createSidebarScrollable() { + private createSidebarScrollable() { const $timePanelScrollable = $('
') .addClass(SCHEDULER_SIDEBAR_SCROLLABLE_CLASS) .appendTo(this._$flexContainer); @@ -2680,72 +2684,72 @@ class SchedulerWorkSpace extends Widget { this._scrollSync.sidebar = getMemoizeScrollTo(() => this._sidebarScrollable); } - _attachTableClasses() { - this._addTableClass(this._$dateTable, DATE_TABLE_CLASS); + private attachTableClasses() { + this.addTableClass(this._$dateTable, DATE_TABLE_CLASS); - if (this._isVerticalGroupedWorkSpace()) { + if (this.isVerticalGroupedWorkSpace()) { const groupCount = this._getGroupCount(); for (let i = 0; i < groupCount; i++) { - this._addTableClass(this._allDayTables[i], ALL_DAY_TABLE_CLASS); + this.addTableClass(this._allDayTables[i], ALL_DAY_TABLE_CLASS); } } else if (!this.isRenovatedRender()) { - this._addTableClass(this._$allDayTable, ALL_DAY_TABLE_CLASS); + this.addTableClass(this._$allDayTable, ALL_DAY_TABLE_CLASS); } } - _attachHeaderTableClasses() { - this._addTableClass(this._$headerPanel, HEADER_PANEL_CLASS); + private attachHeaderTableClasses() { + this.addTableClass(this._$headerPanel, HEADER_PANEL_CLASS); } - _addTableClass($el, className) { + private addTableClass($el, className) { ($el && !$el.hasClass(className)) && $el.addClass(className); } _initMarkup() { this.cache.clear(); - this._initWorkSpaceUnits(); + this.initWorkSpaceUnits(); - this._initVirtualScrolling(); + this.initVirtualScrolling(); - this._initDateTableScrollable(); + this.initDateTableScrollable(); - this._createWorkSpaceElements(); + this.createWorkSpaceElements(); // @ts-expect-error super._initMarkup(); if (!this.option('crossScrollingEnabled')) { - this._attachTableClasses(); - this._attachHeaderTableClasses(); + this.attachTableClasses(); + this.attachHeaderTableClasses(); } - this._toggleGroupedClass(); + this.toggleGroupedClass(); - this._renderView(); - this._attachEvents(); + this.renderView(); + this.attachEvents(); } _render() { // @ts-expect-error super._render(); - this._renderDateTimeIndication(); - this._setIndicationUpdateInterval(); + this.renderDateTimeIndication(); + this.setIndicationUpdateInterval(); } - _toggleGroupedClass() { + private toggleGroupedClass() { (this.$element() as any).toggleClass(GROUPED_WORKSPACE_CLASS, this._getGroupCount() > 0); } - _renderView() { + protected renderView() { if (this.isRenovatedRender()) { - if (this._isVerticalGroupedWorkSpace()) { + if (this.isVerticalGroupedWorkSpace()) { this.renderRGroupPanel(); } } else { - this._applyCellTemplates( - this._renderGroupHeader(), + this.applyCellTemplates( + this.renderGroupHeader(), ); } @@ -2754,7 +2758,7 @@ class SchedulerWorkSpace extends Widget { this.virtualScrollingDispatcher.updateDimensions(); } - this._updateGroupTableHeight(); + this.updateGroupTableHeight(); this.updateHeaderEmptyCellWidth(); this._shader = new VerticalShader(this); @@ -2770,58 +2774,59 @@ class SchedulerWorkSpace extends Widget { }); } - protected _renderDateTimeIndication() { return noop(); } + protected renderDateTimeIndication() { return noop(); } protected renderCurrentDateTimeLineAndShader(): void { return noop(); } protected renderCurrentDateTimeIndication(): void { return noop(); } - protected _setIndicationUpdateInterval() { return noop(); } + protected setIndicationUpdateInterval() { return noop(); } - _detachGroupCountClass() { + protected detachGroupCountClass() { VERTICAL_GROUP_COUNT_CLASSES.forEach((className) => { this.$element().removeClass(className); }); } - _attachGroupCountClass() { + protected attachGroupCountClass() { const className = this._groupedStrategy.getGroupCountClass(this.option('groups')); this.$element().addClass(className); } - _getDateHeaderTemplate() { + protected getDateHeaderTemplate() { return this.option('dateCellTemplate'); } - _updateAllDayVisibility(): void { - this.$element().toggleClass(WORKSPACE_WITH_ALL_DAY_CLASS, this._isShowAllDayPanel()); - this._updateAllDayExpansion(); + protected updateAllDayVisibility(): void { + this.$element().toggleClass(WORKSPACE_WITH_ALL_DAY_CLASS, this.isShowAllDayPanel()); + this.updateAllDayExpansion(); } - _updateAllDayExpansion(): void { - const isExpanded = !this.option('allDayExpanded') && this._isShowAllDayPanel(); + private updateAllDayExpansion(): void { + const isExpanded = !this.option('allDayExpanded') && this.isShowAllDayPanel(); this.cache.clear(); this.$element().toggleClass(WORKSPACE_WITH_COLLAPSED_ALL_DAY_CLASS, isExpanded); } - _getDateTables() { + private getDateTables() { return this._$dateTable.add(this._$allDayTable); } - _getDateTable() { + private getDateTable() { return this._$dateTable; } - _removeAllDayElements() { + private removeAllDayElements() { this._$allDayTable?.remove(); this._$allDayTitle?.remove(); } + // TODO: make it private. Being used as public method by external code. _cleanView(): void { this.cache.clear(); - this._cleanTableWidths(); + this.cleanTableWidths(); this.cellsSelectionState.clearSelectedAndFocusedCells(); if (!this.isRenovatedRender()) { this._$thead.empty(); @@ -2840,19 +2845,19 @@ class SchedulerWorkSpace extends Widget { _clean() { (eventsEngine.off as any)(domAdapter.getDocument(), SCHEDULER_CELL_DXPOINTERUP_EVENT_NAME); - this._disposeRenovatedComponents(); + this.disposeRenovatedComponents(); // @ts-expect-error super._clean(); } - _cleanTableWidths() { + private cleanTableWidths() { this._$headerPanel.css('width', ''); this._$dateTable.css('width', ''); this._$allDayTable?.css('width', ''); } - _disposeRenovatedComponents() { + private disposeRenovatedComponents() { this.renovatedAllDayPanel?.dispose(); this.renovatedAllDayPanel = undefined; @@ -2898,10 +2903,10 @@ class SchedulerWorkSpace extends Widget { // These methods should be deleted when we get rid of old render // ---------------- - _createAllDayPanelElements() { + protected createAllDayPanelElements() { const groupCount = this._getGroupCount(); - if (this._isVerticalGroupedWorkSpace() && groupCount !== 0) { + if (this.isVerticalGroupedWorkSpace() && groupCount !== 0) { for (let i = 0; i < groupCount; i++) { const $allDayTitle = $('
') .addClass(ALL_DAY_TITLE_CLASS) @@ -2944,40 +2949,40 @@ class SchedulerWorkSpace extends Widget { this.renderRWorkSpace(renderComponents); } else { // TODO Old render: Delete this old render block after the SSR tests check. - this._renderDateHeader(); - this._renderTimePanel(); - this._renderGroupAllDayPanel(); - this._renderDateTable(); - this._renderAllDayPanel(); + this.renderDateHeader(); + this.renderTimePanel(); + this.renderGroupAllDayPanel(); + this.renderDateTable(); + this.renderAllDayPanel(); } - this._initPositionHelper(); + this.initPositionHelper(); } - _renderGroupHeader() { - const $container = this._getGroupHeaderContainer(); + protected renderGroupHeader() { + const $container = this.getGroupHeaderContainer(); const groupCount = this._getGroupCount(); let cellTemplates = []; if (groupCount) { - const groupRows = this._makeGroupRows(this.option('groups'), this.option('groupByDate')); - this._attachGroupCountClass(); + const groupRows = this.makeGroupRows(this.option('groups'), this.option('groupByDate')); + this.attachGroupCountClass(); $container.append(groupRows.elements); cellTemplates = groupRows.cellTemplates; } else { - this._detachGroupCountClass(); + this.detachGroupCountClass(); } return cellTemplates; } - _applyCellTemplates(templates) { + protected applyCellTemplates(templates) { templates?.forEach((template) => { template(); }); } - _makeGroupRows(groups, groupByDate): any { - const tableCreatorStrategy = this._isVerticalGroupedWorkSpace() ? tableCreator.VERTICAL : tableCreator.HORIZONTAL; + protected makeGroupRows(groups, groupByDate): any { + const tableCreatorStrategy = this.isVerticalGroupedWorkSpace() ? tableCreator.VERTICAL : tableCreator.HORIZONTAL; return tableCreator.makeGroupedTable( tableCreatorStrategy, @@ -2985,7 +2990,7 @@ class SchedulerWorkSpace extends Widget { { groupHeaderRowClass: GROUP_ROW_CLASS, groupRowClass: GROUP_ROW_CLASS, - groupHeaderClass: this._getGroupHeaderClass.bind(this), + groupHeaderClass: this.getGroupHeaderClass.bind(this), groupHeaderContentClass: GROUP_HEADER_CONTENT_CLASS, }, this._getCellCount() || 1, @@ -2995,12 +3000,12 @@ class SchedulerWorkSpace extends Widget { ); } - _renderDateHeader(): any { - const container = this._getDateHeaderContainer(); + protected renderDateHeader(): any { + const container = this.getDateHeaderContainer(); const $headerRow = $('
').addClass(HEADER_ROW_CLASS); const count = this._getCellCount(); - const cellTemplate = this._getDateHeaderTemplate(); - const repeatCount = this._getCalculateHeaderCellRepeatCount(); + const cellTemplate = this.getDateHeaderTemplate(); + const repeatCount = this.getCalculateHeaderCellRepeatCount(); const templateCallbacks = []; const groupByDate = this.isGroupedByDate(); @@ -3008,7 +3013,7 @@ class SchedulerWorkSpace extends Widget { for (let rowIndex = 0; rowIndex < repeatCount; rowIndex++) { for (let columnIndex = 0; columnIndex < count; columnIndex++) { const templateIndex = rowIndex * count + columnIndex; - this._renderDateHeaderTemplate($headerRow, columnIndex, templateIndex, cellTemplate, templateCallbacks); + this.renderDateHeaderTemplate($headerRow, columnIndex, templateIndex, cellTemplate, templateCallbacks); } } @@ -3018,19 +3023,19 @@ class SchedulerWorkSpace extends Widget { for (let columnIndex = 0; columnIndex < count; columnIndex++) { const templateIndex = columnIndex * repeatCount; - const cellElement = this._renderDateHeaderTemplate($headerRow, columnIndex, templateIndex, cellTemplate, templateCallbacks); + const cellElement = this.renderDateHeaderTemplate($headerRow, columnIndex, templateIndex, cellTemplate, templateCallbacks); cellElement.attr('colSpan', colSpan); } container.prepend($headerRow); } - this._applyCellTemplates(templateCallbacks); + this.applyCellTemplates(templateCallbacks); return $headerRow; } - _renderDateHeaderTemplate(container, panelCellIndex, templateIndex, cellTemplate, templateCallbacks) { + private renderDateHeaderTemplate(container, panelCellIndex, templateIndex, cellTemplate, templateCallbacks) { const validTemplateIndex = this.isGroupedByDate() ? Math.floor(templateIndex / this._getGroupCount()) : templateIndex; @@ -3040,7 +3045,7 @@ class SchedulerWorkSpace extends Widget { text, startDate: date, } = completeDateHeaderMap[completeDateHeaderMap.length - 1][validTemplateIndex]; const $cell = $('
') - .addClass(this._getHeaderPanelCellClass(panelCellIndex)) + .addClass(this.getHeaderPanelCellClass(panelCellIndex)) .attr('title', text); if (cellTemplate?.render) { @@ -3048,7 +3053,7 @@ class SchedulerWorkSpace extends Widget { model: { text, date, - ...this._getGroupsForDateHeaderTemplate(templateIndex), + ...this.getGroupsForDateHeaderTemplate(templateIndex), }, index: templateIndex, container: getPublicElement($cell), @@ -3061,9 +3066,9 @@ class SchedulerWorkSpace extends Widget { return $cell; } - _getGroupsForDateHeaderTemplate(templateIndex, indexMultiplier = 1) { + protected getGroupsForDateHeaderTemplate(templateIndex, indexMultiplier = 1) { if (this._isHorizontalGroupedWorkSpace() && !this.isGroupedByDate()) { - const groupIndex = this._getGroupIndex(0, templateIndex * indexMultiplier); + const groupIndex = this.getGroupIndex(0, templateIndex * indexMultiplier); const groups = getLeafGroupValues(this.resourceManager.groupsLeafs, groupIndex); return { @@ -3075,61 +3080,61 @@ class SchedulerWorkSpace extends Widget { return {}; } - _getHeaderPanelCellClass(i) { + protected getHeaderPanelCellClass(i) { const cellClass = `${HEADER_PANEL_CELL_CLASS} ${HORIZONTAL_SIZES_CLASS}`; return this._groupedStrategy.addAdditionalGroupCellClasses(cellClass, i + 1, undefined, undefined, this.isGroupedByDate()); } - _renderAllDayPanel(index?: any) { + protected renderAllDayPanel(index?: any) { let cellCount = this._getCellCount(); - if (!this._isVerticalGroupedWorkSpace()) { + if (!this.isVerticalGroupedWorkSpace()) { cellCount *= this._getGroupCount() || 1; } - const cellTemplates = this._renderTableBody({ + const cellTemplates = this.renderTableBody({ container: this._allDayPanels.length ? getPublicElement(this._allDayTables[index]) : getPublicElement(this._$allDayTable), rowCount: 1, cellCount, - cellClass: this._getAllDayPanelCellClass.bind(this), + cellClass: this.getAllDayPanelCellClass.bind(this), rowClass: ALL_DAY_TABLE_ROW_CLASS, cellTemplate: this.option('dataCellTemplate'), // TODO: remove along with old render - getCellData: this._oldRender_getAllDayCellData(index), + getCellData: this.oldRender_getAllDayCellData(index), groupIndex: index, }, true); - this._updateAllDayVisibility(); - this._updateScrollable(); - this._applyCellTemplates(cellTemplates); + this.updateAllDayVisibility(); + this.updateScrollable(); + this.applyCellTemplates(cellTemplates); } - _renderGroupAllDayPanel() { - if (this._isVerticalGroupedWorkSpace()) { + protected renderGroupAllDayPanel() { + if (this.isVerticalGroupedWorkSpace()) { const groupCount = this._getGroupCount(); for (let i = 0; i < groupCount; i++) { - this._renderAllDayPanel(i); + this.renderAllDayPanel(i); } } } - _getAllDayPanelCellClass(i, j) { + private getAllDayPanelCellClass(i, j) { const cellClass = `${ALL_DAY_TABLE_CELL_CLASS} ${HORIZONTAL_SIZES_CLASS}`; return this._groupedStrategy.addAdditionalGroupCellClasses(cellClass, j + 1); } - _renderTimePanel() { + protected renderTimePanel() { const repeatCount = this._groupedStrategy.calculateTimeCellRepeatCount(); const getTimeCellGroups = (rowIndex) => { - if (!this._isVerticalGroupedWorkSpace()) { + if (!this.isVerticalGroupedWorkSpace()) { return {}; } - const groupIndex = this._getGroupIndex(rowIndex, 0); + const groupIndex = this.getGroupIndex(rowIndex, 0); const groups = getLeafGroupValues(this.resourceManager.groupsLeafs, groupIndex); return { groupIndex, groups }; @@ -3141,7 +3146,7 @@ class SchedulerWorkSpace extends Widget { allDayPanelsCount = 1; } if (this.isGroupedAllDayPanel()) { - allDayPanelsCount = Math.ceil((rowIndex + 1) / this._getRowCount()); + allDayPanelsCount = Math.ceil((rowIndex + 1) / this.getRowCount()); } const validRowIndex = rowIndex + allDayPanelsCount; @@ -3149,36 +3154,36 @@ class SchedulerWorkSpace extends Widget { return this.viewDataProvider.completeTimePanelMap[validRowIndex][field]; }; - this._renderTableBody({ + this.renderTableBody({ container: getPublicElement(this._$timePanel), - rowCount: this._getTimePanelRowCount() * repeatCount, + rowCount: this.getTimePanelRowCount() * repeatCount, cellCount: 1, - cellClass: this._getTimeCellClass.bind(this), + cellClass: this.getTimeCellClass.bind(this), rowClass: TIME_PANEL_ROW_CLASS, cellTemplate: this.option('timeCellTemplate'), getCellText: (rowIndex) => getData(rowIndex, 'text'), getCellDate: (rowIndex) => getData(rowIndex, 'startDate'), - groupCount: this._getGroupCount(), - allDayElements: this._insertAllDayRowsIntoDateTable() ? this._allDayTitles : undefined, + groupCount: this._getCellCount(), + allDayElements: this.insertAllDayRowsIntoDateTable() ? this._allDayTitles : undefined, getTemplateData: getTimeCellGroups.bind(this), }); } - _getTimeCellClass(i) { + private getTimeCellClass(i) { const cellClass = `${TIME_PANEL_CELL_CLASS} ${VERTICAL_SIZES_CLASS}`; - return this._isVerticalGroupedWorkSpace() + return this.isVerticalGroupedWorkSpace() ? this._groupedStrategy.addAdditionalGroupCellClasses(cellClass, i, i) : cellClass; } - _renderDateTable() { + protected renderDateTable() { const groupCount = this._getGroupCount(); - this._renderTableBody({ + this.renderTableBody({ container: getPublicElement(this._$dateTable), - rowCount: this._getTotalRowCount(groupCount), - cellCount: this._getTotalCellCount(groupCount), - cellClass: this._getDateTableCellClass.bind(this), + rowCount: this.getTotalRowCount(groupCount), + cellCount: this.getTotalCellCount(groupCount), + cellClass: this.getDateTableCellClass.bind(this), rowClass: DATE_TABLE_ROW_CLASS, cellTemplate: this.option('dataCellTemplate'), // TODO: remove along with old render @@ -3187,7 +3192,7 @@ class SchedulerWorkSpace extends Widget { let validRowIndex = rowIndex; if (isGroupedAllDayPanel) { - const rowCount = this._getRowCount(); + const rowCount = this.getRowCount(); const allDayPanelsCount = Math.ceil(rowIndex / rowCount); validRowIndex += allDayPanelsCount; } @@ -3195,25 +3200,25 @@ class SchedulerWorkSpace extends Widget { const { cellData } = this.viewDataProvider.viewDataMap.dateTableMap[validRowIndex][columnIndex]; return { - value: this._normalizeCellData(cellData), + value: this.normalizeCellData(cellData), fullValue: cellData, key: CELL_DATA, }; }, - allDayElements: this._insertAllDayRowsIntoDateTable() ? this._allDayPanels : undefined, + allDayElements: this.insertAllDayRowsIntoDateTable() ? this._allDayPanels : undefined, groupCount, groupByDate: this.option('groupByDate'), }); } - _insertAllDayRowsIntoDateTable() { + protected insertAllDayRowsIntoDateTable() { return this._groupedStrategy.insertAllDayRowsIntoDateTable(); } - _renderTableBody(options, delayCellTemplateRendering?: any): any { + protected renderTableBody(options, delayCellTemplateRendering?: any): any { let result: any[] = []; if (!delayCellTemplateRendering) { - this._applyCellTemplates( + this.applyCellTemplates( tableCreator.makeTable(options), ); } else { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts index 1e184dd264ce..9ff8c6a7f1d8 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts @@ -8,12 +8,12 @@ const DAY_CLASS = 'dx-scheduler-work-space-day'; class SchedulerWorkSpaceDay extends SchedulerWorkSpaceVertical { get type() { return VIEWS.DAY; } - _getElementClass() { + protected override getElementClass() { return DAY_CLASS; } - _renderDateHeader() { - return this.option('intervalCount') === 1 ? null : super._renderDateHeader(); + protected override renderDateHeader() { + return this.option('intervalCount') === 1 ? null : super.renderDateHeader(); } renderRHeaderPanel() { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts index 121ac7ce3712..65aaafb781cd 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts @@ -48,7 +48,7 @@ class HorizontalGroupedStrategy { } getTotalRowCount() { - return this._workSpace._getRowCount(); + return this._workSpace.getRowCount(); } calculateTimeCellRepeatCount() { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts index 8edcbf3a854b..4fbf46c25d6a 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts @@ -16,7 +16,7 @@ class VerticalGroupedStrategy { } prepareCellIndexes(cellCoordinates, groupIndex, inAllDayRow) { - let rowIndex = cellCoordinates.rowIndex + groupIndex * this._workSpace._getRowCount(); + let rowIndex = cellCoordinates.rowIndex + groupIndex * this._workSpace.getRowCount(); if (this._workSpace.supportAllDayRow() && this._workSpace.option('showAllDayPanel')) { rowIndex += groupIndex; @@ -33,7 +33,7 @@ class VerticalGroupedStrategy { } getGroupIndex(rowIndex) { - return Math.floor(rowIndex / this._workSpace._getRowCount()); + return Math.floor(rowIndex / this._workSpace.getRowCount()); } calculateHeaderCellRepeatCount() { @@ -49,7 +49,7 @@ class VerticalGroupedStrategy { } getTotalRowCount() { - return this._workSpace._getRowCount() * this._workSpace._getGroupCount(); + return this._workSpace.getRowCount() * this._workSpace._getGroupCount(); } calculateTimeCellRepeatCount() { @@ -57,7 +57,7 @@ class VerticalGroupedStrategy { } getWorkSpaceMinWidth() { - let minWidth = this._workSpace._getWorkSpaceWidth(); + let minWidth = this._workSpace.getWorkSpaceWidth(); const workSpaceElementWidth = getBoundingRect(this._workSpace.$element().get(0)).width; const workspaceContainerWidth = workSpaceElementWidth - this._workSpace.getTimePanelWidth() @@ -118,7 +118,7 @@ class VerticalGroupedStrategy { const offset = this._workSpace.getIndicatorOffset(0); const tableOffset = this._workSpace.option('crossScrollingEnabled') ? 0 : this._workSpace.getGroupTableWidth(); const horizontalOffset = rtlOffset ? rtlOffset - offset : offset; - let verticalOffset = this._workSpace._getRowCount() * this._workSpace.getCellHeight() * i; + let verticalOffset = this._workSpace.getRowCount() * this._workSpace.getCellHeight() * i; if (this._workSpace.supportAllDayRow() && this._workSpace.option('showAllDayPanel')) { verticalOffset += this._workSpace.getAllDayHeight() * (i + 1); @@ -149,7 +149,7 @@ class VerticalGroupedStrategy { } getShaderMaxHeight() { - let height = this._workSpace._getRowCount() * this._workSpace.getCellHeight(); + let height = this._workSpace.getRowCount() * this._workSpace.getCellHeight(); if (this._workSpace.supportAllDayRow() && this._workSpace.option('showAllDayPanel')) { height += this._workSpace.getCellHeight(); @@ -178,7 +178,7 @@ class VerticalGroupedStrategy { } _addLastGroupCellClass(cellClass, index) { - if (index % this._workSpace._getRowCount() === 0) { + if (index % this._workSpace.getRowCount() === 0) { return `${cellClass} ${LAST_GROUP_CELL_CLASS}`; } @@ -186,7 +186,7 @@ class VerticalGroupedStrategy { } _addFirstGroupCellClass(cellClass, index) { - if ((index - 1) % this._workSpace._getRowCount() === 0) { + if ((index - 1) % this._workSpace.getRowCount() === 0) { return `${cellClass} ${FIRST_GROUP_CELL_CLASS}`; } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts index d7c00cba9354..2a23d2356840 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts @@ -84,7 +84,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { return this.option('rtlEnabled') ? getBoundingRect(this._dateTableScrollable.$content().get(0)).width - this.getTimePanelWidth() - width : 0; } - protected _setIndicationUpdateInterval() { + protected setIndicationUpdateInterval() { if (!this.option('showCurrentTimeIndicator') || this.option('indicatorUpdateInterval') === 0) { return; } @@ -129,7 +129,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { let timeDiff = today.getTime() - viewStartTime; if (this.option('type') === 'workWeek') { - const weekendDays = this._getWeekendsCount(Math.round(timeDiff / toMs('day'))) * toMs('day'); + const weekendDays = this.getWeekendsCount(Math.round(timeDiff / toMs('day'))) * toMs('day'); timeDiff -= weekendDays; } @@ -173,7 +173,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { renderCurrentDateTimeLineAndShader(): void { this._cleanDateTimeIndicator(); this._shader?.clean(); - this._renderDateTimeIndication(); + this.renderDateTimeIndication(); } _isCurrentTimeHeaderCell(headerIndex: number): boolean { @@ -187,8 +187,8 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { return false; } - _getHeaderPanelCellClass(i) { - const cellClass = super._getHeaderPanelCellClass(i); + protected override getHeaderPanelCellClass(i) { + const cellClass = super.getHeaderPanelCellClass(i); if (this._isCurrentTimeHeaderCell(i)) { return `${cellClass} ${HEADER_CURRENT_TIME_CELL_CLASS}`; @@ -213,21 +213,21 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { (this.$element() as any).find(`.${SCHEDULER_DATE_TIME_INDICATOR_CLASS}`).remove(); } - _cleanWorkSpace() { - super._cleanWorkSpace(); + protected override cleanWorkSpace() { + super.cleanWorkSpace(); - this._renderDateTimeIndication(); - this._setIndicationUpdateInterval(); + this.renderDateTimeIndication(); + this.setIndicationUpdateInterval(); } _optionChanged(args) { switch (args.name) { case 'showCurrentTimeIndicator': case 'indicatorTime': - this._cleanWorkSpace(); + this.cleanWorkSpace(); break; case 'indicatorUpdateInterval': - this._setIndicationUpdateInterval(); + this.setIndicationUpdateInterval(); break; case 'showAllDayPanel': case 'allDayExpanded': @@ -253,10 +253,10 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { } _getCurrentTimePanelCellIndices() { - const rowCountPerGroup = this._getTimePanelRowCount(); + const rowCountPerGroup = this.getTimePanelRowCount(); const today = this._getToday(); const index = this.getCellIndexByDate(today); - const { rowIndex: currentTimeRowIndex } = this._getCellCoordinatesByIndex(index); + const { rowIndex: currentTimeRowIndex } = this.getCellCoordinatesByIndex(index); if (currentTimeRowIndex === undefined) { return []; @@ -271,7 +271,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { : [currentTimeRowIndex, currentTimeRowIndex + 1]; } - const verticalGroupCount = this._isVerticalGroupedWorkSpace() + const verticalGroupCount = this.isVerticalGroupedWorkSpace() ? this._getGroupCount() : 1; @@ -282,7 +282,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { ], []); } - protected _renderDateTimeIndication(): void { + protected renderDateTimeIndication(): void { if (!this.isIndicationAvailable()) { return; } @@ -311,7 +311,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace { // Temporary new render methods. // TODO Old render: replace base call methods by these after the deleting of the old render. protected _setCurrentTimeCells(): void { - const timePanelCells = this._getTimePanelCells(); + const timePanelCells = this.getTimePanelCells(); const currentTimeCellIndices = this._getCurrentTimePanelCellIndices(); currentTimeCellIndices.forEach((timePanelCellIndex) => { timePanelCells.eq(timePanelCellIndex) diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts index fe0888845659..c324a45a2773 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts @@ -23,24 +23,24 @@ const toMs = dateUtils.dateToMilliseconds; class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { get type() { return VIEWS.MONTH; } - _getElementClass() { + protected override getElementClass() { return MONTH_CLASS; } - _getFormat() { + protected override getFormat() { return formatWeekday; } - _getIntervalBetween(currentDate) { + protected override getIntervalBetween(currentDate) { const firstViewDate = this.getStartViewDate(); const timeZoneOffset = dateUtils.getTimezonesDifference(firstViewDate, currentDate); return currentDate.getTime() - (firstViewDate.getTime() - (this.option('startDayHour') as any) * 3600000) - timeZoneOffset; } - _getDateGenerationOptions() { + protected override getDateGenerationOptions() { return { - ...super._getDateGenerationOptions(), + ...super.getDateGenerationOptions(), cellCountInDay: 1, }; } @@ -55,7 +55,7 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { const DAYS_IN_WEEK = 7; let averageWidth = 0; - const cells = this._getCells().slice(0, DAYS_IN_WEEK); + const cells = this.getCells().slice(0, DAYS_IN_WEEK); cells.each((index, element) => { averageWidth += hasWindow() ? getBoundingRect(element).width : 0; }); @@ -64,11 +64,11 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { }); } - _insertAllDayRowsIntoDateTable() { + protected override insertAllDayRowsIntoDateTable() { return false; } - _getCellCoordinatesByIndex(index) { + protected override getCellCoordinatesByIndex(index) { const rowIndex = Math.floor(index / this._getCellCount()); const columnIndex = index - this._getCellCount() * rowIndex; @@ -78,12 +78,12 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { }; } - _needCreateCrossScrolling() { + protected override needCreateCrossScrolling() { // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - return this.option('crossScrollingEnabled') || this._isVerticalGroupedWorkSpace(); + return this.option('crossScrollingEnabled') || this.isVerticalGroupedWorkSpace(); } - _getViewStartByOptions() { + protected override getViewStartByOptions() { return monthUtils.getViewStartByOptions( this.option('startDate') as any, this.option('currentDate') as any, @@ -92,7 +92,7 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { ); } - _updateIndex(index) { + protected override updateIndex(index) { return index; } @@ -124,8 +124,8 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { return true; } - _getHeaderDate() { - return this._getViewStartByOptions(); + protected override getHeaderDate() { + return this.getViewStartByOptions(); } scrollToTime() { return noop(); } @@ -140,7 +140,7 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { this._$dateTable, DateTableMonthComponent, 'renovatedDateTable', - this._getRDateTableProps(), + this.getRDateTableProps(), ); } @@ -148,15 +148,15 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { // We need these methods for now but they are useless for renovation // ------------- - _createWorkSpaceElements() { - if (this._isVerticalGroupedWorkSpace()) { - this._createWorkSpaceScrollableElements(); + protected override createWorkSpaceElements() { + if (this.isVerticalGroupedWorkSpace()) { + this.createWorkSpaceScrollableElements(); } else { - super._createWorkSpaceElements(); + super.createWorkSpaceElements(); } } - _updateAllDayVisibility() { return noop(); } + protected override updateAllDayVisibility() { return noop(); } _updateAllDayHeight() { return noop(); } @@ -164,9 +164,9 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { // These methods should be deleted when we get rid of old render // -------------- - _renderTimePanel() { return noop(); } + protected override renderTimePanel() { return noop(); } - _renderAllDayPanel() { return noop(); } + protected override renderAllDayPanel() { return noop(); } _setMonthClassesToCell($cell, data) { $cell @@ -175,9 +175,9 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { .toggleClass(DATE_TABLE_OTHER_MONTH_DATE_CLASS, data.otherMonth); } - _createAllDayPanelElements() {} + protected override createAllDayPanelElements() {} - _renderTableBody(options) { + protected override renderTableBody(options) { options.getCellText = (rowIndex, columnIndex) => { const date = this.viewDataProvider.completeViewDataMap[rowIndex][columnIndex].startDate; @@ -186,7 +186,7 @@ class SchedulerWorkSpaceMonth extends SchedulerWorkSpace { options.getCellTextClass = DATE_TABLE_CELL_TEXT_CLASS; options.setAdditionalClasses = this._setMonthClassesToCell.bind(this); - super._renderTableBody(options); + super.renderTableBody(options); } } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_vertical.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_vertical.ts index 129d2604b158..428b6e95d240 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_vertical.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_vertical.ts @@ -3,7 +3,7 @@ import { formatWeekdayAndDay } from '@ts/scheduler/r1/utils/index'; import SchedulerWorkSpaceIndicator from './m_work_space_indicator'; class SchedulerWorkspaceVertical extends SchedulerWorkSpaceIndicator { - _getFormat() { + protected override getFormat() { return formatWeekdayAndDay; } @@ -16,7 +16,7 @@ class SchedulerWorkspaceVertical extends SchedulerWorkSpaceIndicator { }; } - _isRenderHeaderPanelEmptyCell() { + protected override isRenderHeaderPanelEmptyCell() { return true; } } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts index c149aab4b726..e756a49ad902 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts @@ -8,12 +8,12 @@ const WEEK_CLASS = 'dx-scheduler-work-space-week'; class SchedulerWorkSpaceWeek extends SchedulerWorkSpaceVertical { get type() { return VIEWS.WEEK; } - _getElementClass() { + protected override getElementClass() { return WEEK_CLASS; } - _calculateViewStartDate() { - return weekUtils.calculateViewStartDate(this.option('startDate') as any, this._firstDayOfWeek()); + protected override calculateViewStartDate() { + return weekUtils.calculateViewStartDate(this.option('startDate') as any, this.firstDayOfWeek()); } } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts index e1d7b6761cc4..c0b43a1bc5aa 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts @@ -14,10 +14,10 @@ class SchedulerWorkSpaceWorkWeek extends SchedulerWorkSpaceWeek { // @ts-expect-error super(...args); - this._getWeekendsCount = getWeekendsCount; + this.getWeekendsCount = getWeekendsCount; } - _getElementClass() { + protected override getElementClass() { return WORK_WEEK_CLASS; } } diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts index c1bb4a3b77ae..be832dd4012d 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts @@ -237,7 +237,7 @@ export default class ViewDataProvider { } getCellsByGroupIndexAndAllDay(groupIndex: number, isAllDay: boolean): ViewCellData[][] { - const rowsPerGroup = this._getRowCountWithAllDayRows(); + const rowsPerGroup = this.getRowCountWithAllDayRows(); const isShowAllDayPanel = this._options.isAllDayPanelVisible; const firstRowInGroup = this._options.isVerticalGrouping @@ -505,7 +505,7 @@ export default class ViewDataProvider { return this.viewDataGenerator.getVisibleDayDuration(startDayHour, endDayHour, hoursInterval); } - _getRowCountWithAllDayRows() { + getRowCountWithAllDayRows() { const allDayRowCount = this._options.isAllDayPanelVisible ? 1 : 0; return this.getRowCount(this._options) + allDayRowCount; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/currentTimeIndicator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/currentTimeIndicator.tests.js index bb69c6c167aa..123c71072078 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/currentTimeIndicator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/currentTimeIndicator.tests.js @@ -67,7 +67,7 @@ QUnit.module('DateTime indicator on Day View', () => { QUnit.test('Indication should be updated by some timer', async function(assert) { const instance = createInstance({}); - const renderIndicatorStub = sinon.stub(instance, '_renderDateTimeIndication'); + const renderIndicatorStub = sinon.stub(instance, 'renderDateTimeIndication'); instance.option({ indicatorUpdateInterval: 10 @@ -82,7 +82,7 @@ QUnit.module('DateTime indicator on Day View', () => { QUnit.test('Indication should not be updated by some timer if indicatorUpdateInterval = 0', async function(assert) { const instance = createInstance({}); - const renderIndicatorStub = sinon.stub(instance, '_renderDateTimeIndication'); + const renderIndicatorStub = sinon.stub(instance, 'renderDateTimeIndication'); instance.option({ indicatorUpdateInterval: 0 @@ -95,7 +95,7 @@ QUnit.module('DateTime indicator on Day View', () => { QUnit.test('Indication should be updated on dimensionChanged', async function(assert) { const instance = createInstance({}); - const renderIndicatorStub = sinon.stub(instance, '_renderDateTimeIndication'); + const renderIndicatorStub = sinon.stub(instance, 'renderDateTimeIndication'); instance.option({ indicatorTime: new Date(2017, 8, 5, 12, 45) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js index 3d02e73d8477..01342de5d11b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js @@ -142,7 +142,7 @@ QUnit.module('Scrolling to time', () => { assert.roughEqual( scrollBy.getCall(0).args[0].left, - scheduler.instance._workSpace._getScrollCoordinates(new Date(2015, 1, 9, 9, 5)).left, + scheduler.instance._workSpace.getScrollCoordinates(new Date(2015, 1, 9, 9, 5)).left, 1.001, 'scrollBy was called with right distance', ); @@ -170,7 +170,7 @@ QUnit.module('Scrolling to time', () => { assert.roughEqual( scrollBy.getCall(0).args[0].left, - scheduler.instance._workSpace._getScrollCoordinates(new Date(2015, 1, 9, 9, 5)).left - scrollLeft - offset, + scheduler.instance._workSpace.getScrollCoordinates(new Date(2015, 1, 9, 9, 5)).left - scrollLeft - offset, 1.001, 'scrollBy was called with right distance', ); @@ -196,7 +196,7 @@ QUnit.module('Scrolling to time', () => { assert.roughEqual( scrollBy.getCall(0).args[0].left, - scheduler.instance._workSpace._getScrollCoordinates(new Date(2015, 1, 11, 9, 5)).left, + scheduler.instance._workSpace.getScrollCoordinates(new Date(2015, 1, 11, 9, 5)).left, 1.001, 'scrollBy was called with right distance', ); @@ -225,7 +225,7 @@ QUnit.module('Scrolling to time', () => { assert.roughEqual( scrollBy.getCall(0).args[0].left, - scheduler.instance._workSpace._getScrollCoordinates(new Date(2015, 1, 11, 9, 5)).left - scrollLeft - offset, + scheduler.instance._workSpace.getScrollCoordinates(new Date(2015, 1, 11, 9, 5)).left - scrollLeft - offset, 1.001, 'scrollBy was called with right distance', ); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js index 2ee80cf95620..746cb1d679f7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js @@ -352,12 +352,12 @@ QUnit.module('TimelineDay with intervalCount markup', timelineDayModuleConfig, ( this.instance.option('intervalCount', 2); let cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 2, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 2, 'view has right cell count'); this.instance.option('intervalCount', 4); cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 4, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 4, 'view has right cell count'); }); QUnit.test('TimelineDay Day view cells have right cellData with view option intervalCount=2', async function(assert) { @@ -661,12 +661,12 @@ QUnit.module('TimelineWeek with intervalCount markup', timelineWeekModuleConfig, this.instance.option('intervalCount', 2); let cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 7 * 2, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 7 * 2, 'view has right cell count'); this.instance.option('intervalCount', 4); cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 7 * 4, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 7 * 4, 'view has right cell count'); }); QUnit.test('TimelineWeek view cells have right cellData with view option intervalCount=2', async function(assert) { @@ -872,12 +872,12 @@ QUnit.module('TimelineWorkWeek with intervalCount markup', timelineWorkWeekModul this.instance.option('intervalCount', 2); let cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 5 * 2, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 5 * 2, 'view has right cell count'); this.instance.option('intervalCount', 4); cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 5 * 4, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 5 * 4, 'view has right cell count'); }); QUnit.test('TimelineWorkWeek view cells have right cellData with view option intervalCount=2', async function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js index 197f9753394e..d44fefda5fd9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js @@ -248,7 +248,7 @@ QUnit.test('Timeline should not have time panel offset', async function(assert) QUnit.test('Tables should be rerendered if dimension was changed and horizontal scrolling is enabled', async function(assert) { this.instance.option('crossScrollingEnabled', true); - const stub = sinon.stub(this.instance, '_setTableSizes'); + const stub = sinon.stub(this.instance, 'setTableSizes'); resizeCallbacks.fire(); @@ -260,7 +260,7 @@ QUnit.test('dateUtils.getTimezonesDifference should be called when calculating i const minDate = new Date('Thu Mar 10 2016 00:00:00 GMT-0500'); const maxDate = new Date('Mon Mar 15 2016 00:00:00 GMT-0400'); - this.instance._getIntervalBetween(minDate, maxDate, true); + this.instance.getIntervalBetween(minDate, maxDate, true); assert.ok(stub.calledOnce, 'getTimezonesDifference was called'); @@ -458,7 +458,7 @@ QUnit.module('Timeline Keyboard Navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, renovateRender: true, scrolling: { mode: scrollingMode, orientation: 'vertical' }, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js index ed2bbc97de93..4e23a87062a0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js @@ -76,7 +76,7 @@ module('Work Space Base', { if(viewName === 'Day' || viewName === 'Week') { test('Scheduler workspace scrollables should be updated after allDayExpanded option changed', async function(assert) { this.instance.option('allDayExpanded', false); - const stub = sinon.stub(this.instance, '_updateScrollable'); + const stub = sinon.stub(this.instance, 'updateScrollable'); this.instance.option('allDayExpanded', true); @@ -86,7 +86,7 @@ module('Work Space Base', { test('Scheduler workspace scrollables should be updated after endDayHour option changed if allDayPanel is hided', async function(assert) { this.instance.option('showAllDayPanel', false); this.instance.option('endDayHour', 18); - const stub = sinon.stub(this.instance, '_updateScrollable'); + const stub = sinon.stub(this.instance, 'updateScrollable'); this.instance.option('endDayHour', 24); @@ -106,7 +106,7 @@ module('Work Space Base', { test('Tables should be rerendered if dimension was changed and horizontal scrolling is enabled', async function(assert) { this.instance.option('crossScrollingEnabled', true); - const stub = sinon.stub(this.instance, '_setTableSizes'); + const stub = sinon.stub(this.instance, 'setTableSizes'); resizeCallbacks.fire(); @@ -115,7 +115,7 @@ module('Work Space Base', { test('Tables should not be rerendered if dimension was changed and horizontal scrolling isn\'t enabled', async function(assert) { this.instance.option('crossScrollingEnabled', false); - const stub = sinon.stub(this.instance, '_setTableSizes'); + const stub = sinon.stub(this.instance, 'setTableSizes'); resizeCallbacks.fire(); @@ -123,7 +123,7 @@ module('Work Space Base', { }); test('Tables should be rerendered if width was changed and horizontal scrolling is enabled', async function(assert) { - const stub = sinon.stub(this.instance, '_setTableSizes'); + const stub = sinon.stub(this.instance, 'setTableSizes'); this.instance.option('crossScrollingEnabled', true); this.instance.option('width', 777); @@ -131,7 +131,7 @@ module('Work Space Base', { }); test('Tables should not be rerendered if width was changed and horizontal scrolling isn\'t enabled', async function(assert) { - const stub = sinon.stub(this.instance, '_setTableSizes'); + const stub = sinon.stub(this.instance, 'setTableSizes'); this.instance.option('crossScrollingEnabled', false); this.instance.option('width', 777); @@ -144,7 +144,7 @@ module('Work Space Base', { const maxDate = new Date('Mon Mar 15 2016 00:00:00 GMT-0400'); // TODO: use public method instead - this.instance._getIntervalBetween(minDate, maxDate, true); + this.instance.getIntervalBetween(minDate, maxDate, true); assert.ok(stub.calledOnce, 'getTimezonesDifference was called'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js index b71f19628bb1..d70c4ab0ec96 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js @@ -32,7 +32,7 @@ module('Work Space Day', { getResourceManager: getEmptyResourceManager, }).dxSchedulerWorkSpaceDay('instance'); this.instance.initDragBehavior(); - this.instance._attachTablesEvents(); + this.instance.attachTablesEvents(); } }, () => { test('Workspace getAllDayHeight() should return 0 or allDayPanel-height depending on the showAllDayPanel option', async function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup-1.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup-1.tests.js index ce53ce66207d..70d5ba7d38e8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup-1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup-1.tests.js @@ -226,12 +226,12 @@ QUnit.module('Workspace Day markup', dayModuleConfig, () => { this.instance.option('intervalCount', 2); let cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 2, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 2, 'view has right cell count'); this.instance.option('intervalCount', 4); cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 4, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 4, 'view has right cell count'); }); }); @@ -520,12 +520,12 @@ QUnit.module('Workspace Week markup', weekModuleConfig, () => { this.instance.option('intervalCount', 2); let cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 7 * 2, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 7 * 2, 'view has right cell count'); this.instance.option('intervalCount', 4); cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 7 * 4, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 7 * 4, 'view has right cell count'); }); }); @@ -732,12 +732,12 @@ QUnit.module('Workspace Work Week markup', workWeekModuleConfig, () => { this.instance.option('intervalCount', 2); let cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 5 * 2, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 5 * 2, 'view has right cell count'); this.instance.option('intervalCount', 4); cells = this.instance.$element().find('.dx-scheduler-date-table-cell'); - assert.equal(cells.length, this.instance._getCellCountInDay() * 5 * 4, 'view has right cell count'); + assert.equal(cells.length, this.instance.getCellCountInDay() * 5 * 4, 'view has right cell count'); }); QUnit.test('Workspace work week view should contain 15 headers if intervalCount=3', async function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js index bcac8339b598..82032fcad561 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js @@ -249,7 +249,7 @@ module('Work Space Month', () => { firstDayOfWeek: 1, }); - const $cell = this.instance._getCells().eq(14); + const $cell = this.instance.getCells().eq(14); assert.deepEqual($cell.data('dxCellData'), { startDate: new Date(2016, 2, 14, 5, 0), @@ -370,7 +370,7 @@ module('Work Space Month', () => { test('Tables should not be rerendered if dimension was changed and horizontal scrolling is disabled', async function(assert) { this.instance.option('crossScrollingEnabled', false); - const stub = sinon.stub(this.instance, '_setTableSizes'); + const stub = sinon.stub(this.instance, 'setTableSizes'); resizeCallbacks.fire(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.navigation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.navigation.tests.js index 1013e3ad80fe..c11bba1ae870 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.navigation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.navigation.tests.js @@ -999,7 +999,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, getResourceManager: getEmptyResourceManager, }, 'dxSchedulerWorkSpaceWeek'); @@ -1027,7 +1027,7 @@ module('Workspace navigation', () => { currentDate: new Date(2015, 3, 1), onContentReady: function(e) { e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); } }, 'dxSchedulerWorkSpaceWeek'); @@ -1057,7 +1057,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, }, 'dxSchedulerWorkSpaceWeek'); @@ -1104,7 +1104,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, onSelectedCellsClick: () => {}, ...(await getWorkspaceResourceConfig( @@ -1157,7 +1157,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, ...(await getWorkspaceResourceConfig( [{ @@ -1335,7 +1335,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, intervalCount: 3, groupOrientation: 'horizontal', @@ -1383,7 +1383,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, intervalCount: 3, groupOrientation: 'horizontal', @@ -1459,7 +1459,7 @@ module('Workspace navigation', () => { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); e.component.initDragBehavior(); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, intervalCount, groupOrientation: 'vertical', @@ -1515,7 +1515,7 @@ module('Workspace navigation', () => { onContentReady: function(e) { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, groupOrientation: 'vertical', startDayHour: 0, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.renovation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.renovation.tests.js index 3537a5aab439..0dacd9ee746c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.renovation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.renovation.tests.js @@ -60,7 +60,7 @@ module('Renovated Render', { onContentReady: function(e) { const scrollable = e.component.getScrollable(); scrollable.option('scrollByContent', false); - e.component._attachTablesEvents(); + e.component.attachTablesEvents(); }, ...options, })[workSpace]('instance'); @@ -927,7 +927,7 @@ module('Renovated Render', { const disposeRenovatedComponentsStub = sinon.spy(noop); - this.instance._disposeRenovatedComponents = disposeRenovatedComponentsStub; + this.instance.disposeRenovatedComponents = disposeRenovatedComponentsStub; this.instance.option('currentDate', new Date(2020, 8, 2)); @@ -944,7 +944,7 @@ module('Renovated Render', { const disposeRenovatedComponentsStub = sinon.spy(noop); - this.instance._disposeRenovatedComponents = disposeRenovatedComponentsStub; + this.instance.disposeRenovatedComponents = disposeRenovatedComponentsStub; this.instance.option('showAllDayPanel', true); @@ -958,7 +958,7 @@ module('Renovated Render', { }); const disposeRenovatedComponentsStub = sinon.spy(noop); - this.instance._disposeRenovatedComponents = disposeRenovatedComponentsStub; + this.instance.disposeRenovatedComponents = disposeRenovatedComponentsStub; await applyWorkspaceGroups(this.instance, resources); assert.ok(disposeRenovatedComponentsStub.called, 'Renovated components weren\'t disposed'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js index 26c114f91d7f..130a5a54680a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js @@ -163,7 +163,7 @@ QUnit.module('Vertical Workspace with horizontal scrollbar', { const $element = this.instance.$element(); $element.css('width', 1000); - sinon.stub(this.instance, '_getWorkSpaceWidth').returns(50); + sinon.stub(this.instance, 'getWorkSpaceWidth').returns(50); triggerHidingEvent($element); triggerShownEvent($element);