@synerise/ds-date-range-picker 0.21.22 → 0.21.23

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.21.23](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.21.22...@synerise/ds-date-range-picker@0.21.23) (2023-08-03)
+
+
+### Bug Fixes
+
+* **date-range-picker:** fixed algorithm for disabling timepicker options ([487066f](https://github.com/Synerise/synerise-design/commit/487066f75f0bd1949ec4a5bf28effa40c1f9f2e8))
+
+
+
+
+
 ## [0.21.22](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.21.21...@synerise/ds-date-range-picker@0.21.22) (2023-07-26)
 
 **Note:** Version bump only for package @synerise/ds-date-range-picker

package/dist/RangePicker/utils.js

@@ -18,14 +18,6 @@ var getAmOrPmFromDate = function getAmOrPmFromDate(date) {
   return dayjs(date).get(HOUR) >= HOUR_12 ? PM : AM;
 };
 
-var change24To12Hour = function change24To12Hour(date) {
-  var dateBuilder = dayjs(date);
-  var hour = dateBuilder.get(HOUR);
-  var hourToMap = MAP_24_HOUR_TO_12[hour];
-  dateBuilder = dateBuilder.set(HOUR, hourToMap);
-  return dateBuilder.toDate();
-};
-
 export var getDisabledTimeOptions = function getDisabledTimeOptions(initialDay, granularity, initialLowerLimit, initialUpperLimit, is12HoursClock) {
   if (initialLowerLimit === void 0) {
     initialLowerLimit = null;
@@ -43,56 +35,27 @@ export var getDisabledTimeOptions = function getDisabledTimeOptions(initialDay,
     return [];
   }
 
-  var dayClockMode = getAmOrPmFromDate(legacyParse(day));
-  var lowerLimitClockMode = getAmOrPmFromDate(legacyParse(lowerLimit));
-  var upperLimitClockMode = getAmOrPmFromDate(legacyParse(upperLimit));
   var dayBuilder = dayjs(day);
-  var dayHour = dayBuilder.get(HOUR);
+  var dayClockMode = getAmOrPmFromDate(legacyParse(day));
+  var disableMeridienToggle = false;
 
-  if (is12HoursClock && lowerLimit) {
-    if (lowerLimitClockMode === PM && dayjs(lowerLimit).get(HOUR) === HOUR_12) {
-      return [DISABLE_CLOCK_MODE_HOUR];
-    }
+  if (is12HoursClock && granularity === HOURS_GRANULARITY) {
+    var diff;
 
-    if (lowerLimitClockMode === AM && dayClockMode === PM) {
-      var day12HBuilder = dayjs(change24To12Hour(dayBuilder.toDate()));
-      var lowLimitDayBuilder = dayjs(lowerLimit);
+    if (lowerLimit) {
+      diff = dayBuilder.diff(dayjs(lowerLimit), 'minute') / 60;
 
-      if (day12HBuilder.isBefore(lowLimitDayBuilder)) {
-        return [DISABLE_CLOCK_MODE_HOUR];
+      if (diff < 12 && dayClockMode === PM) {
+        disableMeridienToggle = true;
       }
     }
 
-    if (lowerLimitClockMode === AM && dayClockMode === PM) {
-      return [];
-    }
-
-    if (lowerLimitClockMode === PM && dayClockMode === PM) {
-      day = change24To12Hour(legacyParse(day));
-      lowerLimit = change24To12Hour(legacyParse(lowerLimit));
-    }
-  }
-
-  if (is12HoursClock && upperLimit) {
-    if (upperLimitClockMode === PM && dayClockMode === PM) {
-      day = change24To12Hour(legacyParse(day));
-    }
-
-    upperLimit = change24To12Hour(legacyParse(upperLimit));
-    var upLimitDayBuilder = dayjs(upperLimit);
-
-    if (upperLimitClockMode === PM && dayClockMode === AM && dayBuilder.isAfter(upLimitDayBuilder)) {
-      return [DISABLE_CLOCK_MODE_HOUR];
-    }
-
-    if (upperLimitClockMode === PM && dayClockMode === AM) {
-      return [];
-    }
-  }
+    if (upperLimit) {
+      diff = dayjs(upperLimit).diff(dayBuilder, 'minute') / 60;
 
-  if (is12HoursClock && granularity !== HOURS_GRANULARITY) {
-    if (dayHour === HOUR_12) {
-      return [];
+      if (diff < 12 && dayClockMode === AM) {
+        disableMeridienToggle = true;
+      }
     }
   }
 
@@ -110,27 +73,23 @@ export var getDisabledTimeOptions = function getDisabledTimeOptions(initialDay,
     return GET[granularity](option);
   });
 
-  if (is12HoursClock) {
-    if (granularity === HOURS_GRANULARITY) {
+  if (is12HoursClock && granularity === HOURS_GRANULARITY) {
+    if (dayClockMode === AM) {
       result = result.filter(function (item) {
-        return item !== HOUR_12;
+        return item < HOUR_12;
       });
+    } else if (dayClockMode === PM) {
+      result = result.filter(function (item) {
+        return item >= HOUR_12;
+      });
+    }
 
-      var _lowLimitDayBuilder = dayjs(lowLimit);
-
-      var lowerLimitHour = _lowLimitDayBuilder.get(HOUR);
-
-      if (lowerLimitClockMode === PM && lowerLimitHour !== HOUR_12 && result[0] === 0) {
-        result.push(HOUR_12);
-      }
-
-      if (lowerLimitClockMode === AM && lowerLimitHour !== 0 && dayClockMode === AM && initialLowerLimit !== null) {
-        result.push(HOUR_12);
-      }
+    result = result.map(function (item) {
+      return MAP_24_HOUR_TO_12[item];
+    });
 
-      if (upperLimit && upperLimitClockMode === AM && dayClockMode === AM) {
-        result.push(DISABLE_CLOCK_MODE_HOUR);
-      }
+    if (disableMeridienToggle) {
+      result.push(DISABLE_CLOCK_MODE_HOUR);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-date-range-picker",
-  "version": "0.21.22",
+  "version": "0.21.23",
   "description": "Date-Range-Picker UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "Synerise/synerise-design",
@@ -34,10 +34,10 @@
   "dependencies": {
     "@date-fns/upgrade": "^1.0.3",
     "@synerise/ds-button": "^0.17.20",
-    "@synerise/ds-date-picker": "^0.10.6",
+    "@synerise/ds-date-picker": "^0.10.7",
     "@synerise/ds-icon": "^0.58.0",
     "@synerise/ds-manageable-list": "^0.25.14",
-    "@synerise/ds-time-picker": "^0.7.15",
+    "@synerise/ds-time-picker": "^0.7.16",
     "@synerise/ds-tooltip": "^0.14.0",
     "@synerise/ds-utils": "^0.19.0",
     "date-fns": "^2.16.1",
@@ -54,5 +54,5 @@
   "devDependencies": {
     "@types/ramda": "^0.27.14"
   },
-  "gitHead": "283730ca9bb63422391388fbc020906edf942b57"
+  "gitHead": "3879c41ef7a22df15d5cd80ceaa41ec56e551429"
 }