@synerise/ds-date-range-picker 0.21.9 → 0.21.10

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.21.10](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.21.9...@synerise/ds-date-range-picker@0.21.10) (2023-05-26)
+
+
+### Bug Fixes
+
+* **date-range-picker:** fixes monthly filter (days of week) value ([3b47835](https://github.com/Synerise/synerise-design/commit/3b478352c78a3932609ba4f6ffda2b5948960ff9))
+* **date-range-picker:** invalid key name fixed ([fbff700](https://github.com/Synerise/synerise-design/commit/fbff7005f01df30834c595fe2656be107fe115f8))
+
+
+
+
+
 ## [0.21.9](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.21.8...@synerise/ds-date-range-picker@0.21.9) (2023-05-25)
 
 **Note:** Version bump only for package @synerise/ds-date-range-picker

package/dist/RangeFilter/Filters/new/Monthly/Monthly.js

@@ -119,11 +119,11 @@ var Monthly = function Monthly(_ref) {
     onChange(scheduleToUpdate);
   }, [onChange]);
   React.useEffect(function () {
-    var entriesWithActiveDaysValue = Object.keys(value).filter(function (id) {
+    var entriesWithActiveDaysValue = activeDays.length ? Object.keys(value).filter(function (id) {
       return activeDays.every(function (day) {
         return !!value[id][day] && haveActiveDaysCommonRange(value[id], activeDays);
       });
-    });
+    }) : [];
     removeEmptyEntries(value);
     setFilteredSchedule(entriesWithActiveDaysValue);
   }, [value, activeDays, removeEmptyEntries]);
@@ -267,9 +267,10 @@ var Monthly = function Monthly(_ref) {
       readOnly: disabled,
       intl: intl,
       onToggle: handleToggleDay,
+      onClear: removeDaySelection,
       texts: EMPTY_OBJECT
     });
-  }, [activeDays, intl, getDayLabel, handleToggleDay, isDayRestricted, disabled]);
+  }, [activeDays, intl, getDayLabel, handleToggleDay, removeDaySelection, isDayRestricted, disabled]);
   var handleRangeAdd = React.useCallback(function () {
     var _objectSpread2;
 
@@ -307,7 +308,7 @@ var Monthly = function Monthly(_ref) {
     onUnselectAll: handleUnselectAll,
     onSelectAll: handleSelectAll,
     showUnselectAll: Boolean(activeDays.length),
-    showSelectAll: true,
+    showSelectAll: allKeys.length > activeDays.length,
     renderDay: renderDay,
     keys: allKeys,
     days: EMPTY_OBJECT,

package/dist/RangeFilter/Filters/new/Weekly/Weekly.js

@@ -213,9 +213,10 @@ var Weekly = function Weekly(_ref) {
       readOnly: disabled,
       intl: intl,
       onToggle: handleToggleDay,
+      onClear: removeDaySelection,
       texts: EMPTY_OBJECT
     });
-  }, [activeDays, intl, getDayLabel, handleToggleDay, isDayRestricted, disabled]);
+  }, [activeDays, intl, getDayLabel, handleToggleDay, removeDaySelection, isDayRestricted, disabled]);
   var handleRangeAdd = React.useCallback(function () {
     var _objectSpread2;
 
@@ -253,7 +254,7 @@ var Weekly = function Weekly(_ref) {
     onUnselectAll: handleUnselectAll,
     onSelectAll: handleSelectAll,
     showUnselectAll: Boolean(activeDays.length),
-    showSelectAll: true,
+    showSelectAll: allKeys.length > activeDays.length,
     renderDay: renderDay,
     keys: allKeys,
     days: EMPTY_OBJECT,

package/dist/RangeFilter/Shared/TimeWindow/Day/Day.js

@@ -1,4 +1,4 @@
-var _excluded = ["active", "label", "onToggle", "readOnly", "restricted", "dayKey", "texts"];
+var _excluded = ["active", "label", "onToggle", "onClear", "readOnly", "restricted", "dayKey", "texts"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -22,6 +22,7 @@ var Day = function Day(_ref) {
   var active = _ref.active,
       label = _ref.label,
       onToggle = _ref.onToggle,
+      onClear = _ref.onClear,
       readOnly = _ref.readOnly,
       restricted = _ref.restricted,
       dayKey = _ref.dayKey,
@@ -36,9 +37,9 @@ var Day = function Day(_ref) {
     return active ? 'primary' : 'secondary';
   }, [active]);
   var handleIconClick = React.useCallback(function () {
-    !readOnly && onToggle(dayKey, false);
-  }, [readOnly, onToggle, dayKey]);
-  var handleMouseOut = React.useCallback(function () {
+    !readOnly && onClear(dayKey);
+  }, [readOnly, onClear, dayKey]);
+  var handleMouseLeave = React.useCallback(function () {
     setHovered(false);
   }, []);
   var handleButtonClick = React.useCallback(function () {
@@ -61,14 +62,12 @@ var Day = function Day(_ref) {
     return setHovered(visible);
   }, []);
   return /*#__PURE__*/React.createElement(S.Container, null, /*#__PURE__*/React.createElement(Button, _extends({}, rest, {
-    onMouseLeave: handleMouseOut,
-    onMouseOut: handleMouseOut,
-    onBlur: handleMouseOut,
+    onMouseLeave: handleMouseLeave,
     block: true,
     onClick: handleButtonClick,
     type: type,
     mode: "label-icon"
-  }), /*#__PURE__*/React.createElement(S.Content, null, label)), restricted && !active && /*#__PURE__*/React.createElement(Tooltip, {
+  }), /*#__PURE__*/React.createElement(S.Content, null, label)), restricted && /*#__PURE__*/React.createElement(Tooltip, {
     trigger: ['hover'],
     title: (texts == null ? void 0 : texts.clear) || 'Clear',
     onVisibleChange: handleTooltipVisibleChange,

package/dist/RangeFilter/Shared/TimeWindow/Day/Day.types.d.ts

@@ -8,6 +8,7 @@ export declare type DayProps = {
     restricted: boolean;
     active: boolean;
     onToggle: (dayKey: DayKey, forceState?: boolean) => void;
+    onClear: (dayKey: DayKey) => void;
     readOnly?: boolean;
     texts?: GridTexts;
 } & WrappedComponentProps;

package/dist/RangeFilter/Shared/TimeWindow/TimeWindow.js

@@ -119,6 +119,10 @@ var TimeWindowBase = /*#__PURE__*/function (_React$PureComponent) {
       }
     });
 
+    _defineProperty(_assertThisInitialized(_this), "handleClearDay", function (dayKey) {
+      _this.removeDaySelection(dayKey);
+    });
+
     _defineProperty(_assertThisInitialized(_this), "handleDayChange", function (dayKey, dayChanges) {
       var _objectSpread2;
 
@@ -324,6 +328,7 @@ var TimeWindowBase = /*#__PURE__*/function (_React$PureComponent) {
         readOnly: readOnly,
         intl: intl,
         onToggle: _this.handleToggleDay,
+        onClear: _this.handleClearDay,
         texts: texts
       });
     });
@@ -506,6 +511,7 @@ var TimeWindowBase = /*#__PURE__*/function (_React$PureComponent) {
       numberOfDays: numberOfDays,
       texts: texts
     }, rest, {
+      showSelectAll: keys.length > (activeDays == null ? void 0 : activeDays.length),
       title: /*#__PURE__*/React.createElement(SelectionCount, {
         selectedDayCount: activeDays.length,
         label: intl.formatMessage({

package/dist/RangeFilter/utils.js

@@ -96,9 +96,12 @@ export var normalizeValue = function normalizeValue(_ref) {
                   daysArray = _ref3[1];
               return {
                 week: +week + 1,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 days: daysArray.map(function (day) {
+                  var dayOfWeek = +day.day % 7;
                   return _objectSpread({}, omit(day, ['week']), {
-                    type: type
+                    type: type,
+                    day: dayOfWeek
                   });
                 })
               };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-date-range-picker",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "Date-Range-Picker UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "Synerise/synerise-design",
@@ -33,12 +33,12 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@date-fns/upgrade": "^1.0.3",
-    "@synerise/ds-button": "^0.17.16",
-    "@synerise/ds-date-picker": "^0.10.0",
+    "@synerise/ds-button": "^0.17.17",
+    "@synerise/ds-date-picker": "^0.10.1",
     "@synerise/ds-icon": "^0.56.0",
-    "@synerise/ds-manageable-list": "^0.25.5",
-    "@synerise/ds-time-picker": "^0.7.9",
-    "@synerise/ds-tooltip": "^0.13.4",
+    "@synerise/ds-manageable-list": "^0.25.6",
+    "@synerise/ds-time-picker": "^0.7.10",
+    "@synerise/ds-tooltip": "^0.13.5",
     "@synerise/ds-utils": "^0.19.0",
     "date-fns": "^2.16.1",
     "dayjs": "^1.8.35",
@@ -54,5 +54,5 @@
   "devDependencies": {
     "@types/ramda": "^0.27.14"
   },
-  "gitHead": "6de508bd1e3f2c816ffdf413d7eadb762fb20890"
+  "gitHead": "2b2a3ea268c4cf9790e9b1b98365d08f3c8526ef"
 }