Scheduler - Replace underscore-prefixed with private/protected modifiers

aleksei-semikozov · aleksei-semikozov · commit 4b12af62e085 · 2026-04-02T07:57:37.000-03:00
diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts
@@ -759,7 +759,7 @@ class SchedulerAppointments extends CollectionWidget<any> {
       const shiftedStartDate = dateUtilsTs.addOffsets(startDate, -viewOffset);
       const shiftedEndDate = dateUtilsTs.addOffsets(endDate, -viewOffset);
 
-      dateRange = this._getDateRange(e, shiftedStartDate, shiftedEndDate);
+      dateRange = this.getDateRange(e, shiftedStartDate, shiftedEndDate);
       dateRange.startDate = dateUtilsTs.addOffsets(dateRange.startDate, viewOffset);
       dateRange.endDate = dateUtilsTs.addOffsets(dateRange.endDate, viewOffset);
     }
@@ -858,7 +858,7 @@ class SchedulerAppointments extends CollectionWidget<any> {
     return startDate;
   }
 
-  _getDateRange(e, startDate, endDate) {
+  private getDateRange(e, startDate, endDate) {
     const itemData = (this as any)._getItemData(e.element);
     const deltaTime = this.invoke('getDeltaTime', e, this._initialSize, itemData);
     const renderingStrategyDirection = this.invoke('getRenderingStrategyDirection');
diff --git a/packages/devextreme/js/__internal/scheduler/header/m_header.ts b/packages/devextreme/js/__internal/scheduler/header/m_header.ts
@@ -255,7 +255,7 @@ export class SchedulerHeader extends Widget<HeaderOptions> {
     return getNextIntervalDate(options, direction);
   }
 
-  private _getDisplayedDate(): Date {
+  private getDisplayedDate(): Date {
     const { startViewDate, currentView } = this.option();
     const isMonth = currentView.type === 'month';
 
@@ -267,7 +267,7 @@ export class SchedulerHeader extends Widget<HeaderOptions> {
     let date = currentDate;
 
     if (startViewDate) {
-      date = this._getDisplayedDate();
+      date = this.getDisplayedDate();
     }
 
     date = dateUtils.trimTime(date);
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/helpers/m_position_helper.ts b/packages/devextreme/js/__internal/scheduler/workspaces/helpers/m_position_helper.ts
@@ -231,7 +231,7 @@ class GroupStrategyBase {
     return maxVerticalPosition - getCellHeight(this.DOMMetaData) * rowCount;
   }
 
-  _getAllDayHeight(showAllDayPanel) {
+  protected getAllDayHeight(showAllDayPanel) {
     return getAllDayHeight(showAllDayPanel, true, this.DOMMetaData);
   }
 
@@ -250,7 +250,7 @@ class GroupStrategyBase {
 
     // Should decrease allDayPanel amount due to the dual calculation corrections.
     if (isGroupedAllDayPanel) {
-      result -= (groupIndex + 1) * this._getAllDayHeight(showAllDayPanel);
+      result -= (groupIndex + 1) * this.getAllDayHeight(showAllDayPanel);
     }
 
     return result;
@@ -282,7 +282,7 @@ class GroupStrategyHorizontal extends GroupStrategyBase {
     return 0;
   }
 
-  _getAllDayHeight(showAllDayPanel) {
+  protected getAllDayHeight(showAllDayPanel) {
     return getAllDayHeight(showAllDayPanel, false, this.DOMMetaData);
   }
 }
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts
@@ -580,11 +580,11 @@ class VirtualScrollingBase {
 
     const needAddItems = this.itemSizeChanged || isAppend || isPrepend;
     if (needAddItems) {
-      this._updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter);
+      this.updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter);
     }
   }
 
-  _updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter) {
+  protected updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter) {
     const { state } = this;
 
     state.virtualItemSizeBefore = virtualItemSizeBefore;
@@ -649,9 +649,9 @@ class HorizontalVirtualScrolling extends VirtualScrollingBase {
     };
   }
 
-  _updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter) {
+  protected updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter) {
     if (!this.isRTL) {
-      super._updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter);
+      super.updateStateVirtualItems(virtualItemSizeBefore, virtualItemSizeAfter);
     } else {
       const { state } = this;
 
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts
@@ -49,12 +49,12 @@ export class ViewDataGenerator {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected _calculateStartViewDate(options: any): Date {
+  protected calculateStartViewDate(options: any): Date {
     return new Date();
   }
 
   public getStartViewDate(options): Date {
-    return this._calculateStartViewDate(options);
+    return this.calculateStartViewDate(options);
   }
 
   // entry point
@@ -74,7 +74,7 @@ export class ViewDataGenerator {
       hoursInterval,
     } = options;
 
-    this._setVisibilityDates(options);
+    this.setVisibilityDates(options);
     this.setHiddenInterval(startDayHour, endDayHour, hoursInterval);
 
     const groupsList = getAllGroupValues(getResourceManager().groupsLeafs);
@@ -741,12 +741,12 @@ export class ViewDataGenerator {
     return hoursInterval * toMs('hour');
   }
 
-  public _getIntervalDuration(intervalCount) {
+  public getIntervalDuration(intervalCount) {
     return toMs('day') * intervalCount;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected _setVisibilityDates(options: any) {}
+  protected setVisibilityDates(options: any) {}
 
   public getCellCountInDay(startDayHour, endDayHour, hoursInterval) {
     const result = calculateDayDuration(startDayHour, endDayHour) / hoursInterval;
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_day.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_day.ts
@@ -2,12 +2,12 @@ import { dayUtils } from '../../r1/utils/index';
 import { ViewDataGenerator } from './m_view_data_generator';
 
 export class ViewDataGeneratorDay extends ViewDataGenerator {
-  _calculateStartViewDate(options) {
+  calculateStartViewDate(options) {
     return dayUtils.calculateStartViewDate(
       options.currentDate,
       options.startDayHour,
       options.startDate,
-      this._getIntervalDuration(options.intervalCount),
+      this.getIntervalDuration(options.intervalCount),
     );
   }
 }
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts
@@ -63,7 +63,7 @@ export class ViewDataGeneratorMonth extends ViewDataGenerator {
     return toMs('day');
   }
 
-  _calculateStartViewDate(options) {
+  calculateStartViewDate(options) {
     return monthUtils.calculateStartViewDate(
       options.currentDate,
       options.startDayHour,
@@ -73,7 +73,7 @@ export class ViewDataGeneratorMonth extends ViewDataGenerator {
     );
   }
 
-  _setVisibilityDates(options) {
+  setVisibilityDates(options) {
     const {
       intervalCount,
       startDate,
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts
@@ -15,7 +15,7 @@ export class ViewDataGeneratorTimelineMonth extends ViewDataGenerator {
     return toMs('day');
   }
 
-  _calculateStartViewDate(options: any) {
+  calculateStartViewDate(options: any) {
     return timelineMonthUtils.calculateStartViewDate(
       options.currentDate,
       options.startDayHour,
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_week.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_week.ts
@@ -4,16 +4,16 @@ import { ViewDataGenerator } from './m_view_data_generator';
 export class ViewDataGeneratorWeek extends ViewDataGenerator {
   readonly daysInInterval: number = 7;
 
-  _getIntervalDuration(intervalCount) {
+  getIntervalDuration(intervalCount) {
     return weekUtils.getIntervalDuration(intervalCount);
   }
 
-  _calculateStartViewDate(options) {
+  calculateStartViewDate(options) {
     return weekUtils.calculateStartViewDate(
       options.currentDate,
       options.startDayHour,
       options.startDate,
-      this._getIntervalDuration(options.intervalCount),
+      this.getIntervalDuration(options.intervalCount),
       this.getFirstDayOfWeek(options.firstDayOfWeek),
     );
   }
diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_work_week.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_work_week.ts
@@ -8,12 +8,12 @@ export class ViewDataGeneratorWorkWeek extends ViewDataGeneratorWeek {
     return isDataOnWeekend(date);
   }
 
-  _calculateStartViewDate(options) {
+  calculateStartViewDate(options) {
     return workWeekUtils.calculateStartViewDate(
       options.currentDate,
       options.startDayHour,
       options.startDate,
-      this._getIntervalDuration(options.intervalCount),
+      this.getIntervalDuration(options.intervalCount),
       this.getFirstDayOfWeek(options.firstDayOfWeek),
     );
   }
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
@@ -453,7 +453,7 @@ export default class ViewDataProvider {
   }
 
   getIntervalDuration(intervalCount: number): number {
-    return this.viewDataGenerator._getIntervalDuration(intervalCount);
+    return this.viewDataGenerator.getIntervalDuration(intervalCount);
   }
 
   getLastCellEndDate(): Date {

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ export class SchedulerHeader extends Widget<HeaderOptions> {`
`255`	`255`	`return getNextIntervalDate(options, direction);`
`256`	`256`	`}`
`257`	`257`
`258`		`- private _getDisplayedDate(): Date {`
	`258`	`+ private getDisplayedDate(): Date {`
`259`	`259`	`const { startViewDate, currentView } = this.option();`
`260`	`260`	`const isMonth = currentView.type === 'month';`
`261`	`261`
`@@ -267,7 +267,7 @@ export class SchedulerHeader extends Widget<HeaderOptions> {`
`267`	`267`	`let date = currentDate;`
`268`	`268`
`269`	`269`	`if (startViewDate) {`
`270`		`- date = this._getDisplayedDate();`
	`270`	`+ date = this.getDisplayedDate();`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`date = dateUtils.trimTime(date);`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ class GroupStrategyBase {`
`231`	`231`	`return maxVerticalPosition - getCellHeight(this.DOMMetaData) * rowCount;`
`232`	`232`	`}`
`233`	`233`
`234`		`- _getAllDayHeight(showAllDayPanel) {`
	`234`	`+ protected getAllDayHeight(showAllDayPanel) {`
`235`	`235`	`return getAllDayHeight(showAllDayPanel, true, this.DOMMetaData);`
`236`	`236`	`}`
`237`	`237`
`@@ -250,7 +250,7 @@ class GroupStrategyBase {`
`250`	`250`
`251`	`251`	`// Should decrease allDayPanel amount due to the dual calculation corrections.`
`252`	`252`	`if (isGroupedAllDayPanel) {`
`253`		`- result -= (groupIndex + 1) * this._getAllDayHeight(showAllDayPanel);`
	`253`	`+ result -= (groupIndex + 1) * this.getAllDayHeight(showAllDayPanel);`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`return result;`
`@@ -282,7 +282,7 @@ class GroupStrategyHorizontal extends GroupStrategyBase {`
`282`	`282`	`return 0;`
`283`	`283`	`}`
`284`	`284`
`285`		`- _getAllDayHeight(showAllDayPanel) {`
	`285`	`+ protected getAllDayHeight(showAllDayPanel) {`
`286`	`286`	`return getAllDayHeight(showAllDayPanel, false, this.DOMMetaData);`
`287`	`287`	`}`
`288`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,12 @@ export class ViewDataGenerator {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// eslint-disable-next-line @typescript-eslint/no-unused-vars`
`52`		`- protected _calculateStartViewDate(options: any): Date {`
	`52`	`+ protected calculateStartViewDate(options: any): Date {`
`53`	`53`	`return new Date();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public getStartViewDate(options): Date {`
`57`		`- return this._calculateStartViewDate(options);`
	`57`	`+ return this.calculateStartViewDate(options);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// entry point`
`@@ -74,7 +74,7 @@ export class ViewDataGenerator {`
`74`	`74`	`hoursInterval,`
`75`	`75`	`} = options;`
`76`	`76`
`77`		`- this._setVisibilityDates(options);`
	`77`	`+ this.setVisibilityDates(options);`
`78`	`78`	`this.setHiddenInterval(startDayHour, endDayHour, hoursInterval);`
`79`	`79`
`80`	`80`	`const groupsList = getAllGroupValues(getResourceManager().groupsLeafs);`
`@@ -741,12 +741,12 @@ export class ViewDataGenerator {`
`741`	`741`	`return hoursInterval * toMs('hour');`
`742`	`742`	`}`
`743`	`743`
`744`		`- public _getIntervalDuration(intervalCount) {`
	`744`	`+ public getIntervalDuration(intervalCount) {`
`745`	`745`	`return toMs('day') * intervalCount;`
`746`	`746`	`}`
`747`	`747`
`748`	`748`	`// eslint-disable-next-line @typescript-eslint/no-unused-vars`
`749`		`- protected _setVisibilityDates(options: any) {}`
	`749`	`+ protected setVisibilityDates(options: any) {}`
`750`	`750`
`751`	`751`	`public getCellCountInDay(startDayHour, endDayHour, hoursInterval) {`
`752`	`752`	`const result = calculateDayDuration(startDayHour, endDayHour) / hoursInterval;`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ import { dayUtils } from '../../r1/utils/index';`
`2`	`2`	`import { ViewDataGenerator } from './m_view_data_generator';`
`3`	`3`
`4`	`4`	`export class ViewDataGeneratorDay extends ViewDataGenerator {`
`5`		`- _calculateStartViewDate(options) {`
	`5`	`+ calculateStartViewDate(options) {`
`6`	`6`	`return dayUtils.calculateStartViewDate(`
`7`	`7`	`options.currentDate,`
`8`	`8`	`options.startDayHour,`
`9`	`9`	`options.startDate,`
`10`		`- this._getIntervalDuration(options.intervalCount),`
	`10`	`+ this.getIntervalDuration(options.intervalCount),`
`11`	`11`	`);`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export class ViewDataGeneratorTimelineMonth extends ViewDataGenerator {`
`15`	`15`	`return toMs('day');`
`16`	`16`	`}`
`17`	`17`
`18`		`- _calculateStartViewDate(options: any) {`
	`18`	`+ calculateStartViewDate(options: any) {`
`19`	`19`	`return timelineMonthUtils.calculateStartViewDate(`
`20`	`20`	`options.currentDate,`
`21`	`21`	`options.startDayHour,`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ export class ViewDataGeneratorWorkWeek extends ViewDataGeneratorWeek {`
`8`	`8`	`return isDataOnWeekend(date);`
`9`	`9`	`}`
`10`	`10`
`11`		`- _calculateStartViewDate(options) {`
	`11`	`+ calculateStartViewDate(options) {`
`12`	`12`	`return workWeekUtils.calculateStartViewDate(`
`13`	`13`	`options.currentDate,`
`14`	`14`	`options.startDayHour,`
`15`	`15`	`options.startDate,`
`16`		`- this._getIntervalDuration(options.intervalCount),`
	`16`	`+ this.getIntervalDuration(options.intervalCount),`
`17`	`17`	`this.getFirstDayOfWeek(options.firstDayOfWeek),`
`18`	`18`	`);`
`19`	`19`	`}`