v3.5.3

t1m0n · May 26, 2024 · d182c0a · d182c0a
1 parent 071e9a4
commit d182c0a
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### v3.5.3
+* fixed range mode [#613](https://github.com/t1m0n/air-datepicker/issues/613)
+
 ### v3.5.2
 * fixed range mode [#613](https://github.com/t1m0n/air-datepicker/issues/613)
 

diff --git a/README.md b/README.md
@@ -24,6 +24,9 @@ new AirDatepicker('#el' [, options]);
 
 ## Recent updates
 
+### v3.5.3
+* fixed range mode [#613](https://github.com/t1m0n/air-datepicker/issues/613)
+
 ### v3.5.2
 * fixed range mode [#613](https://github.com/t1m0n/air-datepicker/issues/613)
 

diff --git a/dist/README.md b/dist/README.md
@@ -24,6 +24,9 @@ new AirDatepicker('#el' [, options]);
 
 ## Recent updates
 
+### v3.5.3
+* fixed range mode [#613](https://github.com/t1m0n/air-datepicker/issues/613)
+
 ### v3.5.2
 * fixed range mode [#613](https://github.com/t1m0n/air-datepicker/issues/613)
 

diff --git a/dist/air-datepicker.css b/dist/air-datepicker.css
diff --git a/dist/air-datepicker.js b/dist/air-datepicker.js
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "air-datepicker",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "scripts": {
     "dev": "cross-env NODE_ENV=development webpack",
     "dev:serve": "cross-env NODE_ENV=development webpack serve",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "air-datepicker",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "scripts": {
     "dev": "cross-env NODE_ENV=development webpack",
     "dev:serve": "cross-env NODE_ENV=development webpack serve",

diff --git a/src/datepicker.js b/src/datepicker.js
@@ -35,7 +35,7 @@ let $datepickersContainer = '',
 
 export default class Datepicker {
     static defaults = defaults
-    static version = '3.5.2'
+    static version = '3.5.3'
     static defaultGlobalContainerId = 'air-datepicker-global-container'
     static buildGlobalContainer(id) {
         containerBuilt = true;
@@ -589,6 +589,7 @@ export default class Datepicker {
                     // Assume that if unselectDate has been called, then there is only one selected date
                     // in range mode, so we need to reset rangeDateTo
                     _this.rangeDateTo = '';
+                    _this.rangeDateFrom = selected[0];
 
                     _this._updateLastSelectedDate(_this.selectedDates[_this.selectedDates.length - 1]);
                 }

diff --git a/src/datepickerCell.scss b/src/datepickerCell.scss
@@ -53,7 +53,7 @@
     background: var(--adp-cell-background-color-in-range);
     border-radius: 0;
 
-    &:hover {
+    &:hover, &.-focus- {
       background: var(--adp-cell-background-color-in-range-hover);
     }
   }

diff --git a/tests/options.test.js b/tests/options.test.js
@@ -829,7 +829,7 @@ describe('OPTIONS TESTS', () => {
             expect(timeFormat.format(dp.selectedDates[1])).toEqual('20:20');
         });
 
-        it('should work correctly when user unselects one date and then selects another', () => {
+        it('should work correctly when user unselects "to" date and then selects other', () => {
             init({
                 range: true,
                 toggleSelected: true,
@@ -851,5 +851,51 @@ describe('OPTIONS TESTS', () => {
             expect(dp.selectedDates[1].toLocaleDateString('ru')).toEqual('23.05.2024');
 
         });
+
+        it('should work correctly when user unselects "from" date and then selects another', () => {
+            init({
+                range: true,
+                toggleSelected: true,
+                startDate: '2024-05-26',
+            });
+
+            // Select two dates
+            dp.getCell('2024-05-12').click();
+            dp.getCell('2024-05-17').click();
+
+            // Unselect the last one
+            dp.getCell('2024-05-12').click();
+
+            // Select other 'to' date
+            dp.getCell('2024-05-01').click();
+
+            expect(dp.selectedDates).toHaveLength(2);
+            expect(dp.selectedDates[0].toLocaleDateString('ru')).toEqual('01.05.2024');
+            expect(dp.selectedDates[1].toLocaleDateString('ru')).toEqual('17.05.2024');
+
+        });
+
+        it('should work correctly when user unselects "to" date and then selects other date erlier than "from"', () => {
+            init({
+                range: true,
+                toggleSelected: true,
+                startDate: '2024-05-26',
+            });
+
+            // Select two dates
+            dp.getCell('2024-05-12').click();
+            dp.getCell('2024-05-17').click();
+
+            // Unselect the last one
+            dp.getCell('2024-05-17').click();
+
+            // Select other 'to' date
+            dp.getCell('2024-05-01').click();
+
+            expect(dp.selectedDates).toHaveLength(2);
+            expect(dp.selectedDates[0].toLocaleDateString('ru')).toEqual('01.05.2024');
+            expect(dp.selectedDates[1].toLocaleDateString('ru')).toEqual('12.05.2024');
+
+        });
     });
 });