daterangepicker-4.x 4.2.5 → 4.3.0

package/README.md

@@ -18,8 +18,8 @@ Above samples are based on the [original repository](https://github.com/dangross
 ```html
 <script type="text/javascript" src="https://cdn.jsdelivr.net/jquery/latest/jquery.min.js"></script>
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/luxon@3.5.0/build/global/luxon.min.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.2.5/daterangepicker.min.js"></script>
-<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.2.5/daterangepicker.min.css" rel="stylesheet" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.3.0/daterangepicker.min.js"></script>
+<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.3.0/daterangepicker.min.css" rel="stylesheet" />
 
 <input type="text" id="daterange" />
 
@@ -339,9 +339,9 @@ When `startDate` or `endDate` are modified, then a warning is written to console
 **Example**  
 ```js
 constrainDate({}, [DateTime.fromISO('2025-02-03'), DateTime.fromISO('2025-02-25')]) => 
-[ DateTime.fromISO('2025-02-05'), DateTime.fromISO('2025-02-20'), { startDate: {modified: true}, endDate: {modified: true} } ]
+[ DateTime.fromISO('2025-02-05'), DateTime.fromISO('2025-02-20'), { startDate: { stepped: ... }, endDate: { stepped: ..., modified: [{old: ... new: ..., reason: 'minSpan'}] } } ]
 constrainDate({span: false, invalidDate: true, invalidTime: true}) => 
-{ startDate: {modified: true, isInvalidDate: true, isInvalidTime: false}, endDate: {modified: false, isInvalidDate: false, isInvalidTime: true} } ]
+{ startDate: {stepped: ..., modified: [{old: ... new: ..., reason: 'minDate'}], isInvalidDate: true, isInvalidTime: false}, endDate: {stepped: ..., isInvalidDate: false, isInvalidTime: true} } ]
 ```
 <a name="DateRangePicker+updateView"></a>
 
@@ -531,7 +531,7 @@ Options for DateRangePicker
 | minYear | <code>number</code> |  | Default: `DateTime.now().minus({year:100}).year`<br/>The minimum year shown in the dropdowns when `showDropdowns: true` |
 | maxYear | <code>number</code> |  | Default: `DateTime.now().plus({year:100}).year`<br/>The maximum  year shown in the dropdowns when `showDropdowns: true` |
 | showWeekNumbers | <code>boolean</code> | <code>false</code> | Show **localized** week numbers at the start of each week on the calendars |
-| showISOWeekNumbers | <code>boolean</code> | <code>false</code> | Show **ISO** week numbers at the start of each week on the calendars |
+| showISOWeekNumbers | <code>boolean</code> | <code>false</code> | Show **ISO** week numbers at the start of each week on the calendars.<br/> Takes precedence over localized `showWeekNumbers` |
 | timePicker | <code>boolean</code> | <code>false</code> | Adds select boxes to choose times in addition to dates |
 | timePicker24Hour | <code>boolean</code> | <code>true</code> | Use 24-hour instead of 12-hour times, removing the AM/PM selection |
 | timePickerStepSize | [<code>Duration</code>](https://moment.github.io/luxon/api-docs/index.html#duration) \| <code>string</code> \| <code>number</code> |  | Default: `Duration.fromObject({minutes:1})`<br/>Set the time picker step size.<br/> Must be a `luxon.Duration` or the number of seconds or a string according to [ISO-8601](ISO-8601) duration.<br/> Valid values are 1,2,3,4,5,6,10,12,15,20,30 for `Duration.fromObject({seconds: ...})` and `Duration.fromObject({minutes: ...})`  and 1,2,3,4,6,(8,12) for `Duration.fromObject({hours: ...})`.<br/> Duration must be greater than `minSpan` and smaller than `maxSpan`.<br/> For example `timePickerStepSize: 600` will disable time picker seconds and time picker minutes are set to step size of 10 Minutes.<br/> Overwrites `timePickerIncrement` and `timePickerSeconds` |

package/daterangepicker.js

@@ -73,7 +73,8 @@
         * @property {number} minYear - Default: `DateTime.now().minus({year:100}).year`<br/>The minimum year shown in the dropdowns when `showDropdowns: true`
         * @property {number} maxYear - Default: `DateTime.now().plus({year:100}).year`<br/>The maximum  year shown in the dropdowns when `showDropdowns: true`
         * @property {boolean} showWeekNumbers=false - Show **localized** week numbers at the start of each week on the calendars
-        * @property {boolean} showISOWeekNumbers=false - Show **ISO** week numbers at the start of each week on the calendars
+        * @property {boolean} showISOWeekNumbers=false - Show **ISO** week numbers at the start of each week on the calendars.<br/>
+        * Takes precedence over localized `showWeekNumbers`
         
         * @property {boolean} timePicker=false - Adds select boxes to choose times in addition to dates
         * @property {boolean} timePicker24Hour=true - Use 24-hour instead of 12-hour times, removing the AM/PM selection
@@ -201,19 +202,12 @@
         this.isInvalidTime = null;
         this.isCustomDate = null;
         this.onOutsideClick = 'apply';
-        this.ranges = {};
-
-        this.opens = 'right';
-        if (this.element.hasClass('pull-right'))
-            this.opens = 'left';
-
-        this.drops = 'down';
-        if (this.element.hasClass('dropup'))
-            this.drops = 'up';
-
+        this.opens = this.element.hasClass('pull-right') ? 'left' : 'right';
+        this.drops = this.element.hasClass('dropup') ? 'up' : 'down';
         this.buttonClasses = 'btn btn-sm';
         this.applyButtonClasses = 'btn-primary';
         this.cancelButtonClasses = 'btn-default';
+        this.ranges = {};
 
         this.locale = {
             direction: 'ltr',
@@ -273,6 +267,10 @@
         //
 
         if (typeof options.locale === 'object') {
+            for (let key of ['separator', 'applyLabel', 'cancelLabel', 'weekLabel']) {
+                if (typeof options.locale[key] === 'string')
+                    this.locale[key] = options.locale[key];
+            }
 
             if (typeof options.locale.direction === 'string') {
                 if (['rtl', 'ltr'].includes(options.locale.direction))
@@ -284,9 +282,6 @@
             if (['string', 'object'].includes(typeof options.locale.format))
                 this.locale.format = options.locale.format;
 
-            if (typeof options.locale.separator === 'string')
-                this.locale.separator = options.locale.separator;
-
             if (Array.isArray(options.locale.daysOfWeek)) {
                 if (options.locale.daysOfWeek.some(x => typeof x !== 'string'))
                     console.error(`Option 'options.locale.daysOfWeek' must be an array of strings`)
@@ -304,15 +299,6 @@
             if (typeof options.locale.firstDay === 'number')
                 this.locale.firstDay = options.locale.firstDay;
 
-            if (typeof options.locale.applyLabel === 'string')
-                this.locale.applyLabel = options.locale.applyLabel;
-
-            if (typeof options.locale.cancelLabel === 'string')
-                this.locale.cancelLabel = options.locale.cancelLabel;
-
-            if (typeof options.locale.weekLabel === 'string')
-                this.locale.weekLabel = options.locale.weekLabel;
-
             if (typeof options.locale.customRangeLabel === 'string') {
                 //Support unicode chars in the custom range name.
                 var elem = document.createElement('textarea');
@@ -326,14 +312,28 @@
         }
         this.container.addClass(this.locale.direction);
 
-        if (typeof options.singleDatePicker === 'boolean')
-            this.singleDatePicker = options.singleDatePicker;
+        for (let key of ['timePicker', 'singleDatePicker', 'timePicker24Hour', 'showWeekNumbers', 'showISOWeekNumbers',
+            'showDropdowns', 'linkedCalendars', 'showCustomRangeLabel', 'alwaysShowCalendars', 'autoApply', 'autoUpdateInput']) {
+            if (typeof options[key] === 'boolean')
+                this[key] = options[key];
+        }
+
+        for (let key of ['applyButtonClasses', 'cancelButtonClasses']) {
+            if (typeof options[key] === 'string')
+                this[key] = options[key];
+        }
 
-        if (typeof options.timePicker === 'boolean')
-            this.timePicker = options.timePicker;
+        for (let key of ['minYear', 'maxYear']) {
+            if (typeof options[key] === 'number')
+                this[key] = options[key];
+        }
 
-        if (typeof options.timePicker24Hour === 'boolean')
-            this.timePicker24Hour = options.timePicker24Hour;
+        for (let key of ['isInvalidDate', 'isInvalidTime', 'isCustomDate']) {
+            if (typeof options[key] === 'function')
+                this[key] = options[key]
+            else
+                this[key] = function () { return false };
+        }
 
         if (typeof options.timePickerSeconds === 'boolean')  // backward compatibility            
             this.timePickerStepSize = Duration.fromObject({ [options.timePickerSeconds ? 'seconds' : 'minutes']: 1 });
@@ -402,7 +402,7 @@
             if (this.minSpan && this.maxSpan && this.minSpan > this.maxSpan) {
                 this.minSpan = null;
                 this.maxSpan = null;
-                console.error(`Ignore option 'minSpan' and 'maxSpan', because 'minSpan' must be smaller than 'maxSpan'`);
+                console.warn(`Ignore option 'minSpan' and 'maxSpan', because 'minSpan' must be smaller than 'maxSpan'`);
             }
         }
 
@@ -472,17 +472,13 @@
         if (!this.startDate && this.initalMonth) {
             // No initial date selected
             this.endDate = null;
+            if (this.timePicker)
+                console.error(`Option 'initalMonth' works only with 'timePicker: false'`);
         } else {
-            // Do some sanity checks on startDate for minDate, maxDate
+            // Do some sanity checks on startDate and endDate for minDate, maxDate, minSpan, maxSpan, etc.
             this.constrainDate();
         }
 
-        if (typeof options.applyButtonClasses === 'string')
-            this.applyButtonClasses = options.applyButtonClasses;
-
-        if (typeof options.cancelButtonClasses === 'string')
-            this.cancelButtonClasses = options.cancelButtonClasses;
-
         if (typeof options.opens === 'string') {
             if (['left', 'right', 'center'].includes(options.opens))
                 this.opens = options.opens
@@ -497,57 +493,12 @@
                 console.error(`Option 'options.drops' must be 'drop', 'down' or 'auto'`);
         }
 
-        if (typeof options.showWeekNumbers === 'boolean')
-            this.showWeekNumbers = options.showWeekNumbers;
-
-        if (typeof options.showISOWeekNumbers === 'boolean')
-            this.showISOWeekNumbers = options.showISOWeekNumbers;
-
         if (Array.isArray(options.buttonClasses)) {
             this.buttonClasses = options.buttonClasses.join(' ')
         } else if (typeof options.buttonClasses === 'string') {
             this.buttonClasses = options.buttonClasses;
         }
 
-        if (typeof options.showDropdowns === 'boolean')
-            this.showDropdowns = options.showDropdowns;
-
-        if (typeof options.minYear === 'number')
-            this.minYear = options.minYear;
-
-        if (typeof options.maxYear === 'number')
-            this.maxYear = options.maxYear;
-
-        if (typeof options.showCustomRangeLabel === 'boolean')
-            this.showCustomRangeLabel = options.showCustomRangeLabel;
-
-        if (typeof options.autoApply === 'boolean')
-            this.autoApply = options.autoApply;
-
-        if (typeof options.autoUpdateInput === 'boolean')
-            this.autoUpdateInput = options.autoUpdateInput;
-
-        if (typeof options.linkedCalendars === 'boolean')
-            this.linkedCalendars = options.linkedCalendars;
-
-        if (typeof options.isInvalidDate === 'function')
-            this.isInvalidDate = options.isInvalidDate
-        else
-            this.isInvalidDate = function () { return false };
-
-        if (typeof options.isInvalidTime === 'function')
-            this.isInvalidTime = options.isInvalidTime
-        else
-            this.isInvalidTime = function () { return false };
-
-        if (typeof options.isCustomDate === 'function')
-            this.isCustomDate = options.isCustomDate
-        else
-            this.isCustomDate = function () { return false };
-
-        if (typeof options.alwaysShowCalendars === 'boolean')
-            this.alwaysShowCalendars = options.alwaysShowCalendars;
-
         if (typeof options.onOutsideClick === 'string') {
             if (['cancel', 'apply'].includes(options.onOutsideClick))
                 this.onOutsideClick = options.onOutsideClick
@@ -590,14 +541,14 @@
                     continue;
 
                 const validRange = this.constrainDate({ span: false }, [range, start, end]);
-                options.ranges[range] = validRange;
+                options.ranges[range] = [validRange[0], validRange[1]];
 
                 //Support unicode chars in the range names.
                 var elem = document.createElement('textarea');
                 elem.innerHTML = range;
                 var rangeHtml = elem.value;
 
-                this.ranges[rangeHtml] = validRange;
+                this.ranges[rangeHtml] = [validRange[0], validRange[1]];
             }
 
             var list = '<ul>';
@@ -637,14 +588,12 @@
             this.container.find('.drp-calendar.left').addClass('single');
             this.container.find('.drp-calendar.left').show();
             this.container.find('.drp-calendar.right').hide();
-            if (!this.timePicker && this.autoApply) {
+            if (!this.timePicker && this.autoApply)
                 this.container.addClass('auto-apply');
-            }
         }
 
-        if ((typeof options.ranges === 'undefined' && !this.singleDatePicker) || this.alwaysShowCalendars) {
+        if ((typeof options.ranges === 'undefined' && !this.singleDatePicker) || this.alwaysShowCalendars)
             this.container.addClass('show-calendar');
-        }
 
         this.container.addClass('opens' + this.opens);
 
@@ -866,9 +815,9 @@
         * @returns {Array} - Corrected range as array of `[startDate, endDate, isInvalid]` when range is set, otherwise just `isInvalid` object
         * @example 
         * constrainDate({}, [DateTime.fromISO('2025-02-03'), DateTime.fromISO('2025-02-25')]) => 
-        * [ DateTime.fromISO('2025-02-05'), DateTime.fromISO('2025-02-20'), { startDate: {modified: true}, endDate: {modified: true} } ]
+        * [ DateTime.fromISO('2025-02-05'), DateTime.fromISO('2025-02-20'), { startDate: { stepped: ... }, endDate: { stepped: ..., modified: [{old: ... new: ..., reason: 'minSpan'}] } } ]
         * constrainDate({span: false, invalidDate: true, invalidTime: true}) => 
-        * { startDate: {modified: true, isInvalidDate: true, isInvalidTime: false}, endDate: {modified: false, isInvalidDate: false, isInvalidTime: true} } ]
+        * { startDate: {stepped: ..., modified: [{old: ... new: ..., reason: 'minDate'}], isInvalidDate: true, isInvalidTime: false}, endDate: {stepped: ..., isInvalidDate: false, isInvalidTime: true} } ]
         */
         constrainDate: function ({ minMax = true, span = true, stepSize = true, invalidDate = false, invalidTime = false, writeWarning = true } = {}, range) {
             const name = range === undefined ? null : range[0];
@@ -879,12 +828,13 @@
             if (!startDate)
                 return;
 
-            let isInvalid = { startDate: { modified: false } };
+            let result = { startDate: { modified: [] } };
             if (invalidDate)
-                isInvalid.startDate.isInvalidDate = false;
+                result.startDate.isInvalidDate = false;
             if (invalidTime)
-                isInvalid.startDate.isInvalidTime = false;
+                result.startDate.isInvalidTime = false;
 
+            let modified = { old: startDate, reason: stepSize && this.timePicker ? 'timePickerStepSize' : 'No timePicker' };
             if (stepSize && this.timePicker) {
                 // Round time to step size
                 const secs = this.timePickerStepSize.as('seconds');
@@ -892,28 +842,40 @@
             } else {
                 startDate = startDate.startOf('day');
             }
+            modified.new = startDate;
+            if (modified.new != modified.old)
+                result.startDate.modified.push(modified);
+
 
             if (minMax) {
                 if (this.minDate && startDate < this.minDate) {
+                    let modified = { old: startDate, reason: 'minDate' };
                     if (this.timePicker) {
                         while (startDate < this.minDate)
                             startDate = startDate.plus(this.timePickerStepSize);
                     } else {
                         startDate = this.minDate;
                     }
-                    isInvalid.startDate.modified = true;
-                    if (writeWarning)
-                        console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'minDate'`);
+                    modified.new = startDate;
+                    if (modified.new != modified.old) {
+                        result.startDate.modified.push(modified);
+                        if (writeWarning)
+                            console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'minDate'`);
+                    }
                 } else if (this.maxDate && startDate > this.maxDate) {
+                    let modified = { old: startDate, reason: 'maxDate' };
                     if (this.timePicker) {
                         while (startDate > this.maxDate)
                             startDate = startDate.minus(this.timePickerStepSize);
                     } else {
                         startDate = this.maxDate.startOf('day');
                     }
-                    isInvalid.startDate.modified = true;
-                    if (writeWarning)
-                        console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'maxDate'`);
+                    modified.new = startDate;
+                    if (modified.new != modified.old) {
+                        result.startDate.modified.push(modified);
+                        if (writeWarning)
+                            console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'maxDate'`);
+                    }
                 }
             }
 
@@ -928,7 +890,7 @@
             }
 
             if (invalidDate && this.isInvalidDate(startDate)) {
-                isInvalid.startDate.isInvalidDate = true;
+                result.startDate.isInvalidDate = true;
                 if (writeWarning)
                     console.warn(`The startDate${nLog} ${startDate.toISODate()} is invalid by 'isInvalidDate'`);
             }
@@ -936,34 +898,36 @@
             if (invalidTime && this.timePicker) {
                 for (let unit of units) {
                     if (this.isInvalidTime(startDate, unit, 'start'))
-                        isInvalid.startDate.isInvalidTime = true;
+                        result.startDate.isInvalidTime = true;
                     if (writeWarning)
                         console.warn(`The startDate${nLog} ${startDate.toISO({ suppressMilliseconds: true })} ${unit} is invalid by 'isInvalidTime'`);
                 }
             }
 
+            if (result.startDate.modified.length == 0)
+                delete result.startDate.modified;
+
             if (this.singleDatePicker) {
                 endDate = startDate;
                 if (range === undefined) {
                     this.startDate = startDate;
                     this.endDate = endDate;
-                    return isInvalid;
+                    return result;
                 } else {
-                    return [startDate, endDate, isInvalid];
+                    return [startDate, endDate, result];
                 }
             }
 
             if (endDate == null)
-                return isInvalid;
+                return result;
 
-            isInvalid.endDate = { modified: false };
+            result.endDate = { modified: [] };
             if (invalidDate)
-                isInvalid.endDate.isInvalidDate = false;
+                result.endDate.isInvalidDate = false;
             if (invalidTime)
-                isInvalid.endDate.isInvalidTime = false;
-
-
+                result.endDate.isInvalidTime = false;
 
+            modified = { old: endDate, reason: stepSize && this.timePicker ? 'timePickerStepSize' : 'No timePicker' };
             if (stepSize && this.timePicker) {
                 // Round time to step size
                 const secs = this.timePickerStepSize.as('seconds');
@@ -971,28 +935,40 @@
             } else {
                 endDate = endDate.endOf('day');
             }
+            modified.new = endDate;
+            if (modified.new != modified.old)
+                result.endDate.modified.push(modified);
+
 
             if (minMax) {
                 if (this.maxDate && endDate > this.maxDate) {
+                    let modified = { old: endDate, reason: 'maxDate' };
                     if (this.timePicker) {
                         while (endDate > this.maxDate)
                             endDate = endDate.minus(this.timePickerStepSize);
                     } else {
                         endDate = this.maxDate.endOf('day');
                     }
-                    isInvalid.endDate.modified = true;
-                    if (writeWarning)
-                        console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxDate'`);
+                    modified.new = endDate;
+                    if (modified.new != modified.old) {
+                        result.endDate.modified.push(modified);
+                        if (writeWarning)
+                            console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxDate'`);
+                    }
                 } else if (this.minDate && endDate < this.minDate) {
+                    let modified = { old: endDate, reason: 'minDate' };
                     if (this.timePicker) {
                         while (endDate < this.minDate)
                             endDate = endDate.plus(this.timePickerStepSize);
                     } else {
                         endDate = this.minDate;
                     }
-                    isInvalid.endDate.modified = true;
-                    if (writeWarning)
-                        console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minDate'`);
+                    modified.new = endDate;
+                    if (modified.new != modified.old) {
+                        result.endDate.modified.push(modified);
+                        if (writeWarning)
+                            console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minDate'`);
+                    }
                 }
             }
 
