@syncfusion/ej2-schedule 25.1.35 → 25.1.37

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 (58) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/ej2-schedule.min.js +2 -2
  3. package/dist/ej2-schedule.umd.min.js +2 -2
  4. package/dist/ej2-schedule.umd.min.js.map +1 -1
  5. package/dist/es6/ej2-schedule.es2015.js +91 -31
  6. package/dist/es6/ej2-schedule.es2015.js.map +1 -1
  7. package/dist/es6/ej2-schedule.es5.js +91 -28
  8. package/dist/es6/ej2-schedule.es5.js.map +1 -1
  9. package/dist/global/ej2-schedule.min.js +2 -2
  10. package/dist/global/ej2-schedule.min.js.map +1 -1
  11. package/dist/global/index.d.ts +1 -1
  12. package/package.json +9 -9
  13. package/src/recurrence-editor/recurrence-editor.js +1 -2
  14. package/src/schedule/actions/crud.js +3 -0
  15. package/src/schedule/base/css-constant.d.ts +2 -0
  16. package/src/schedule/base/css-constant.js +2 -0
  17. package/src/schedule/base/type.d.ts +1 -0
  18. package/src/schedule/event-renderer/agenda-base.d.ts +1 -1
  19. package/src/schedule/event-renderer/agenda-base.js +36 -14
  20. package/src/schedule/event-renderer/event-base.js +4 -2
  21. package/src/schedule/event-renderer/vertical-view.js +7 -1
  22. package/src/schedule/renderer/agenda.d.ts +1 -0
  23. package/src/schedule/renderer/agenda.js +38 -9
  24. package/styles/bootstrap-dark.css +3 -0
  25. package/styles/bootstrap.css +3 -0
  26. package/styles/bootstrap4.css +3 -0
  27. package/styles/bootstrap5-dark.css +3 -0
  28. package/styles/bootstrap5.css +3 -0
  29. package/styles/fabric-dark.css +3 -0
  30. package/styles/fabric.css +3 -0
  31. package/styles/fluent-dark.css +4 -1
  32. package/styles/fluent.css +4 -1
  33. package/styles/highcontrast-light.css +3 -0
  34. package/styles/highcontrast.css +3 -0
  35. package/styles/material-dark.css +12 -0
  36. package/styles/material.css +12 -0
  37. package/styles/material3-dark.css +3 -0
  38. package/styles/material3.css +3 -0
  39. package/styles/schedule/_layout.scss +4 -0
  40. package/styles/schedule/bootstrap-dark.css +3 -0
  41. package/styles/schedule/bootstrap.css +3 -0
  42. package/styles/schedule/bootstrap4.css +3 -0
  43. package/styles/schedule/bootstrap5-dark.css +3 -0
  44. package/styles/schedule/bootstrap5.css +3 -0
  45. package/styles/schedule/fabric-dark.css +3 -0
  46. package/styles/schedule/fabric.css +3 -0
  47. package/styles/schedule/fluent-dark.css +4 -1
  48. package/styles/schedule/fluent.css +4 -1
  49. package/styles/schedule/highcontrast-light.css +3 -0
  50. package/styles/schedule/highcontrast.css +3 -0
  51. package/styles/schedule/material-dark.css +12 -0
  52. package/styles/schedule/material.css +12 -0
  53. package/styles/schedule/material3-dark.css +3 -0
  54. package/styles/schedule/material3.css +3 -0
  55. package/styles/schedule/tailwind-dark.css +3 -0
  56. package/styles/schedule/tailwind.css +3 -0
  57. package/styles/tailwind-dark.css +3 -0
  58. package/styles/tailwind.css +3 -0
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * filename: index.d.ts
3
- * version : 25.1.35
3
+ * version : 25.1.37
4
4
  * Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
5
5
  * Use of this code is subject to the terms of our license.
6
6
  * A copy of the current license can be obtained at any time by e-mailing
package/package.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "_from": "@syncfusion/ej2-schedule@*",
3
- "_id": "@syncfusion/ej2-schedule@22.9.0",
3
+ "_id": "@syncfusion/ej2-schedule@25.1.35",
4
4
  "_inBundle": false,
