From 86d9e9b8984d29f8cce94ed483e0318b7252badf Mon Sep 17 00:00:00 2001 From: Sergio Bur Date: Tue, 30 Dec 2025 10:36:57 +0100 Subject: [PATCH 1/5] fix: fix bug --- .../__tests__/workspace.base.test.ts | 72 ------- .../__tests__/workspace.recalculation.test.ts | 79 ------- .../scheduler/__tests__/workspace.test.ts | 198 ++++++++++++++++++ .../scheduler/workspaces/m_work_space.ts | 19 +- 4 files changed, 211 insertions(+), 157 deletions(-) delete mode 100644 packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts delete mode 100644 packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts create mode 100644 packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts deleted file mode 100644 index 297f343f1769..000000000000 --- a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { - describe, expect, it, jest, -} from '@jest/globals'; - -import { getResourceManagerMock } from '../__mock__/resource_manager.mock'; -import SchedulerTimelineDay from '../workspaces/m_timeline_day'; -import SchedulerTimelineMonth from '../workspaces/m_timeline_month'; -import SchedulerTimelineWeek from '../workspaces/m_timeline_week'; -import SchedulerTimelineWorkWeek from '../workspaces/m_timeline_work_week'; -import type SchedulerWorkSpace from '../workspaces/m_work_space'; -import SchedulerWorkSpaceDay from '../workspaces/m_work_space_day'; -import SchedulerWorkSpaceMonth from '../workspaces/m_work_space_month'; -import SchedulerWorkSpaceWeek from '../workspaces/m_work_space_week'; -import SchedulerWorkSpaceWorkWeek from '../workspaces/m_work_space_work_week'; - -type WorkspaceConstructor = new (container: Element, options?: any) => T; - -const createWorkspace = ( - WorkSpace: WorkspaceConstructor, - currentView: string, -): T => { - const container = document.createElement('div'); - const workspace = new WorkSpace(container, { - views: [currentView], - currentView, - currentDate: new Date(2017, 4, 25), - firstDayOfWeek: 0, - getResourceManager: () => getResourceManagerMock([]), - }); - (workspace as any)._isVisible = () => true; - expect(container.classList).toContain('dx-scheduler-work-space'); - - return workspace; -}; -const workSpaces: { - currentView: string; - WorkSpace: WorkspaceConstructor; -}[] = [ - { currentView: 'day', WorkSpace: SchedulerWorkSpaceDay }, - { currentView: 'week', WorkSpace: SchedulerWorkSpaceWeek }, - { currentView: 'workWeek', WorkSpace: SchedulerWorkSpaceWorkWeek }, - { currentView: 'month', WorkSpace: SchedulerWorkSpaceMonth }, - { currentView: 'timelineDay', WorkSpace: SchedulerTimelineDay }, - { currentView: 'timelineWeek', WorkSpace: SchedulerTimelineWeek }, - { currentView: 'timelineWorkWeek', WorkSpace: SchedulerTimelineWorkWeek }, - { currentView: 'timelineMonth', WorkSpace: SchedulerTimelineMonth }, -]; - -describe('scheduler workspace', () => { - workSpaces.forEach(({ currentView, WorkSpace }) => { - it(`should clear cache on dimension change, view: ${currentView}`, () => { - const workspace = createWorkspace(WorkSpace, currentView); - jest.spyOn(workspace.cache, 'clear'); - - workspace.cache.memo('test', () => 'value'); - workspace._dimensionChanged(); - - expect(workspace.cache.clear).toHaveBeenCalledTimes(1); - }); - - it(`should clear cache on _cleanView call, view: ${currentView}`, () => { - const workspace = createWorkspace(WorkSpace, currentView); - jest.spyOn(workspace.cache, 'clear'); - - workspace.cache.memo('test', () => 'value'); - workspace._cleanView(); - - expect(workspace.cache.clear).toHaveBeenCalledTimes(1); - expect(workspace.cache.size).toBe(0); - }); - }); -}); diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts deleted file mode 100644 index 13ffa2259716..000000000000 --- a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { - afterEach, beforeEach, describe, expect, it, -} from '@jest/globals'; -import $ from '@js/core/renderer'; - -import fx from '../../../common/core/animation/fx'; -import CustomStore from '../../../data/custom_store'; -import { createScheduler } from './__mock__/create_scheduler'; -import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler'; - -const CLASSES = { - scheduler: 'dx-scheduler', - workSpace: 'dx-scheduler-work-space', -}; - -describe('Workspace Recalculation with Async Templates (T661335)', () => { - beforeEach(() => { - fx.off = true; - setupSchedulerTestEnvironment({ height: 600 }); - }); - - afterEach(() => { - const $scheduler = $(document.querySelector(`.${CLASSES.scheduler}`)); - // @ts-expect-error - $scheduler.dxScheduler('dispose'); - document.body.innerHTML = ''; - fx.off = false; - }); - - it('should not duplicate workspace elements when resources are loaded asynchronously (T661335)', async () => { - const { scheduler, container } = await createScheduler({ - templatesRenderAsynchronously: true, - currentView: 'day', - views: ['day'], - groups: ['owner'], - resources: [ - { - fieldExpr: 'owner', - dataSource: [{ id: 1, text: 'Owner 1' }], - }, - { - fieldExpr: 'room', - dataSource: new CustomStore({ - load(): Promise { - return new Promise((resolve) => { - setTimeout(() => { - resolve([{ id: 1, text: 'Room 1', color: '#ff0000' }]); - }); - }); - }, - }), - }, - ], - dataSource: [ - { - text: 'Meeting in Room 1', - startDate: new Date(2017, 4, 25, 9, 0), - endDate: new Date(2017, 4, 25, 10, 0), - roomId: 1, - }, - ], - startDayHour: 9, - currentDate: new Date(2017, 4, 25), - height: 600, - }); - - scheduler.option('groups', ['room']); - - await new Promise((r) => { setTimeout(r); }); - - const $workSpaces = $(container).find(`.${CLASSES.workSpace}`); - const $groupHeader = $(container).find('.dx-scheduler-group-header'); - - expect($workSpaces.length).toBe(1); - - expect($groupHeader.length).toBeGreaterThan(0); - expect($groupHeader.text()).toContain('Room 1'); - }); -}); diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts new file mode 100644 index 000000000000..4934ad1ecd94 --- /dev/null +++ b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts @@ -0,0 +1,198 @@ +import { + afterEach, beforeEach, describe, expect, it, jest, +} from '@jest/globals'; +import $ from '@js/core/renderer'; +import { getWidth } from '@js/core/utils/size'; + +import fx from '../../../common/core/animation/fx'; +import CustomStore from '../../../data/custom_store'; +import { getResourceManagerMock } from '../__mock__/resource_manager.mock'; +import SchedulerTimelineDay from '../workspaces/m_timeline_day'; +import SchedulerTimelineMonth from '../workspaces/m_timeline_month'; +import SchedulerTimelineWeek from '../workspaces/m_timeline_week'; +import SchedulerTimelineWorkWeek from '../workspaces/m_timeline_work_week'; +import type SchedulerWorkSpace from '../workspaces/m_work_space'; +import SchedulerWorkSpaceDay from '../workspaces/m_work_space_day'; +import SchedulerWorkSpaceMonth from '../workspaces/m_work_space_month'; +import SchedulerWorkSpaceWeek from '../workspaces/m_work_space_week'; +import SchedulerWorkSpaceWorkWeek from '../workspaces/m_work_space_work_week'; +import { createScheduler } from './__mock__/create_scheduler'; +import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler'; + +const CLASSES = { + scheduler: 'dx-scheduler', + workSpace: 'dx-scheduler-work-space', +}; + +type WorkspaceConstructor = new (container: Element, options?: any) => T; + +const createWorkspace = ( + WorkSpace: WorkspaceConstructor, + currentView: string, +): T => { + const container = document.createElement('div'); + const workspace = new WorkSpace(container, { + views: [currentView], + currentView, + currentDate: new Date(2017, 4, 25), + firstDayOfWeek: 0, + getResourceManager: () => getResourceManagerMock([]), + }); + (workspace as any)._isVisible = () => true; + expect(container.classList).toContain('dx-scheduler-work-space'); + + return workspace; +}; + +const workSpaces: { + currentView: string; + WorkSpace: WorkspaceConstructor; +}[] = [ + { currentView: 'day', WorkSpace: SchedulerWorkSpaceDay }, + { currentView: 'week', WorkSpace: SchedulerWorkSpaceWeek }, + { currentView: 'workWeek', WorkSpace: SchedulerWorkSpaceWorkWeek }, + { currentView: 'month', WorkSpace: SchedulerWorkSpaceMonth }, + { currentView: 'timelineDay', WorkSpace: SchedulerTimelineDay }, + { currentView: 'timelineWeek', WorkSpace: SchedulerTimelineWeek }, + { currentView: 'timelineWorkWeek', WorkSpace: SchedulerTimelineWorkWeek }, + { currentView: 'timelineMonth', WorkSpace: SchedulerTimelineMonth }, +]; + +describe('Workspace', () => { + describe('Base functionality', () => { + workSpaces.forEach(({ currentView, WorkSpace }) => { + it(`should clear cache on dimension change, view: ${currentView}`, () => { + const workspace = createWorkspace(WorkSpace, currentView); + jest.spyOn(workspace.cache, 'clear'); + + workspace.cache.memo('test', () => 'value'); + workspace._dimensionChanged(); + + expect(workspace.cache.clear).toHaveBeenCalledTimes(1); + }); + + it(`should clear cache on _cleanView call, view: ${currentView}`, () => { + const workspace = createWorkspace(WorkSpace, currentView); + jest.spyOn(workspace.cache, 'clear'); + + workspace.cache.memo('test', () => 'value'); + workspace._cleanView(); + + expect(workspace.cache.clear).toHaveBeenCalledTimes(1); + expect(workspace.cache.size).toBe(0); + }); + }); + }); + + describe('Recalculation with Async Templates', () => { + beforeEach(() => { + fx.off = true; + setupSchedulerTestEnvironment({ height: 600 }); + }); + + afterEach(() => { + const $scheduler = $(document.querySelector(`.${CLASSES.scheduler}`)); + // @ts-expect-error + $scheduler.dxScheduler('dispose'); + document.body.innerHTML = ''; + fx.off = false; + }); + + it('should not duplicate workspace elements when resources are loaded asynchronously (T661335)', async () => { + const { scheduler, container } = await createScheduler({ + templatesRenderAsynchronously: true, + currentView: 'day', + views: ['day'], + groups: ['owner'], + resources: [ + { + fieldExpr: 'owner', + dataSource: [{ id: 1, text: 'Owner 1' }], + }, + { + fieldExpr: 'room', + dataSource: new CustomStore({ + load(): Promise { + return new Promise((resolve) => { + setTimeout(() => { + resolve([{ id: 1, text: 'Room 1', color: '#ff0000' }]); + }); + }); + }, + }), + }, + ], + dataSource: [ + { + text: 'Meeting in Room 1', + startDate: new Date(2017, 4, 25, 9, 0), + endDate: new Date(2017, 4, 25, 10, 0), + roomId: 1, + }, + ], + startDayHour: 9, + currentDate: new Date(2017, 4, 25), + height: 600, + }); + + scheduler.option('groups', ['room']); + + await new Promise((r) => { setTimeout(r); }); + + const $workSpaces = $(container).find(`.${CLASSES.workSpace}`); + const $groupHeader = $(container).find('.dx-scheduler-group-header'); + + expect($workSpaces.length).toBe(1); + + expect($groupHeader.length).toBeGreaterThan(0); + expect($groupHeader.text()).toContain('Room 1'); + }); + }); + + describe('scrollTo', () => { + beforeEach(() => { + fx.off = true; + setupSchedulerTestEnvironment({ height: 600 }); + }); + + afterEach(() => { + document.body.innerHTML = ''; + fx.off = false; + }); + + it('should scroll to date with offset (T1310544)', async () => { + const { scheduler } = await createScheduler({ + views: ['timelineDay'], + currentView: 'timelineDay', + currentDate: new Date(2021, 1, 2), + firstDayOfWeek: 0, + startDayHour: 6, + endDayHour: 18, + offset: 720, + cellDuration: 60, + height: 580, + }); + + const workspace = scheduler.getWorkSpace(); + const scrollable = workspace.getScrollable(); + const $scrollable = scrollable.$element(); + const scrollBySpy = jest.spyOn(scrollable, 'scrollBy'); + + // With offset: 720 (12 hours), cells start at 18:00 (6:00 + 12h) + // For date 22:00, this should be cell index 4 (18:00=0, 19:00=1, 20:00=2, 21:00=3, 22:00=4) + const leftCellCount = 4; + const cellWidth = workspace.getCellWidth(); + const scrollableWidth = getWidth($scrollable); + const expectedLeft = leftCellCount * cellWidth - (scrollableWidth - cellWidth) / 2; + + const targetDate = new Date(2021, 1, 2, 22, 0); + scheduler.scrollTo(targetDate, undefined, false); + + expect(scrollBySpy).toHaveBeenCalledTimes(1); + const scrollParams = scrollBySpy.mock.calls[0][0] as { left: number; top: number }; + expect(scrollParams.left).toBeCloseTo(expectedLeft, 1); + + scrollBySpy.mockRestore(); + }); + }); +}); 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 8f7490714114..ab80e53b889e 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -1408,13 +1408,16 @@ class SchedulerWorkSpace extends Widget { const currentDate = date || new Date(this.option('currentDate')); const startDayHour = this.option('startDayHour'); const endDayHour = this.option('endDayHour'); + const viewOffset = this.option('viewOffset'); - if (hours < startDayHour) { - hours = startDayHour; - } + if (viewOffset === 0) { + if (hours < startDayHour) { + hours = startDayHour; + } - if (hours >= endDayHour) { - hours = endDayHour - 1; + if (hours >= endDayHour) { + hours = endDayHour - 1; + } } currentDate.setHours(hours, minutes, 0, 0); @@ -1877,10 +1880,14 @@ class SchedulerWorkSpace extends Widget { } _isValidScrollDate(date, throwWarning = true) { + const viewOffset = this.option('viewOffset') as number; const min = this.getStartViewDate(); const max = this.getEndViewDate(); - if (date < min || date > max) { + const extendedMin = new Date(min.getTime() - viewOffset); + const extendedMax = new Date(max.getTime() + viewOffset); + + if (date < extendedMin || date > extendedMax) { throwWarning && errors.log('W1008', date); return false; } From fe65c325cd7c4a2e2773f4bb3ef61ddc8af7f46f Mon Sep 17 00:00:00 2001 From: Sergio Bur Date: Mon, 5 Jan 2026 08:43:29 +0100 Subject: [PATCH 2/5] test: reerrange tests --- .../__tests__/workspace.base.test.ts | 72 ++++++++++++++++++ .../scheduler/__tests__/workspace.test.ts | 75 +------------------ 2 files changed, 75 insertions(+), 72 deletions(-) create mode 100644 packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts new file mode 100644 index 000000000000..297f343f1769 --- /dev/null +++ b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.base.test.ts @@ -0,0 +1,72 @@ +import { + describe, expect, it, jest, +} from '@jest/globals'; + +import { getResourceManagerMock } from '../__mock__/resource_manager.mock'; +import SchedulerTimelineDay from '../workspaces/m_timeline_day'; +import SchedulerTimelineMonth from '../workspaces/m_timeline_month'; +import SchedulerTimelineWeek from '../workspaces/m_timeline_week'; +import SchedulerTimelineWorkWeek from '../workspaces/m_timeline_work_week'; +import type SchedulerWorkSpace from '../workspaces/m_work_space'; +import SchedulerWorkSpaceDay from '../workspaces/m_work_space_day'; +import SchedulerWorkSpaceMonth from '../workspaces/m_work_space_month'; +import SchedulerWorkSpaceWeek from '../workspaces/m_work_space_week'; +import SchedulerWorkSpaceWorkWeek from '../workspaces/m_work_space_work_week'; + +type WorkspaceConstructor = new (container: Element, options?: any) => T; + +const createWorkspace = ( + WorkSpace: WorkspaceConstructor, + currentView: string, +): T => { + const container = document.createElement('div'); + const workspace = new WorkSpace(container, { + views: [currentView], + currentView, + currentDate: new Date(2017, 4, 25), + firstDayOfWeek: 0, + getResourceManager: () => getResourceManagerMock([]), + }); + (workspace as any)._isVisible = () => true; + expect(container.classList).toContain('dx-scheduler-work-space'); + + return workspace; +}; +const workSpaces: { + currentView: string; + WorkSpace: WorkspaceConstructor; +}[] = [ + { currentView: 'day', WorkSpace: SchedulerWorkSpaceDay }, + { currentView: 'week', WorkSpace: SchedulerWorkSpaceWeek }, + { currentView: 'workWeek', WorkSpace: SchedulerWorkSpaceWorkWeek }, + { currentView: 'month', WorkSpace: SchedulerWorkSpaceMonth }, + { currentView: 'timelineDay', WorkSpace: SchedulerTimelineDay }, + { currentView: 'timelineWeek', WorkSpace: SchedulerTimelineWeek }, + { currentView: 'timelineWorkWeek', WorkSpace: SchedulerTimelineWorkWeek }, + { currentView: 'timelineMonth', WorkSpace: SchedulerTimelineMonth }, +]; + +describe('scheduler workspace', () => { + workSpaces.forEach(({ currentView, WorkSpace }) => { + it(`should clear cache on dimension change, view: ${currentView}`, () => { + const workspace = createWorkspace(WorkSpace, currentView); + jest.spyOn(workspace.cache, 'clear'); + + workspace.cache.memo('test', () => 'value'); + workspace._dimensionChanged(); + + expect(workspace.cache.clear).toHaveBeenCalledTimes(1); + }); + + it(`should clear cache on _cleanView call, view: ${currentView}`, () => { + const workspace = createWorkspace(WorkSpace, currentView); + jest.spyOn(workspace.cache, 'clear'); + + workspace.cache.memo('test', () => 'value'); + workspace._cleanView(); + + expect(workspace.cache.clear).toHaveBeenCalledTimes(1); + expect(workspace.cache.size).toBe(0); + }); + }); +}); diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts index 4934ad1ecd94..856c638eeef5 100644 --- a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts +++ b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts @@ -6,16 +6,6 @@ import { getWidth } from '@js/core/utils/size'; import fx from '../../../common/core/animation/fx'; import CustomStore from '../../../data/custom_store'; -import { getResourceManagerMock } from '../__mock__/resource_manager.mock'; -import SchedulerTimelineDay from '../workspaces/m_timeline_day'; -import SchedulerTimelineMonth from '../workspaces/m_timeline_month'; -import SchedulerTimelineWeek from '../workspaces/m_timeline_week'; -import SchedulerTimelineWorkWeek from '../workspaces/m_timeline_work_week'; -import type SchedulerWorkSpace from '../workspaces/m_work_space'; -import SchedulerWorkSpaceDay from '../workspaces/m_work_space_day'; -import SchedulerWorkSpaceMonth from '../workspaces/m_work_space_month'; -import SchedulerWorkSpaceWeek from '../workspaces/m_work_space_week'; -import SchedulerWorkSpaceWorkWeek from '../workspaces/m_work_space_work_week'; import { createScheduler } from './__mock__/create_scheduler'; import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler'; @@ -24,67 +14,8 @@ const CLASSES = { workSpace: 'dx-scheduler-work-space', }; -type WorkspaceConstructor = new (container: Element, options?: any) => T; - -const createWorkspace = ( - WorkSpace: WorkspaceConstructor, - currentView: string, -): T => { - const container = document.createElement('div'); - const workspace = new WorkSpace(container, { - views: [currentView], - currentView, - currentDate: new Date(2017, 4, 25), - firstDayOfWeek: 0, - getResourceManager: () => getResourceManagerMock([]), - }); - (workspace as any)._isVisible = () => true; - expect(container.classList).toContain('dx-scheduler-work-space'); - - return workspace; -}; - -const workSpaces: { - currentView: string; - WorkSpace: WorkspaceConstructor; -}[] = [ - { currentView: 'day', WorkSpace: SchedulerWorkSpaceDay }, - { currentView: 'week', WorkSpace: SchedulerWorkSpaceWeek }, - { currentView: 'workWeek', WorkSpace: SchedulerWorkSpaceWorkWeek }, - { currentView: 'month', WorkSpace: SchedulerWorkSpaceMonth }, - { currentView: 'timelineDay', WorkSpace: SchedulerTimelineDay }, - { currentView: 'timelineWeek', WorkSpace: SchedulerTimelineWeek }, - { currentView: 'timelineWorkWeek', WorkSpace: SchedulerTimelineWorkWeek }, - { currentView: 'timelineMonth', WorkSpace: SchedulerTimelineMonth }, -]; - describe('Workspace', () => { - describe('Base functionality', () => { - workSpaces.forEach(({ currentView, WorkSpace }) => { - it(`should clear cache on dimension change, view: ${currentView}`, () => { - const workspace = createWorkspace(WorkSpace, currentView); - jest.spyOn(workspace.cache, 'clear'); - - workspace.cache.memo('test', () => 'value'); - workspace._dimensionChanged(); - - expect(workspace.cache.clear).toHaveBeenCalledTimes(1); - }); - - it(`should clear cache on _cleanView call, view: ${currentView}`, () => { - const workspace = createWorkspace(WorkSpace, currentView); - jest.spyOn(workspace.cache, 'clear'); - - workspace.cache.memo('test', () => 'value'); - workspace._cleanView(); - - expect(workspace.cache.clear).toHaveBeenCalledTimes(1); - expect(workspace.cache.size).toBe(0); - }); - }); - }); - - describe('Recalculation with Async Templates', () => { + describe('Recalculation with Async Templates (T661335)', () => { beforeEach(() => { fx.off = true; setupSchedulerTestEnvironment({ height: 600 }); @@ -149,7 +80,7 @@ describe('Workspace', () => { }); }); - describe('scrollTo', () => { + describe('scrollTo (T1310544)', () => { beforeEach(() => { fx.off = true; setupSchedulerTestEnvironment({ height: 600 }); @@ -160,7 +91,7 @@ describe('Workspace', () => { fx.off = false; }); - it('should scroll to date with offset (T1310544)', async () => { + it('T1310544: should scroll to date with offset: 720 (12 hours)', async () => { const { scheduler } = await createScheduler({ views: ['timelineDay'], currentView: 'timelineDay', From ba9ea314152e5519fa738a598a058bcd0e42b836 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 15 Jan 2026 21:51:31 +0800 Subject: [PATCH 3/5] fix & test --- .../tests/scheduler/common/scrollTo.ts | 88 ++++++++++++ .../__tests__/workspace.recalculation.test.ts | 79 +++++++++++ .../scheduler/__tests__/workspace.test.ts | 129 ------------------ .../scheduler/workspaces/m_work_space.ts | 38 ++---- .../view_model/m_view_data_provider.ts | 68 +++++---- packages/testcafe-models/scheduler/index.ts | 36 ++++- 6 files changed, 254 insertions(+), 184 deletions(-) create mode 100644 packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts delete mode 100644 packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts diff --git a/e2e/testcafe-devextreme/tests/scheduler/common/scrollTo.ts b/e2e/testcafe-devextreme/tests/scheduler/common/scrollTo.ts index 03be9d4df440..e405b63bcacc 100644 --- a/e2e/testcafe-devextreme/tests/scheduler/common/scrollTo.ts +++ b/e2e/testcafe-devextreme/tests/scheduler/common/scrollTo.ts @@ -230,3 +230,91 @@ test('ScrollTo works correctly in timeline RTL (native, sync header/workspace)', height: 580, rtlEnabled: true, })); + +[ + // startDayHour: 6:00, endDayHour: 18:00 + { + offset: 0, + targetDate: new Date(2021, 1, 3, 4, 0), + expectedDate: new Date(2021, 1, 3, 6, 0), + }, + { + offset: 0, + targetDate: new Date(2021, 1, 3, 12, 0), + expectedDate: new Date(2021, 1, 3, 12, 0), + }, + { + offset: 0, + targetDate: new Date(2021, 1, 3, 20, 0), + expectedDate: new Date(2021, 1, 3, 18, 0), + }, + + // startDayHour: 18:00, endDayHour: next day 6:00 + { + offset: 720, + targetDate: new Date(2021, 1, 3, 10, 0), + expectedDate: new Date(2021, 1, 3, 6, 0), + }, + { + offset: 720, + targetDate: new Date(2021, 1, 3, 20, 0), + expectedDate: new Date(2021, 1, 3, 20, 0), + }, + { + offset: 720, + targetDate: new Date(2021, 1, 4, 1, 0), + expectedDate: new Date(2021, 1, 4, 1, 0), + }, + { + offset: 720, + targetDate: new Date(2021, 1, 4, 7, 0), + expectedDate: new Date(2021, 1, 4, 6, 0), + }, + + // startDayHour: prev day 18:00, endDayHour: 6:00 + { + offset: -720, + targetDate: new Date(2021, 1, 3, 16, 0), + expectedDate: new Date(2021, 1, 3, 18, 0), + }, + { + offset: -720, + targetDate: new Date(2021, 1, 3, 21, 0), + expectedDate: new Date(2021, 1, 3, 21, 0), + }, + { + offset: -720, + targetDate: new Date(2021, 1, 4, 3, 0), + expectedDate: new Date(2021, 1, 4, 3, 0), + }, + { + offset: -720, + targetDate: new Date(2021, 1, 3, 7, 0), + expectedDate: new Date(2021, 1, 3, 6, 0), + }, +].forEach(({ offset, targetDate, expectedDate }) => { + test(`scrollTo should scroll to date with offset=${offset}, targetDate=${targetDate.toString()} (T1310544)`, async (t) => { + const scheduler = new Scheduler('#container'); + + await scheduler.scrollTo(targetDate); + + const cellData = await scheduler.getCellDataAtViewportCenter(); + + await t + .expect(expectedDate.getTime()).gte(cellData.startDate.getTime()) + // eslint-disable-next-line spellcheck/spell-checker + .expect(expectedDate.getTime()).lte(cellData.endDate.getTime()); + }).before(async () => createScheduler({ + dataSource: [], + views: [{ + type: 'timelineWeek', + offset, + cellDuration: 60, + }], + currentView: 'timelineWeek', + currentDate: new Date(2021, 1, 2), + startDayHour: 6, + endDayHour: 18, + height: 580, + })); +}); diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts new file mode 100644 index 000000000000..13ffa2259716 --- /dev/null +++ b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.recalculation.test.ts @@ -0,0 +1,79 @@ +import { + afterEach, beforeEach, describe, expect, it, +} from '@jest/globals'; +import $ from '@js/core/renderer'; + +import fx from '../../../common/core/animation/fx'; +import CustomStore from '../../../data/custom_store'; +import { createScheduler } from './__mock__/create_scheduler'; +import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler'; + +const CLASSES = { + scheduler: 'dx-scheduler', + workSpace: 'dx-scheduler-work-space', +}; + +describe('Workspace Recalculation with Async Templates (T661335)', () => { + beforeEach(() => { + fx.off = true; + setupSchedulerTestEnvironment({ height: 600 }); + }); + + afterEach(() => { + const $scheduler = $(document.querySelector(`.${CLASSES.scheduler}`)); + // @ts-expect-error + $scheduler.dxScheduler('dispose'); + document.body.innerHTML = ''; + fx.off = false; + }); + + it('should not duplicate workspace elements when resources are loaded asynchronously (T661335)', async () => { + const { scheduler, container } = await createScheduler({ + templatesRenderAsynchronously: true, + currentView: 'day', + views: ['day'], + groups: ['owner'], + resources: [ + { + fieldExpr: 'owner', + dataSource: [{ id: 1, text: 'Owner 1' }], + }, + { + fieldExpr: 'room', + dataSource: new CustomStore({ + load(): Promise { + return new Promise((resolve) => { + setTimeout(() => { + resolve([{ id: 1, text: 'Room 1', color: '#ff0000' }]); + }); + }); + }, + }), + }, + ], + dataSource: [ + { + text: 'Meeting in Room 1', + startDate: new Date(2017, 4, 25, 9, 0), + endDate: new Date(2017, 4, 25, 10, 0), + roomId: 1, + }, + ], + startDayHour: 9, + currentDate: new Date(2017, 4, 25), + height: 600, + }); + + scheduler.option('groups', ['room']); + + await new Promise((r) => { setTimeout(r); }); + + const $workSpaces = $(container).find(`.${CLASSES.workSpace}`); + const $groupHeader = $(container).find('.dx-scheduler-group-header'); + + expect($workSpaces.length).toBe(1); + + expect($groupHeader.length).toBeGreaterThan(0); + expect($groupHeader.text()).toContain('Room 1'); + }); +}); diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts deleted file mode 100644 index 856c638eeef5..000000000000 --- a/packages/devextreme/js/__internal/scheduler/__tests__/workspace.test.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { - afterEach, beforeEach, describe, expect, it, jest, -} from '@jest/globals'; -import $ from '@js/core/renderer'; -import { getWidth } from '@js/core/utils/size'; - -import fx from '../../../common/core/animation/fx'; -import CustomStore from '../../../data/custom_store'; -import { createScheduler } from './__mock__/create_scheduler'; -import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler'; - -const CLASSES = { - scheduler: 'dx-scheduler', - workSpace: 'dx-scheduler-work-space', -}; - -describe('Workspace', () => { - describe('Recalculation with Async Templates (T661335)', () => { - beforeEach(() => { - fx.off = true; - setupSchedulerTestEnvironment({ height: 600 }); - }); - - afterEach(() => { - const $scheduler = $(document.querySelector(`.${CLASSES.scheduler}`)); - // @ts-expect-error - $scheduler.dxScheduler('dispose'); - document.body.innerHTML = ''; - fx.off = false; - }); - - it('should not duplicate workspace elements when resources are loaded asynchronously (T661335)', async () => { - const { scheduler, container } = await createScheduler({ - templatesRenderAsynchronously: true, - currentView: 'day', - views: ['day'], - groups: ['owner'], - resources: [ - { - fieldExpr: 'owner', - dataSource: [{ id: 1, text: 'Owner 1' }], - }, - { - fieldExpr: 'room', - dataSource: new CustomStore({ - load(): Promise { - return new Promise((resolve) => { - setTimeout(() => { - resolve([{ id: 1, text: 'Room 1', color: '#ff0000' }]); - }); - }); - }, - }), - }, - ], - dataSource: [ - { - text: 'Meeting in Room 1', - startDate: new Date(2017, 4, 25, 9, 0), - endDate: new Date(2017, 4, 25, 10, 0), - roomId: 1, - }, - ], - startDayHour: 9, - currentDate: new Date(2017, 4, 25), - height: 600, - }); - - scheduler.option('groups', ['room']); - - await new Promise((r) => { setTimeout(r); }); - - const $workSpaces = $(container).find(`.${CLASSES.workSpace}`); - const $groupHeader = $(container).find('.dx-scheduler-group-header'); - - expect($workSpaces.length).toBe(1); - - expect($groupHeader.length).toBeGreaterThan(0); - expect($groupHeader.text()).toContain('Room 1'); - }); - }); - - describe('scrollTo (T1310544)', () => { - beforeEach(() => { - fx.off = true; - setupSchedulerTestEnvironment({ height: 600 }); - }); - - afterEach(() => { - document.body.innerHTML = ''; - fx.off = false; - }); - - it('T1310544: should scroll to date with offset: 720 (12 hours)', async () => { - const { scheduler } = await createScheduler({ - views: ['timelineDay'], - currentView: 'timelineDay', - currentDate: new Date(2021, 1, 2), - firstDayOfWeek: 0, - startDayHour: 6, - endDayHour: 18, - offset: 720, - cellDuration: 60, - height: 580, - }); - - const workspace = scheduler.getWorkSpace(); - const scrollable = workspace.getScrollable(); - const $scrollable = scrollable.$element(); - const scrollBySpy = jest.spyOn(scrollable, 'scrollBy'); - - // With offset: 720 (12 hours), cells start at 18:00 (6:00 + 12h) - // For date 22:00, this should be cell index 4 (18:00=0, 19:00=1, 20:00=2, 21:00=3, 22:00=4) - const leftCellCount = 4; - const cellWidth = workspace.getCellWidth(); - const scrollableWidth = getWidth($scrollable); - const expectedLeft = leftCellCount * cellWidth - (scrollableWidth - cellWidth) / 2; - - const targetDate = new Date(2021, 1, 2, 22, 0); - scheduler.scrollTo(targetDate, undefined, false); - - expect(scrollBySpy).toHaveBeenCalledTimes(1); - const scrollParams = scrollBySpy.mock.calls[0][0] as { left: number; top: number }; - expect(scrollParams.left).toBeCloseTo(expectedLeft, 1); - - scrollBySpy.mockRestore(); - }); - }); -}); 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 ab80e53b889e..2be1aece5e3d 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -1404,29 +1404,20 @@ class SchedulerWorkSpace extends Widget { return (this.$element() as any).find(`.${GROUP_HEADER_CLASS}`); } - _getScrollCoordinates(hours, minutes, date, groupIndex?: any, allDay?: any) { + _getScrollCoordinates(date, groupIndex?: any, allDay?: any) { const currentDate = date || new Date(this.option('currentDate')); - const startDayHour = this.option('startDayHour'); - const endDayHour = this.option('endDayHour'); - const viewOffset = this.option('viewOffset'); - if (viewOffset === 0) { - if (hours < startDayHour) { - hours = startDayHour; - } + const cell = this.viewDataProvider.findGlobalCellPosition(currentDate, groupIndex, allDay, true); - if (hours >= endDayHour) { - hours = endDayHour - 1; - } + if (!cell) { + return undefined; } - currentDate.setHours(hours, minutes, 0, 0); - - const cell = this.viewDataProvider.findGlobalCellPosition(currentDate, groupIndex, allDay); + currentDate.setHours(cell.cellData.startDate.getHours(), currentDate.getMinutes(), 0, 0); return this.virtualScrollingDispatcher.calculateCoordinatesByDataAndPosition( - cell?.cellData, - cell?.position, + cell.cellData, + cell.position, currentDate, isDateAndTimeView(this.type as any), this.viewDirection === 'vertical', @@ -1848,7 +1839,11 @@ class SchedulerWorkSpace extends Widget { : 0; const isScrollToAllDay = allDay && this.isAllDayPanelVisible; - const coordinates = this._getScrollCoordinates(date.getHours(), date.getMinutes(), date, groupIndex, isScrollToAllDay); + const coordinates = this._getScrollCoordinates(date, groupIndex, isScrollToAllDay); + + if (!coordinates) { + return; + } const scrollable = this.getScrollable(); const $scrollable = scrollable.$element(); @@ -1881,13 +1876,10 @@ class SchedulerWorkSpace extends Widget { _isValidScrollDate(date, throwWarning = true) { const viewOffset = this.option('viewOffset') as number; - const min = this.getStartViewDate(); - const max = this.getEndViewDate(); - - const extendedMin = new Date(min.getTime() - viewOffset); - const extendedMax = new Date(max.getTime() + viewOffset); + const min = new Date(this.getStartViewDate().getTime() + viewOffset); + const max = new Date(this.getEndViewDate().getTime() + viewOffset); - if (date < extendedMin || date > extendedMax) { + if (date < min || date > max) { throwWarning && errors.log('W1008', date); return false; } 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 49b903a2802e..c1bb4a3b77ae 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 @@ -282,51 +282,67 @@ export default class ViewDataProvider { return startDate < groupEndDate && endDate > groupStartDate; } - findGlobalCellPosition(date, groupIndex = 0, allDay = false) { + findGlobalCellPosition(date, groupIndex = 0, allDay = false, findClosest = false) { const { completeViewDataMap } = this; const showAllDayPanel = this._options.isAllDayPanelVisible; + let resultDiff = Number.MAX_VALUE; + let resultCellData: ViewCellData | undefined; + let resultCellColumnIndex = -1; + let resultCellRowIndex = -1; + + const getCellPosition = (columnIndex: number, rowIndex: number) => ({ + columnIndex, + rowIndex: showAllDayPanel && !this._options.isVerticalGrouping + ? rowIndex - 1 + : rowIndex, + }); + for (let rowIndex = 0; rowIndex < completeViewDataMap.length; rowIndex += 1) { const currentRow = completeViewDataMap[rowIndex]; for (let columnIndex = 0; columnIndex < currentRow.length; columnIndex += 1) { const cellData = currentRow[columnIndex]; const { - startDate: currentStartDate, - endDate: currentEndDate, - groupIndex: currentGroupIndex, - allDay: currentAllDay, + startDate: cellStartDate, + endDate: cellEndDate, + groupIndex: cellGroupIndex, + allDay: cellAllDay, } = cellData; - if (groupIndex === currentGroupIndex - && allDay === Boolean(currentAllDay) - && this._compareDatesAndAllDay(date, currentStartDate, currentEndDate, allDay)) { + if (groupIndex !== cellGroupIndex || allDay !== Boolean(cellAllDay)) { + continue; + } + + const isDateInCell = allDay + ? dateUtils.sameDate(date, cellStartDate) + : date >= cellStartDate && date < cellEndDate; + + if (isDateInCell) { return { - position: { - columnIndex, - rowIndex: showAllDayPanel && !this._options.isVerticalGrouping - ? rowIndex - 1 - : rowIndex, - }, + position: getCellPosition(columnIndex, rowIndex), cellData, }; } + + const diff = Math.abs(date.getTime() - cellStartDate.getTime()); + + if (findClosest && diff < resultDiff) { + resultDiff = diff; + resultCellData = cellData; + resultCellColumnIndex = columnIndex; + resultCellRowIndex = rowIndex; + } } } - return undefined; - } - - private _compareDatesAndAllDay( - date: Date, - cellStartDate: Date, - cellEndDate: Date, - allDay: boolean, - ): boolean { - return allDay - ? dateUtils.sameDate(date, cellStartDate) - : date >= cellStartDate && date < cellEndDate; + return resultCellData + ? { + position: getCellPosition(resultCellColumnIndex, resultCellRowIndex), + cellData: resultCellData, + } + : undefined; } getSkippedDaysCount(groupIndex, startDate, endDate, daysCount) { diff --git a/packages/testcafe-models/scheduler/index.ts b/packages/testcafe-models/scheduler/index.ts index 208518cf7248..a8fd2502b6cd 100644 --- a/packages/testcafe-models/scheduler/index.ts +++ b/packages/testcafe-models/scheduler/index.ts @@ -159,6 +159,28 @@ export default class Scheduler extends Widget { return cells.filter(`.${CLASS.focusedCell}`); } + getCellDataAtViewportCenter(): any { + const { getInstance } = this; + + return ClientFunction( + () => { + const instance = getInstance() as any; + const workSpace = instance.getWorkSpace(); + const scrollable = workSpace.getScrollable(); + const scrollLeft = scrollable.scrollLeft(); + const scrollTop = scrollable.scrollTop(); + const centerX = scrollLeft + scrollable.$element().width() / 2; + const centerY = scrollTop + scrollable.$element().height() / 2; + + const cellElement = workSpace.getCellByCoordinates({ top: centerY, left: centerX }, false); + const cellData = workSpace.getCellData(cellElement); + + return cellData; + }, + { dependencies: { getInstance } } + )(); + } + getSelectedCells(isAllDay = false): Selector { const cells = isAllDay ? this.allDayTableCells : this.dateTableCells; @@ -193,13 +215,15 @@ export default class Scheduler extends Widget { scrollTo(date: Date, group?: Record, allDay?: boolean): Promise { const { getInstance } = this; - const scrollTo = (): any => (getInstance() as any).scrollTo(date, group, allDay); - return ClientFunction(scrollTo, { - dependencies: { - date, group, allDay, getInstance, - }, - })(); + return ClientFunction( + () => { + const instance = getInstance() as any; + instance.scrollTo(date, group, allDay); + }, { + dependencies: { date, group, allDay, getInstance }, + } + )(); } hideAppointmentTooltip(): Promise { From a91abb44acea5039a747084d5e8dfc8365c77a5a Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 15 Jan 2026 22:34:51 +0800 Subject: [PATCH 4/5] fix scrollToTime --- .../js/__internal/scheduler/workspaces/m_work_space.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 2be1aece5e3d..0a4353a5afe5 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -1819,7 +1819,9 @@ class SchedulerWorkSpace extends Widget { return; } - const coordinates = this._getScrollCoordinates(hours, minutes, date); + date = date || new Date(this.option('currentDate')); + date.setHours(hours, minutes, 0, 0); + const coordinates = this._getScrollCoordinates(date); const scrollable = this.getScrollable(); From e6bfc70776ed18b4bea1881166bc2b4025df1841 Mon Sep 17 00:00:00 2001 From: Eldar Iusupzhanov Date: Thu, 15 Jan 2026 23:13:23 +0800 Subject: [PATCH 5/5] fix scrollToTime --- .../js/__internal/scheduler/workspaces/m_timeline.ts | 5 ++++- .../DevExpress.ui.widgets.scheduler/scrollToTime.tests.js | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts index 849115ee7a13..89679e7d539c 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts @@ -280,7 +280,10 @@ class SchedulerTimeline extends SchedulerWorkSpace { } scrollToTime(hours, minutes, date) { - const coordinates = this._getScrollCoordinates(hours, minutes, date); + date = date || new Date(this.option('currentDate')); + date.setHours(hours, minutes, 0, 0); + + const coordinates = this._getScrollCoordinates(date); const scrollable = this.getScrollable(); const offset = this.option('rtlEnabled') ? getBoundingRect(this.getScrollableContainer().get(0)).width : 0; 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 f62962b562a9..3d02e73d8477 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(9, 5, new Date(2015, 1, 9)).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(9, 5, new Date(2015, 1, 9)).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(9, 5, new Date(2015, 1, 11)).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(9, 5, new Date(2015, 1, 11)).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', );