daterangepicker-4.x 4.2.4 → 4.2.6

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.4/daterangepicker.min.js"></script>
-<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.2.4/daterangepicker.min.css" rel="stylesheet" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.2.6/daterangepicker.min.js"></script>
+<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.2.6/daterangepicker.min.css" rel="stylesheet" />
 
 <input type="text" id="daterange" />
 
@@ -202,6 +202,8 @@ use <a href="#event_timeChange.daterangepicker">&quot;timeChange.daterangepicker
 <dt><a href="#Range">Range</a> : <code>Object</code></dt>
 <dd><p>A single predefined range</p>
 </dd>
+<dt><a href="#constraintOptions">constraintOptions</a> : <code>Object</code></dt>
+<dd></dd>
 <dt><a href="#callback">callback</a> : <code>function</code></dt>
 <dd></dd>
 </dl>
@@ -217,6 +219,7 @@ use <a href="#event_timeChange.daterangepicker">&quot;timeChange.daterangepicker
         * [.setStartDate(startDate, isValid)](#DateRangePicker+setStartDate)
         * [.setEndDate(endDate, isValid)](#DateRangePicker+setEndDate)
         * [.setPeriod(startDate, endDate, isValid)](#DateRangePicker+setPeriod)
+        * [.constrainDate(options, [range])](#DateRangePicker+constrainDate) ⇒ <code>Array</code>
         * [.updateView()](#DateRangePicker+updateView)
         * [.showCalendars()](#DateRangePicker+showCalendars)
         * [.hideCalendars()](#DateRangePicker+hideCalendars)
@@ -314,6 +317,32 @@ const DateTime = luxon.DateTime;
 const drp = $('#picker').data('daterangepicker');
 drp.setPeriod(DateTime.now().startOf('week'), DateTime.now().startOf('week').plus({days: 10}));
 ```
+<a name="DateRangePicker+constrainDate"></a>
+
+### dateRangePicker.constrainDate(options, [range]) ⇒ <code>Array</code>
+Validate `startDate` and `endDate` or `range` against `timePickerStepSize`, `minDate`, `maxDate`, 
+`minSpan`, `maxSpan`, `invalidDate` and `invalidTime` and modifies them, if needed. 
+When `startDate` or `endDate` are modified, then a warning is written to console by default.
+
+**Kind**: instance method of [<code>DateRangePicker</code>](#DateRangePicker)  
+**Returns**: <code>Array</code> - - Corrected range as array of `[startDate, endDate, isInvalid]` when range is set, otherwise just `isInvalid` object  
+**Throws**:
+
+- `RangeError` if 'minDate' contradicts to 'minSpan'
+
+
+| Param | Type | Description |
+| --- | --- | --- |
+| options | [<code>constraintOptions</code>](#constraintOptions) | Defines which constraints shall be validated |
+| [range] | <code>Array</code> | Used to check prefefined range instead of `startDate` and `endDate` => `[name, startDate, endDate]` When set, then function does not modify anything, just returning corrected range. |
+
+**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} } ]
+constrainDate({span: false, invalidDate: true, invalidTime: true}) => 
+{ startDate: {modified: true, isInvalidDate: true, isInvalidTime: false}, endDate: {modified: false, isInvalidDate: false, isInvalidTime: true} } ]
+```
 <a name="DateRangePicker+updateView"></a>
 
 ### dateRangePicker.updateView()
@@ -502,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` |
@@ -576,6 +605,21 @@ A single predefined range
 ```js
 { Today: [DateTime.now().startOf('day'), DateTime.now().endOf('day')] }        
 ```
+<a name="constraintOptions"></a>
+
+## constraintOptions : <code>Object</code>
+**Kind**: global typedef  
+**Properties**
+
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| stepSize | <code>boolean</code> | <code>true</code> | If `true`, then `startDate` and `endDate` are rounded to match `timePickerStepSize` (no warning) |
+| minMax | <code>boolean</code> | <code>true</code> | If `true` then and if the `startDate` and `endDate` do not fall into `minDate` and `maxDate` then dates are shifted and a warning is written to console. |
+| span | <code>boolean</code> | <code>true</code> | If `true` then and if the `startDate` and `endDate` do not fall into `minDate` and `maxSpan`  then `endDate` is shifted and a warning is written to console. |
+| invalidDate | <code>boolean</code> | <code>false</code> | If `true` then and if `invalidDate` return `true`, then an error is logged to console |
+| invalidTime | <code>boolean</code> | <code>false</code> | If `true` then and if `invalidTime` return `true`, then an error is logged to console |
+| writeWarning | <code>boolean</code> | <code>true</code> | If `true` then a warning is written to console if `startDate` or `endDate` is modified  with the exception of rounding due to `timePickerStepSize`. |
+
 <a name="callback"></a>
 
 ## callback : <code>function</code>

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
@@ -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) {
-                this.container.addClass('auto-apply');
-            }
+            if (!this.timePicker && this.autoApply) 
+                this.container.addClass('auto-apply');            
         }
 
-        if ((typeof options.ranges === 'undefined' && !this.singleDatePicker) || this.alwaysShowCalendars) {
-            this.container.addClass('show-calendar');
-        }
+        if ((typeof options.ranges === 'undefined' && !this.singleDatePicker) || this.alwaysShowCalendars) 
+            this.container.addClass('show-calendar');        
 
         this.container.addClass('opens' + this.opens);
 
@@ -850,19 +799,27 @@
         * then `endDate` is shifted and a warning is written to console. 
         * @property {boolean} invalidDate=false If `true` then and if `invalidDate` return `true`, then an error is logged to console
         * @property {boolean} invalidTime=false If `true` then and if `invalidTime` return `true`, then an error is logged to console
-        * @private
+        * @property {boolean} writeWarning=true If `true` then a warning is written to console if `startDate` or `endDate` is modified 
+        * with the exception of rounding due to `timePickerStepSize`.
+
         */
 
         /**
-        * Modifies and checks `startDate` and `endDate` against `timePickerStepSize`, `minDate`, `maxDate`, 
-        * `minSpan`, `maxSpan`, `invalidDate` and `invalidTime` 
-        * @param {constraintOptions} options - Defines which constraint shall apply
+        * Validate `startDate` and `endDate` or `range` against `timePickerStepSize`, `minDate`, `maxDate`, 
+        * `minSpan`, `maxSpan`, `invalidDate` and `invalidTime` and modifies them, if needed. 
+        * When `startDate` or `endDate` are modified, then a warning is written to console by default.
+        * @param {constraintOptions} options - Defines which constraints shall be validated
         * @param {Array} [range] - Used to check prefefined range instead of `startDate` and `endDate` => `[name, startDate, endDate]`
-        * @throws `RangeError` for invalid date values
-        * @returns {Array} - Corrected array of `[startDate, endDate]` or `null`
-        * @private
+        * When set, then function does not modify anything, just returning corrected range.
+        * @throws `RangeError` if 'minDate' contradicts to 'minSpan'
+        * @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} } ]
+        * constrainDate({span: false, invalidDate: true, invalidTime: true}) => 
+        * { startDate: {modified: true, isInvalidDate: true, isInvalidTime: false}, endDate: {modified: false, isInvalidDate: false, isInvalidTime: true} } ]
         */
-        constrainDate: function ({ minMax = true, span = true, stepSize = true, invalidDate = false, invalidTime = false } = {}, range) {
+        constrainDate: function ({ minMax = true, span = true, stepSize = true, invalidDate = false, invalidTime = false, writeWarning = true } = {}, range) {
             const name = range === undefined ? null : range[0];
             const nLog = range === undefined ? '' : ` of range '${name}'`;
             let startDate = range === undefined ? this.startDate : range[1];
@@ -871,6 +828,12 @@
             if (!startDate)
                 return;
 
+            let isInvalid = { startDate: { modified: false } };
+            if (invalidDate)
+                isInvalid.startDate.isInvalidDate = false;
+            if (invalidTime)
+                isInvalid.startDate.isInvalidTime = false;
+
             if (stepSize && this.timePicker) {
                 // Round time to step size
                 const secs = this.timePickerStepSize.as('seconds');
@@ -887,7 +850,9 @@
                     } else {
                         startDate = this.minDate;
                     }
-                    console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'minDate'`);
+                    isInvalid.startDate.modified = true;
+                    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) {
                     if (this.timePicker) {
                         while (startDate > this.maxDate)
@@ -895,7 +860,9 @@
                     } else {
                         startDate = this.maxDate.startOf('day');
                     }
-                    console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'maxDate'`);
+                    isInvalid.startDate.modified = true;
+                    if (writeWarning)
+                        console.warn(`Set startDate${nLog} to ${this.timePicker ? startDate.toISO({ suppressMilliseconds: true }) : startDate.toISODate()} due to 'maxDate'`);
                 }
             }
 
@@ -909,30 +876,42 @@
                     units.push('ampm');
             }
 
-            if (invalidDate && this.timePicker && this.isInvalidDate(startDate))
-                console.error(`The startDate${nLog} ${startDate.toISODate()} is invalid by 'isInvalidDate'`);
+            if (invalidDate && this.isInvalidDate(startDate)) {
+                isInvalid.startDate.isInvalidDate = true;
+                if (writeWarning)
+                    console.warn(`The startDate${nLog} ${startDate.toISODate()} is invalid by 'isInvalidDate'`);
+            }
 
             if (invalidTime && this.timePicker) {
                 for (let unit of units) {
                     if (this.isInvalidTime(startDate, unit, 'start'))
-                        console.error(`The startDate${nLog} ${startDate.toISO({ suppressMilliseconds: true })} ${unit} is invalid by 'invalidTime'`);
+                        isInvalid.startDate.isInvalidTime = true;
+                    if (writeWarning)
+                        console.warn(`The startDate${nLog} ${startDate.toISO({ suppressMilliseconds: true })} ${unit} is invalid by 'isInvalidTime'`);
                 }
             }
 
-
             if (this.singleDatePicker) {
                 endDate = startDate;
                 if (range === undefined) {
                     this.startDate = startDate;
                     this.endDate = endDate;
-                    return null;
+                    return isInvalid;
                 } else {
-                    return [startDate, endDate];
+                    return [startDate, endDate, isInvalid];
                 }
             }
 
             if (endDate == null)
-                return;
+                return isInvalid;
+
+            isInvalid.endDate = { modified: false };
+            if (invalidDate)
+                isInvalid.endDate.isInvalidDate = false;
+            if (invalidTime)
+                isInvalid.endDate.isInvalidTime = false;
+
+
 
             if (stepSize && this.timePicker) {
                 // Round time to step size
@@ -950,7 +929,9 @@
                     } else {
                         endDate = this.maxDate.endOf('day');
                     }
-                    console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxDate'`);
+                    isInvalid.endDate.modified = true;
+                    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) {
                     if (this.timePicker) {
                         while (endDate < this.minDate)
@@ -958,7 +939,9 @@
                     } else {
                         endDate = this.minDate;
                     }
-                    console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minDate'`);
+                    isInvalid.endDate.modified = true;
+                    if (writeWarning)
+                        console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minDate'`);
                 }
             }
 
@@ -973,7 +956,9 @@
                         } else {
                             endDate = maxDate.endOf('day');
                         }
-                        console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxSpan'`);
+                        isInvalid.endDate.modified = true;
+                        if (writeWarning)
+                            console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'maxSpan'`);
                     }
                 }
 
@@ -990,28 +975,35 @@
                             } else {
                                 endDate = minDate.endOf('day');
                             }
-                            console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minSpan'`);
+                            iisInvalid.endDate.modified = true;
+                            if (writeWarning)
+                                console.warn(`Set endDate${nLog} to ${this.timePicker ? endDate.toISO({ suppressMilliseconds: true }) : endDate.toISODate()} due to 'minSpan'`);
                         }
                     }
                 }
             }
 
