rsuite 5.17.0-beta.1 → 5.17.0

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");
@@ -161,11 +165,31 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
    */
 
   var updateCalendarDateRange = (0, _react.useCallback)(function (value, calendarKey) {
+    var nextValue = value;
+    var shouldTime = _utils.DateUtils.shouldTime,
+        getHours = _utils.DateUtils.getHours,
+        getMinutes = _utils.DateUtils.getMinutes,
+        getSeconds = _utils.DateUtils.getSeconds,
+        set = _utils.DateUtils.set;
+
+    if (shouldTime(formatStr) && calendarKey === undefined && (value === null || value === void 0 ? void 0 : value.length) === 1 && (defaultCalendarValue === null || defaultCalendarValue === void 0 ? void 0 : defaultCalendarValue.length) === 2) {
+      var calendarEndDate = (calendarDate === null || calendarDate === void 0 ? void 0 : calendarDate[1]) || defaultCalendarValue[1];
+      var _startDate = value[0]; // When updating the start date, the time of the end date should keep the time set by the user by default.
+
+      var _endDate = set((0, _dateUtils.addMonths)(_startDate, 1), {
+        hours: getHours(calendarEndDate),
+        minutes: getMinutes(calendarEndDate),
+        seconds: getSeconds(calendarEndDate)
+      });
+
+      nextValue = [_startDate, _endDate];
+    }
+
     setCalendarDate((0, _utils2.getCalendarDate)({
-      value: value,
+      value: nextValue,
       calendarKey: calendarKey
     }));
-  }, []); // if valueProp changed then update selectValue/hoverValue
+  }, [calendarDate, defaultCalendarValue, formatStr]); // if valueProp changed then update selectValue/hoverValue
 
   (0, _react.useEffect)(function () {
     setSelectedDates(valueProp !== null && valueProp !== void 0 ? valueProp : []);
@@ -399,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);
@@ -463,10 +494,11 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     var nextCalendarDate;
 
     if (value && value.length) {
-      var _startDate = value[0],
+      var _startDate2 = value[0],
           endData = value[1];
-      nextCalendarDate = [_startDate, (0, _dateUtils.isSameMonth)(_startDate, endData) ? (0, _dateUtils.addMonths)(endData, 1) : endData];
+      nextCalendarDate = [_startDate2, (0, _dateUtils.isSameMonth)(_startDate2, endData) ? (0, _dateUtils.addMonths)(endData, 1) : endData];
     } else {
+      // Reset the date on the calendar to the default date
       nextCalendarDate = (0, _utils2.getCalendarDate)({
         value: defaultCalendarValue !== null && defaultCalendarValue !== void 0 ? defaultCalendarValue : null
       });
@@ -568,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')
@@ -592,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/cjs/Disclosure/Disclosure.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import DisclosureButton from './DisclosureButton';
 import DisclosureContent from './DisclosureContent';
-export declare type DisclosureTrigger = 'click' | 'hover';
-export interface DisclosureRenderProps extends Pick<React.HTMLAttributes<HTMLElement>, 'onMouseEnter' | 'onMouseLeave'> {
+export declare type DisclosureTrigger = 'click' | 'mouseover';
+export interface DisclosureRenderProps extends Pick<React.HTMLAttributes<HTMLElement>, 'onMouseOver' | 'onMouseOut'> {
     open: boolean;
 }
 export interface DisclosureProps {

package/cjs/Disclosure/Disclosure.js

@@ -74,7 +74,7 @@ var Disclosure = /*#__PURE__*/_react.default.memo(function (props) {
       });
     }
   });
-  var onMouseEnter = (0, _react.useCallback)(function (event) {
+  var onMouseOver = (0, _react.useCallback)(function (event) {
     if (!open) {
       dispatch({
         type: _DisclosureContext.DisclosureActionTypes.Show
@@ -82,7 +82,7 @@ var Disclosure = /*#__PURE__*/_react.default.memo(function (props) {
       onToggle === null || onToggle === void 0 ? void 0 : onToggle(true, event);
     }
   }, [open, dispatch, onToggle]);
-  var onMouseLeave = (0, _react.useCallback)(function (event) {
+  var onMouseOut = (0, _react.useCallback)(function (event) {
     if (open) {
       dispatch({
         type: _DisclosureContext.DisclosureActionTypes.Hide
@@ -113,13 +113,13 @@ var Disclosure = /*#__PURE__*/_react.default.memo(function (props) {
       open: open
     };
 
-    if (trigger.includes('hover')) {
-      renderProps.onMouseEnter = onMouseEnter;
-      renderProps.onMouseLeave = onMouseLeave;
+    if (trigger.includes('mouseover')) {
+      renderProps.onMouseOver = onMouseOver;
+      renderProps.onMouseOut = onMouseOut;
     }
 
     return renderProps;
-  }, [open, trigger, onMouseEnter, onMouseLeave]);
+  }, [open, trigger, onMouseOver, onMouseOut]);
   return /*#__PURE__*/_react.default.createElement(_DisclosureContext.default.Provider, {
     value: contextValue
   }, children(renderProps, containerElementRef));

package/cjs/FormControl/FormControl.js

@@ -58,7 +58,6 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       AccepterComponent = _props$accepter === void 0 ? _Input.default : _props$accepter,
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? 'form-control' : _props$classPrefix,
-      className = props.className,
       checkAsync = props.checkAsync,
       checkTrigger = props.checkTrigger,
       _props$errorPlacement = props.errorPlacement,
@@ -78,7 +77,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _props$shouldResetWit = props.shouldResetWithUnmount,
       shouldResetWithUnmount = _props$shouldResetWit === void 0 ? false : _props$shouldResetWit,
       rule = props.rule,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount", "rule"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount", "rule"]);
 
   var _useContext2 = (0, _react.useContext)(_FormGroup.FormGroupContext),
       controlId = _useContext2.controlId;
@@ -100,10 +99,9 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
-      prefix = _useClassNames.prefix,
-      merge = _useClassNames.merge;
+      prefix = _useClassNames.prefix;
 
-  var classes = merge(className, withClassPrefix('wrapper'));
+  var classes = withClassPrefix('wrapper');
 
   var handleFieldChange = function handleFieldChange(value, event) {
     handleFieldCheck(value, trigger === 'change');

package/cjs/Navbar/NavbarDropdownMenu.js

@@ -15,17 +15,17 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 
-var _isNil = _interopRequireDefault(require("lodash/isNil"));
+var _utils = require("../utils");
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"));
 
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
 
-var _utils = require("../utils");
+var _useCustom2 = _interopRequireDefault(require("../utils/useCustom"));
 
 var _ = require(".");
 
@@ -68,7 +68,7 @@ var NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props,
       openDirection = _props$openDirection === void 0 ? 'end' : _props$openDirection,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "classPrefix", "children", "openDirection"]);
 
-  var _useCustom = (0, _utils.useCustom)('DropdownMenu'),
+  var _useCustom = (0, _useCustom2.default)('DropdownMenu'),
       rtl = _useCustom.rtl;
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
@@ -94,7 +94,7 @@ var NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props,
   var Icon = rtl ? _AngleLeft.default : _AngleRight.default;
   return /*#__PURE__*/_react.default.createElement(_Disclosure.default, {
     hideOnClickOutside: true,
-    trigger: ['click', 'hover'],
+    trigger: ['click', 'mouseover'],
     onToggle: function onToggle(open, event) {
       return _onToggle === null || _onToggle === void 0 ? void 0 : _onToggle(open, undefined, event);
     }
@@ -117,18 +117,12 @@ var NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props,
         open: open,
         disabled: disabled
       }));
-      var dataAttributes = {
-        'data-event-key': eventKey
-      };
-
-      if (!(0, _isNil.default)(eventKey) && typeof eventKey !== 'string') {
-        dataAttributes['data-event-key-type'] = typeof eventKey;
-      }
-
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
         ref: (0, _utils.mergeRefs)(buttonRef, buttonRef),
-        className: classes
-      }, dataAttributes, buttonProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+        className: classes,
+        "data-event-key": eventKey,
+        "data-event-key-type": typeof eventKey
+      }, buttonProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
         className: prefix('menu-icon')
       }), title, /*#__PURE__*/_react.default.createElement(Icon, {
         className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))