@progress/kendo-angular-scheduler 23.2.1-develop.1 → 23.2.1-develop.2

package/fesm2022/progress-kendo-angular-scheduler.mjs

@@ -44,7 +44,7 @@ const packageMetadata = {
     productCode: 'KENDOUIANGULAR',
     productCodes: ['KENDOUIANGULAR'],
     publishDate: 0,
-    version: '23.2.1-develop.1',
+    version: '23.2.1-develop.2',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };
 
@@ -2790,6 +2790,12 @@ function resourcesMatch(res1, res2, resourceConfigs) {
  * @hidden
  */
 function isSameRange(range1, range2, resourceConfigs) {
+    if (!range1 && !range2) {
+        return true;
+    }
+    if (!range1 || !range2) {
+        return false;
+    }
     return (range1.start.getTime() === range2.start.getTime() &&
         range1.end.getTime() === range2.end.getTime() &&
         range1.isAllDay === range2.isAllDay &&
@@ -10318,6 +10324,7 @@ class SlotSelectableDirective {
      */
     selectionOriginResources;
     selectedRange = null;
+    rangeBeforeDrag = null;
     slotSelectionChangeSource = new EventEmitter();
     subscriptions = new Subscription();
     constructor(scheduler, cdr) {
@@ -10335,20 +10342,27 @@ class SlotSelectableDirective {
         this.subscriptions.add(startSource.subscribe(e => this.initDragSelect(e)));
         this.subscriptions.add(drag$.subscribe(e => this.onDrag(e)));
         this.subscriptions.add(end$.subscribe(() => this.onRelease()));
+        this.subscriptions.add(this.scheduler.slotClick.subscribe(e => this.onSlotClick(e)));
     }
     ngOnInit() {
         this.scheduler.isSlotSelected = this.isSlotSelected.bind(this);
     }
     ngOnChanges(changes) {
         if (isChanged("slotSelection", changes, false)) {
-            const defaults = {
-                isAllDay: false,
-                resources: this.scheduler?.resources ? this.scheduler.resources.reduce((result, resource) => {
-                    result.push(...resource.data);
-                    return result;
-                }, []) : []
-            };
-            this.selectedRange = Object.assign(defaults, changes['slotSelection'].currentValue);
+            const currentValue = changes['slotSelection'].currentValue;
+            if (!currentValue) {
+                this.selectedRange = null;
+            }
+            else {
+                const defaults = {
+                    isAllDay: false,
+                    resources: this.scheduler?.resources ? this.scheduler.resources.reduce((result, resource) => {
+                        result.push(...resource.data);
+                        return result;
+                    }, []) : []
+                };
+                this.selectedRange = Object.assign(defaults, currentValue);
+            }
             this.cdr.markForCheck();
         }
     }
@@ -10367,6 +10381,7 @@ class SlotSelectableDirective {
     }
     initDragSelect({ start, end, isAllDay, resources }) {
         this.selectionOriginResources = resources.slice();
+        this.rangeBeforeDrag = this.selectedRange;
         this.selectedRange = { start, end, isAllDay, resources: resources.slice() };
         this.cdr.markForCheck();
     }
@@ -10380,11 +10395,23 @@ class SlotSelectableDirective {
         this.cdr.markForCheck();
     }
     onRelease() {
+        const hasChanged = !isSameRange(this.rangeBeforeDrag, this.selectedRange, this.scheduler.resources);
         this.selectionOriginResources = null;
-        if (this.selectedRange) {
+        this.rangeBeforeDrag = null;
+        if (this.selectedRange && hasChanged) {
             this.slotSelectionChangeSource.emit(this.selectedRange);
         }
     }
+    onSlotClick({ start, end, isAllDay, resources }) {
+        const newRange = { start, end, isAllDay, resources: resources.slice() };
+        const hasChanged = !isSameRange(this.selectedRange, newRange, this.scheduler.resources);
+        if (!hasChanged) {
+            return;
+        }
+        this.selectedRange = newRange;
+        this.cdr.markForCheck();
+        this.slotSelectionChangeSource.emit(this.selectedRange);
+    }
     /**
      * @hidden
      * Checks if the selected range contains a local date range.
@@ -12619,6 +12646,7 @@ class BaseView {
     editable;
     selectable; // initialized to false in the scheduler component
     getField = getField;
+    isSlotSelected = () => false;
     changes = new BehaviorSubject(null);
     viewRangeChange = new BehaviorSubject(null);
     subs = new Subscription();
@@ -12661,7 +12689,7 @@ class BaseView {
     scrollInterval;
     autoHeight = false;
     rtl = false;
-    isSlotSelected = () => false;
+    isEventTarget = false;
     constructor(viewContext, viewState, intl, slotService, zone, renderer, element, pdfService, localization, cdr, scrollBarWidthService) {
         this.viewContext = viewContext;
         this.viewState = viewState;
@@ -12908,15 +12936,15 @@ class BaseView {
                 if (!args.isTouch) {
                     args.originalEvent.preventDefault();
                 }
-                this.pressLocation = { x: args.pageX, y: args.pageY };
                 this.pressTarget = task;
             }
         }
+        this.pressLocation = { x: args.pageX, y: args.pageY };
+        this.isEventTarget = Boolean(this.targetTask(target));
         const notDraggingEvent = !this.pressTarget;
         if (notDraggingEvent && this.selectable) {
             //fixes https://github.com/telerik/kendo-angular/issues/4446
             args.originalEvent.preventDefault();
-            this.initDragSelect(args);
         }
         this.dragArgs = args;
     }
@@ -12932,6 +12960,13 @@ class BaseView {
                 args.originalEvent.preventDefault();
                 this.scrollContainer(this.drag, args);
             }
+            const hasMovedMinDistance = this.pressLocation && pointDistance(this.pressLocation.x, this.pressLocation.y, args.pageX, args.pageY) >= MIN_MOVE_DISTANCE;
+            const canStartDragSelection = !this.isEventTarget && !this.dragSelecting && this.selectable;
+            if (canStartDragSelection && hasMovedMinDistance) {
+                args.pageX = this.pressLocation.x;
+                args.pageY = this.pressLocation.y;
+                this.initDragSelect(args);
+            }
             if (this.dragSelecting) {
                 this.dragSelect(args);
             }
@@ -12985,6 +13020,7 @@ class BaseView {
         this.dragArgs = null;
         this.pressLocation = null;
         this.pressTarget = null;
+        this.isEventTarget = false;
     }
     setHintClass(className) {
         (this.dragging || this.resizing).hintClass = className;
@@ -13021,11 +13057,13 @@ class BaseView {
         return this.dragging ? this.dragHints : this.resizeHints;
     }
     initDrag(args) {
-        if (!this.dragging && this.pressLocation && pointDistance(this.pressLocation.x, this.pressLocation.y, args.pageX, args.pageY) >= MIN_MOVE_DISTANCE) {
+        const hasPressTarget = this.pressTarget && this.pressLocation;
+        const hasMovedMinDistance = hasPressTarget && pointDistance(this.pressLocation.x, this.pressLocation.y, args.pageX, args.pageY) >= MIN_MOVE_DISTANCE;
+        const canStartDrag = !this.dragging && hasPressTarget && hasMovedMinDistance;
+        if (canStartDrag) {
             const dragging = this.pressTarget;
             const task = dragging.task;
             if (this.emitEvent('dragStart', { event: task.event, dataItem: task.event.dataItem })) {
-                this.pressLocation = null;
                 this.pressTarget = null;
                 return;
             }

package/package-metadata.mjs

@@ -7,7 +7,7 @@ export const packageMetadata = {
   "productCodes": [
     "KENDOUIANGULAR"
   ],
-  "publishDate": 1772207712,
-  "version": "23.2.1-develop.1",
+  "publishDate": 1772441522,
+  "version": "23.2.1-develop.2",
   "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progress/kendo-angular-scheduler",
-  "version": "23.2.1-develop.1",
+  "version": "23.2.1-develop.2",
   "description": "Kendo UI Scheduler Angular - Outlook or Google-style angular scheduler calendar. Full-featured and customizable embedded scheduling from the creator developers trust for professional UI components.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Progress",
@@ -19,7 +19,7 @@
     "package": {
       "productName": "Kendo UI for Angular",
       "productCode": "KENDOUIANGULAR",
-      "publishDate": 1772207712,
+      "publishDate": 1772441522,
       "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
     }
   },
@@ -32,23 +32,23 @@
     "@progress/kendo-data-query": "^1.7.3",
     "@progress/kendo-drawing": "^1.24.0",
     "@progress/kendo-licensing": "^1.10.0",
-    "@progress/kendo-angular-tooltip": "23.2.1-develop.1",
-    "@progress/kendo-angular-buttons": "23.2.1-develop.1",
-    "@progress/kendo-angular-common": "23.2.1-develop.1",
-    "@progress/kendo-angular-dateinputs": "23.2.1-develop.1",
-    "@progress/kendo-angular-dialog": "23.2.1-develop.1",
-    "@progress/kendo-angular-dropdowns": "23.2.1-develop.1",
-    "@progress/kendo-angular-icons": "23.2.1-develop.1",
-    "@progress/kendo-angular-inputs": "23.2.1-develop.1",
-    "@progress/kendo-angular-intl": "23.2.1-develop.1",
-    "@progress/kendo-angular-l10n": "23.2.1-develop.1",
-    "@progress/kendo-angular-label": "23.2.1-develop.1",
-    "@progress/kendo-angular-popup": "23.2.1-develop.1",
+    "@progress/kendo-angular-tooltip": "23.2.1-develop.2",
+    "@progress/kendo-angular-buttons": "23.2.1-develop.2",
+    "@progress/kendo-angular-common": "23.2.1-develop.2",
+    "@progress/kendo-angular-dateinputs": "23.2.1-develop.2",
+    "@progress/kendo-angular-dialog": "23.2.1-develop.2",
+    "@progress/kendo-angular-dropdowns": "23.2.1-develop.2",
+    "@progress/kendo-angular-icons": "23.2.1-develop.2",
+    "@progress/kendo-angular-inputs": "23.2.1-develop.2",
+    "@progress/kendo-angular-intl": "23.2.1-develop.2",
+    "@progress/kendo-angular-l10n": "23.2.1-develop.2",
+    "@progress/kendo-angular-label": "23.2.1-develop.2",
+    "@progress/kendo-angular-popup": "23.2.1-develop.2",
     "rxjs": "^6.5.3 || ^7.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.1",
-    "@progress/kendo-angular-schematics": "23.2.1-develop.1",
+    "@progress/kendo-angular-schematics": "23.2.1-develop.2",
     "@progress/kendo-date-math": "^1.3.2",
     "@progress/kendo-draggable": "^3.0.2",
     "@progress/kendo-file-saver": "^1.0.7",

package/schematics/ngAdd/index.js

@@ -9,10 +9,10 @@ const schematics_1 = require("@angular-devkit/schematics");
 function default_1(options) {
     const finalOptions = Object.assign(Object.assign({}, options), { mainNgModule: 'SchedulerModule', package: 'scheduler', peerDependencies: {
             // peer deps of the dropdowns
-            '@progress/kendo-angular-treeview': '23.2.1-develop.1',
-            '@progress/kendo-angular-navigation': '23.2.1-develop.1',
+            '@progress/kendo-angular-treeview': '23.2.1-develop.2',
+            '@progress/kendo-angular-navigation': '23.2.1-develop.2',
             // peer dependency of kendo-angular-inputs
-            '@progress/kendo-angular-dialog': '23.2.1-develop.1',
+            '@progress/kendo-angular-dialog': '23.2.1-develop.2',
             // peer dependency of kendo-angular-icons
             '@progress/kendo-svg-icons': '^4.0.0'
         } });

package/views/common/base-view.d.ts

@@ -63,6 +63,7 @@ export declare abstract class BaseView implements OnInit, OnChanges, AfterViewIn
     editable: any;
     selectable: boolean;
     getField: any;
+    isSlotSelected: SlotSelectionCallback;
     protected changes: BehaviorSubject<any>;
     protected viewRangeChange: BehaviorSubject<any>;
     protected subs: Subscription;
@@ -105,7 +106,7 @@ export declare abstract class BaseView implements OnInit, OnChanges, AfterViewIn
     protected scrollInterval: any;
     protected autoHeight: boolean;
     protected rtl: boolean;
-    isSlotSelected: SlotSelectionCallback;
+    private isEventTarget;
     constructor(viewContext: ViewContextService, viewState: ViewStateService, intl: IntlService, slotService: BaseSlotService, zone: NgZone, renderer: Renderer2, element: ElementRef, pdfService: PDFService, localization: LocalizationService, cdr: ChangeDetectorRef, scrollBarWidthService: ScrollbarWidthService);
     /**
      * Generates a list of space-separated IDs based on a collection of items to associate scrollable containers

package/views/common/slot-selectable.directive.d.ts

@@ -40,6 +40,7 @@ export declare class SlotSelectableDirective implements OnInit, OnChanges, OnDes
      */
     private selectionOriginResources;
     private selectedRange;
+    private rangeBeforeDrag;
     private slotSelectionChangeSource;
     private subscriptions;
     constructor(scheduler: SchedulerComponent, cdr: ChangeDetectorRef);
@@ -50,6 +51,7 @@ export declare class SlotSelectableDirective implements OnInit, OnChanges, OnDes
     private initDragSelect;
     private onDrag;
     private onRelease;
+    private onSlotClick;
     /**
      * @hidden
      * Checks if the selected range contains a local date range.