@syncfusion/ej2-schedule 20.2.36 → 20.2.38

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.2.36
+*  version : 20.2.38
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-schedule@*",
-  "_id": "@syncfusion/ej2-schedule@19.19.3",
+  "_id": "@syncfusion/ej2-schedule@20.2.36",
   "_inBundle": false,
-  "_integrity": "sha512-yRrF7cHt6giBASGyunHixawRX/57JGqtX3l2mBdM1AcPFrTszQGXiaYYfWrPjmUE17xtmz0/910RDHAgdYxinw==",
+  "_integrity": "sha512-LvbKoK7n6mykYe9JbXXXshmU2sZVFJ0OJA22Ng55q2fBao9kgZt+AmwYZk9ffzyFZbzAYgIPKSiNrRF9+Ps3PA==",
   "_location": "/@syncfusion/ej2-schedule",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-schedule",
     "/@syncfusion/ej2-vue-schedule"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-schedule/-/ej2-schedule-19.19.3.tgz",
-  "_shasum": "c5df3df291a7c0b7d6dae1b29def618a17894953",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-20.2.36.tgz",
+  "_shasum": "9714b4fa139a8afc99b3875e52350e177510889d",
   "_spec": "@syncfusion/ej2-schedule@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,16 +35,16 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.2.36",
-    "@syncfusion/ej2-buttons": "~20.2.36",
-    "@syncfusion/ej2-calendars": "~20.2.36",
-    "@syncfusion/ej2-data": "~20.2.36",
-    "@syncfusion/ej2-dropdowns": "~20.2.36",
-    "@syncfusion/ej2-excel-export": "~20.2.36",
-    "@syncfusion/ej2-inputs": "~20.2.36",
-    "@syncfusion/ej2-lists": "~20.2.36",
-    "@syncfusion/ej2-navigations": "~20.2.36",
-    "@syncfusion/ej2-popups": "~20.2.36"
+    "@syncfusion/ej2-base": "~20.2.38",
+    "@syncfusion/ej2-buttons": "~20.2.38",
+    "@syncfusion/ej2-calendars": "~20.2.38",
+    "@syncfusion/ej2-data": "~20.2.38",
+    "@syncfusion/ej2-dropdowns": "~20.2.38",
+    "@syncfusion/ej2-excel-export": "~20.2.38",
+    "@syncfusion/ej2-inputs": "~20.2.38",
+    "@syncfusion/ej2-lists": "~20.2.38",
+    "@syncfusion/ej2-navigations": "~20.2.38",
+    "@syncfusion/ej2-popups": "~20.2.38"
   },
   "deprecated": false,
   "description": "Flexible scheduling library with more built-in features and enhanced customization options similar to outlook and google calendar, allowing the users to plan and manage their appointments with efficient data-binding support.",
@@ -81,6 +81,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.2.36",
+  "version": "20.2.38",
   "sideEffects": false
 }

package/src/schedule/event-renderer/event-base.d.ts

