@progress/kendo-angular-scheduler 18.1.0-develop.24 → 18.1.0-develop.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/esm2022/package-metadata.mjs +2 -2
  2. package/esm2022/views/day-time/day-time-slot.service.mjs +16 -4
  3. package/fesm2022/progress-kendo-angular-scheduler.mjs +18 -6
  4. package/package.json +15 -15
  5. package/schematics/ngAdd/index.js +3 -3
package/esm2022/package-metadata.mjs CHANGED
@@ -10,7 +10,7 @@ export const packageMetadata = {
10
10
  productName: 'Kendo UI for Angular',
11
11
  productCode: 'KENDOUIANGULAR',
12
12
  productCodes: ['KENDOUIANGULAR'],
13
- publishDate: 1738856848,
14
- version: '18.1.0-develop.24',
13
+ publishDate: 1738911655,
14
+ version: '18.1.0-develop.26',
15
15
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
16
16
  };
package/esm2022/views/day-time/day-time-slot.service.mjs CHANGED
@@ -58,11 +58,23 @@ function initTimeColumns(slotKeys, slotItems) {
58
58
  events.splice(event.columnIndex, 0, event);
59
59
  break;
60
60
  }
61
- if (!intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime) &&
62
- !minHeightOverlaps(current.rect.top, event.rect.top)) {
61
+ //events that don't intersect their start or end times but overlap in rendered height due to the minimum event height
62
+ const anyOverlappingEvents = events.filter(e => e !== current && e.rect).some(event => {
63
+ const areIntersecting = intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime);
64
+ const areOverlapping = minHeightOverlaps(current.rect.top, event.rect.top);
65
+ return !areIntersecting && areOverlapping;
66
+ });
67
+ const intersectingEvents = intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime);
68
+ const overlappingEvents = minHeightOverlaps(current.rect.top, event.rect.top);
69
+ if (!(anyOverlappingEvents || intersectingEvents || overlappingEvents)) {
70
+ columns--;
63
71
  event.columnIndex = idx;
64
- event.lastColumn = !events.some(e => e.columnIndex && idx < e.columnIndex &&
65
- intersects(event.item.startTime, event.item.endTime, e.item.startTime, e.item.endTime));
72
+ event.lastColumn = !events.some((e) => {
73
+ const hasColumnIndex = e.columnIndex;
74
+ const isBeforeCurrentIndex = idx < e.columnIndex;
75
+ const areIntersecting = intersects(event.item.startTime, event.item.endTime, e.item.startTime, e.item.endTime);
76
+ return hasColumnIndex && isBeforeCurrentIndex && areIntersecting;
77
+ });
66
78
  events.splice(eventIdx, 1);
67
79
  events.splice(idx, 0, event);
68
80
  break;
package/fesm2022/progress-kendo-angular-scheduler.mjs CHANGED
@@ -43,8 +43,8 @@ const packageMetadata = {
43
43
  productName: 'Kendo UI for Angular',
44
44
  productCode: 'KENDOUIANGULAR',
45
45
  productCodes: ['KENDOUIANGULAR'],
46
- publishDate: 1738856848,
47
- version: '18.1.0-develop.24',
46
+ publishDate: 1738911655,
47
+ version: '18.1.0-develop.26',
48
48
  licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
49
49
  };
50
50
 
@@ -15196,11 +15196,23 @@ function initTimeColumns(slotKeys, slotItems) {
15196
15196
  events.splice(event.columnIndex, 0, event);
15197
15197
  break;
15198
15198
  }
15199
- if (!intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime) &&
15200
- !minHeightOverlaps(current.rect.top, event.rect.top)) {
15199
+ //events that don't intersect their start or end times but overlap in rendered height due to the minimum event height
15200
+ const anyOverlappingEvents = events.filter(e => e !== current && e.rect).some(event => {
15201
+ const areIntersecting = intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime);
15202
+ const areOverlapping = minHeightOverlaps(current.rect.top, event.rect.top);
15203
+ return !areIntersecting && areOverlapping;
15204
+ });
15205
+ const intersectingEvents = intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime);
15206
+ const overlappingEvents = minHeightOverlaps(current.rect.top, event.rect.top);
15207
+ if (!(anyOverlappingEvents || intersectingEvents || overlappingEvents)) {
15208
+ columns--;
15201
15209
  event.columnIndex = idx;
15202
- event.lastColumn = !events.some(e => e.columnIndex && idx < e.columnIndex &&
15203
- intersects(event.item.startTime, event.item.endTime, e.item.startTime, e.item.endTime));
15210
+ event.lastColumn = !events.some((e) => {
15211
+ const hasColumnIndex = e.columnIndex;
15212
+ const isBeforeCurrentIndex = idx < e.columnIndex;
15213
+ const areIntersecting = intersects(event.item.startTime, event.item.endTime, e.item.startTime, e.item.endTime);
15214
+ return hasColumnIndex && isBeforeCurrentIndex && areIntersecting;
15215
+ });
15204
15216
  events.splice(eventIdx, 1);
15205
15217
  events.splice(idx, 0, event);
15206
15218
  break;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@progress/kendo-angular-scheduler",
3
- "version": "18.1.0-develop.24",
3
+ "version": "18.1.0-develop.26",
4
4
  "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.",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "author": "Progress",
@@ -19,7 +19,7 @@
19
19
  "package": {
20
20
  "productName": "Kendo UI for Angular",
21
21
  "productCode": "KENDOUIANGULAR",
22
- "publishDate": 1738856848,
22
+ "publishDate": 1738911655,
23
23
  "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
24
24
  }
25
25
  },
