rsuite 5.16.6 → 5.17.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [5.17.0](https://github.com/rsuite/rsuite/compare/v5.16.6...v5.17.0) (2022-08-26)
+
+### Features
+
+- **DateRangePicker:** supports placing predefined ranges on the left ([#2670](https://github.com/rsuite/rsuite/issues/2670)) ([8df4a61](https://github.com/rsuite/rsuite/commit/8df4a61d3b81e6054369197ff44e1416ea1aefbb))
+
 ## [5.16.6](https://github.com/rsuite/rsuite/compare/v5.16.5...v5.16.6) (2022-08-18)
 
 ### Bug Fixes

package/DatePicker/styles/index.less

@@ -19,18 +19,8 @@
 
 // Toolbar
 .rs-picker-toolbar {
-  .clearfix();
-
   padding: @calendar-picker-padding;
   border-top: 1px solid @calendar-toolbar-border-color;
-
-  &-ranges {
-    display: inline-block;
-  }
-
-  &-right {
-    float: right;
-  }
 }
 
 // Picker date

package/DateRangePicker/styles/index.less

@@ -10,7 +10,7 @@
 .rs-picker-daterange-menu {
   .rs-calendar {
     display: inline-block;
-    height: 278px;
+    height: 276px;
     padding-bottom: 12px;
 
     &:first-child {
@@ -35,10 +35,6 @@
     }
   }
 
-  .rs-picker-toolbar {
-    margin-top: 4px;
-  }
-
   .rs-picker-daterange-panel-show-one-calendar .rs-picker-toolbar {
     max-width: @date-range-picker-calendar-default-width;
 
@@ -71,3 +67,14 @@
   // Make sure group wrapper can put 2 date-panels even screen width is not enough.
   min-width: 492px;
 }
+
+// Predefined Ranges
+.rs-picker-daterange-predefined {
+  height: 366px;
+  border-right: 1px solid var(--rs-border-primary);
+  padding: 4px 0;
+
+  .rs-btn {
+    display: block;
+  }
+}

package/cjs/DatePicker/PredefinedRanges.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { StackProps } from '../Stack';
+import { RangeType } from './types';
+import { CalendarLocale } from '../locales';
+export interface PredefinedRangesProps<T = any, Shortcut = T> extends StackProps {
+    ranges?: RangeType<Shortcut>[];
+    calendarDate: T;
+    locale: CalendarLocale;
+    disabledShortcut?: (value: T) => boolean;
+    onClickShortcut?: (value: Shortcut, closeOverlay: boolean, event: React.MouseEvent) => void;
+}
+declare const PredefinedRanges: React.ForwardRefExoticComponent<PredefinedRangesProps<any, any> & React.RefAttributes<HTMLDivElement>>;
+export default PredefinedRanges;

package/cjs/DatePicker/PredefinedRanges.js

@@ -0,0 +1,79 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Button = _interopRequireDefault(require("../Button"));
+
+var _Stack = _interopRequireDefault(require("../Stack"));
+
+var _utils = require("../utils");
+
+var _utils2 = require("./utils");
+
+var PredefinedRanges = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var className = props.className,
+      disabledShortcut = props.disabledShortcut,
+      onClickShortcut = props.onClickShortcut,
+      calendarDate = props.calendarDate,
+      rangesProp = props.ranges,
+      locale = props.locale,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["className", "disabledShortcut", "onClickShortcut", "calendarDate", "ranges", "locale"]);
+
+  var _useState = (0, _react.useState)((0, _utils2.getRanges)(props)),
+      ranges = _useState[0],
+      setRanges = _useState[1];
+
+  (0, _utils.useUpdateEffect)(function () {
+    setRanges((0, _utils2.getRanges)({
+      ranges: rangesProp,
+      calendarDate: calendarDate
+    }));
+  }, [calendarDate, rangesProp]);
+  var hasLocaleKey = (0, _react.useCallback)(function (key) {
+    return (0, _utils2.getDefaultRanges)(calendarDate).some(function (item) {
+      return item.label === key;
+    });
+  }, [calendarDate]);
+  return /*#__PURE__*/_react.default.createElement(_Stack.default, (0, _extends2.default)({
+    className: className,
+    ref: ref,
+    alignItems: "flex-start",
+    spacing: 4
+  }, rest), ranges.map(function (_ref, index) {
+    var value = _ref.value,
+        closeOverlay = _ref.closeOverlay,
+        label = _ref.label,
+        rest = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["value", "closeOverlay", "label"]);
+    var disabled = disabledShortcut === null || disabledShortcut === void 0 ? void 0 : disabledShortcut(value);
+
+    var handleClickShortcut = function handleClickShortcut(event) {
+      if (disabled) {
+        return;
+      }
+
+      onClickShortcut === null || onClickShortcut === void 0 ? void 0 : onClickShortcut(value, closeOverlay !== false ? true : false, event);
+    };
+
+    return /*#__PURE__*/_react.default.createElement(_Button.default, (0, _extends2.default)({
+      appearance: "link",
+      size: "sm",
+      key: index,
+      disabled: disabled,
+      onClick: handleClickShortcut
+    }, rest), hasLocaleKey(label) && typeof label === 'string' ? locale === null || locale === void 0 ? void 0 : locale[label] : label);
+  }));
+});
+
+var _default = PredefinedRanges;
+exports.default = _default;

