Merge branch '26_1' into 26_1_chat_main_action_button

marker-dao · web-flow · commit 644acefa7991 · 2026-04-02T12:55:57.000+02:00
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.html b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.html
@@ -70,7 +70,7 @@
 </dx-scheduler>
 <div class="options">
   <div class="option">
-    <span>Overlapping Rule</span>
+    <span>Allow Overlapping Appointments</span>
     <dx-select-box
       [items]="overlappingRuleItems"
       valueExpr="value"
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts
@@ -45,8 +45,8 @@ export class AppComponent {
   assignees: Assignee[] = assignees;
 
   overlappingRuleItems = [
-    { value: 'sameResource', text: 'Allow across resources' },
-    { value: 'allResources', text: 'Disallow all overlaps' },
+    { value: 'sameResource', text: 'Different Resources' },
+    { value: 'allResources', text: 'Never' },
   ];
 
   assigneeIdEditorOptions = {
@@ -163,7 +163,7 @@ export class AppComponent {
     );
   }
 
-  private alertConflictIfNeeded(
+  private handleConflict(
     e: DxSchedulerTypes.AppointmentAddingEvent | DxSchedulerTypes.AppointmentUpdatingEvent,
     appointmentData: Appointment,
   ): void {
@@ -195,11 +195,11 @@ export class AppComponent {
   }
 
   onAppointmentAdding(e: DxSchedulerTypes.AppointmentAddingEvent): void {
-    this.alertConflictIfNeeded(e, e.appointmentData as Appointment);
+    this.handleConflict(e, e.appointmentData as Appointment);
   }
 
   onAppointmentUpdating(e: DxSchedulerTypes.AppointmentUpdatingEvent): void {
-    this.alertConflictIfNeeded(e, { ...e.oldData, ...e.newData } as Appointment);
+    this.handleConflict(e, { ...e.oldData, ...e.newData } as Appointment);
   }
 
   onOverlappingRuleChanged(e: DxSelectBoxTypes.ValueChangedEvent): void {
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/App.tsx b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/App.tsx
@@ -22,8 +22,8 @@ const currentDate = new Date(2026, 1, 10);
 const views: SchedulerTypes.ViewType[] = ['day', 'week', 'workWeek', 'month'];
 
 const overlappingRuleItems = [
-  { value: 'sameResource', text: 'Allow across resources' },
-  { value: 'allResources', text: 'Disallow all overlaps' },
+  { value: 'sameResource', text: 'Different Resources' },
+  { value: 'allResources', text: 'Never' },
 ];
 
 function getNextDay(date: Date): Date {
@@ -112,7 +112,7 @@ const App = () => {
     formRef.current?.option('elementAttr.class', show ? '' : 'hide-informer');
   }, []);
 
-  const alertConflictIfNeeded = useCallback((
+  const handleConflict = useCallback((
     e: SchedulerTypes.AppointmentAddingEvent | SchedulerTypes.AppointmentUpdatingEvent,
     appointmentData: Appointment,
   ) => {
@@ -144,12 +144,12 @@ const App = () => {
   }, [setConflictError]);
 
   const onAppointmentAdding = useCallback((e: SchedulerTypes.AppointmentAddingEvent) => {
-    alertConflictIfNeeded(e, e.appointmentData as Appointment);
-  }, [alertConflictIfNeeded]);
+    handleConflict(e, e.appointmentData as Appointment);
+  }, [handleConflict]);
 
   const onAppointmentUpdating = useCallback((e: SchedulerTypes.AppointmentUpdatingEvent) => {
-    alertConflictIfNeeded(e, { ...e.oldData, ...e.newData } as Appointment);
-  }, [alertConflictIfNeeded]);
+    handleConflict(e, { ...e.oldData, ...e.newData } as Appointment);
+  }, [handleConflict]);
 
   const popupOptions = useMemo(() => ({
     onInitialized: (e: PopupTypes.InitializedEvent) => {
@@ -254,7 +254,7 @@ const App = () => {
 
       <div className="options">
         <div className="option">
-          <span>Overlapping Rule</span>
+          <span>Allow Overlapping Appointments</span>
           <SelectBox
             items={overlappingRuleItems}
             valueExpr="value"
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/App.js b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/App.js
@@ -10,8 +10,8 @@ import { data, assignees } from './data.js';
 const currentDate = new Date(2026, 1, 10);
 const views = ['day', 'week', 'workWeek', 'month'];
 const overlappingRuleItems = [
-  { value: 'sameResource', text: 'Allow across resources' },
-  { value: 'allResources', text: 'Disallow all overlaps' },
+  { value: 'sameResource', text: 'Different Resources' },
+  { value: 'allResources', text: 'Never' },
 ];
 function getNextDay(date) {
   const next = new Date(date);
@@ -80,7 +80,7 @@ const App = () => {
     showConflictErrorRef.current = show;
     formRef.current?.option('elementAttr.class', show ? '' : 'hide-informer');
   }, []);
-  const alertConflictIfNeeded = useCallback(
+  const handleConflict = useCallback(
     (e, appointmentData) => {
       if (!detectConflict(e.component, appointmentData, overlappingRuleRef.current)) {
         setConflictError(false);
@@ -113,15 +113,15 @@ const App = () => {
   );
   const onAppointmentAdding = useCallback(
     (e) => {
-      alertConflictIfNeeded(e, e.appointmentData);
+      handleConflict(e, e.appointmentData);
     },
-    [alertConflictIfNeeded],
+    [handleConflict],
   );
   const onAppointmentUpdating = useCallback(
     (e) => {
-      alertConflictIfNeeded(e, { ...e.oldData, ...e.newData });
+      handleConflict(e, { ...e.oldData, ...e.newData });
     },
-    [alertConflictIfNeeded],
+    [handleConflict],
   );
   const popupOptions = useMemo(
     () => ({
@@ -238,7 +238,7 @@ const App = () => {
 
       <div className="options">
         <div className="option">
-          <span>Overlapping Rule</span>
+          <span>Allow Overlapping Appointments</span>
           <SelectBox
             items={overlappingRuleItems}
             valueExpr="value"
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/App.vue b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/App.vue
@@ -72,7 +72,7 @@
 
   <div class="options">
     <div class="option">
-      <span>Overlapping Rule</span>
+      <span>Allow Overlapping Appointments</span>
       <DxSelectBox
         :items="overlappingRuleItems"
         value-expr="value"
@@ -114,8 +114,8 @@ const views: DxSchedulerTypes.ViewType[] = ['day', 'week', 'workWeek', 'month'];
 const formElementAttr = { class: 'hide-informer', id: 'form' };
 
 const overlappingRuleItems = [
-  { value: 'sameResource', text: 'Allow across resources' },
-  { value: 'allResources', text: 'Disallow all overlaps' },
+  { value: 'sameResource', text: 'Different Resources' },
+  { value: 'allResources', text: 'Never' },
 ];
 
 function getNextDay(date: Date): Date {
@@ -189,7 +189,7 @@ const popupOptions = {
   },
 };
 
-const alertConflictIfNeeded = (
+const handleConflict = (
   e: DxSchedulerTypes.AppointmentAddingEvent | DxSchedulerTypes.AppointmentUpdatingEvent,
   appointmentData: Appointment,
 ) => {
@@ -221,11 +221,11 @@ const alertConflictIfNeeded = (
 };
 
 const onAppointmentAdding = (e: DxSchedulerTypes.AppointmentAddingEvent) => {
-  alertConflictIfNeeded(e, e.appointmentData as Appointment);
+  handleConflict(e, e.appointmentData as Appointment);
 };
 
 const onAppointmentUpdating = (e: DxSchedulerTypes.AppointmentUpdatingEvent) => {
-  alertConflictIfNeeded(e, { ...e.oldData, ...e.newData } as Appointment);
+  handleConflict(e, { ...e.oldData, ...e.newData } as Appointment);
 };
 
 const onFormInitialized = (e: DxFormTypes.InitializedEvent) => {
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/description.md b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/description.md
@@ -0,0 +1,26 @@
+This example prevents appointment time conflicts in DevExtreme Scheduler. Use the **Allow Overlapping Appointments** select-box to select a time conflict resolution mode.
+<!--split-->
+
+### Detect Conflicts
+
+Handle the [onAppointmentAdding](/Documentation/ApiReference/UI_Components/dxScheduler/Configuration/#onAppointmentAdding) and [onAppointmentUpdating](/Documentation/ApiReference/UI_Components/dxScheduler/Configuration/#onAppointmentUpdating) events to check if a new or updated appointment creates a time conflict. Set `e.cancel = true` to block the operation if necessary.
+
+Call [getOccurrences](/Documentation/ApiReference/UI_Components/dxScheduler/Methods/#getOccurrences) to expand [recurring appointments](/Documentation/Guide/UI_Components/Scheduler/Appointments/Appointment_Types/#Recurring_Appointments) into individual occurrences within the target range. Check for overlapping time ranges.
+
+### Conflict Detection Modes
+
+The demo supports two modes:
+
+- **Different Resources**: appointments assigned to different resources (assignees) can overlap.
+- **Never**: overlapping appointments are not allowed, regardless of resource assignment.
+
+To implement resource-aware checks, access appointments and compare their `assigneeId` field values.
+
+### Display Errors
+
+When a conflict is detected, the demo displays the error in the following ways:
+
+- A message box.
+- An inline validation message (if an appointment edit form is active).
+
+To display inline validation, configure a custom form item inside [editing.form](/Documentation/ApiReference/UI_Components/dxScheduler/Configuration/editing/form/) and use the `customizeItem` function to attach custom `validationRules` to the time editors.
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.html b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.html
@@ -18,7 +18,7 @@
       <div id="scheduler"></div>
       <div class="options">
         <div class="option">
-          <span>Overlapping Rule</span>
+          <span>Allow Overlapping Appointments</span>
           <div id="overlapping-rule"></div>
         </div>
       </div>
diff --git a/apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.js b/apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.js
@@ -109,10 +109,10 @@ $(() => {
       },
     },
     onAppointmentAdding(e) {
-      alertConflictIfNeeded(e, e.appointmentData);
+      handleConflict(e, e.appointmentData);
     },
     onAppointmentUpdating(e) {
-      alertConflictIfNeeded(e, e.newData);
+      handleConflict(e, e.newData);
     },
   }).dxScheduler('instance');
 
@@ -121,7 +121,7 @@ $(() => {
     form?.option('elementAttr.class', show ? '' : 'hide-informer');
   }
 
-  function alertConflictIfNeeded(e, appointmentData) {
+  function handleConflict(e, appointmentData) {
     if (!detectConflict(appointmentData)) {
       setConflictError(false);
       return;
@@ -198,8 +198,8 @@ $(() => {
 
   $('#overlapping-rule').dxSelectBox({
     items: [
-      { value: 'sameResource', text: 'Allow across resources' },
-      { value: 'allResources', text: 'Disallow all overlaps' },
+      { value: 'sameResource', text: 'Different Resources' },
+      { value: 'allResources', text: 'Never' },
     ],
     valueExpr: 'value',
     displayExpr: 'text',
diff --git a/apps/demos/testing/etalons/Scheduler-ResolveTimeConflicts (fluent.blue.light).png b/apps/demos/testing/etalons/Scheduler-ResolveTimeConflicts (fluent.blue.light).png
diff --git a/apps/demos/testing/etalons/Scheduler-ResolveTimeConflicts (material.blue.light).png b/apps/demos/testing/etalons/Scheduler-ResolveTimeConflicts (material.blue.light).png
diff --git a/package.json b/package.json
@@ -98,7 +98,8 @@
       "flatted@<3.4.0": "^3.4.0",
       "undici@<7.24.0": "^7.24.0",
       "socket.io-parser@>=4.0.0 <4.2.6": "^4.2.6",
-      "lodash@<4.18.1": "4.18.1"
+      "lodash@<4.18.1": "4.18.1",
+      "lodash.template@<4.18.1": "4.18.1"
     }
   },
   "packageManager": "pnpm@9.15.9"
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.test.ts
@@ -65,10 +65,10 @@ describe('snapToCells', () => {
   });
 
   describe('auto mode', () => {
-    it('should snap both boundaries when cells are covered by more than 50%', () => {
+    it('should stretch appointments that occupy less than two cells', () => {
       const items = [
         {
-          cellIndex: 0, endCellIndex: 1, startDateUTC: 2, endDateUTC: 16, duration: 14,
+          cellIndex: 0, endCellIndex: 1, startDateUTC: 2, endDateUTC: 19, duration: 17,
         },
       ];
 
@@ -79,30 +79,30 @@ describe('snapToCells', () => {
       ]);
     });
 
-    it('should not snap boundary when cell is covered by less than 50%', () => {
+    it('should not stretch appointments that occupy exactly two cells', () => {
       const items = [
         {
-          cellIndex: 0, endCellIndex: 0, startDateUTC: 2, endDateUTC: 7, duration: 5,
+          cellIndex: 0, endCellIndex: 2, startDateUTC: 1, endDateUTC: 21, duration: 20,
         },
       ];
 
       expect(snapToCells(items as any, cells, 'auto')).toEqual([
         expect.objectContaining({
-          startDateUTC: 2, endDateUTC: 7, duration: 5,
+          startDateUTC: 1, endDateUTC: 21, duration: 20,
         }),
       ]);
     });
 
-    it('should not snap boundary when cell is covered by exactly 50%', () => {
+    it('should not stretch appointments that occupy more than two cells', () => {
       const items = [
         {
-          cellIndex: 0, endCellIndex: 0, startDateUTC: 0, endDateUTC: 5, duration: 5,
+          cellIndex: 0, endCellIndex: 2, startDateUTC: 2, endDateUTC: 26, duration: 24,
         },
       ];
 
       expect(snapToCells(items as any, cells, 'auto')).toEqual([
         expect.objectContaining({
-          startDateUTC: 0, endDateUTC: 5, duration: 5,
+          startDateUTC: 2, endDateUTC: 26, duration: 24,
         }),
       ]);
     });
diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.ts
@@ -4,21 +4,6 @@ import type {
   CellInterval, ListEntity, Position,
 } from '../../types';
 
-const getCellFill = (
-  startDateUTC: number,
-  endDateUTC: number,
-  cell: CellInterval,
-): number => {
-  const cellDuration = cell.max - cell.min;
-  if (cellDuration <= 0) return 0;
-
-  const overlapStart = Math.max(startDateUTC, cell.min);
-  const overlapEnd = Math.min(endDateUTC, cell.max);
-  const overlapDuration = Math.max(0, overlapEnd - overlapStart);
-
-  return overlapDuration / cellDuration;
-};
-
 export const snapToCells = <T extends ListEntity & Position>(
   entities: T[],
   cells: CellInterval[],
@@ -29,14 +14,13 @@ export const snapToCells = <T extends ListEntity & Position>(
   return entities.map((entity) => {
     const startCell = cells[entity.cellIndex];
     const endCell = cells[entity.endCellIndex];
+    const cellDuration = startCell.max - startCell.min;
+    const appointmentDuration = entity.endDateUTC - entity.startDateUTC;
+    const isLessThanTwoCells = cellDuration > 0 && appointmentDuration / cellDuration < 2;
+    const shouldSnap = mode === 'always' || isLessThanTwoCells;
 
-    const snapStart = mode === 'always'
-      || getCellFill(entity.startDateUTC, entity.endDateUTC, startCell) > 0.5;
-    const snapEnd = mode === 'always'
-      || getCellFill(entity.startDateUTC, entity.endDateUTC, endCell) > 0.5;
-
-    const startDateUTC = snapStart ? startCell.min : entity.startDateUTC;
-    const endDateUTC = snapEnd ? endCell.max : entity.endDateUTC;
+    const startDateUTC = shouldSnap ? startCell.min : entity.startDateUTC;
+    const endDateUTC = shouldSnap ? endCell.max : entity.endDateUTC;
 
     return {
       ...entity,
diff --git a/packages/sbom/package.json b/packages/sbom/package.json
@@ -12,6 +12,8 @@
       "body-parser@>=2.2.0 <2.2.1": ">=2.2.1",
       "jws@=4.0.0": ">=4.0.1",
       "minimatch@>=10.0.0 <10.2.3": "^10.2.4",
+      "picomatch@>=2.0.0 <2.3.2": "2.3.2",
+      "picomatch@>=4.0.0 <4.0.4": "4.0.4",
       "qs": ">=6.14.1",
       "tar@<=7.5.9": "^7.5.10",
       "undici@<7.24.0": "^7.24.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