5
- "_integrity": "sha512-HgWYJsJtHsRwZLq9VMWjqS/mOk6zZlOZ4oCvazTD0KeKLwl5mimeKns07gIPbz0pY8yWKHLOwt2tvzjYxIi23A==",
5
+ "_integrity": "sha512-C5bGDJaFwqPz1Wq+Z8zpeJVuVORM+lbciSAfEMADI0Y4RxFMazNh7QeO+TmJob7HNwweDSMqndt8PekrkE+/iw==",
6
6
  "_location": "/@syncfusion/ej2-schedule",
7
7
  "_phantomChildren": {},
8
8
  "_requested": {
@@ -23,8 +23,8 @@
23
23
  "/@syncfusion/ej2-react-schedule",
24
24
  "/@syncfusion/ej2-vue-schedule"
25
25
  ],
26
- "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-release/@syncfusion/ej2-schedule/-/ej2-schedule-22.9.0.tgz",
27
- "_shasum": "35f485e5f3e388697c615f38881aa98e3965b071",
26
+ "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-25.1.35.tgz",
27
+ "_shasum": "dcc2a86f99921e8b4a2578498d701159a470ecec",
28
28
  "_spec": "@syncfusion/ej2-schedule@*",
29
29
  "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
30
30
  "author": {
@@ -37,13 +37,13 @@
37
37
  "dependencies": {
38
38
  "@syncfusion/ej2-base": "~25.1.35",
39
39
  "@syncfusion/ej2-buttons": "~25.1.35",
40
- "@syncfusion/ej2-calendars": "~25.1.35",
40
+ "@syncfusion/ej2-calendars": "~25.1.37",
41
41
  "@syncfusion/ej2-data": "~25.1.35",
42
- "@syncfusion/ej2-dropdowns": "~25.1.35",
42
+ "@syncfusion/ej2-dropdowns": "~25.1.37",
43
43
  "@syncfusion/ej2-excel-export": "~25.1.35",
44
- "@syncfusion/ej2-inputs": "~25.1.35",
44
+ "@syncfusion/ej2-inputs": "~25.1.37",
45
45
  "@syncfusion/ej2-lists": "~25.1.35",
46
- "@syncfusion/ej2-navigations": "~25.1.35",
46
+ "@syncfusion/ej2-navigations": "~25.1.37",
47
47
  "@syncfusion/ej2-popups": "~25.1.35"
48
48
  },
49
49
  "deprecated": false,
@@ -73,6 +73,6 @@
73
73
  "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
74
74
  },
75
75
  "typings": "index.d.ts",
76
- "version": "25.1.35",
76
+ "version": "25.1.37",
77
77
  "sideEffects": false
78
78
  }