package/cjs/DatePicker/Toolbar.d.ts

@@ -1,17 +1,10 @@
 import React from 'react';
-import { StandardProps } from '../@types/common';
-import { RangeType } from './types';
-import { CalendarLocale } from '../locales';
+import { PredefinedRangesProps } from './PredefinedRanges';
 export type { RangeType } from './types';
-export interface ToolbarProps<T = any, Shortcut = T> extends StandardProps {
+export interface ToolbarProps<T = any, Shortcut = T> extends PredefinedRangesProps<T, Shortcut> {
     hideOkBtn?: boolean;
-    locale?: CalendarLocale;
-    calendarDate: T;
-    ranges?: RangeType<Shortcut>[];
     disabledOkBtn?: (value: T) => boolean;
-    disabledShortcut?: (value: T) => boolean;
     onOk?: (event: React.MouseEvent) => void;
-    onClickShortcut?: (value: Shortcut, closeOverlay: boolean, event: React.MouseEvent) => void;
 }
 declare type ToolbarComponent = React.ForwardRefExoticComponent<ToolbarProps> & {
     <T = any, Shortcut = T>(props: ToolbarProps<T, Shortcut>): React.ReactElement | null;

package/cjs/DatePicker/Toolbar.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -11,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -19,11 +17,34 @@ var _Button = _interopRequireDefault(require("../Button"));
 
 var _utils = require("../utils");
 
-var _utils2 = require("./utils");
+var _PredefinedRanges = _interopRequireDefault(require("./PredefinedRanges"));
+
+var _Stack = _interopRequireDefault(require("../Stack"));
+
+var SubmitButton = function SubmitButton(_ref) {
+  var hide = _ref.hide,
+      disabledOkBtn = _ref.disabledOkBtn,
+      calendarDate = _ref.calendarDate,
+      onOk = _ref.onOk,
+      children = _ref.children;
+
+  if (hide) {
+    return null;
+  }
 
+  var disabled = disabledOkBtn === null || disabledOkBtn === void 0 ? void 0 : disabledOkBtn(calendarDate);
+  return /*#__PURE__*/_react.default.createElement(_Button.default, {
+    appearance: "primary",
+    size: "sm",
+    disabled: disabled,
+    onClick: disabled ? undefined : onOk
+  }, children);
+};
 /**
  * Toolbar for DatePicker and DateRangePicker
  */
+
+
 var Toolbar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var className = props.className,
       _props$classPrefix = props.classPrefix,
@@ -34,78 +55,40 @@ var Toolbar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onOk = props.onOk,
       onClickShortcut = props.onClickShortcut,
       calendarDate = props.calendarDate,
-      rangesProp = props.ranges,
+      ranges = props.ranges,
       locale = props.locale,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["className", "classPrefix", "disabledOkBtn", "disabledShortcut", "hideOkBtn", "onOk", "onClickShortcut", "calendarDate", "ranges", "locale"]);
 
-  var _useState = (0, _react.useState)((0, _utils2.getRanges)(props)),
-      ranges = _useState[0],
-      setRanges = _useState[1];
-
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       merge = _useClassNames.merge,
       prefix = _useClassNames.prefix,
       withClassPrefix = _useClassNames.withClassPrefix;
 
-  (0, _utils.useUpdateEffect)(function () {
-    setRanges((0, _utils2.getRanges)({
-      ranges: rangesProp,
-      calendarDate: calendarDate
-    }));
-  }, [calendarDate, rangesProp]);
-  var hasLocaleKey = (0, _react.useCallback)(function (key) {
-    return (0, _utils2.getDefaultRanges)(calendarDate).some(function (item) {
-      return item.label === key;
-    });
-  }, [calendarDate]);
-  var renderOkButton = (0, _react.useCallback)(function () {
-    if (hideOkBtn) {
-      return null;
-    }
-
-    var disabled = disabledOkBtn === null || disabledOkBtn === void 0 ? void 0 : disabledOkBtn(calendarDate);
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: prefix('right')
-    }, /*#__PURE__*/_react.default.createElement(_Button.default, {
-      appearance: "primary",
-      size: "sm",
-      disabled: disabled,
-      onClick: disabled ? undefined : onOk
-    }, locale === null || locale === void 0 ? void 0 : locale.ok));
-  }, [disabledOkBtn, hideOkBtn, locale, onOk, calendarDate, prefix]);
-
-  if (hideOkBtn && ranges.length === 0) {
+  if (hideOkBtn && (ranges === null || ranges === void 0 ? void 0 : ranges.length) === 0) {
     return null;
   }
 
   var classes = merge(className, withClassPrefix());
-  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(_Stack.default, (0, _extends2.default)({
     ref: ref,
-    className: classes
+    className: classes,
+    justifyContent: "space-between",
+    alignItems: "flex-start"
+  }, rest), /*#__PURE__*/_react.default.createElement(_PredefinedRanges.default, {
+    className: prefix('ranges'),
+    ranges: ranges,
+    calendarDate: calendarDate,
+    locale: locale,
+    disabledShortcut: disabledShortcut,
+    onClickShortcut: onClickShortcut
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: prefix('ranges')
-  }, ranges.map(function (_ref, index) {
-    var value = _ref.value,
-        closeOverlay = _ref.closeOverlay,
-        label = _ref.label;
-    var disabled = disabledShortcut === null || disabledShortcut === void 0 ? void 0 : disabledShortcut(value);
-
-    var handleClickShortcut = function handleClickShortcut(event) {
-      if (disabled) {
-        return;
-      }
-
-      onClickShortcut === null || onClickShortcut === void 0 ? void 0 : onClickShortcut(value, closeOverlay !== false ? true : false, event);
-    };
-
-    return /*#__PURE__*/_react.default.createElement(_Button.default, {
-      appearance: "link",
-      size: "sm",
-      key: index,
-      disabled: disabled,
-      onClick: handleClickShortcut
-    }, hasLocaleKey(label) && typeof label === 'string' ? locale === null || locale === void 0 ? void 0 : locale[label] : label);
-  })), renderOkButton());
+    className: prefix('right')
+  }, /*#__PURE__*/_react.default.createElement(SubmitButton, {
+    disabledOkBtn: disabledOkBtn,
+    hide: hideOkBtn,
+    calendarDate: calendarDate,
+    onOk: onOk
+  }, locale === null || locale === void 0 ? void 0 : locale.ok)));
 });
 
 Toolbar.displayName = 'Toolbar';