@@ -32,23 +32,23 @@
32
32
  "@progress/kendo-data-query": "^1.0.0",
33
33
  "@progress/kendo-drawing": "^1.21.0",
34
34
  "@progress/kendo-licensing": "^1.0.2",
35
- "@progress/kendo-angular-tooltip": "18.1.0-develop.24",
36
- "@progress/kendo-angular-buttons": "18.1.0-develop.24",
37
- "@progress/kendo-angular-common": "18.1.0-develop.24",
38
- "@progress/kendo-angular-dateinputs": "18.1.0-develop.24",
39
- "@progress/kendo-angular-dialog": "18.1.0-develop.24",
40
- "@progress/kendo-angular-dropdowns": "18.1.0-develop.24",
41
- "@progress/kendo-angular-icons": "18.1.0-develop.24",
42
- "@progress/kendo-angular-inputs": "18.1.0-develop.24",
43
- "@progress/kendo-angular-intl": "18.1.0-develop.24",
44
- "@progress/kendo-angular-l10n": "18.1.0-develop.24",
45
- "@progress/kendo-angular-label": "18.1.0-develop.24",
46
- "@progress/kendo-angular-popup": "18.1.0-develop.24",
35
+ "@progress/kendo-angular-tooltip": "18.1.0-develop.26",
36
+ "@progress/kendo-angular-buttons": "18.1.0-develop.26",
37
+ "@progress/kendo-angular-common": "18.1.0-develop.26",
38
+ "@progress/kendo-angular-dateinputs": "18.1.0-develop.26",
39
+ "@progress/kendo-angular-dialog": "18.1.0-develop.26",
40
+ "@progress/kendo-angular-dropdowns": "18.1.0-develop.26",
41
+ "@progress/kendo-angular-icons": "18.1.0-develop.26",
42
+ "@progress/kendo-angular-inputs": "18.1.0-develop.26",
43
+ "@progress/kendo-angular-intl": "18.1.0-develop.26",
44
+ "@progress/kendo-angular-l10n": "18.1.0-develop.26",
45
+ "@progress/kendo-angular-label": "18.1.0-develop.26",
46
+ "@progress/kendo-angular-popup": "18.1.0-develop.26",
47
47
  "rxjs": "^6.5.3 || ^7.0.0"
48
48
  },
49
49
  "dependencies": {
50
50
  "tslib": "^2.3.1",
51
- "@progress/kendo-angular-schematics": "18.1.0-develop.24",
51
+ "@progress/kendo-angular-schematics": "18.1.0-develop.26",
52
52
  "@progress/kendo-date-math": "^1.3.2",
53
53
  "@progress/kendo-draggable": "^3.0.2",
54
54
  "@progress/kendo-file-saver": "^1.0.7",
package/schematics/ngAdd/index.js CHANGED
@@ -4,10 +4,10 @@ const schematics_1 = require("@angular-devkit/schematics");
4
4
  function default_1(options) {
5
5
  const finalOptions = Object.assign(Object.assign({}, options), { mainNgModule: 'SchedulerModule', package: 'scheduler', peerDependencies: {
6
6
  // peer deps of the dropdowns
7
- '@progress/kendo-angular-treeview': '18.1.0-develop.24',
8
- '@progress/kendo-angular-navigation': '18.1.0-develop.24',
7
+ '@progress/kendo-angular-treeview': '18.1.0-develop.26',
8
+ '@progress/kendo-angular-navigation': '18.1.0-develop.26',
9
9
  // peer dependency of kendo-angular-inputs
10
- '@progress/kendo-angular-dialog': '18.1.0-develop.24',
10
+ '@progress/kendo-angular-dialog': '18.1.0-develop.26',
11
11
  // peer dependency of kendo-angular-icons
12
12
  '@progress/kendo-svg-icons': '^4.0.0'
13
13
  } });