refactor: delete public methods for headerPanel, flexContainer, allDayShaderIndicator

Author: sjbur

packages/devextreme/js/__internal/scheduler/shaders/current_time_shader_vertical.ts

@@ -5,6 +5,8 @@ import CurrentTimeShader from './current_time_shader';
 
 export const DATE_TIME_SHADER_ALL_DAY_CLASS = 'dx-scheduler-date-time-shader-all-day';
 
+const ALL_DAY_PANEL_CLASS = 'dx-scheduler-all-day-panel';
+
 const DATE_TIME_SHADER_TOP_CLASS = 'dx-scheduler-date-time-shader-top';
 const DATE_TIME_SHADER_BOTTOM_CLASS = 'dx-scheduler-date-time-shader-bottom';
 
@@ -126,7 +128,10 @@ class VerticalCurrentTimeShader extends CurrentTimeShader {
       setWidth(this.$allDayIndicator, shaderWidth);
       this.$allDayIndicator.css('left', this.getShaderOffset(i, shaderWidth));
 
-      this.workSpace.addAllDayShaderIndicator(this.$allDayIndicator);
+      const $allDayPanel = this.workSpace.$element().find(`.${ALL_DAY_PANEL_CLASS}`);
+      if ($allDayPanel.length) {
+        $allDayPanel.first().prepend(this.$allDayIndicator);
+      }
     }
   }
 
@@ -153,7 +158,7 @@ class VerticalCurrentTimeShader extends CurrentTimeShader {
   clean(): void {
     super.clean();
 
-    this.workSpace?.removeAllDayShaderIndicator();
+    this.workSpace?.$element().find(`.${DATE_TIME_SHADER_ALL_DAY_CLASS}`).remove();
   }
 }
 

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

@@ -4,7 +4,7 @@ import { noop } from '@js/core/utils/common';
 import dateUtils from '@js/core/utils/date';
 import { extend } from '@js/core/utils/extend';
 import { getBoundingRect } from '@js/core/utils/position';
-import { getOuterWidth, setHeight } from '@js/core/utils/size';
+import { getOuterHeight, getOuterWidth, setHeight } from '@js/core/utils/size';
 import { hasWindow } from '@js/core/utils/window';
 // NOTE: Renovation component import.
 import { HeaderPanelTimelineComponent } from '@ts/scheduler/r1/components/index';
@@ -177,7 +177,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
   private getWorkSpaceMinHeight() {
     let minHeight = this.getWorkSpaceHeight();
 
-    const workspaceContainerHeight = this.getFlexContainerOuterHeight();
+    const workspaceContainerHeight = this.$flexContainer ? getOuterHeight(this.$flexContainer, true) : 0;
 
     if (minHeight < workspaceContainerHeight) {
       minHeight = workspaceContainerHeight;

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

@@ -71,7 +71,7 @@ import { CompactAppointmentsHelper } from '../m_compact_appointments_helper';
 import type { SubscribeKey, SubscribeMethods } from '../m_subscribes';
 import tableCreatorModule from '../m_table_creator';
 import { utils } from '../m_utils';
-import VerticalShader, { DATE_TIME_SHADER_ALL_DAY_CLASS } from '../shaders/current_time_shader_vertical';
+import VerticalShader from '../shaders/current_time_shader_vertical';
 import type { ResourceLoader } from '../utils/loader/resource_loader';
 import {
   getAppointmentGroupIndex,
@@ -226,7 +226,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
 
   protected getToday?(): Date;
 
-  private $allDayPanel: any;
+  protected $allDayPanel: any;
 
   private $allDayTitle: any;
 
@@ -276,7 +276,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
 
   positionHelper!: PositionHelper;
 
-  private $headerPanelContainer: any;
+  protected $headerPanelContainer: any;
 
   private $headerTablesContainer: any;
 
@@ -294,7 +294,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
 
   private allDayPanels!: any[];
 
-  private $flexContainer: any;
+  protected $flexContainer: any;
 
   protected shader: any;
 
@@ -925,30 +925,6 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     }
   }
 
-  getHeaderPanelContainerHeight(): number {
-    if (!hasWindow() || !this.$headerPanelContainer) {
-      return 0;
-    }
-
-    return getBoundingRect(this.$headerPanelContainer.get(0) as HTMLElement).height;
-  }
-
-  getFlexContainerOuterHeight(): number {
-    if (!this.$flexContainer) {
-      return 0;
-    }
-
-    return getOuterHeight(this.$flexContainer, true);
-  }
-
-  addAllDayShaderIndicator($indicator: any): void {
-    this.$allDayPanel?.prepend($indicator);
-  }
-
-  removeAllDayShaderIndicator(): void {
-    this.$allDayPanel?.find(`.${DATE_TIME_SHADER_ALL_DAY_CLASS}`).remove();
-  }
-
   private getScrollbarWidth() {
     const containerElement = $(this.$dateTableScrollable.container()).get(0) as HTMLElement;
     const scrollbarWidth = containerElement.offsetWidth - containerElement.clientWidth;

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

@@ -1,4 +1,5 @@
 import { getBoundingRect } from '@js/core/utils/position';
+import { hasWindow } from '@js/core/utils/window';
 import { calculateDayDuration, getVerticalGroupCountClass } from '@ts/scheduler/r1/utils/index';
 import { WORK_SPACE_BORDER_PX } from '@ts/scheduler/workspaces/const';
 
@@ -92,7 +93,10 @@ class VerticalGroupedStrategy {
 
       const dayHeight = (calculateDayDuration(startDayHour, endDayHour) / hoursInterval) * this._workSpace.getCellHeight();
       const scrollTop = this.getScrollableScrollTop();
-      const headerRowHeight = this._workSpace.getHeaderPanelContainerHeight();
+      let headerRowHeight = 0;
+      if (hasWindow() && this._workSpace.$headerPanelContainer) {
+        headerRowHeight = getBoundingRect(this._workSpace.$headerPanelContainer.get(0) as HTMLElement).height;
+      }
 
       let topOffset = groupIndex * dayHeight + headerRowHeight + this._workSpace.option('getHeaderHeight')() - scrollTop;