@synerise/ds-date-range-picker 0.22.0 → 0.23.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.23.0](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.22.0...@synerise/ds-date-range-picker@0.23.0) (2023-08-22)
+
+
+### Bug Fixes
+
+* **date-range-picker:** adds weekly types exports ([9d145bd](https://github.com/Synerise/synerise-design/commit/9d145bd6bd0060e7c044f694bdfeb7badaf8e475))
+
+
+### Features
+
+* **date-range-picker:** added prop to hide "now" button ([61fe484](https://github.com/Synerise/synerise-design/commit/61fe484482b1610a872d918efa79760c906f3e7a))
+
+
+
+
+
 # [0.22.0](https://github.com/Synerise/synerise-design/compare/@synerise/ds-date-range-picker@0.21.24...@synerise/ds-date-range-picker@0.22.0) (2023-08-20)
 
 

package/README.md

@@ -54,6 +54,7 @@ const value = {
 | relativePast         | Enable relative filter for past ranges                              | boolean              | `false`                                                       |
 | relativeFuture       | Enable relative filter for future ranges                            | boolean              | `false`                                                       |
 | showTime             | Enable user to choose particular hour                               | boolean              | `false`                                                       |
+| showNowButton        | Include "now" button to select current time (last minue)                             | boolean              | `true`                                                       |
 | showFilter           | Enable range filtering                                              | boolean              | `false`                                                       |
 | showCustomRange      | Enable custom range form in relative range picker                   | boolean              | `true`                                                       |
 | validate             | Function to specify if particular date ranges are correct           | (date:Date)=>boolean | -                                                             |

package/dist/DateRangePicker.types.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { ReactNode } from 'react';
 import { WrappedComponentProps } from 'react-intl';
 import { PopoverProps } from 'antd/lib/popover';
 import { DateToFormatOptions } from '@synerise/ds-data-format';
@@ -41,7 +41,7 @@ export interface DateRangePickerProps extends WrappedComponentProps {
     onVisibleChange?: (visible: boolean) => void;
     onFilterSave?: (filters: SavedFilter[]) => void;
     popoverProps?: Partial<PopoverProps>;
-    popoverTrigger?: React.ReactNode;
+    popoverTrigger?: ReactNode;
     ranges?: DateRange[];
     rangeUnits?: Array<RelativeUnits>;
     relativeFuture?: boolean;
@@ -52,6 +52,7 @@ export interface DateRangePickerProps extends WrappedComponentProps {
     showFilter?: boolean;
     showTime?: boolean;
     showCustomRange?: boolean;
+    showNowButton?: boolean;
     texts: Texts;
     validate?: (value: DateRange) => {
         valid: boolean;
@@ -82,7 +83,7 @@ export interface State {
     visibleAddonKey?: string | undefined;
 }
 export declare type Texts = {
-    [k in Translations]: string | React.ReactNode;
+    [k in Translations]: string | ReactNode;
 } & {
     [k in TranslationsPlaceholders]: string;
 };
@@ -92,6 +93,6 @@ export declare type WithTranslations = {
     texts?: Texts;
 };
 export declare type AddonType = {
-    content: React.ReactNode;
+    content: ReactNode;
     key: string;
 };

package/dist/Footer/Footer.types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { WrappedComponentProps } from 'react-intl';
 import { DateToFormatOptions } from '@synerise/ds-data-format';
-import { Texts } from 'DateRangePicker.types';
+import { Texts } from '../DateRangePicker.types';
 import { DateRange } from '../date.types';
 export declare type Props = {
     mode: string;

package/dist/RangePicker/RangePicker.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { RangePickerProps as Props } from './RangePicker.types';
 declare const _default: React.FC<Props>;
 export default _default;

package/dist/RangePicker/RangePicker.js

@@ -8,7 +8,7 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { DateUtils } from 'react-day-picker';
 import fnsIsSameDay from 'date-fns/isSameDay';
 import fnsIsValid from 'date-fns/isValid';
@@ -73,13 +73,13 @@ function replaceRange(value, day) {
   };
 }
 
-var RangePicker = /*#__PURE__*/function (_React$PureComponent) {
-  _inheritsLoose(RangePicker, _React$PureComponent);
+var RangePicker = /*#__PURE__*/function (_PureComponent) {
+  _inheritsLoose(RangePicker, _PureComponent);
 
   function RangePicker(props) {
     var _this;
 
-    _this = _React$PureComponent.call(this, props) || this; // eslint-disable-next-line react/state-in-constructor
+    _this = _PureComponent.call(this, props) || this; // eslint-disable-next-line react/state-in-constructor
 
     _defineProperty(_assertThisInitialized(_this), "componentDidUpdate", NOOP);
 
@@ -472,11 +472,13 @@ var RangePicker = /*#__PURE__*/function (_React$PureComponent) {
         dateOnly = _this$props10.dateOnly,
         onSwitchMode = _this$props10.onSwitchMode,
         texts = _this$props10.texts;
+    var _this$props$showNowBu = this.props.showNowButton,
+        showNowButton = _this$props$showNowBu === void 0 ? true : _this$props$showNowBu;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(S.Sides, null, /*#__PURE__*/React.createElement(S.Side, {
       mode: mode
     }, this.renderSide(COLUMNS.LEFT)), /*#__PURE__*/React.createElement(S.Side, {
       mode: mode
-    }, this.renderSide(COLUMNS.RIGHT))), /*#__PURE__*/React.createElement(S.PickerFooter, null, /*#__PURE__*/React.createElement(Range, {
+    }, this.renderSide(COLUMNS.RIGHT))), /*#__PURE__*/React.createElement(S.PickerFooter, null, showNowButton && /*#__PURE__*/React.createElement(Range, {
       onClick: function onClick(_ref) {
         var currentTarget = _ref.currentTarget;
         var now = new Date();
@@ -503,6 +505,6 @@ var RangePicker = /*#__PURE__*/function (_React$PureComponent) {
   };
 
   return RangePicker;
-}(React.PureComponent);
+}(PureComponent);
 
 export default withDataFormat(RangePicker);

package/dist/RangePicker/RangePicker.types.d.ts

@@ -12,6 +12,7 @@ export interface RangePickerProps extends WrappedComponentProps {
     texts: Texts;
     forceAdjacentMonths?: boolean;
     showCustomRange?: boolean;
+    showNowButton?: boolean;
     startAlwaysOnTheLeft?: boolean;
     jumpToStartAndEnd?: boolean;
 }

package/dist/RawDateRangePicker.d.ts

@@ -1,9 +1,9 @@
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import type { DateRangePickerProps, DateRangePickerProps as Props, State, AddonType } from './DateRangePicker.types';
 import type { DateRange, RelativeDateRange } from './date.types';
 import { FilterDefinition, FilterValue } from './RangeFilter/RangeFilter.types';
 export declare function defaultValueTransformer(value: DateRange): DateRange;
-export declare class RawDateRangePicker extends React.PureComponent<DateRangePickerProps, State> {
+export declare class RawDateRangePicker extends PureComponent<DateRangePickerProps, State> {
     static defaultProps: {
         ranges: DateRange[];
         relativePast: boolean;
@@ -27,7 +27,7 @@ export declare class RawDateRangePicker extends React.PureComponent<DateRangePic
     getAddons: () => AddonType[];
     render(): JSX.Element;
 }
-declare const _default: React.ForwardRefExoticComponent<Pick<DateRangePickerProps, "readOnly" | "texts" | "valueFormatOptions" | "format" | "value" | "onVisibleChange" | "rangeUnits" | "containerClass" | "disableDefaultTexts" | "disabledDate" | "forceAdjacentMonths" | "forceAbsolute" | "footerProps" | "onValueChange" | "onApply" | "onFilterSave" | "popoverProps" | "popoverTrigger" | "ranges" | "relativeFuture" | "relativePast" | "relativeModes" | "savedFilters" | "showRelativePicker" | "showFilter" | "showTime" | "showCustomRange" | "validate" | "valueTransformer" | "arrowColor" | "disableAbsoluteTimepickerInRelative" | "rangePickerInputProps" | "allowedFilterTypes" | "renderPopoverTrigger" | "isTruncateMs" | "filterValueSelectionModes"> & {
+declare const _default: React.ForwardRefExoticComponent<Pick<DateRangePickerProps, "readOnly" | "texts" | "valueFormatOptions" | "format" | "value" | "onVisibleChange" | "rangeUnits" | "containerClass" | "disableDefaultTexts" | "disabledDate" | "forceAdjacentMonths" | "forceAbsolute" | "footerProps" | "onValueChange" | "onApply" | "onFilterSave" | "popoverProps" | "popoverTrigger" | "ranges" | "relativeFuture" | "relativePast" | "relativeModes" | "savedFilters" | "showRelativePicker" | "showFilter" | "showTime" | "showCustomRange" | "showNowButton" | "validate" | "valueTransformer" | "arrowColor" | "disableAbsoluteTimepickerInRelative" | "rangePickerInputProps" | "allowedFilterTypes" | "renderPopoverTrigger" | "isTruncateMs" | "filterValueSelectionModes"> & {
     forwardedRef?: ((instance: any) => void) | React.RefObject<any> | null | undefined;
 } & React.RefAttributes<any>> & {
     WrappedComponent: React.ComponentType<DateRangePickerProps>;

package/dist/RawDateRangePicker.js

@@ -10,7 +10,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { omitBy, isUndefined } from 'lodash';
 import { injectIntl } from 'react-intl';
 import fnsIsValid from 'date-fns/isValid';
@@ -74,13 +74,13 @@ export function defaultValueTransformer(value) {
 
   return value;
 }
-export var RawDateRangePicker = /*#__PURE__*/function (_React$PureComponent) {
-  _inheritsLoose(RawDateRangePicker, _React$PureComponent);
+export var RawDateRangePicker = /*#__PURE__*/function (_PureComponent) {
+  _inheritsLoose(RawDateRangePicker, _PureComponent);
 
   function RawDateRangePicker(props) {
     var _this;
 
-    _this = _React$PureComponent.call(this, props) || this; // eslint-disable-next-line react/state-in-constructor
+    _this = _PureComponent.call(this, props) || this; // eslint-disable-next-line react/state-in-constructor
 
     _defineProperty(_assertThisInitialized(_this), "handleFilterCancel", function () {
       _this.setState({
@@ -329,7 +329,9 @@ export var RawDateRangePicker = /*#__PURE__*/function (_React$PureComponent) {
         allowedFilterTypes = _this$props4.allowedFilterTypes,
         _this$props4$disableA = _this$props4.disableAbsoluteTimepickerInRelative,
         disableAbsoluteTimepickerInRelative = _this$props4$disableA === void 0 ? false : _this$props4$disableA,
-        filterValueSelectionModes = _this$props4.filterValueSelectionModes;
+        filterValueSelectionModes = _this$props4.filterValueSelectionModes,
+        _this$props4$showNowB = _this$props4.showNowButton,
+        showNowButton = _this$props4$showNowB === void 0 ? true : _this$props4$showNowB;
     var _this$state3 = this.state,
         value = _this$state3.value,
         mode = _this$state3.mode;
@@ -372,10 +374,11 @@ export var RawDateRangePicker = /*#__PURE__*/function (_React$PureComponent) {
     var isValidSince = value.type === 'SINCE' && Boolean(value.offset && value.duration); // TODO apply ranges and find mapped lifetime here, this applies only for defaultValueTransformer
 
     var isValid = (isValidAbsolute || isValidRelative || isValidSince || key === CONST.ALL_TIME) && validator.valid;
-    var canSwitchToTimePicker = isValid && (!disableAbsoluteTimepickerInRelative || value.type === 'ABSOLUTE');
+    var canSwitchToTimePicker = isValid && !isLifetime(value) && (!disableAbsoluteTimepickerInRelative || value.type === 'ABSOLUTE');
     return /*#__PURE__*/React.createElement(Container, {
       className: containerClass
     }, /*#__PURE__*/React.createElement(RangePicker, {
+      showNowButton: showNowButton,
       value: value,
       onChange: this.handleRangeChange,
       mode: mode,
@@ -409,7 +412,7 @@ export var RawDateRangePicker = /*#__PURE__*/function (_React$PureComponent) {
   };
 
   return RawDateRangePicker;
-}(React.PureComponent); // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+}(PureComponent); // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
 // @ts-ignore
 
 _defineProperty(RawDateRangePicker, "defaultProps", {

package/dist/RelativeRangePicker/Elements/RangeButtons/RangeButtons.js

@@ -8,6 +8,7 @@ var RangeButtons = function RangeButtons(_ref) {
       onChange = _ref.onChange;
   return /*#__PURE__*/React.createElement(React.Fragment, null, ranges.map(function (range) {
     return /*#__PURE__*/React.createElement(S.Range, {
+      "data-testid": "relative-range-preset-" + (range.key || range.id),
       key: range.key || range.id,
       onClick: function onClick() {
         onChange && onChange(range);

package/dist/RelativeRangePicker/RelativeRangePicker.js

@@ -238,6 +238,7 @@ var RelativeRangePicker = /*#__PURE__*/function (_React$PureComponent) {
     var hiddenRanges = groupedRanges ? groupedRanges.slice(3) : [];
     if (!currentGroup) return null;
     return /*#__PURE__*/React.createElement(S.Container, null, /*#__PURE__*/React.createElement(S.Ranges, null, showCustomRange && /*#__PURE__*/React.createElement(S.Range, {
+      "data-testid": "relative-range-preset-" + CUSTOM_RANGE_KEY,
       key: CUSTOM_RANGE_KEY,
       onClick: this.handleCustomClick,
       type: isCustomValue ? 'primary' : 'tertiary'

package/dist/index.d.ts

@@ -5,4 +5,6 @@ export { RawDateRangePicker } from './RawDateRangePicker';
 export * as utils from './utils';
 export * as CONST from './constants';
 export { default } from './DateRangePicker';
+export { fnsFormat } from './fns';
+export type { WeeklyProps, WeeklyScheduleDayValue, WeeklySchedule, DayOfWeekIndex, } from './RangeFilter/Filters/new/Weekly/Weekly.types';
 export { getDisabledTimeOptions } from './RangePicker/utils';

package/dist/index.js

@@ -7,4 +7,5 @@ export { _utils as utils };
 import * as _CONST from './constants';
 export { _CONST as CONST };
 export { default } from './DateRangePicker';
+export { fnsFormat } from './fns';
 export { getDisabledTimeOptions } from './RangePicker/utils';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-date-range-picker",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "Date-Range-Picker UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "Synerise/synerise-design",
@@ -37,19 +37,19 @@
     "@synerise/ds-button": "^0.18.0",
     "@synerise/ds-button-group": "^0.6.28",
     "@synerise/ds-data-format": "^0.4.0",
-    "@synerise/ds-date-picker": "^0.10.9",
-    "@synerise/ds-dropdown": "^0.17.72",
+    "@synerise/ds-date-picker": "^0.10.10",
+    "@synerise/ds-dropdown": "^0.17.73",
     "@synerise/ds-icon": "^0.58.0",
-    "@synerise/ds-inline-edit": "^0.6.71",
-    "@synerise/ds-input": "^0.18.46",
-    "@synerise/ds-input-number": "^0.8.19",
-    "@synerise/ds-manageable-list": "^0.26.0",
-    "@synerise/ds-menu": "^0.17.15",
-    "@synerise/ds-scrollbar": "^0.6.4",
-    "@synerise/ds-select": "^0.15.11",
-    "@synerise/ds-tags": "^0.8.6",
-    "@synerise/ds-time-picker": "^0.8.0",
-    "@synerise/ds-tooltip": "^0.14.1",
+    "@synerise/ds-inline-edit": "^0.6.72",
+    "@synerise/ds-input": "^0.18.47",
+    "@synerise/ds-input-number": "^0.8.20",
+    "@synerise/ds-manageable-list": "^0.26.1",
+    "@synerise/ds-menu": "^0.17.16",
+    "@synerise/ds-scrollbar": "^0.6.5",
+    "@synerise/ds-select": "^0.15.12",
+    "@synerise/ds-tags": "^0.8.7",
+    "@synerise/ds-time-picker": "^0.8.1",
+    "@synerise/ds-tooltip": "^0.14.2",
     "@synerise/ds-utils": "^0.19.0",
     "date-fns": "^2.16.1",
     "dayjs": "^1.8.35",
@@ -60,10 +60,12 @@
   },
   "peerDependencies": {
     "@synerise/ds-core": "*",
-    "react": ">=16.9.0 < 17.0.0"
+    "antd": "^4",
+    "react": ">=16.9.0 < 17.0.0",
+    "styled-components": "5.0.1"
   },
   "devDependencies": {
     "@types/ramda": "^0.27.14"
   },
-  "gitHead": "0795eb5071d9160e429731ba8f8807c1ae509085"
+  "gitHead": "1f03e5affd1f22c9d3c7b4f1401887263d32d3d5"
 }

package/dist/RangeFilter/Filters/new/Weekly/utils.spec.d.ts

@@ -1 +0,0 @@
-import '@testing-library/jest-dom/extend-expect';

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

@@ -1,36 +0,0 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import '@testing-library/jest-dom/extend-expect';
-import { removeEmptyEntries } from './utils';
-var dayValue = {
-  "start": "06:00:00.000",
-  "stop": "20:59:59.999",
-  "restricted": true,
-  "display": false,
-  "inverted": false,
-  "mode": "Range"
-};
-var scheduleWithEmptyEntries = {
-  '5de64ead-e81e-4bf9-8e13-47e8829b8cc3': {
-    0: _objectSpread({}, dayValue),
-    1: _objectSpread({}, dayValue),
-    2: _objectSpread({}, dayValue),
-    3: _objectSpread({}, dayValue),
-    4: _objectSpread({}, dayValue),
-    5: _objectSpread({}, dayValue),
-    6: _objectSpread({}, dayValue)
-  },
-  // @ts-ignore
-  '5dr44ead-e81e-4bf9-8e13-47e8829b8cc3': {}
-};
-describe('Weekly utils', function () {
-  it('removeEmptyEntries should clear entries with no day data', function () {
-    removeEmptyEntries(scheduleWithEmptyEntries);
-    expect(Object.keys(scheduleWithEmptyEntries).length).toBe(1);
-    expect(Object.keys(scheduleWithEmptyEntries)[0]).toBe('5de64ead-e81e-4bf9-8e13-47e8829b8cc3');
-  });
-});