-            if (invalidDate && this.timePicker && this.isInvalidDate(endDate))
-                console.error(`The endDate${nLog} ${endDate.toISODate()} is invalid by 'isInvalidDate'`);
+            if (invalidDate && this.isInvalidDate(endDate)) {
+                isInvalid.endDate.isInvalidDate = true;
+                if (writeWarning)
+                    console.warn(`The endDate${nLog} ${endDate.toISODate()} is invalid by 'isInvalidDate'`);
+            }
 
             if (invalidTime && this.timePicker) {
                 for (let unit of units) {
                     if (this.isInvalidTime(endDate, unit, 'end'))
-                        console.error(`The endDate${nLog} ${endDate.toISO({ suppressMilliseconds: true })} ${unit} is invalid by 'invalidTime'`);
+                        isInvalid.endDate.isInvalidTime = true;
+                    if (writeWarning)
+                        console.warn(`The endDate${nLog} ${endDate.toISO({ suppressMilliseconds: true })} ${unit} is invalid by 'isInvalidTime'`);
                 }
             }
 
             if (range === undefined) {
                 this.startDate = startDate;
                 this.endDate = endDate;
-                return null;
+                return isInvalid;
             } else {
-                return [startDate, endDate];
+                return [startDate, endDate, isInvalid];
             }
 
         },
@@ -1139,9 +1131,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 });
             }
 
@@ -1166,7 +1156,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');
@@ -1300,10 +1290,10 @@
                 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++) {
 

package/package.json

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