@synerise/ds-date-range-picker 0.30.2 → 0.30.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/dist/RangePicker/utils.js +36 -9
  3. package/package.json +20 -20
package/CHANGELOG.md CHANGED
@@ -3,6 +3,25 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.30.4](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.30.3...@synerise/ds-date-range-picker@0.30.4) (2024-10-28)
7
+
8
+ **Note:** Version bump only for package @synerise/ds-date-range-picker
9
+
10
+
11
+
12
+
13
+
14
+ ## [0.30.3](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.30.2...@synerise/ds-date-range-picker@0.30.3) (2024-10-24)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * **date-range-picker:** fixed disabled time options util ([c5d2fe8](https://github.com/Synerise/synerise-design/commit/c5d2fe81888069b90802dd6189eef5de6e26ec5f))
20
+
21
+
22
+
23
+
24
+
6
25
  ## [0.30.2](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.30.1...@synerise/ds-date-range-picker@0.30.2) (2024-10-23)
7
26
 
8
27
  **Note:** Version bump only for package @synerise/ds-date-range-picker
package/dist/RangePicker/utils.js CHANGED
@@ -5,7 +5,7 @@ import fnsMax from 'date-fns/max';
5
5
  import fnsIsValid from 'date-fns/isValid';
6
6
  import dayjs from 'dayjs';
7
7
  import { AM, PM, HOUR_12, MAP_24_HOUR_TO_12, HOUR, DISABLE_CLOCK_MODE_HOUR } from '@synerise/ds-time-picker';
8
- import { fnsEndOfDay, fnsIsSameMonth, fnsStartOfDay, fnsStartOfMonth } from '../fns';
8
+ import { fnsEndOfDay, fnsIsSameMonth, fnsStartOfDay, fnsStartOfMonth, fnsIsBefore } from '../fns';
9
9
  import { TIME_OPTIONS } from '../constants';
10
10
  import SET from '../dateUtils/set';
11
11
  import GET from '../dateUtils/get';
@@ -18,6 +18,34 @@ var getAmOrPmFromDate = function getAmOrPmFromDate(date) {
18
18
  return dayjs(date).get(HOUR) >= HOUR_12 ? PM : AM;
19
19
  };
20
20
 
