rsuite 5.17.0-beta.1 → 5.17.0

package/Button/styles/index.less

@@ -44,7 +44,7 @@
   });
 
   .button-disabled({
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
     color: var(--rs-btn-default-disabled-text);
     background-color: var(--rs-btn-default-disabled-bg);
   });

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [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
+
+- **Button:** use [@cursor-disabled](https://github.com/cursor-disabled) intead of hardcoded cursor ([#2658](https://github.com/rsuite/rsuite/issues/2658)) ([5731762](https://github.com/rsuite/rsuite/commit/57317622eb2d65e94e0a8bb962512232cc4dfd3d))
+- **DatePicker,DateRangePicker:** display month name as title of month calendar view ([#2660](https://github.com/rsuite/rsuite/issues/2660)) ([1e812ef](https://github.com/rsuite/rsuite/commit/1e812ef7510ea7b82beda7c058bd07080db198f5))
+- **Form.Control:** apply className to accepter component ([#2662](https://github.com/rsuite/rsuite/issues/2662)) ([a164d28](https://github.com/rsuite/rsuite/commit/a164d287acfe8be2f98080e3b7eb15971f47809f))
+
+## [5.16.5](https://github.com/rsuite/rsuite/compare/v5.16.4...v5.16.5) (2022-08-11)
+
+### Bug Fixes
+
+- **AutoComplete:** fix `listbox` not keeping the same width as `input` ([#2645](https://github.com/rsuite/rsuite/issues/2645)) ([ad09288](https://github.com/rsuite/rsuite/commit/ad09288e0fc38f964524466a79ca25532dc221f8))
+- **AutoComplete:** fix missing definition of string in datatype ([#2644](https://github.com/rsuite/rsuite/issues/2644)) ([528e291](https://github.com/rsuite/rsuite/commit/528e29154d188d928e3d93853f5ed0673b932b4a))
+- **DateRangePicker:** fix default time not working ([#2642](https://github.com/rsuite/rsuite/issues/2642)) ([915de28](https://github.com/rsuite/rsuite/commit/915de2820af418195e7f9a6ed228c1b05362d633))
+
 ## [5.16.4](https://github.com/rsuite/rsuite/compare/v5.16.3...v5.16.4) (2022-08-04)
 
 ### 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/Calendar/Header.js

@@ -90,14 +90,12 @@ var Header = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     return timeFormat.join(':');
   }, [format, showMeridian]);
   var getDateFormat = (0, _react.useCallback)(function () {
-    if (showDate) {
-      return (locale === null || locale === void 0 ? void 0 : locale.formattedDayPattern) || 'yyyy-MM-dd';
-    } else if (showMonth) {
+    if (showMonth) {
       return (locale === null || locale === void 0 ? void 0 : locale.formattedMonthPattern) || 'yyyy-MM';
     }
 
     return 'yyyy';
-  }, [locale, showDate, showMonth]);
+  }, [locale, showMonth]);
   var renderTitle = (0, _react.useCallback)(function () {
     var _renderTitleProp;
 

package/cjs/Calendar/useCalendarDate.d.ts

@@ -1,5 +1,6 @@
 declare const useCalendarDate: (value: Date | null | undefined, defaultDate: Date | undefined) => {
     calendarDate: Date;
     setCalendarDate: (date: Date | undefined) => void;
+    resetCalendarDate: () => void;
 };
 export default useCalendarDate;

package/cjs/Calendar/useCalendarDate.js

@@ -21,6 +21,11 @@ var useCalendarDate = function useCalendarDate(value, defaultDate) {
       setValue(date);
     }
   }, [calendarDate]);
+  var resetCalendarDate = (0, _react.useCallback)(function () {
+    var _ref2;
+
+    setValue((_ref2 = value !== null && value !== void 0 ? value : defaultDate) !== null && _ref2 !== void 0 ? _ref2 : new Date());
+  }, [defaultDate, value]);
   (0, _utils.useUpdateEffect)(function () {
     var _valueRef$current;
 
@@ -31,7 +36,8 @@ var useCalendarDate = function useCalendarDate(value, defaultDate) {
   }, [value]);
   return {
     calendarDate: calendarDate,
-    setCalendarDate: setCalendarDate
+    setCalendarDate: setCalendarDate,
+    resetCalendarDate: resetCalendarDate
   };
 };
 

package/cjs/DatePicker/DatePicker.js

@@ -101,7 +101,8 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   var _useCalendarDate = (0, _useCalendarDate2.default)(valueProp, calendarDefaultDate),
       calendarDate = _useCalendarDate.calendarDate,
-      setCalendarDate = _useCalendarDate.setCalendarDate;
+      setCalendarDate = _useCalendarDate.setCalendarDate,
+      resetCalendarDate = _useCalendarDate.resetCalendarDate;
 
   var _useState = (0, _react.useState)(),
       inputState = _useState[0],
@@ -244,9 +245,9 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    */
 
   var handleClean = (0, _react.useCallback)(function (event) {
-    setCalendarDate(new Date());
     updateValue(event, null);
-  }, [setCalendarDate, updateValue]);
+    resetCalendarDate();
+  }, [resetCalendarDate, updateValue]);
   /**
    * Handle keyboard events.
    */

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;