package/cjs/DateRangePicker/DateRangePicker.js

@@ -29,6 +29,10 @@ var _CustomProvider = require("../CustomProvider");
 
 var _Toolbar = _interopRequireDefault(require("../DatePicker/Toolbar"));
 
+var _PredefinedRanges = _interopRequireDefault(require("../DatePicker/PredefinedRanges"));
+
+var _Stack = _interopRequireDefault(require("../Stack"));
+
 var _Picker = require("../Picker");
 
 var _utils = require("../utils");
@@ -419,10 +423,17 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       closeOverlay = false;
     }
 
-    handleValueUpdate(event, value, closeOverlay); // End unfinished selections.
+    updateCalendarDateRange(value);
+
+    if (closeOverlay) {
+      handleValueUpdate(event, value, closeOverlay);
+    } else {
+      setSelectedDates(value !== null && value !== void 0 ? value : []);
+    } // End unfinished selections.
+
 
     hasDoneSelect.current = true;
-  }, [handleValueUpdate]);
+  }, [handleValueUpdate, updateCalendarDateRange]);
   var handleOK = (0, _react.useCallback)(function (event) {
     handleValueUpdate(event, selectedDates);
     onOk === null || onOk === void 0 ? void 0 : onOk(selectedDates, event);
@@ -589,13 +600,27 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       renderTitle: renderTitle
     };
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
+      role: "dialog",
       className: classes,
       ref: (0, _utils.mergeRefs)(overlayRef, speakerRef),
       target: triggerRef,
       style: styles
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: panelClasses
-    }, /*#__PURE__*/_react.default.createElement("div", {
+    }, /*#__PURE__*/_react.default.createElement(_Stack.default, {
+      alignItems: "flex-start"
+    }, /*#__PURE__*/_react.default.createElement(_PredefinedRanges.default, {
+      direction: "column",
+      spacing: 0,
+      className: prefix('daterange-predefined'),
+      ranges: (ranges === null || ranges === void 0 ? void 0 : ranges.filter(function (range) {
+        return (range === null || range === void 0 ? void 0 : range.placement) === 'left';
+      })) || [],
+      calendarDate: calendarDate,
+      locale: locale,
+      disabledShortcut: disabledShortcutButton,
+      onClickShortcut: handleShortcutPageDate
+    }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: prefix('daterange-content')
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: prefix('daterange-header')
@@ -613,8 +638,10 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       hideOkBtn: oneTap,
       onOk: handleOK,
       onClickShortcut: handleShortcutPageDate,
-      ranges: ranges
-    })));
+      ranges: ranges === null || ranges === void 0 ? void 0 : ranges.filter(function (range) {
+        return (range === null || range === void 0 ? void 0 : range.placement) === 'bottom' || (range === null || range === void 0 ? void 0 : range.placement) === undefined;
+      })
+    })))));
   };
 
   var hasValue = !(0, _isNil.default)(value) && value.length > 1;

