Skip to content

Scheduler: current_time_shader refactor — pass config object instead of whole workspace #33931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bit-byte0 merged 1 commit into from
Jun 10, 2026
+16 −3
Merged

Scheduler: current_time_shader refactor — pass config object instead of whole workspace #33931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/devextreme/js/__internal/scheduler/shaders/current_time_shader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import type { dxElementWrapper } from '@js/core/renderer';
import $ from '@js/core/renderer';

import type SchedulerWorkSpace from '../workspaces/m_work_space';
export interface CurrentTimeShaderConfig {
$container: dxElementWrapper;
}

const DATE_TIME_SHADER_CLASS = 'dx-scheduler-date-time-shader';

class CurrentTimeShader {
protected $container = this.workSpace.getScrollable().$content();
protected readonly $container: dxElementWrapper;

protected shader!: dxElementWrapper[];

protected $shader!: dxElementWrapper;

constructor(protected workSpace: SchedulerWorkSpace) {
constructor(config: CurrentTimeShaderConfig) {
this.$container = config.$container;
}

render(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number): void {
Expand Down
5 changes: 5 additions & 0 deletions packages/devextreme/js/__internal/scheduler/shaders/current_time_shader_horizontal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@ import type { dxElementWrapper } from '@js/core/renderer';
import { getBoundingRect } from '@js/core/utils/position';
import { setWidth } from '@js/core/utils/size';

import type SchedulerWorkSpace from '../workspaces/m_work_space';
import CurrentTimeShader from './current_time_shader';

class HorizontalCurrentTimeShader extends CurrentTimeShader {
constructor(protected readonly workSpace: SchedulerWorkSpace) {
super({ $container: workSpace.getScrollable().$content() });
}

renderShader(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number): void {
const effectiveGroupCount = isHorizontalGroupedWorkSpace ? groupCount : 1;

Expand Down
5 changes: 5 additions & 0 deletions packages/devextreme/js/__internal/scheduler/shaders/current_time_shader_vertical.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import $, { type dxElementWrapper } from '@js/core/renderer';
import { setHeight, setWidth } from '@js/core/utils/size';

import type SchedulerWorkSpace from '../workspaces/m_work_space';
import CurrentTimeShader from './current_time_shader';

const DATE_TIME_SHADER_ALL_DAY_CLASS = 'dx-scheduler-date-time-shader-all-day';
Expand All @@ -17,6 +18,10 @@ class VerticalCurrentTimeShader extends CurrentTimeShader {

private $allDayIndicator!: dxElementWrapper;

constructor(protected readonly workSpace: SchedulerWorkSpace) {
super({ $container: workSpace.getScrollable().$content() });
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
renderShader(isHorizontalGroupedWorkSpace: boolean, groupCount: number, cellCount: number): void {
let shaderHeight = this.getShaderHeight();
Expand Down