add jest tests

Ambrozy · Ambrozy · commit 6314c13e1f7d · 2025-08-26T22:41:03.000+02:00
diff --git a/e2e/testcafe-devextreme/tests/scheduler/common/layout/appointments/collector.ts b/e2e/testcafe-devextreme/tests/scheduler/common/layout/appointments/collector.ts
@@ -86,6 +86,30 @@ generateOptionMatrix({
   });
 });
 
+['generic.light', 'material.blue.light', 'fluent.blue.light'].forEach((theme) => {
+  test(`Appointment collector has correct offset when month view with double interval theme=${theme}`, async (t) => {
+    const scheduler = new Scheduler('#container');
+
+    const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+    await t
+      .expect(await takeScreenshot(`appointment-collector-month-double-interval-${theme}.png`, scheduler.workSpace))
+      .ok()
+
+      .expect(compareResults.isValid())
+      .ok(compareResults.errorMessages());
+  }).before(async () => {
+    await changeTheme(theme);
+
+    return createWidget('dxScheduler', {
+      ...getSchedulerBaseOptions('month'),
+      views: [{ type: 'month', intervalCount: 2 }],
+    });
+  }).after(async () => {
+    await changeTheme('generic.light');
+  });
+});
+
 generateOptionMatrix({
   view: ['day', 'week', 'workWeek', 'month', 'timelineDay', 'timelineWeek', 'timelineWorkWeek', 'timelineMonth'],
   variants: [
diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts
@@ -234,7 +234,6 @@ class SchedulerAppointments extends CollectionWidget {
       allowResize: true,
       allowAllDayResize: true,
       onAppointmentDblClick: null,
-      _collectorOffset: 0,
       groups: [],
       resources: [],
     });
@@ -1006,7 +1005,7 @@ class SchedulerAppointments extends CollectionWidget {
       items,
       buttonColor: items.colors[0],
       sortedIndex: appointment.sortedIndex,
-      width: appointment.width - this.option('_collectorOffset'),
+      width: appointment.width,
       height: appointment.height,
       onAppointmentClick: this.option('onItemClick'),
       allowDrag: this.option('allowDrag'),
diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.test.ts b/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.test.ts
@@ -0,0 +1,87 @@
+import {
+  describe, expect, it,
+} from '@jest/globals';
+
+import { VIEW_TYPES } from '../../utils/options/constants_view';
+import type { ViewType } from '../../utils/options/types';
+import { getDeltaTime } from './get_delta_time';
+
+describe('getDeltaTime', () => {
+  VIEW_TYPES.forEach((view) => {
+    it(`should return zero for not resized appointment in ${view} view`, () => {
+      expect(getDeltaTime(
+        { width: 100, height: 100 },
+        { width: 100, height: 100 },
+        {
+          viewType: view,
+          cellSize: { width: 50, height: 50 },
+          resizableStep: 50,
+          cellDurationInMinutes: 30,
+          isAllDay: true,
+        },
+      )).toBe(0);
+    });
+  });
+
+  ['day', 'week', 'workWeek'].forEach((view) => {
+    it(`should return correct delta in px for resized appointment in vertical ${view} view`, () => {
+      expect(getDeltaTime(
+        { width: 100, height: 50 },
+        { width: 100, height: 100 },
+        {
+          viewType: view as ViewType,
+          cellSize: { width: 50, height: 50 },
+          resizableStep: 50,
+          cellDurationInMinutes: 30,
+          isAllDay: false,
+        },
+      )).toBe(-30 * 60_000);
+    });
+
+    it(`should return correct delta in px for resized all day appointment in vertical ${view} view`, () => {
+      expect(getDeltaTime(
+        { width: 50, height: 100 },
+        { width: 100, height: 100 },
+        {
+          viewType: view as ViewType,
+          cellSize: { width: 50, height: 50 },
+          resizableStep: 50,
+          cellDurationInMinutes: 30,
+          isAllDay: true,
+        },
+      )).toBe(-24 * 3600_000);
+    });
+  });
+
+  ['timelineMonth', 'month'].forEach((view) => {
+    it(`should return correct delta in px for resized appointment in ${view} view`, () => {
+      expect(getDeltaTime(
+        { width: 50, height: 100 },
+        { width: 100, height: 100 },
+        {
+          viewType: view as ViewType,
+          cellSize: { width: 50, height: 50 },
+          resizableStep: 50,
+          cellDurationInMinutes: 30,
+          isAllDay: false,
+        },
+      )).toBe(-24 * 3600_000);
+    });
+  });
+
+  ['timelineDay', 'timelineWeek', 'timelineWorkWeek'].forEach((view) => {
+    it(`should return zero for not resized appointment in horizontal ${view} view`, () => {
+      expect(getDeltaTime(
+        { width: 50, height: 100 },
+        { width: 100, height: 100 },
+        {
+          viewType: view as ViewType,
+          cellSize: { width: 50, height: 50 },
+          resizableStep: 50,
+          cellDurationInMinutes: 30,
+          isAllDay: false,
+        },
+      )).toBe(-30 * 60_000);
+    });
+  });
+});
diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.ts b/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.ts
@@ -1,6 +1,6 @@
 import dateUtils from '@js/core/utils/date';
 
-import type { SafeAppointment, ViewType } from '../../types';
+import type { ViewType } from '../../types';
 
 const toMs = dateUtils.dateToMilliseconds;
 const VERTICAL_VIEW_TYPES = ['day', 'week', 'workWeek'];
@@ -14,7 +14,7 @@ interface Options {
   cellSize: Size;
   cellDurationInMinutes: number;
   resizableStep: number;
-  isAllDay: (itemData: SafeAppointment) => boolean;
+  isAllDay: boolean;
 }
 
 const MIN_RESIZABLE_STEP = 2;
@@ -44,7 +44,6 @@ const getVerticalDeltaTime = (args: Size, initialSize: Size, {
 export const getDeltaTime = (
   args: Size,
   initialSize: Size,
-  itemData: SafeAppointment,
   options: Options,
 ): number => {
   const { viewType, resizableStep, isAllDay } = options;
@@ -53,10 +52,10 @@ export const getDeltaTime = (
       return getAllDayDeltaWidth(args, initialSize, resizableStep) * toMs('day');
     case viewType === 'agenda':
       return 0;
-    case VERTICAL_VIEW_TYPES.includes(viewType) && !isAllDay(itemData):
+    case VERTICAL_VIEW_TYPES.includes(viewType) && !isAllDay:
       return getVerticalDeltaTime(args, initialSize, options);
     default:
-      return isAllDay(itemData)
+      return isAllDay
         ? getAllDayDeltaWidth(args, initialSize, resizableStep) * toMs('day')
         : getHorizontalDeltaTime(args, initialSize, options);
   }
diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts
@@ -1301,8 +1301,6 @@ class Scheduler extends SchedulerOptionsBaseWidget {
     if (currentViewOptions.startDate) {
       this._updateOption('header', 'currentDate', this._workSpace._getHeaderDate());
     }
-
-    this._appointments.option('_collectorOffset', this.getCollectorOffset());
   }
 
   _recalculateWorkspace() {
diff --git a/packages/devextreme/js/__internal/scheduler/m_subscribes.ts b/packages/devextreme/js/__internal/scheduler/m_subscribes.ts
@@ -181,15 +181,15 @@ const subscribes = {
   },
 
   getDeltaTime(e, initialSize, itemData) {
-    return getDeltaTime(e, initialSize, itemData, {
+    return getDeltaTime(e, initialSize, {
       viewType: this.currentView.type,
       cellSize: {
         width: this.getWorkSpace().getCellWidth(),
         height: this.getWorkSpace().getCellHeight(),
       },
       cellDurationInMinutes: this.getWorkSpace().option('cellDuration'),
       resizableStep: this.getWorkSpace().positionHelper.getResizableStep(),
-      isAllDay: (appointmentData) => isAllDay(this, appointmentData),
+      isAllDay: isAllDay(this, itemData),
     });
   },
 
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_base.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_base.ts
@@ -132,10 +132,6 @@ class BaseRenderingStrategy {
     return coordinates;
   }
 
-  needCorrectAppointmentDates() {
-    return true;
-  }
-
   getDirection() {
     return 'horizontal';
   }
@@ -636,7 +632,7 @@ class BaseRenderingStrategy {
     if ((coordinates.count - countFullWidthAppointmentInCell) > 0) {
       const { top, left } = coordinates;
       const compactRender = this.isAdaptive || !isAllDay && this.supportCompactDropDownAppointments();
-      const width = this.getDropDownAppointmentWidth(this.intervalCount, isAllDay);
+      const width = this.getDropDownAppointmentWidth(this.intervalCount, isAllDay) - this.options._collectorOffset;
       const height = this.getDropDownAppointmentHeight();
       const rtlOffset = this.rtlEnabled ? width : 0;
       coordinates.virtual = {
@@ -846,15 +842,6 @@ class BaseRenderingStrategy {
     return this._getAppointmentDefaultWidth();
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _needVerticalGroupBounds(allDay) {
-    return false;
-  }
-
-  _needHorizontalGroupBounds() {
-    return false;
-  }
-
   getAppointmentDurationInMs(apptStartDate, apptEndDate, allDay) {
     if (allDay) {
       const appointmentDuration = apptEndDate.getTime() - apptStartDate.getTime();
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_horizontal_month.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_horizontal_month.ts
@@ -174,18 +174,6 @@ class HorizontalMonthRenderingStrategy extends HorizontalMonthLineRenderingStrat
     const offset = intervalCount > 1 ? MONTH_DROPDOWN_APPOINTMENT_MAX_RIGHT_OFFSET : MONTH_DROPDOWN_APPOINTMENT_MIN_RIGHT_OFFSET;
     return this.cellWidth - offset;
   }
-
-  needCorrectAppointmentDates() {
-    return false;
-  }
-
-  _needVerticalGroupBounds() {
-    return false;
-  }
-
-  _needHorizontalGroupBounds() {
-    return true;
-  }
 }
 
 export default HorizontalMonthRenderingStrategy;
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_horizontal_month_line.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_horizontal_month_line.ts
@@ -68,10 +68,6 @@ class HorizontalMonthLineRenderingStrategy extends HorizontalAppointmentsStrateg
     return result;
   }
 
-  needCorrectAppointmentDates() {
-    return false;
-  }
-
   getPositionShift(timeShift) {
     return {
       top: 0,
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_vertical.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/rendering_strategies/m_strategy_vertical.ts
@@ -423,15 +423,6 @@ class VerticalRenderingStrategy extends BaseAppointmentsStrategy {
     return this.allDayHeight || this.getAppointmentMinSize();
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  _needVerticalGroupBounds(allDay) {
-    return !allDay;
-  }
-
-  _needHorizontalGroupBounds() {
-    return false;
-  }
-
   getPositionShift(timeShift, isAllDay) {
     if (!isAllDay && this.isAdaptive && this._getMaxAppointmentCountPerCellByType(isAllDay) === 0) {
       return {
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/m_appointments_layout_manager.ts b/packages/devextreme/js/__internal/scheduler/view_model/m_appointments_layout_manager.ts
@@ -144,6 +144,7 @@ class AppointmentLayoutManager {
       intervalDuration: workspace.getIntervalDuration(),
       allDayIntervalDuration: workspace.getIntervalDuration(true),
       isVerticalGroupOrientation: workspace.isVerticalOrientation(),
+      _collectorOffset: this.instance.getCollectorOffset(),
       DOMMetaData,
       // agenda only
       instance: this.instance,
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js
@@ -451,32 +451,6 @@ QUnit.module('Appointments', moduleOptions, () => {
         assert.deepEqual(instance.option('items'), items, 'items are not affected');
     });
 
-    QUnit.test('Delta time for resizable appointment should be 0 if appointment isn\'t resized', async function(assert) {
-        const strategy = new HorizontalMonthAppointmentsStrategy({
-            instance: {
-                notifyObserver: commonUtils.noop,
-                option: commonUtils.noop,
-                fire: commonUtils.noop,
-            },
-            getResizableStep: () => 0
-        });
-        const deltaTime = strategy.getDeltaTime({ width: 100 }, { width: 100 });
-
-        assert.strictEqual(deltaTime, 0, 'Delta time is 0');
-    });
-
-    QUnit.test('Delta time for resizable appointment should decreased correctly in vertical strategy', async function(assert) {
-        const strategy = new VerticalAppointmentsStrategy({
-            dataAccessors: mockDataAccessor,
-            allDayPanelMode: 'all',
-            cellDurationInMinutes: 30,
-            cellHeight: 50
-        });
-        const deltaTime = strategy.getDeltaTime({ height: 50 }, { height: 100 }, { allDay: false });
-
-        assert.strictEqual(deltaTime, -1800000, 'Delta time is OK');
-    });
-
     QUnit.test('Scheduler appointment should have aria-role \'button\'', function(assert) {
         const item = {
             itemData: {
diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js
@@ -843,36 +843,30 @@ QUnit.module('Options for Material-based themes in components', {
         themes.isMaterialBased = this.origIsMaterialBased;
     }
 }, () => {
-    QUnit.test('_collectorOffset option should be passed to SchedulerAppointments depending on the view', async function(assert) {
+    QUnit.test('_collectorOffset option should be depending on the view', async function(assert) {
         const scheduler = await createWrapper({
             currentView: 'month',
             showCurrentTimeIndicator: false
         });
 
-        const appointments = scheduler.instance.getAppointmentsInstance();
-
-        assert.equal(appointments.option('_collectorOffset'), 20, 'SchedulerAppointments has correct _collectorOffset');
+        assert.equal(scheduler.instance.getCollectorOffset(), 20, 'SchedulerAppointments has correct _collectorOffset');
 
         scheduler.instance.option('currentView', 'week');
         await waitAsync(10);
-        assert.equal(appointments.option('_collectorOffset'), 0, 'SchedulerAppointments has correct _collectorOffset');
+        assert.equal(scheduler.instance.getCollectorOffset(), 0, 'SchedulerAppointments has correct _collectorOffset');
     });
 
-    QUnit.test('Real _collectorOffset option should be passed to SchedulerAppointments depending on the adaptivityEnabled', async function(assert) {
+    QUnit.test('Real _collectorOffset option should be depending on the adaptivityEnabled', async function(assert) {
         const scheduler = await createWrapper({
             currentView: 'month',
             showCurrentTimeIndicator: false,
             adaptivityEnabled: false
         });
 
-        let appointments = scheduler.instance.getAppointmentsInstance();
-
-        assert.equal(appointments.option('_collectorOffset'), 20, 'SchedulerAppointments has correct _collectorOffset');
+        assert.equal(scheduler.instance.getCollectorOffset(), 20, 'SchedulerAppointments has correct _collectorOffset');
 
         scheduler.instance.option('adaptivityEnabled', true);
-        appointments = scheduler.instance.getAppointmentsInstance();
-
-        assert.equal(appointments.option('_collectorOffset'), 0, 'SchedulerAppointments has correct _collectorOffset');
+        assert.equal(scheduler.instance.getCollectorOffset(), 0, 'SchedulerAppointments has correct _collectorOffset');
     });
 });
 

Original file line number	Diff line number	Diff line change
`@@ -1301,8 +1301,6 @@ class Scheduler extends SchedulerOptionsBaseWidget {`
`1301`	`1301`	`if (currentViewOptions.startDate) {`
`1302`	`1302`	`this._updateOption('header', 'currentDate', this._workSpace._getHeaderDate());`
`1303`	`1303`	`}`
`1304`		`-`
`1305`		`- this._appointments.option('_collectorOffset', this.getCollectorOffset());`
`1306`	`1304`	`}`
`1307`	`1305`
`1308`	`1306`	`_recalculateWorkspace() {`