package/cjs/DateRangePicker/types.d.ts

@@ -4,8 +4,9 @@ export declare type ValueType = [Date?, Date?];
 export declare type DateRange = [Date, Date];
 export interface RangeType {
     label: React.ReactNode;
-    closeOverlay?: boolean;
     value: DateRange | ((value?: ValueType) => DateRange);
+    closeOverlay?: boolean;
+    placement?: 'bottom' | 'left';
 }
 export declare type DisabledDateFunction = (
 /** Date used to determine if disabling is required. */

package/dist/rsuite-rtl.css

@@ -4369,20 +4369,6 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
   border-top: 1px solid #e5e5ea;
   border-top: 1px solid var(--rs-border-primary);
 }
-.rs-picker-toolbar::before,
-.rs-picker-toolbar::after {
-  content: ' ';
-  display: table;
-}
-.rs-picker-toolbar::after {
-  clear: both;
-}
-.rs-picker-toolbar-ranges {
-  display: inline-block;
-}
-.rs-picker-toolbar-right {
-  float: left;
-}
 .rs-picker-date-inline {
   height: 299px;
 }
@@ -4465,7 +4451,7 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
 }
 .rs-picker-daterange-menu .rs-calendar {
   display: inline-block;
-  height: 278px;
+  height: 276px;
   padding-bottom: 12px;
 }
 .rs-picker-daterange-menu .rs-calendar:first-child {
@@ -4485,9 +4471,6 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
 .rs-picker-daterange-menu .rs-calendar-month-dropdown-list {
   width: 185px;
 }
-.rs-picker-daterange-menu .rs-picker-toolbar {
-  margin-top: 4px;
-}
 .rs-picker-daterange-menu .rs-picker-daterange-panel-show-one-calendar .rs-picker-toolbar {
   max-width: 255px;
 }
@@ -4510,6 +4493,15 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
   height: 274px;
   min-width: 492px;
 }
+.rs-picker-daterange-predefined {
+  height: 366px;
+  border-left: 1px solid #e5e5ea;
+  border-left: 1px solid var(--rs-border-primary);
+  padding: 4px 0;
+}
+.rs-picker-daterange-predefined .rs-btn {
+  display: block;
+}
 .rs-divider {
   background-color: #e5e5ea;
   background-color: var(--rs-divider-border);