@@ -1001,15 +977,19 @@
                     // If the end date exceeds those allowed by the maxSpan option, shorten the range to the allowable period.
                     const maxDate = startDate.plus(this.maxSpan);
                     if (endDate > maxDate) {
+                        let modified = { old: endDate, reason: 'maxSpan' };
                         if (this.timePicker) {
                             while (endDate > maxDate)
                                 endDate = endDate.minus(this.timePickerStepSize);
                         } else {
                             endDate = maxDate.endOf('day');
                         }
-                        isInvalid.endDate.modified = true;
-                        if (writeWarning)
-                            console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxSpan'`);
+                        modified.new = endDate;
+                        if (modified.new != modified.old) {
+                            result.endDate.modified.push(modified);
+                            if (writeWarning)
+                                console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxSpan'`);
+                        }
                     }
                 }
 
@@ -1017,16 +997,16 @@
                     // If the end date falls below those allowed by the minSpan option, expand the range to the allowable period.
                     const minDate = startDate.plus(this.minSpan);
                     if (endDate < minDate) {
-                        if (this.minDate && endDate > this.minDate) {
-                            throw RangeError(`Option${nLog} 'minDate' contradicts to option 'minSpan'`);
+                        let modified = { old: endDate, reason: 'minSpan' };
+                        if (this.timePicker) {
+                            while (endDate < minDate)
+                                endDate = endDate.plus(this.timePickerStepSize);
                         } else {
-                            if (this.timePicker) {
-                                while (endDate < minDate)
-                                    endDate = endDate.plus(this.timePickerStepSize);
-                            } else {
-                                endDate = minDate.endOf('day');
-                            }
-                            iisInvalid.endDate.modified = true;
+                            endDate = minDate.endOf('day');
+                        }
+                        modified.new = endDate;
+                        if (modified.new != modified.old) {
+                            result.endDate.modified.push(modified);
                             if (writeWarning)
                                 console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minSpan'`);
                         }
@@ -1035,7 +1015,7 @@
             }
 
             if (invalidDate && this.isInvalidDate(endDate)) {
-                isInvalid.endDate.isInvalidDate = true;
+                result.endDate.isInvalidDate = true;
                 if (writeWarning)
                     console.warn(`The endDate${nLog} ${endDate.toISODate()} is invalid by 'isInvalidDate'`);
             }
@@ -1043,18 +1023,21 @@
             if (invalidTime && this.timePicker) {
                 for (let unit of units) {
                     if (this.isInvalidTime(endDate, unit, 'end'))
-                        isInvalid.endDate.isInvalidTime = true;
+                        result.endDate.isInvalidTime = true;
                     if (writeWarning)
                         console.warn(`The endDate${nLog} ${endDate.toISO({ suppressMilliseconds: true })} ${unit} is invalid by 'isInvalidTime'`);
                 }
             }
 
+            if (result.endDate.modified.length == 0)
+                delete result.endDate.modified;
+
             if (range === undefined) {
                 this.startDate = startDate;
                 this.endDate = endDate;
-                return isInvalid;
+                return result;
             } else {
-                return [startDate, endDate, isInvalid];
+                return [startDate, endDate, result];
             }
 
         },