21
+ var getInterval = function getInterval(initialDate, startDate, endDate) {
22
+ if (!startDate && !endDate) {
23
+ return {
24
+ start: fnsStartOfDay(initialDate),
25
+ end: fnsEndOfDay(initialDate)
26
+ };
27
+ }
28
+
29
+ if (!startDate && endDate) {
30
+ return {
31
+ start: fnsIsBefore(initialDate, endDate) ? fnsStartOfDay(initialDate) : fnsStartOfDay(endDate),
32
+ end: endDate
33
+ };
34
+ }
35
+
36
+ if (!endDate && startDate) {
37
+ return {
38
+ start: startDate,
39
+ end: fnsIsBefore(initialDate, startDate) ? fnsEndOfDay(startDate) : fnsEndOfDay(initialDate)
40
+ };
41
+ }
42
+
43
+ return {
44
+ start: startDate,
45
+ end: endDate
46
+ };
47
+ };
48
+
21
49
  export var getDisabledTimeOptions = function getDisabledTimeOptions(initialDay, granularity, initialLowerLimit, initialUpperLimit, is12HoursClock) {
22
50
  if (initialLowerLimit === void 0) {
23
51
  initialLowerLimit = null;
@@ -36,7 +64,8 @@ export var getDisabledTimeOptions = function getDisabledTimeOptions(initialDay,
36
64
  }
37
65
 
38
66
  var dayBuilder = dayjs(day);
39
- var dayClockMode = getAmOrPmFromDate(legacyParse(day));
67
+ var dayAsDate = typeof day === 'string' ? legacyParse(day) : day;
68
+ var dayClockMode = getAmOrPmFromDate(dayAsDate);
40
69
  var disableMeridienToggle = false;
41
70
 
42
71
  if (is12HoursClock && granularity === HOURS_GRANULARITY) {
@@ -59,16 +88,14 @@ export var getDisabledTimeOptions = function getDisabledTimeOptions(initialDay,
59
88
  }
60
89
  }
61
90
 
62
- var lowLimit = lowerLimit || fnsStartOfDay(legacyParse(day));
63
- var upLimit = upperLimit || fnsEndOfDay(legacyParse(day));
91
+ var intervalStartDate = lowerLimit ? legacyParse(lowerLimit) : undefined;
92
+ var intervalEndDate = upperLimit ? legacyParse(upperLimit) : undefined;
93
+ var interval = getInterval(dayAsDate, intervalStartDate, intervalEndDate);
64
94
  var options = TIME_OPTIONS[granularity].map(function (option) {
65
- return SET[granularity](day, option);
95
+ return SET[granularity](dayAsDate, option);
66
96
  });
67
97
  var result = options.filter(function (opt) {
68
- return !fnsIsWithinRange(legacyParse(opt), {
69
- start: legacyParse(lowLimit),
70
- end: legacyParse(upLimit)
71
- });
98
+ return !fnsIsWithinRange(opt, interval);
72
99
  }).map(function (option) {
73
100
  return GET[granularity](option);
74
101
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@synerise/ds-date-range-picker",
3
- "version": "0.30.2",
3
+ "version": "0.30.4",
4
4
  "description": "Date-Range-Picker UI Component for the Synerise Design System",
5
5
  "license": "ISC",
6
6
  "repository": "Synerise/synerise-design",
@@ -35,25 +35,25 @@
35
35
  "types": "dist/index.d.ts",
36
36
  "dependencies": {
37
37
  "@date-fns/upgrade": "^1.0.3",
38
- "@synerise/ds-badge": "^0.8.14",
39
- "@synerise/ds-button": "^0.21.14",
40
- "@synerise/ds-button-group": "^0.7.18",
38
+ "@synerise/ds-badge": "^0.8.15",
39
+ "@synerise/ds-button": "^0.21.15",
40
+ "@synerise/ds-button-group": "^0.7.19",
41
41
  "@synerise/ds-data-format": "^0.5.4",
42
- "@synerise/ds-date-picker": "^0.12.1",
43
- "@synerise/ds-dropdown": "^0.18.19",
44
- "@synerise/ds-icon": "^0.66.0",
45
- "@synerise/ds-inline-edit": "^0.8.15",
46
- "@synerise/ds-input": "^0.24.9",
47
- "@synerise/ds-input-number": "^0.10.10",
48
- "@synerise/ds-list-item": "^0.4.14",
49
- "@synerise/ds-manageable-list": "^0.28.3",
50
- "@synerise/ds-scrollbar": "^0.11.14",
51
- "@synerise/ds-select": "^0.16.21",
52
- "@synerise/ds-slider": "^0.13.43",
53
- "@synerise/ds-tags": "^0.10.13",
54
- "@synerise/ds-time-picker": "^0.10.29",
55
- "@synerise/ds-tooltip": "^0.14.44",
56
- "@synerise/ds-utils": "^0.30.0",
42
+ "@synerise/ds-date-picker": "^0.12.2",
43
+ "@synerise/ds-dropdown": "^0.18.20",
44
+ "@synerise/ds-icon": "^0.66.1",
45
+ "@synerise/ds-inline-edit": "^0.8.16",
46
+ "@synerise/ds-input": "^0.24.10",
47
+ "@synerise/ds-input-number": "^0.10.11",
48
+ "@synerise/ds-list-item": "^0.4.15",
49
+ "@synerise/ds-manageable-list": "^0.28.4",
50
+ "@synerise/ds-scrollbar": "^0.11.15",
51
+ "@synerise/ds-select": "^0.16.22",
52
+ "@synerise/ds-slider": "^0.13.44",
53
+ "@synerise/ds-tags": "^0.10.14",
54
+ "@synerise/ds-time-picker": "^0.10.30",
55
+ "@synerise/ds-tooltip": "^0.14.45",
56
+ "@synerise/ds-utils": "^0.30.1",
57
57
  "date-fns": "^2.16.1",
58
58
  "date-fns-tz": "1.1.4",
59
59
  "dayjs": "^1.8.35",
@@ -69,5 +69,5 @@
69
69
  "react": ">=16.9.0 <= 17.0.2",
70
70
  "styled-components": "5.0.1"
71
71
  },
72
- "gitHead": "c45f411bd0eac69ae70b6c948da1c530539b01d6"
72
+ "gitHead": "fbadaa2299668c527b52ecc66d61fc2165528bff"
73
73
  }