refactor: make isHorizontalGroupedWorkSpace

getCellCount
getGroupCount protected

Author: sjbur

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

@@ -15,10 +15,10 @@ class CurrentTimeShader {
   constructor(protected workSpace: SchedulerWorkSpace) {
   }
 
-  render(): void {
+  render(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number): void {
     this.initShaderElements();
 
-    this.renderShader();
+    this.renderShader(isHorizontalGroupedWorkSpace, groupCount, cellCount);
 
     this.shader.forEach((shader) => {
       this.$container.append(shader);
@@ -31,7 +31,8 @@ class CurrentTimeShader {
     this.shader.push(this.$shader);
   }
 
-  renderShader(): void {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  renderShader(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number):void {}
 
   createShader(): dxElementWrapper {
     return $('<div>').addClass(DATE_TIME_SHADER_CLASS);

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

@@ -5,19 +5,17 @@ import { setWidth } from '@js/core/utils/size';
 import CurrentTimeShader from './current_time_shader';
 
 class HorizontalCurrentTimeShader extends CurrentTimeShader {
-  renderShader(): void {
-    const groupCount = this.workSpace.isHorizontalGroupedWorkSpace()
-      ? this.workSpace.getGroupCount()
-      : 1;
+  renderShader(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number): void {
+    const effectiveGroupCount = isHorizontalGroupedWorkSpace ? groupCount : 1;
 
-    for (let i = 0; i < groupCount; i += 1) {
+    for (let i = 0; i < effectiveGroupCount; i += 1) {
       const isFirstShader = i === 0;
       const $shader = isFirstShader ? this.$shader : this.createShader();
 
       if (this.workSpace.isGroupedByDate()) {
-        this.customizeGroupedByDateShader($shader, i);
+        this.customizeGroupedByDateShader($shader, i, groupCount, cellCount);
       } else {
-        this.customizeShader($shader, i);
+        this.customizeShader($shader, i, cellCount);
       }
 
       if (!isFirstShader) {
@@ -26,15 +24,19 @@ class HorizontalCurrentTimeShader extends CurrentTimeShader {
     }
   }
 
-  private customizeShader($shader: dxElementWrapper, groupIndex: number): void {
+  private customizeShader(
+    $shader: dxElementWrapper,
+    groupIndex: number,
+    dateTableCellCount: number,
+  ): void {
     // @ts-expect-error
     const shaderWidth = this.workSpace.getIndicationWidth() as number;
 
     this.applyShaderWidth($shader, shaderWidth);
 
     if (groupIndex >= 1) {
       const { workSpace } = this;
-      const indicationWidth = workSpace.getCellCount() * workSpace.getCellWidth();
+      const indicationWidth = dateTableCellCount * workSpace.getCellWidth();
       $shader.css('left', indicationWidth);
     } else {
       $shader.css('left', 0);
@@ -48,11 +50,16 @@ class HorizontalCurrentTimeShader extends CurrentTimeShader {
     }
   }
 
-  private customizeGroupedByDateShader($shader: dxElementWrapper, groupIndex: number): void {
+  private customizeGroupedByDateShader(
+    $shader: dxElementWrapper,
+    groupIndex: number,
+    shaderGroupCount: number,
+    dateTableCellCount: number,
+  ): void {
     // @ts-expect-error
-    const cellCount = this.workSpace.getIndicationCellCount() as number;
-    const integerPart = Math.floor(cellCount);
-    const fractionPart = cellCount - integerPart;
+    const indicationCellCount = this.workSpace.getIndicationCellCount() as number;
+    const integerPart = Math.floor(indicationCellCount);
+    const fractionPart = indicationCellCount - integerPart;
     const isFirstShaderPart = groupIndex === 0;
     const { workSpace } = this;
     const shaderWidth = isFirstShaderPart
@@ -64,9 +71,9 @@ class HorizontalCurrentTimeShader extends CurrentTimeShader {
     this.applyShaderWidth($shader, shaderWidth);
 
     if (isFirstShaderPart) {
-      shaderLeft = workSpace.getCellCount() * workSpace.getCellWidth() * groupIndex;
+      shaderLeft = dateTableCellCount * workSpace.getCellWidth() * groupIndex;
     } else {
-      shaderLeft = workSpace.getCellWidth() * integerPart * workSpace.getGroupCount()
+      shaderLeft = workSpace.getCellWidth() * integerPart * shaderGroupCount
         + groupIndex * workSpace.getCellWidth();
     }
 

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

@@ -15,7 +15,8 @@ class VerticalCurrentTimeShader extends CurrentTimeShader {
 
   private $allDayIndicator!: dxElementWrapper;
 
-  renderShader(): void {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  renderShader(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number): void {
     let shaderHeight = this.getShaderHeight();
     const maxHeight = this.getShaderMaxHeight();
     const isSolidShader = shaderHeight > maxHeight;
@@ -25,7 +26,6 @@ class VerticalCurrentTimeShader extends CurrentTimeShader {
     }
 
     setHeight(this.$shader, shaderHeight);
-    const groupCount = this.workSpace.getGroupCount() || 1;
 
     if (this.workSpace.isGroupedByDate()) {
       this.renderGroupedByDateShaderParts(groupCount, shaderHeight, maxHeight, isSolidShader);

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

@@ -635,7 +635,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     return Boolean(this.option('groups')?.length) && this.option('groupOrientation') === 'vertical';
   }
 
-  isHorizontalGroupedWorkSpace() {
+  protected isHorizontalGroupedWorkSpace() {
     return Boolean(this.option('groups')?.length) && this.option('groupOrientation') === 'horizontal';
   }
 
@@ -821,7 +821,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     });
   }
 
-  getCellCount() {
+  protected getCellCount() {
     return this.viewDataProvider.getCellCount({
       intervalCount: this.option('intervalCount'),
       currentDate: this.option('currentDate'),
@@ -1163,7 +1163,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     );
   }
 
-  getGroupCount() {
+  protected getGroupCount() {
     return this.resourceManager.groupCount();
   }
 

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

@@ -287,7 +287,11 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace {
     }
 
     if (this.option('shadeUntilCurrentTime')) {
-      this.shader.render();
+      this.shader.render(
+        this.isHorizontalGroupedWorkSpace(),
+        this.getGroupCount() || 1,
+        this.getCellCount(),
+      );
     }
 
     if (!this.isIndicationOnView() || !this.isIndicatorVisible()) {