@@ -1182,9 +1165,7 @@
                             second = parseInt(this.container.find('.right .secondselect option:last').val(), 10);
                     }
                 }
-                //if (this.leftCalendar.month)
                 this.leftCalendar.month = this.leftCalendar.month.set({ hour: hour, minute: minute, second: second });
-                //if (this.rightCalendar.month)
                 this.rightCalendar.month = this.rightCalendar.month.set({ hour: hour, minute: minute, second: second });
             }
 
@@ -1209,7 +1190,7 @@
             //
             var calendar = side == 'left' ? this.leftCalendar : this.rightCalendar;
             if (calendar.month == null && !this.startDate && this.initalMonth)
-                calendar.month = this.initalMonth;
+                calendar.month = this.initalMonth.startOf('month');
 
             const firstDay = calendar.month.startOf('month');
             const lastDay = calendar.month.endOf('month').startOf('day');
@@ -1228,21 +1209,10 @@
             while (theDate.weekday != this.locale.firstDay)
                 theDate = theDate.minus({ day: 1 });
 
-            var row, col;
-            for (let i = 0, col = 0, row = 0; i < 42; i++, col++, theDate = theDate.plus({ day: 1 })) {
-                if (i > 0 && col % 7 === 0) {
-                    col = 0;
+            for (let col = 0, row = -1; col < 42; col++, theDate = theDate.plus({ day: 1 })) {
+                if (col % 7 === 0)
                     row++;
-                }
-                calendar[row][col] = theDate.set(time);
-
-                // I have no clue why and how this shall be used in original code. Skip it, maybe I will find out later
-                /*if (this.minDate && calendar[row][col].hasSame(this.minDate, 'month') && calendar[row][col] < this.minDate && side == 'left')
-                    calendar[row][col] = this.minDate;
-        
-                if (this.maxDate && calendar[row][col].hasSame(this.maxDate, 'month') && calendar[row][col] > this.maxDate && side == 'right')
-                    calendar[row][col] = this.maxDate;
-                */
+                calendar[row][col % 7] = theDate.set(time);
             }
 
             //make the calendar object available to hoverDate/clickDate
@@ -1339,16 +1309,16 @@
             if (this.endDate == null && this.minSpan)
                 minLimit = this.startDate.plus(this.minSpan).startOf('day');
 
-            for (var row = 0; row < 6; row++) {
+            for (let row = 0; row < 6; row++) {
                 html += '<tr>';
 
                 // add week number
-                if (this.showWeekNumbers)
-                    html += '<td class="week">' + calendar[row][0].localWeekNumber + '</td>';
-                else if (this.showISOWeekNumbers)
+                if (this.showISOWeekNumbers)
                     html += '<td class="week">' + calendar[row][0].weekNumber + '</td>';
+                else if (this.showWeekNumbers)
+                    html += '<td class="week">' + calendar[row][0].localWeekNumber + '</td>';
 
-                for (var col = 0; col < 7; col++) {
+                for (let col = 0; col < 7; col++) {
 
                     var classes = [];
 
@@ -1802,8 +1772,7 @@
             * @param {DateRangePicker} this - The daterangepicker object
             * @return {boolean} cancel - If `true`, then the picker remains visible
             */
-            const cancel = this.element.triggerHandler('beforeHide.daterangepicker', this);
-            if (cancel)
+            if (this.element.triggerHandler('beforeHide.daterangepicker', this))
                 return;
             $(document).off('.daterangepicker');
             $(window).off('.daterangepicker');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daterangepicker-4.x",
-  "version": "4.2.5",
+  "version": "4.3.0",
   "description": "Date range picker with time component and pre-defined ranges",
   "main": "daterangepicker.js",
   "style": "daterangepicker.css",