@@ -716,7 +716,6 @@ var RecurrenceEditor = /** @class */ (function (_super) {
716
716
  RecurrenceEditor.prototype.setTemplate = function () {
717
717
  var dayData = this.getDayData('narrow');
718
718
  var fullDay = this.getDayData('wide');
719
- var labelId = this.element.id + '_' + 'end_label';
720
719
  this.element.innerHTML = '<div class="' + HEADER + '">' +
721
720
  '<div class="' + INPUTWARAPPER + ' ' + FORMLEFT + '">' +
722
721
  '<input type="text" tabindex="0" class="' + REPEATELEMENT +
@@ -763,7 +762,7 @@ var RecurrenceEditor = /** @class */ (function (_super) {
763
762
  '</div></div>' +
764
763
  '<div class="' + INPUTWARAPPERSIDE + ' ' + ENDON + ' ' + FORMRIGHT + '">' +
765
764
  '<div class="' + INPUTWARAPPER + ' ' + ENDONLEFT + '">' +
766
- '<input type="text" tabindex="0" class="' + ENDONELEMENT + '" aria-labelledby="' + labelId + '"title="' + this.localeObj.getConstant(END) + '" />' +
765
+ '<input type="text" tabindex="0" class="' + ENDONELEMENT + '"title="' + this.localeObj.getConstant(END) + '" />' +
767
766
  '</div>' +
768
767
  '<div class="' + INPUTWARAPPER + ' ' + ENDONDATE + '" >' +
769
768
  '<input type="text" tabindex="0" class="' + UNTILDATE + '"title="' + this.localeObj.getConstant(UNTIL) + '" />' +
@@ -46,6 +46,9 @@ var Crud = /** @class */ (function () {
46
46
  return;
47
47
  }
48
48
  this.parent.trigger(events.dataBinding, e, function (args) {
49
+ if (args.cancel) {
50
+ return;
51
+ }
49
52
  var resultData = extend([], args.result, null, true);
50
53
  _this.parent.eventsData = resultData.filter(function (data) { return !data[_this.parent.eventFields.isBlock]; });
51
54
  _this.parent.blockData = resultData.filter(function (data) { return data[_this.parent.eventFields.isBlock]; });
@@ -122,6 +122,8 @@ export declare const TIMELINE_WRAPPER_CLASS: string;
122
122
  /** @private */
123
123
  export declare const APPOINTMENT_WRAPPER_CLASS: string;
124
124
  /** @private */
125
+ export declare const APPOINTMENT_WRAPPER_HIDDEN_CLASS: string;
126
+ /** @private */
125
127
  export declare const DAY_WRAPPER_CLASS: string;
126
128
  /** @private */
127
129
  export declare const TOOLBAR_CONTAINER: string;
@@ -122,6 +122,8 @@ export var TIMELINE_WRAPPER_CLASS = 'e-timeline-wrapper';
122
122
  /** @private */
123
123
  export var APPOINTMENT_WRAPPER_CLASS = 'e-appointment-wrapper';
124
124
  /** @private */
125
+ export var APPOINTMENT_WRAPPER_HIDDEN_CLASS = 'e-appointment-wrapper-hidden';
126
+ /** @private */
125
127
  export var DAY_WRAPPER_CLASS = 'e-day-wrapper';
126
128
  /** @private */
127
129
  export var TOOLBAR_CONTAINER = 'e-schedule-toolbar-container';
@@ -41,6 +41,7 @@ export declare type ReturnType = {
41
41
  result: Record<string, any>[];
42
42
  count: number;
43
43
  aggregates?: Record<string, any>;
44
+ cancel: boolean;
44
45
  };
45
46
  /**
46
47
  * An enum that holds the available popup types in the scheduler. They are
@@ -6,7 +6,7 @@ export declare class AgendaBase extends ViewBase {
6
6
  createAppointment(event: Record<string, any>): HTMLElement[];
7
7
  processAgendaEvents(events: Record<string, any>[]): Record<string, any>[];
8
8
  wireEventActions(): void;
9
- calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date): void;
9
+ calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date, agendaEnd?: Date): void;
10
10
  private createResourceTableRow;
11
11
  createDateHeaderElement(date: Date): Element;
12
12
  renderEmptyContent(tBody: Element, agendaDate: Date): void;
@@ -163,7 +163,8 @@ var AgendaBase = /** @class */ (function (_super) {
163
163
  EventHandler.add(element, 'click', this.parent.agendaModule.dayNavigationClick, this);
164
164
  }
165
165
  };
166
- AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate) {
166
+ AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate, agendaEnd) {
167
+ if (agendaEnd === void 0) { agendaEnd = null; }
167
168
  if (isNullOrUndefined(this.parent.resourceBase.lastResourceLevel)) {
168
169
  var level = this.getDateSlots(this.renderDates, this.parent.activeViewOptions.workDays);
169
170
  this.parent.resourceBase.generateResourceLevels(level);
@@ -172,7 +173,9 @@ var AgendaBase = /** @class */ (function (_super) {
172
173
  var days = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda') ? noOfDays : 1;
173
174
  var resColl = this.parent.resourceBase.resourceCollection;
174
175
  var resData = this.parent.resourceBase.lastResourceLevel;
176
+ var agendaStart = agendaDate;
175
177
  var initialDate = agendaDate;
178
+ var showWeekend = this.parent.activeViewOptions.showWeekend;
176
179
  for (var i = 0; i < days; i++) {
177
180
  var lastLevelInfo = [];
178
181
  var tempLastLevelInfo = [];
@@ -180,6 +183,21 @@ var AgendaBase = /** @class */ (function (_super) {
180
183
  var eventObj = void 0;
181
184
  var dateObj = void 0;
182
185
  var firstDate = util.addDays(initialDate, i);
186
+ if (this.parent.currentView === 'Agenda' && this.parent.activeViewOptions.group.byDate &&
187
+ this.parent.activeViewOptions.allowVirtualScrolling && !showWeekend && !this.isWorkDay(firstDate)) {
188
+ do {
189
+ firstDate = util.addDays(firstDate, 1);
190
+ if (firstDate >= agendaEnd) {
191
+ break;
192
+ }
193
+ } while (!this.isWorkDay(firstDate) ||
194
+ this.parent.eventBase.filterEvents(firstDate, util.addDays(firstDate, 1)).length < 1);
195
+ if (firstDate >= agendaEnd) {
196
+ break;
197
+ }
198
+ initialDate = util.addDays(firstDate, -i);
199
+ agendaLastDate = util.addDays(firstDate, 1);
200
+ }
183
201
  var finalDate = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda')
184
202
  ? util.addDays(firstDate, 1) : agendaLastDate;
185
203
  var agendaCollection = this.parent.eventBase.filterEvents(firstDate, finalDate);
@@ -194,7 +212,9 @@ var AgendaBase = /** @class */ (function (_super) {
194
212
  for (var r = 0; r < noOfDays; r++) {
195
213
  // eslint-disable-next-line max-len
196
214
  var resDayCollection = this.parent.eventBase.filterEvents(agendaDate, util.addDays(agendaDate, 1), resDataCollection, undefined);
197
- if (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays ||
215
+ if (((showWeekend || !showWeekend && (this.parent.group.byDate ? this.isWorkDay(agendaDate) :
216
+ this.isWorkDay(agendaDate, resData[parseInt(res.toString(), 10)].workDays)))
217
+ && (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays)) ||
198
218
  this.parent.currentView === 'MonthAgenda') {
199
219
  data.push(resDayCollection[0]);
200
220
  eventObj = {
@@ -220,16 +240,18 @@ var AgendaBase = /** @class */ (function (_super) {
220
240
  agendaDate = util.addDays(agendaDate, 1);
221
241
  if (agendaDate.getTime() >= agendaLastDate.getTime() || this.parent.activeViewOptions.group.byDate
222
242
  || this.parent.currentView === 'MonthAgenda') {
223
- lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = cls.AGENDA_DAY_BORDER_CLASS;
224
- var tempObj = {
225
- rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
226
- groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
227
- resourceData: resData[parseInt(res.toString(), 10)].resourceData,
228
- groupIndex: (lastLevelInfo.length - data.length), className: [cls.RESOURCE_NAME],
229
- date: agendaDate
230
- };
231
- lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
232
- tempLastLevelInfo.push(extend({}, tempObj, null, true));
243
+ if (data.length > 0) {
244
+ lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = cls.AGENDA_DAY_BORDER_CLASS;
245
+ var tempObj = {
246
+ rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
247
+ groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
248
+ resourceData: resData[parseInt(res.toString(), 10)].resourceData,
249
+ groupIndex: (lastLevelInfo.length - data.length), className: [cls.RESOURCE_NAME],
250
+ date: agendaDate
251
+ };
252
+ lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
253
+ tempLastLevelInfo.push(extend({}, tempObj, null, true));
254
+ }
233
255
  break;
234
256
  }
235
257
  }
@@ -264,9 +286,9 @@ var AgendaBase = /** @class */ (function (_super) {
264
286
  this.createResourceTableRow(lastLevelInfo, tBody);
265
287
  }
266
288
  }
267
- var totalCollection = this.parent.eventBase.filterEvents(initialDate, agendaLastDate);
289
+ var totalCollection = this.parent.eventBase.filterEvents(agendaStart, agendaLastDate);
268
290
  if (totalCollection.length === 0 && !this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
269
- this.renderEmptyContent(tBody, initialDate);
291
+ this.renderEmptyContent(tBody, agendaStart);
270
292
  }
271
293
  };
272
294
  AgendaBase.prototype.createResourceTableRow = function (tContent, tBody) {
@@ -1281,11 +1281,13 @@ var EventBase = /** @class */ (function () {
1281
1281
  if (index === void 0) { index = 0; }
1282
1282
  var tr = createElement('tr');
1283
1283
  var levels = this.parent.activeView.colLevels.slice(-1)[0];
1284
+ var className = this.parent.isReact && this.parent.activeViewOptions.eventTemplate ?
1285
+ ' ' + cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS : '';
1284
1286
  for (var i = 0, len = levels.length; i < len; i++) {
1285
1287
  var col = levels[parseInt(i.toString(), 10)];
1286
1288
  var appointmentWrap = createElement('td', {
1287
- className: (type === 'allDay') ? cls.ALLDAY_APPOINTMENT_WRAPPER_CLASS : (type === 'timeIndicator') ?
1288
- cls.TIMELINE_WRAPPER_CLASS : cls.DAY_WRAPPER_CLASS, attrs: { 'data-date': col.date.getTime().toString() }
1289
+ className: (type === 'allDay') ? cls.ALLDAY_APPOINTMENT_WRAPPER_CLASS + className : (type === 'timeIndicator') ?
1290
+ cls.TIMELINE_WRAPPER_CLASS : cls.DAY_WRAPPER_CLASS + className, attrs: { 'data-date': col.date.getTime().toString() }
1289
1291
  });
1290
1292
  if (!isNullOrUndefined(col.groupIndex)) {
1291
1293
  appointmentWrap.setAttribute('data-group-index', col.groupIndex.toString());
@@ -44,6 +44,7 @@ var VerticalEvent = /** @class */ (function (_super) {
44
44
  return _this;
45
45
  }
46
46
  VerticalEvent.prototype.renderAppointments = function () {
47
+ var _this = this;
47
48
  if (isNullOrUndefined(this.parent)) {
48
49
  return;
49
50
  }
@@ -103,7 +104,12 @@ var VerticalEvent = /** @class */ (function (_super) {
103
104
  if (isDragging) {
104
105
  this.parent.crudModule.crudObj.isCrudAction = false;
105
106
  }
106
- this.parent.renderTemplates();
107
+ this.parent.renderTemplates(function () {
108
+ if (_this.parent.isReact && _this.parent.activeViewOptions.eventTemplate) {
109
+ var wraps = [].slice.call(_this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS));
110
+ removeClass(wraps, cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS);
111
+ }
112
+ });
107
113
  };
108
114
  VerticalEvent.prototype.initializeValues = function () {
109
115
  this.resources = (this.parent.activeViewOptions.group.resources.length > 0) ? this.parent.uiStateValues.isGroupAdaptive ?
@@ -20,6 +20,7 @@ export declare class Agenda extends AgendaBase implements IRenderer {
20
20
  refreshHeader(): void;
21
21
  private renderInitialContent;
22
22
  renderContent(tBody: Element, agendaDate: Date, lastDate: Date): void;
23
+ private isAgendaWorkDay;
23
24
  private agendaScrolling;
24
25
  private virtualScrolling;
25
26
  private getElementFromScrollerPosition;
@@ -150,9 +150,20 @@ var Agenda = /** @class */ (function (_super) {
150
150
  var firstDate = new Date(agendaDate.getTime());
151
151
  var isObject = this.appointmentFiltering(firstDate, lastDate);
152
152
  if (isObject.length > 0 && this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
153
- agendaDate = isObject[0][fieldMapping.startTime];
154
- agendaDate = new Date(new Date(agendaDate.getTime()).setHours(0, 0, 0, 0));
155
- this.updateHeaderText(isObject[0][fieldMapping.startTime]);
153
+ if (!this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(isObject[0][fieldMapping.startTime])) {
154
+ for (var _i = 0, isObject_1 = isObject; _i < isObject_1.length; _i++) {
155
+ var event_2 = isObject_1[_i];
156
+ if (this.isAgendaWorkDay(event_2[fieldMapping.startTime])) {
157
+ agendaDate = new Date(new Date(event_2[fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
158
+ this.updateHeaderText(event_2[fieldMapping.startTime]);
159
+ break;
160
+ }
161
+ }
162
+ }
163
+ else {
164
+ agendaDate = new Date(new Date(isObject[0][fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
165
+ this.updateHeaderText(isObject[0][fieldMapping.startTime]);
166
+ }
156
167
  }
157
168
  var endDate;
158
169
  if (!this.parent.hideEmptyAgendaDays || (this.parent.agendaDaysCount > 0 && isObject.length > 0)) {
@@ -166,18 +177,25 @@ var Agenda = /** @class */ (function (_super) {
166
177
  this.parent.headerModule.updateHeaderItems('remove');
167
178
  }
168
179
  }
169
- this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date);
180
+ this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date, lastDate);
170
181
  }
171
182
  else {
172
183
  for (var day = 0; day < this.parent.agendaDaysCount; day++) {
173
- var filterData = this.appointmentFiltering(agendaDate);
174
184
  var nTr = this.createTableRowElement(agendaDate, 'data');
175
- if (this.element.querySelector('tr[data-row-index="' + parseInt(nTr.getAttribute('data-row-index'), 10) + '"]')) {
185
+ var virtualContent = this.element.querySelector('tr[data-row-index="' + (+(nTr.dataset.rowIndex)) + '"]');
186
+ if (virtualContent || !this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(agendaDate)) {
176
187
  agendaDate = util.addDays(agendaDate, 1);
188
+ if (!virtualContent && this.parent.activeViewOptions.allowVirtualScrolling) {
189
+ day--;
190
+ }
191
+ if (agendaDate.getTime() > lastDate.getTime()) {
192
+ break;
193
+ }
177
194
  continue;
178
195
  }
179
196
  var dTd = nTr.children[0];
180
197
  var aTd = nTr.children[1];
198
+ var filterData = this.appointmentFiltering(agendaDate);
181
199
  if (filterData.length > 0 || (!this.parent.hideEmptyAgendaDays && filterData.length === 0)) {
182
200
  var elementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ? 'noEvents' : 'data';
183
201
  dTd.appendChild(this.createDateHeaderElement(agendaDate));
@@ -204,6 +222,14 @@ var Agenda = /** @class */ (function (_super) {
204
222
  }
205
223
  this.agendaDates = { start: firstDate, end: endDate };
206
224
  };
225
+ Agenda.prototype.isAgendaWorkDay = function (date) {
226
+ if (this.parent.uiStateValues.isGroupAdaptive && !this.parent.group.byDate) {
227
+ return this.isWorkDay(date, this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex].workDays);
228
+ }
229
+ else {
230
+ return this.isWorkDay(date);
231
+ }
232
+ };
207
233
  Agenda.prototype.agendaScrolling = function (event) {
208
234
  if (this.parent.quickPopup) {
209
235
  this.parent.quickPopup.quickPopupHide();
@@ -308,9 +334,12 @@ var Agenda = /** @class */ (function (_super) {
308
334
  var lastDate = this.getEndDateFromStartDate(date);
309
335
  var daysCount = 0;
310
336
  do {
311
- var filterData = this.appointmentFiltering(currentDate);
312
- if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
313
- daysCount++;
337
+ if (this.parent.activeViewOptions.showWeekend || !this.parent.activeViewOptions.showWeekend &&
338
+ this.isAgendaWorkDay(currentDate)) {
339
+ var filterData = this.appointmentFiltering(currentDate);
340
+ if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
341
+ daysCount++;
342
+ }
314
343
  }
315
344
  currentDate = util.addDays(currentDate, (type === 'next') ? 1 : -1);
316
345
  if (currentDate < firstDate || currentDate > lastDate) {
@@ -1038,6 +1038,9 @@
1038
1038
  padding: 0;
1039
1039
  position: relative;
1040
1040
  }
1041
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1042
+ visibility: hidden;
1043
+ }
1041
1044
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1042
1045
  cursor: default;
1043
1046
  }
@@ -1033,6 +1033,9 @@
1033
1033
  padding: 0;
1034
1034
  position: relative;
1035
1035
  }
1036
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1037
+ visibility: hidden;
1038
+ }
1036
1039
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1037
1040
  cursor: default;
1038
1041
  }
@@ -1138,6 +1138,9 @@
1138
1138
  padding: 0;
1139
1139
  position: relative;
1140
1140
  }
1141
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1142
+ visibility: hidden;
1143
+ }
1141
1144
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1142
1145
  cursor: default;
1143
1146
  }
@@ -1083,6 +1083,9 @@
1083
1083
  padding: 0;
1084
1084
  position: relative;
1085
1085
  }
1086
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1087
+ visibility: hidden;
1088
+ }
1086
1089
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1087
1090
  cursor: default;
1088
1091
  }
@@ -1083,6 +1083,9 @@
1083
1083
  padding: 0;
1084
1084
  position: relative;
1085
1085
  }
1086
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1087
+ visibility: hidden;
1088
+ }
1086
1089
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1087
1090
  cursor: default;
1088
1091
  }
@@ -1001,6 +1001,9 @@
1001
1001
  padding: 0;
1002
1002
  position: relative;
1003
1003
  }
1004
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1005
+ visibility: hidden;
1006
+ }
1004
1007
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1005
1008
  cursor: default;
1006
1009
  }
package/styles/fabric.css CHANGED
@@ -991,6 +991,9 @@
991
991
  padding: 0;
992
992
  position: relative;
993
993
  }
994
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
995
+ visibility: hidden;
996
+ }
994
997
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
995
998
  cursor: default;
996
999
  }
@@ -166,7 +166,7 @@
166
166
 
167
167
  .e-bigger .e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon,
168
168
  .e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon {
169
- margin-top: -1.5em;
169
+ margin-top: -1.6em;
170
170
  }
171
171
 
172
172
  /*! Schedule component's bootstrap5 theme definitions and variables */
@@ -1065,6 +1065,9 @@
1065
1065
  padding: 0;
1066
1066
  position: relative;
1067
1067
  }
1068
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1069
+ visibility: hidden;
1070
+ }
1068
1071
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1069
1072
  cursor: default;
1070
1073
  }
package/styles/fluent.css CHANGED
@@ -166,7 +166,7 @@
166
166
 
167
167
  .e-bigger .e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon,
168
168
  .e-bigger.e-multiselect.e-control-container .e-multi-select-wrapper.e-down-icon .e-clear-icon {
169
- margin-top: -1.5em;
169
+ margin-top: -1.6em;
170
170
  }
171
171
 
172
172
  /*! recurrence editor theme wise definitions*/ /*! Schedule component's bootstrap5 theme definitions and variables */
@@ -1065,6 +1065,9 @@
1065
1065
  padding: 0;
1066
1066
  position: relative;
1067
1067
  }
1068
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1069
+ visibility: hidden;
1070
+ }
1068
1071
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1069
1072
  cursor: default;
1070
1073
  }
@@ -1073,6 +1073,9 @@
1073
1073
  padding: 0;
1074
1074
  position: relative;
1075
1075
  }
1076
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1077
+ visibility: hidden;
1078
+ }
1076
1079
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1077
1080
  cursor: default;
1078
1081
  }
@@ -1082,6 +1082,9 @@
1082
1082
  padding: 0;
1083
1083
  position: relative;
1084
1084
  }
1085
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1086
+ visibility: hidden;
1087
+ }
1085
1088
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1086
1089
  cursor: default;
1087
1090
  }
@@ -121,6 +121,15 @@
121
121
  padding: 5px 5px 5px 12px;
122
122
  }
123
123
 
124
+ .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
125
+ padding: 1px 0;
126
+ }
127
+
128
+ .e-small .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text],
129
+ .e-small.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
130
+ padding: 0;
131
+ }
132
+
124
133
  /*! recurrence editor theme wise definitions*/ /*! Schedule component's material theme definitions and variables */
125
134
  .e-schedule .e-schedule-toolbar .e-icon-prev::before {
126
135
  content: "\e937";
@@ -1017,6 +1026,9 @@
1017
1026
  padding: 0;
1018
1027
  position: relative;
1019
1028
  }
1029
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1030
+ visibility: hidden;
1031
+ }
1020
1032
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1021
1033
  cursor: default;
1022
1034
  }
@@ -157,6 +157,15 @@
157
157
  padding: 4px 8px;
158
158
  }
159
159
 
160
+ .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
161
+ padding: 1px 0;
162
+ }
163
+
164
+ .e-small .e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text],
165
+ .e-small.e-multiselect.e-input-group.e-checkbox .e-multi-select-wrapper input[type=text] {
166
+ padding: 0;
167
+ }
168
+
160
169
  /*! recurrence editor theme wise definitions*/ /*! Schedule component's material theme definitions and variables */
161
170
  .e-schedule .e-schedule-toolbar .e-icon-prev::before {
162
171
  content: "\e937";
@@ -1053,6 +1062,9 @@
1053
1062
  padding: 0;
1054
1063
  position: relative;
1055
1064
  }
1065
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1066
+ visibility: hidden;
1067
+ }
1056
1068
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1057
1069
  cursor: default;