@@ -58,6 +58,8 @@ export declare class EventBase {
     getEventMaxID(resourceId?: number): number | string;
     private activeEventData;
     generateOccurrence(event: Record<string, any>, viewDate?: Date, oldTimezone?: string, isMaxCount?: boolean): Record<string, any>[];
+    private getDSTAdjustedTime;
+    private getDSTDiff;
     getParentEvent(eventObj: Record<string, any>, isParent?: boolean): Record<string, any>;
     getEventCollections(parentObj: Record<string, any>, childObj?: Record<string, any>): {
         [key: string]: Record<string, any>[];

package/src/schedule/event-renderer/event-base.js

@@ -903,6 +903,7 @@ var EventBase = /** @class */ (function () {
         for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
             var date = dates_1[_i];
             var clonedObject = extend({}, event, null, true);
+            date = this.getDSTAdjustedTime(date, clonedObject);
             clonedObject[this.parent.eventFields.startTime] = new Date(date);
             clonedObject[this.parent.eventFields.endTime] = new Date(new Date(date).setMilliseconds(duration));
             clonedObject[this.parent.eventFields.recurrenceID] = clonedObject[this.parent.eventFields.id];
@@ -913,6 +914,21 @@ var EventBase = /** @class */ (function () {
         }
         return occurrenceCollection;
     };
+    EventBase.prototype.getDSTAdjustedTime = function (date, event) {
+        var occurDate = date;
+        if (this.parent.timezone &&
+            (event[this.parent.eventFields.startTimezone] || event[this.parent.eventFields.endTimezone])) {
+            var eventOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), event[this.parent.eventFields.startTimezone]);
+            var schOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), this.parent.timezone);
+            occurDate = (new Date(date).getTime() - (eventOffset - schOffset) * 60000);
+        }
+        return occurDate;
+    };
+    EventBase.prototype.getDSTDiff = function (startDate, occurDate, timezone) {
+        var startOffset = this.parent.tzModule.offset(new Date(startDate), timezone);
+        var occurOffset = this.parent.tzModule.offset(new Date(occurDate), timezone);
+        return startOffset - occurOffset;
+    };
     EventBase.prototype.getParentEvent = function (eventObj, isParent) {
         if (isParent === void 0) { isParent = false; }
         var parentEvent;

package/src/schedule/exports/calendar-export.js

@@ -19,7 +19,7 @@ var ICalendarExport = /** @class */ (function () {
         var timeZone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         var fields = this.parent.eventFields;
         eventsData.forEach(function (eventObj) {
-            var uId = _this.parent.eventBase.generateGuid();
+            var uId = eventObj[fields.id] || eventObj.Guid || _this.parent.eventBase.generateGuid();
             var editedExDate = [];
             if (eventObj[fields.recurrenceID]) {
                 var filter = _this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);

package/src/schedule/exports/calendar-import.js

@@ -78,8 +78,16 @@ var ICalendarImport = /** @class */ (function () {
                             break;
                         case 'UID':
                             curEvent[uId] = value;
-                            curEvent[fields.id] = typeof (id) === 'string' ? id + count.toString() : id + count;
-                            count++;
+                            if (typeof (id) == 'number') {
+                                curEvent[fields.id] = parseInt(value, 10);
+                                if (isNaN(curEvent[fields.id])) {
+                                    curEvent[fields.id] = id + count;
+                                    count++;
+                                }
+                            }
+                            else {
+                                curEvent[fields.id] = value;
+                            }
                             break;
                         case 'SUMMARY':
                             curEvent[fields.subject] = value;
@@ -115,6 +123,10 @@ var ICalendarImport = /** @class */ (function () {
         var appoint = [];
         var uId = 'UID';
         var fields = this.parent.eventFields;
+        var appointmentIds = [];
+        this.parent.eventsData.forEach(function (eventObj) {
+            appointmentIds.push(eventObj[fields.id]);
+        });
         app.forEach(function (eventObj) {
             var parentObj;
             var id;
@@ -123,24 +135,26 @@ var ICalendarImport = /** @class */ (function () {
                 parentObj = eventObj;
                 id = eventObj[fields.id];
             }
-            var data = app.filter(function (data) { return data.UID === eventObj[uId]; });
-            if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
-                for (var i = 0; i < data.length; i++) {
-                    // eslint-disable-next-line no-prototype-builtins
-                    if (data[i].hasOwnProperty(fields.recurrenceID)) {
-                        var exdate = data[i][fields.recurrenceID];
-                        data[i][fields.recurrenceID] = id;
-                        data[i][fields.recurrenceException] = null;
-                        parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
-                            exdate : parentObj[fields.recurrenceException] + ',' + exdate;
-                        appoint.push(data[i]);
+            if (appointmentIds.indexOf(eventObj[fields.id]) < 0) {
+                var data = app.filter(function (data) { return data.UID === eventObj[uId]; });
+                if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
+                    for (var i = 0; i < data.length; i++) {
+                        // eslint-disable-next-line no-prototype-builtins
+                        if (data[i].hasOwnProperty(fields.recurrenceID)) {
+                            var exdate = data[i][fields.recurrenceID];
+                            data[i][fields.recurrenceID] = id;
+                            data[i][fields.recurrenceException] = null;
+                            parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
+                                exdate : parentObj[fields.recurrenceException] + ',' + exdate;
+                            appoint.push(data[i]);
+                        }
                     }
+                    appoint.push(parentObj);
+                    // eslint-disable-next-line no-prototype-builtins
+                }
+                else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
+                    appoint.push(eventObj);
                 }
-                appoint.push(parentObj);
-                // eslint-disable-next-line no-prototype-builtins
-            }
-            else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
-                appoint.push(eventObj);
             }
         });
         return appoint;

package/src/schedule/popups/event-window.js

@@ -154,6 +154,7 @@ var EventWindow = /** @class */ (function () {
     EventWindow.prototype.setDialogContent = function () {
         this.dialogObject.content = this.getEventWindowContent();
         this.dialogObject.dataBind();
+        this.applyFormValidation();
     };
     EventWindow.prototype.preventEventSave = function (e) {
         if (this.parent && !this.parent.allowKeyboardInteraction && e.code === 'Enter') {

package/styles/fluent-dark.css

@@ -350,7 +350,7 @@
 }
 .e-schedule .e-new-event {
   background-color: #0078d4;
-  border: 1px solid #fff;
+  border: 1px solid #1b1a19;
   border-radius: 5px;
   height: 100%;
   opacity: 0.9;
@@ -359,7 +359,7 @@
   z-index: 1;
 }
 .e-schedule .e-new-event .e-title {
-  color: #fff;
+  color: #1b1a19;
   font-size: 12px;
   line-height: 1.2;
   margin: 0;
@@ -473,7 +473,7 @@
 .e-schedule .e-appointment .e-inline-subject {
   background-color: transparent;
   border: 0;
-  color: #fff;
+  color: #1b1a19;
   font-size: 13px;
   font-weight: 500;
   line-height: 1.2;
@@ -585,7 +585,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 54px;
@@ -850,7 +850,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 26px;
@@ -900,7 +900,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   overflow: hidden;
   position: absolute;
 }
@@ -1135,7 +1135,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   cursor: default;
   display: -ms-flexbox;
   display: flex;
@@ -1508,7 +1508,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   cursor: default;
   display: -ms-flexbox;
   display: flex;
@@ -1743,7 +1743,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   cursor: default;
   display: -ms-flexbox;
   display: flex;
@@ -2128,7 +2128,7 @@
   vertical-align: top;
 }
 .e-schedule .e-agenda-view .e-month-header .e-date-header {
-  color: #fff;
+  color: #1b1a19;
   font-size: 18px;
 }
 .e-schedule .e-agenda-view .e-day-date-header {
@@ -3227,7 +3227,7 @@
   background: #0078d4;
   border-radius: 2px;
   box-shadow: 0 25.6px 57.6px 0 rgba(0, 0, 0, 0.22), 0 4.8px 14.4px 0 rgba(0, 0, 0, 0.18), 0 3.2px 7.2px 0 rgba(0, 0, 0, 0.132), 0 0.6px 1.8px 0 rgba(0, 0, 0, 0.108), 0 3.2px 7.2px 0 rgba(0, 0, 0, 0.132), 0 0.6px 1.8px 0 rgba(0, 0, 0, 0.108);
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 38px;
@@ -3396,7 +3396,7 @@
 .e-more-popup-wrapper .e-appointment {
   background: #0078d4;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 26px;
@@ -3407,7 +3407,7 @@
 }
 .e-bigger .e-more-popup-wrapper .e-appointment .e-subject,
 .e-more-popup-wrapper .e-appointment .e-subject {
-  color: #fff;
+  color: #1b1a19;
   -ms-flex: auto;
       flex: auto;
   font-size: 13px;

package/styles/schedule/fluent-dark.css

@@ -350,7 +350,7 @@
 }
 .e-schedule .e-new-event {
   background-color: #0078d4;
-  border: 1px solid #fff;
+  border: 1px solid #1b1a19;
   border-radius: 5px;
   height: 100%;
   opacity: 0.9;
@@ -359,7 +359,7 @@
   z-index: 1;
 }
 .e-schedule .e-new-event .e-title {
-  color: #fff;
+  color: #1b1a19;
   font-size: 12px;
   line-height: 1.2;
   margin: 0;
@@ -473,7 +473,7 @@
 .e-schedule .e-appointment .e-inline-subject {
   background-color: transparent;
   border: 0;
-  color: #fff;
+  color: #1b1a19;
   font-size: 13px;
   font-weight: 500;
   line-height: 1.2;
@@ -585,7 +585,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 54px;
@@ -850,7 +850,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 26px;
@@ -900,7 +900,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   overflow: hidden;
   position: absolute;
 }
@@ -1135,7 +1135,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   cursor: default;
   display: -ms-flexbox;
   display: flex;
@@ -1508,7 +1508,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   cursor: default;
   display: -ms-flexbox;
   display: flex;
@@ -1743,7 +1743,7 @@
   background: #0078d4;
   border: 1px solid #292827;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   cursor: default;
   display: -ms-flexbox;
   display: flex;
@@ -2128,7 +2128,7 @@
   vertical-align: top;
 }
 .e-schedule .e-agenda-view .e-month-header .e-date-header {
-  color: #fff;
+  color: #1b1a19;
   font-size: 18px;
 }
 .e-schedule .e-agenda-view .e-day-date-header {
@@ -3227,7 +3227,7 @@
   background: #0078d4;
   border-radius: 2px;
   box-shadow: 0 25.6px 57.6px 0 rgba(0, 0, 0, 0.22), 0 4.8px 14.4px 0 rgba(0, 0, 0, 0.18), 0 3.2px 7.2px 0 rgba(0, 0, 0, 0.132), 0 0.6px 1.8px 0 rgba(0, 0, 0, 0.108), 0 3.2px 7.2px 0 rgba(0, 0, 0, 0.132), 0 0.6px 1.8px 0 rgba(0, 0, 0, 0.108);
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 38px;
@@ -3396,7 +3396,7 @@
 .e-more-popup-wrapper .e-appointment {
   background: #0078d4;
   border-radius: 2px;
-  color: #fff;
+  color: #1b1a19;
   display: -ms-flexbox;
   display: flex;
   height: 26px;
@@ -3407,7 +3407,7 @@
 }
 .e-bigger .e-more-popup-wrapper .e-appointment .e-subject,
 .e-more-popup-wrapper .e-appointment .e-subject {
-  color: #fff;
+  color: #1b1a19;
   -ms-flex: auto;
       flex: auto;
   font-size: 13px;