@syncfusion/ej2-schedule 20.1.50 → 20.1.52

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.
@@ -3660,10 +3660,6 @@ function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCount, vi
3660
3660
  }
3661
3661
  maxOccurrence = maximumCount;
3662
3662
  setFirstDayOfWeek(DAYINDEX[startDayOfWeek]);
3663
- if (ruleObject.until) {
3664
- var end = resetTime(ruleObject.until);
3665
- ruleObject.until = new Date(end.getFullYear(), end.getMonth(), end.getDate(), 23, 59, 59);
3666
- }
3667
3663
  switch (ruleObject.freq) {
3668
3664
  case 'DAILY':
3669
3665
  dailyType(modifiedDate, ruleObject.until, data, ruleObject);
@@ -3760,9 +3756,6 @@ function dailyType(startDate, endDate, data, ruleObject) {
3760
3756
  }
3761
3757
  }
3762
3758
  tempDate.setDate(tempDate.getDate() + interval);
3763
- if (tempDate.getHours() !== startDate.getHours()) {
3764
- tempDate.setHours(startDate.getHours());
3765
- }
3766
3759
  }
3767
3760
  }
3768
3761
  /**
@@ -3807,9 +3800,6 @@ function weeklyType(startDate, endDate, data, ruleObject) {
3807
3800
  break;
3808
3801
  }
3809
3802
  tempDate.setDate(tempDate.getDate() + 1);
3810
- if (tempDate.getHours() !== startDate.getHours()) {
3811
- tempDate.setHours(startDate.getHours());
3812
- }
3813
3803
  compareTempDate = new Date(tempDate.getTime());
3814
3804
  compareTempDate = resetTime(compareTempDate);
3815
3805
  }
@@ -4692,7 +4682,7 @@ function insertDateCollection(state, startDate, endDate, data, ruleObject, dayDa
4692
4682
  function weekCount(year, startDayOfWeek, monthCollection, week, ruleObject) {
4693
4683
  var firstDayOfWeek = startDayOfWeek || 0;
4694
4684
  var firstOfMonth = new Date(year, ruleObject.month[0] - 1, 1);
4695
- var lastOfMonth = new Date(year, ruleObject.month[0], 0);
4685
+ var lastOfMonth = new Date(year, ruleObject.month[0] - 1, 0);
4696
4686
  var numberOfDaysInMonth = lastOfMonth.getDate();
4697
4687
  var firstWeekDay = (firstOfMonth.getDay() - firstDayOfWeek + 7) % 7;
4698
4688
  var used = firstWeekDay + numberOfDaysInMonth;
@@ -7272,7 +7262,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7272
7262
  appElement = (this.parent.currentView === 'Month') ? appElement : [appElement[0]];
7273
7263
  for (var _i = 0, appElement_1 = appElement; _i < appElement_1.length; _i++) {
7274
7264
  var wrap = appElement_1[_i];
7275
- if (wrap.parentElement && wrap.parentElement.parentNode) {
7265
+ if (!wrap.classList.contains('e-more-indicator') && wrap.parentElement && wrap.parentElement.parentNode) {
7276
7266
  remove(wrap.parentElement);
7277
7267
  }
7278
7268
  }
@@ -7403,19 +7393,12 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7403
7393
  var filteredDates = this.getRenderedDates(dateRender);
7404
7394
  this.getSlotDates(workDays || this.parent.activeViewOptions.workDays);
7405
7395
  this.processBlockEvents(blockList, resIndex, resData);
7406
- var events = [];
7407
7396
  for (var _i = 0, eventsList_1 = eventsList; _i < eventsList_1.length; _i++) {
7408
7397
  var event_1 = eventsList_1[_i];
7409
7398
  if (this.parent.resourceBase && !resData) {
7410
7399
  this.cssClass = this.parent.resourceBase.getCssClass(event_1);
7411
7400
  }
7412
- events = events.concat(this.splitEvent(event_1, filteredDates || this.dateRender));
7413
- }
7414
- for (var level = 0; level < this.slots.length; level++) {
7415
- this.renderedEvents = [];
7416
- var slot = this.slots[level];
7417
- var endDate = addDays(new Date(slot[slot.length - 1]), 1);
7418
- var spannedEvents = this.filterEvents(new Date(slot[0]), endDate, events);
7401
+ var spannedEvents = this.splitEvent(event_1, filteredDates || this.dateRender);
7419
7402
  for (var _a = 0, spannedEvents_1 = spannedEvents; _a < spannedEvents_1.length; _a++) {
7420
7403
  var event_2 = spannedEvents_1[_a];
7421
7404
  if (this.maxHeight) {
@@ -7720,17 +7703,21 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7720
7703
  if (day < 0) {
7721
7704
  return;
7722
7705
  }
7706
+ if ((startTime.getTime() < this.parent.minDate.getTime()) || (endTime.getTime() > this.parent.maxDate.getTime())) {
7707
+ return;
7708
+ }
7723
7709
  var overlapCount = this.getIndex(startTime);
7724
7710
  event.Index = overlapCount;
7711
+ var appHeight = this.eventHeight;
7712
+ this.renderedEvents.push(extend({}, event, null, true));
7725
7713
  var diffInDays = event.data.count;
7726
7714
  if (startTime.getTime() <= endTime.getTime()) {
7727
7715
  var appWidth = (diffInDays * this.cellWidth) - 5;
7728
7716
  var cellTd = this.workCells[day];
7729
- var appTop = (overlapCount * (this.eventHeight + EVENT_GAP));
7730
- var height = this.monthHeaderHeight + ((overlapCount + 1) * (this.eventHeight + EVENT_GAP)) + this.moreIndicatorHeight;
7717
+ var appTop = (overlapCount * (appHeight + EVENT_GAP));
7718
+ var height = this.monthHeaderHeight + ((overlapCount + 1) * (appHeight + EVENT_GAP)) + this.moreIndicatorHeight;
7731
7719
  var enableAppRender = this.maxOrIndicator ? overlapCount < 1 ? true : false : this.cellHeight > height;
7732
7720
  if (this.parent.rowAutoHeight || enableAppRender) {
7733
- this.renderedEvents.push(extend({}, event, null, true));
7734
7721
  var appointmentElement = void 0;
7735
7722
  if (this.inlineValue) {
7736
7723
  appointmentElement = this.parent.inlineModule.createInlineAppointmentElement();
@@ -7749,26 +7736,24 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7749
7736
  }
7750
7737
  else {
7751
7738
  for (var i = 0; i < diffInDays; i++) {
7752
- if (this.workCells[day + i]) {
7753
- var indicator = this.workCells[day + i].querySelector('.' + MORE_INDICATOR_CLASS);
7754
- if (indicator) {
7755
- var count = parseInt(indicator.getAttribute('data-count'), 10) + 1;
7756
- indicator.setAttribute('data-count', count.toString());
7757
- indicator.innerHTML = this.getMoreIndicatorText(count);
7758
- }
7759
- else {
7760
- var startDate = new Date(this.dateRender[day + i].getTime());
7761
- var endDate = addDays(this.dateRender[day + i], 1);
7762
- var groupIndex = this.workCells[day + i].getAttribute('data-group-index');
7763
- var moreIndicatorElement = this.getMoreIndicatorElement(1, startDate, endDate);
7764
- if (!isNullOrUndefined(groupIndex)) {
7765
- moreIndicatorElement.setAttribute('data-group-index', groupIndex);
7766
- }
7767
- moreIndicatorElement.style.top = (this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight) + 'px';
7768
- moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
7769
- this.renderElement(this.workCells[day + i], moreIndicatorElement);
7770
- EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
7739
+ var cellTd_1 = this.workCells[day + i];
7740
+ if (cellTd_1 && isNullOrUndefined(cellTd_1.querySelector('.' + MORE_INDICATOR_CLASS))) {
7741
+ var startDate = new Date(this.dateRender[day + i].getTime());
7742
+ var endDate = addDays(this.dateRender[day + i], 1);
7743
+ var groupIndex = cellTd_1.getAttribute('data-group-index');
7744
+ var filterEvents = this.getFilteredEvents(startDate, endDate, groupIndex);
7745
+ var appArea = this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight;
7746
+ appHeight = this.withIndicator ? appArea : appHeight;
7747
+ var renderedAppCount = Math.floor(appArea / (appHeight + EVENT_GAP));
7748
+ var count = (filterEvents.length - renderedAppCount) <= 0 ? 1 : (filterEvents.length - renderedAppCount);
7749
+ var moreIndicatorElement = this.getMoreIndicatorElement(count, startDate, endDate);
7750
+ if (!isNullOrUndefined(groupIndex)) {
7751
+ moreIndicatorElement.setAttribute('data-group-index', groupIndex);
7771
7752
  }
7753
+ moreIndicatorElement.style.top = appArea + 'px';
7754
+ moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
7755
+ this.renderElement(cellTd_1, moreIndicatorElement);
7756
+ EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
7772
7757
  }
7773
7758
  }
7774
7759
  }
@@ -7805,9 +7790,9 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7805
7790
  };
7806
7791
  MonthEvent.prototype.getOverlapEvents = function (date, appointments) {
7807
7792
  var appointmentsList = [];
7808
- var dateTime = resetTime(date).getTime();
7809
7793
  for (var _i = 0, appointments_1 = appointments; _i < appointments_1.length; _i++) {
7810
7794
  var app = appointments_1[_i];
7795
+ var dateTime = resetTime(date).getTime();
7811
7796
  if ((resetTime(app[this.fields.startTime]).getTime() <= dateTime) &&
7812
7797
  (resetTime(app[this.fields.endTime]).getTime() >= dateTime)) {
7813
7798
  appointmentsList.push(app);
@@ -7891,10 +7876,9 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7891
7876
  MonthEvent.prototype.getMoreIndicatorElement = function (count, startDate, endDate) {
7892
7877
  var moreIndicatorElement = createElement('div', {
7893
7878
  className: MORE_INDICATOR_CLASS,
7894
- innerHTML: this.getMoreIndicatorText(count),
7879
+ innerHTML: '+' + this.parent.globalize.formatNumber(count) + '&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more')),
7895
7880
  attrs: {
7896
7881
  'tabindex': '0',
7897
- 'data-count': count.toString(),
7898
7882
  'data-start-date': startDate.getTime().toString(),
7899
7883
  'data-end-date': endDate.getTime().toString(),
7900
7884
  'role': 'list'
@@ -7902,9 +7886,6 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
7902
7886
  });
7903
7887
  return moreIndicatorElement;
7904
7888
  };
7905
- MonthEvent.prototype.getMoreIndicatorText = function (count) {
7906
- return '+' + this.parent.globalize.formatNumber(count) + '&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more'));
7907
- };
7908
7889
  MonthEvent.prototype.removeHeightProperty = function (selector) {
7909
7890
  var rows = [].slice.call(this.element.querySelectorAll('.' + selector + ' tbody tr'));
7910
7891
  for (var _i = 0, rows_1 = rows; _i < rows_1.length; _i++) {
@@ -12027,8 +12008,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
12027
12008
  return labelText;
12028
12009
  };
12029
12010
  EventWindow.prototype.onChange = function (args) {
12030
- var targetSelector = "." + EVENT_WINDOW_ALL_DAY_CLASS + ",." + TIME_ZONE_CLASS + ",." + EVENT_WINDOW_REPEAT_CLASS;
12031
- var target = closest(args.event.target, targetSelector);
12011
+ var target = args.event.currentTarget.querySelector('input');
12032
12012
  if (target.classList.contains(EVENT_WINDOW_ALL_DAY_CLASS)) {
12033
12013
  this.onAllDayChange(args.checked);
12034
12014
  }
@@ -12194,8 +12174,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
12194
12174
  };
12195
12175
  EventWindow.prototype.showDetails = function (eventData) {
12196
12176
  var eventObj = extend({}, eventData, null, true);
12197
- if ((!this.cellClickAction || this.cellClickAction && !isNullOrUndefined(this.parent.editorTemplate)) &&
12198
- eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
12177
+ if (eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
12199
12178
  this.trimAllDay(eventObj);
12200
12179
  }
12201
12180
  this.eventData = eventObj;
@@ -13510,8 +13489,7 @@ var Render = /** @__PURE__ @class */ (function () {
13510
13489
  this.parent.virtualScrollModule.destroy();
13511
13490
  this.parent.virtualScrollModule = null;
13512
13491
  }
13513
- if (this.parent.currentView.indexOf('Timeline') !== -1 && (this.parent.currentView.indexOf('Year') === -1 ||
13514
- (this.parent.currentView === 'TimelineYear' && this.parent.activeViewOptions.orientation === 'Vertical'))
13492
+ if (this.parent.currentView.indexOf('Timeline') !== -1 && this.parent.currentView.indexOf('Year') === -1
13515
13493
  && this.parent.activeViewOptions.allowVirtualScrolling
13516
13494
  && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
13517
13495
  this.parent.virtualScrollModule = new VirtualScroll(this.parent);
@@ -16347,7 +16325,6 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
16347
16325
  };
16348
16326
  _this.trigger(navigating, navArgs, function (navigationArgs) {
16349
16327
  if (!navigationArgs.cancel) {
16350
- _this.uiStateValues.isInitial = ['TimelineMonth', 'TimelineYear', 'Year'].indexOf(view) > -1 ? true : _this.uiStateValues.isInitial;
16351
16328
  _this.viewIndex = navigationArgs.viewIndex;
16352
16329
  _this.setProperties({ currentView: view }, true);
16353
16330
  if (_this.headerModule) {
@@ -16972,9 +16949,6 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
16972
16949
  if (document.querySelectorAll(template).length) {
16973
16950
  return compile(document.querySelector(template).innerHTML.trim());
16974
16951
  }
16975
- else {
16976
- return compile(template);
16977
- }
16978
16952
  }
16979
16953
  catch (error) {
16980
16954
  return compile(template);
@@ -19860,9 +19834,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
19860
19834
  this.eventHeight = getElementHeightFromClass(eventTable, APPOINTMENT_CLASS);
19861
19835
  var wrapperCollection = [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_CONTAINER_CLASS));
19862
19836
  var resources = this.parent.uiStateValues.isGroupAdaptive ?
19863
- [this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex]] :
19864
- this.parent.activeViewOptions.allowVirtualScrolling ? this.parent.resourceBase.renderedResources :
19865
- this.parent.resourceBase.lastResourceLevel;
19837
+ [this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex]] : this.parent.resourceBase.lastResourceLevel;
19866
19838
  var months = this.getMonths();
19867
19839
  if (this.parent.activeViewOptions.orientation === 'Horizontal') {
19868
19840
  for (var month = 0; month < months.length; month++) {
@@ -22713,9 +22685,8 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
22713
22685
  var msStartHour = startHour.getTime();
22714
22686
  var msEndHour = endHour.getTime();
22715
22687
  if (msStartHour !== msEndHour) {
22716
- var duration = this.parent.activeViewOptions.timeScale.interval / this.parent.activeViewOptions.timeScale.slotCount;
22717
22688
  length = (Math.abs(msEndHour - msStartHour) / msInterval) - ((new Date(msEndHour).getTimezoneOffset()
22718
- - new Date(msStartHour).getTimezoneOffset()) / duration);
22689
+ - new Date(msStartHour).getTimezoneOffset()) / (60 / this.parent.activeViewOptions.timeScale.slotCount));
22719
22690
  }
22720
22691
  if (!this.parent.activeViewOptions.timeScale.enable) {
22721
22692
  length = 1;
@@ -22989,16 +22960,16 @@ var Month = /** @__PURE__ @class */ (function (_super) {
22989
22960
  }
22990
22961
  this.setColWidth(content);
22991
22962
  if (args.scrollPosition || !args.isPreventScrollUpdate && this.parent.currentView === 'TimelineMonth') {
22992
- var top_1 = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.top : args.scrollPosition.top;
22993
- if (leftPanel) {
22994
- leftPanel.scrollTop = top_1;
22995
- }
22996
- content.scrollTop = top_1;
22997
22963
  if (this.parent.uiStateValues.isInitial) {
22998
22964
  this.scrollToSelectedDate();
22999
22965
  this.parent.uiStateValues.isInitial = false;
23000
22966
  }
23001
22967
  else {
22968
+ var top_1 = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.top : args.scrollPosition.top;
22969
+ if (leftPanel) {
22970
+ leftPanel.scrollTop = top_1;
22971
+ }
22972
+ content.scrollTop = top_1;
23002
22973
  content.scrollLeft = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.left :
23003
22974
  args.scrollPosition.left;
23004
22975
  }
@@ -23019,9 +22990,6 @@ var Month = /** @__PURE__ @class */ (function (_super) {
23019
22990
  else {
23020
22991
  content.scrollLeft = 0;
23021
22992
  }
23022
- if (content.scrollLeft === 0 && this.parent.uiStateValues.isInitial) {
23023
- this.parent.uiStateValues.left = 0;
23024
- }
23025
22993
  };
23026
22994
  Month.prototype.setContentHeight = function (content, leftPanelElement, height) {
23027
22995
  content.style.height = 'auto';
@@ -23596,9 +23564,6 @@ var Year = /** @__PURE__ @class */ (function (_super) {
23596
23564
  var viewTypeClass = this.parent.activeViewOptions.orientation === 'Horizontal' ? 'e-horizontal' : 'e-vertical';
23597
23565
  addClass([this.element], [this.viewClass, viewTypeClass, className]);
23598
23566
  this.renderPanel(className);
23599
- if (this.parent.activeViewOptions.allowVirtualScrolling) {
23600
- addClass([this.element], [VIRTUAL_SCROLL_CLASS]);
23601
- }
23602
23567
  var calendarTable = this.createTableLayout(OUTER_TABLE_CLASS);
23603
23568
  this.element.appendChild(calendarTable);
23604
23569
  this.element.querySelector('table').setAttribute('role', 'presentation');
@@ -23819,7 +23784,6 @@ var Year = /** @__PURE__ @class */ (function (_super) {
23819
23784
  Year.prototype.onContentScroll = function (e) {
23820
23785
  var target = e.target;
23821
23786
  var headerWrapper = this.getDatesHeaderElement();
23822
- this.parent.notify(virtualScroll, e);
23823
23787
  if (headerWrapper) {
23824
23788
  headerWrapper.firstElementChild.scrollLeft = target.scrollLeft;
23825
23789
  }
@@ -23992,7 +23956,7 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
23992
23956
  moduleName: 'agenda',
23993
23957
  listClass: this.parent.activeView.viewClass,
23994
23958
  itemClass: this.parent.activeView.viewClass,
23995
- template: "<div class=\"" + AGENDA_NO_EVENT_CLASS + "\">" + this.parent.localeObj.getConstant('noEvents') + "</div>"
23959
+ template: '<div class=' + AGENDA_NO_EVENT_CLASS + '>${subject}</div>'
23996
23960
  });
23997
23961
  }
23998
23962
  else {
@@ -25644,7 +25608,7 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
25644
25608
  !this.parent.uiStateValues.isGroupAdaptive) {
25645
25609
  tdCollection.push(firstTd);
25646
25610
  firstTd.appendChild(this.parent.resourceBase.createResourceColumn());
25647
- this.rowCount = this.parent.resourceBase.renderedResources.length;
25611
+ this.rowCount = this.parent.resourceBase.lastResourceLevel.length;
25648
25612
  }
25649
25613
  else {
25650
25614
  tdCollection.push(firstTd);
@@ -25661,9 +25625,6 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
25661
25625
  content.appendChild(contentTable);
25662
25626
  var eventWrapper = createElement('div', { className: EVENT_TABLE_CLASS });
25663
25627
  content.appendChild(eventWrapper);
25664
- if (this.parent.virtualScrollModule) {
25665
- this.parent.virtualScrollModule.renderVirtualTrack(content);
25666
- }
25667
25628
  var contentTBody = contentTable.querySelector('tbody');
25668
25629
  if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
25669
25630
  if (this.parent.rowAutoHeight) {
@@ -25781,47 +25742,6 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
25781
25742
  }
25782
25743
  }
25783
25744
  };
25784
- TimelineYear.prototype.getContentRows = function () {
25785
- var tRow = [];
25786
- var monthCells = this.getMonths();
25787
- for (var row = 0; row < this.parent.resourceBase.renderedResources.length; row++) {
25788
- var tr = createElement('tr', { attrs: { 'role': 'row' } });
25789
- tRow.push(tr);
25790
- var resData = void 0;
25791
- if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
25792
- resData = this.parent.resourceBase.renderedResources[row];
25793
- }
25794
- var monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[row], 1);
25795
- var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
25796
- for (var month = 0; month < this.columnCount; month++) {
25797
- var classList$$1 = [];
25798
- var groupIndex = resData.groupIndex;
25799
- classList$$1 = classList$$1.concat(resData.className);
25800
- if (classList$$1.indexOf(RESOURCE_PARENT_CLASS) > -1) {
25801
- classList$$1.push(RESOURCE_GROUP_CELLS_CLASS);
25802
- }
25803
- else {
25804
- classList$$1.push(WORKDAY_CLASS);
25805
- }
25806
- monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[month], 1);
25807
- date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
25808
- var tdELe = createElement('td', {
25809
- className: WORK_CELLS_CLASS,
25810
- attrs: {
25811
- 'role': 'gridcell', 'aria-selected': 'false',
25812
- 'data-date': date.getTime().toString()
25813
- }
25814
- });
25815
- addClass([tdELe], classList$$1);
25816
- tdELe.setAttribute('data-group-index', groupIndex.toString());
25817
- this.renderCellTemplate({ date: date, type: 'resourceGroupCells', groupIndex: groupIndex }, tdELe);
25818
- this.wireEvents(tdELe, 'cell');
25819
- this.parent.trigger(renderCell, { elementType: 'resourceGroupCells', element: tdELe, date: date });
25820
- tr.appendChild(tdELe);
25821
- }
25822
- }
25823
- return tRow;
25824
- };
25825
25745
  TimelineYear.prototype.renderResourceContent = function (wrapper, monthBody, contentBody) {
25826
25746
  var months = this.getMonths();
25827
25747
  for (var row = 0; row < this.rowCount; row++) {
@@ -25829,8 +25749,8 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
25829
25749
  var tr = createElement('tr', { attrs: { 'role': 'row' } });
25830
25750
  contentBody.appendChild(tr);
25831
25751
  var resData = void 0;
25832
- if (this.parent.activeViewOptions.orientation === 'Vertical' && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
25833
- resData = this.parent.resourceBase.renderedResources[row];
25752
+ if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
25753
+ resData = this.parent.resourceBase.lastResourceLevel[row];
25834
25754
  }
25835
25755
  var monthDate = new Date(this.parent.selectedDate.getFullYear(), months[row], 1);
25836
25756
  var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
@@ -25851,9 +25771,8 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
25851
25771
  }
25852
25772
  for (var month = 0; month < this.columnCount; month++) {
25853
25773
  var classList$$1 = [];
25854
- var groupIndex = void 0;
25774
+ var groupIndex = row;
25855
25775
  if (this.parent.activeViewOptions.orientation === 'Vertical') {
25856
- groupIndex = resData.groupIndex;
25857
25776
  classList$$1 = classList$$1.concat(resData.className);
25858
25777
  if (classList$$1.indexOf(RESOURCE_PARENT_CLASS) > -1) {
25859
25778
  classList$$1.push(RESOURCE_GROUP_CELLS_CLASS);
@@ -25957,7 +25876,7 @@ var ICalendarExport = /** @__PURE__ @class */ (function () {
25957
25876
  var editedExDate = [];
25958
25877
  if (eventObj[fields.recurrenceID]) {
25959
25878
  var filter = _this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
25960
- uId = filter.length > 0 ? filter[0].UID : uId;
25879
+ uId = filter[0].UID;
25961
25880
  }
25962
25881
  if (!eventObj[fields.recurrenceID] && eventObj[fields.recurrenceRule] && eventObj[fields.recurrenceException]) {
25963
25882
  var exDate = (eventObj[fields.recurrenceException]).split(',');