1058
1070
  }
@@ -1120,6 +1120,9 @@
1120
1120
  padding: 0;
1121
1121
  position: relative;
1122
1122
  }
1123
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1124
+ visibility: hidden;
1125
+ }
1123
1126
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1124
1127
  cursor: default;
1125
1128
  }
@@ -1176,6 +1176,9 @@
1176
1176
  padding: 0;
1177
1177
  position: relative;
1178
1178
  }
1179
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1180
+ visibility: hidden;
1181
+ }
1179
1182
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1180
1183
  cursor: default;
1181
1184
  }
@@ -976,6 +976,10 @@
976
976
  position: relative;
977
977
  }
978
978
 
979
+ .e-appointment-wrapper-hidden {
980
+ visibility: hidden;
981
+ }
982
+
979
983
  .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
980
984
  cursor: default;
981
985
  }
@@ -1038,6 +1038,9 @@
1038
1038
  padding: 0;
1039
1039
  position: relative;
1040
1040
  }
1041
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1042
+ visibility: hidden;
1043
+ }
1041
1044
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1042
1045
  cursor: default;
1043
1046
  }
@@ -1033,6 +1033,9 @@
1033
1033
  padding: 0;
1034
1034
  position: relative;
1035
1035
  }
1036
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1037
+ visibility: hidden;
1038
+ }
1036
1039
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1037
1040
  cursor: default;
1038
1041
  }
@@ -1138,6 +1138,9 @@
1138
1138
  padding: 0;
1139
1139
  position: relative;
1140
1140
  }
1141
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1142
+ visibility: hidden;
1143
+ }
1141
1144
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1142
1145
  cursor: default;
1143
1146
  }
@@ -1083,6 +1083,9 @@
1083
1083
  padding: 0;
1084
1084
  position: relative;
1085
1085
  }
1086
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1087
+ visibility: hidden;
1088
+ }
1086
1089
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1087
1090
  cursor: default;
1088
1091
  }
@@ -1083,6 +1083,9 @@
1083
1083
  padding: 0;
1084
1084
  position: relative;
1085
1085
  }
1086
+ .e-schedule .e-vertical-view .e-appointment-wrapper-hidden {
1087
+ visibility: hidden;
1088
+ }
1086
1089
  .e-schedule .e-vertical-view .e-all-day-appointment-wrapper .e-appointment:not(.e-schedule-event-clone) {
1087
1090
  cursor: default;
1088
1091
  }