rsuite 5.17.0-beta.2 → 5.18.0-beta.3

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+# [5.18.0](https://github.com/rsuite/rsuite/compare/v5.17.1...v5.18.0) (2022-09-08)
+
+### Bug Fixes
+
+- **CheckTreePicker:** fix uncheckable style errors ([#2695](https://github.com/rsuite/rsuite/issues/2695)) ([b47a048](https://github.com/rsuite/rsuite/commit/b47a048f358ca187079ec049340288c72c8999bd))
+- **DateRangePicker:** fix predefined range and OK button conflict ([#2701](https://github.com/rsuite/rsuite/issues/2701)) ([e538d57](https://github.com/rsuite/rsuite/commit/e538d57e209548f2ca9c9b1f937e275181ae97d9))
+- **Dropdown.Menu:** fix custom className overriding rsuite classNames ([#2703](https://github.com/rsuite/rsuite/issues/2703)) ([db1a4db](https://github.com/rsuite/rsuite/commit/db1a4dbf5ddd7cbd4765e91f76bc4c4f8eb598c2))
+- **FormControl:** fix InputGroup not filling the container when fluid ([#2689](https://github.com/rsuite/rsuite/issues/2689)) ([d7b5550](https://github.com/rsuite/rsuite/commit/d7b55506d9810fd854c4ebe60c99a36e9fb9545e))
+- **Input:** fix missing focus ring when mouse hover ([#2702](https://github.com/rsuite/rsuite/issues/2702)) ([f548514](https://github.com/rsuite/rsuite/commit/f548514ed93945d27903190627d03380874d8f1a))
+- **List:** fix helper/holder classname ([#2697](https://github.com/rsuite/rsuite/issues/2697)) ([cd2c42d](https://github.com/rsuite/rsuite/commit/cd2c42d4e3fc9659e3936bec26117cc79882420c))
+
+### Features
+
+- **List:** allow sort with non-adjacent collection ([#2690](https://github.com/rsuite/rsuite/issues/2690)) ([24cfffb](https://github.com/rsuite/rsuite/commit/24cfffb32253e5da463807768318be22bc647ceb))
+- **Uploader:** add support for Button properties on Uploader ([#2688](https://github.com/rsuite/rsuite/issues/2688)) ([6c07781](https://github.com/rsuite/rsuite/commit/6c07781c13a1d46a9220511cd046d668ce593122))
+
+## [5.17.1](https://github.com/rsuite/rsuite/compare/v5.17.0...v5.17.1) (2022-09-01)
+
+### Bug Fixes
+
+- **InputGroup:** fix icons not being vertically centered within the input ([#2680](https://github.com/rsuite/rsuite/issues/2680)) ([b10a050](https://github.com/rsuite/rsuite/commit/b10a050fb52f6fbc23e2cc308d57d67a515596e7))
+
+### Features
+
+- **DatePicker,DateRangePicker:** support to disable keyboard input ([#2673](https://github.com/rsuite/rsuite/issues/2673)) ([01ec4a8](https://github.com/rsuite/rsuite/commit/01ec4a8587d72842f0ae2d76ee51715e9bf7c6c2))
+
 # [5.17.0](https://github.com/rsuite/rsuite/compare/v5.16.6...v5.17.0) (2022-08-26)
 
 ### Features

package/CheckTreePicker/styles/index.less

@@ -92,7 +92,7 @@
   }
 
   // Uncheckable state
-  &-all-uncheckable > .rs-check-item .rs-checkbox-checker > label {
+  &-all-uncheckable .rs-check-item .rs-checkbox-checker > label {
     padding-left: 22px; // 10px + 12px
 
     &::before {

package/DatePicker/styles/index.less

@@ -42,6 +42,10 @@
 
   .rs-picker-toolbar {
     max-width: 100%;
+
+    &-ranges {
+      max-width: 400px;
+    }
   }
 
   .rs-calendar {

package/Form/styles/mixin.less

@@ -23,7 +23,6 @@
   &:focus,
   &:hover:not(:disabled) {
     border-color: var(--rs-input-focus-border);
-    outline: 0;
   }
 
   &:focus {

package/FormControl/styles/index.less

@@ -2,11 +2,17 @@
 @import '../../Form/styles/mixin';
 
 // Full container.
-.rs-form-fluid .rs-form-control-wrapper {
-  width: 100%;
+.rs-form-fluid {
+  .rs-form-control-wrapper {
+    width: 100%;
 
-  > .rs-input-number,
-  > .rs-input {
+    > .rs-input-number,
+    > .rs-input {
+      width: 100%;
+    }
+  }
+
+  &.rs-form-vertical .rs-form-group .rs-input-group {
     width: 100%;
   }
 }

package/InputGroup/styles/index.less

@@ -165,7 +165,11 @@
       top: 0;
       background: none;
       border: none;
-      padding: 11px 13px 8px 13px;
+      padding: 10px 13px;
+
+      &.rs-input-group-btn {
+        padding: 8px 13px;
+      }
     }
 
     .rs-input-group-btn ~ input.rs-input,

package/Uploader/styles/index.less

@@ -12,14 +12,6 @@
       position: absolute !important;
       clip: rect(1px 1px 1px 1px);
     }
-
-    &-disabled {
-      //cursor: not-allowed;
-
-      .rs-uploader-trigger-btn {
-        cursor: not-allowed !important;
-      }
-    }
   }
 
   &-file-item-disabled {
@@ -313,13 +305,6 @@
   }
 }
 
-.rs-uploader-text,
-.rs-uploader-picture-text {
-  .rs-uploader-trigger-btn {
-    .rs-btn();
-  }
-}
-
 .rs-uploader-picture-text {
   .rs-uploader-file-item {
     position: relative;

package/cjs/DatePicker/DatePicker.d.ts

@@ -9,6 +9,8 @@ export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, Form
     ranges?: RangeType<Date>[];
     /** Calendar panel default presentation date and time */
     calendarDefaultDate?: Date;
+    /** Rendered as an input, the date can be entered via the keyboard */
+    editable?: boolean;
     /** Format date */
     format?: string;
     /**

package/cjs/DatePicker/DatePicker.js

@@ -46,6 +46,8 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       calendarDefaultDate = props.calendarDefaultDate,
       _props$cleanable = props.cleanable,
       cleanable = _props$cleanable === void 0 ? true : _props$cleanable,
+      _props$editable = props.editable,
+      editable = _props$editable === void 0 ? true : _props$editable,
       defaultValue = props.defaultValue,
       disabled = props.disabled,
       _props$format = props.format,
@@ -84,7 +86,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onSelect = props.onSelect,
       onToggleMonthDropdown = props.onToggleMonthDropdown,
       onToggleTimeDropdown = props.onToggleTimeDropdown,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "defaultValue", "disabled", "format", "isoWeek", "limitEndYear", "locale", "menuClassName", "appearance", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "toggleAs", "caretAs", "disabledDate", "renderValue", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "editable", "defaultValue", "disabled", "format", "isoWeek", "limitEndYear", "locale", "menuClassName", "appearance", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "toggleAs", "caretAs", "disabledDate", "renderValue", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown"]);
 
   var _useCustom = (0, _utils.useCustom)('DatePicker', overrideLocale),
       locale = _useCustom.locale,
@@ -468,7 +470,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     as: toggleAs,
     ref: targetRef,
     appearance: appearance,
-    editable: true,
+    editable: editable,
     inputValue: value ? formatDate(value, formatStr) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : formatStr,
     inputMask: _utils.DateUtils.getDateMask(formatStr),

package/cjs/DatePicker/Toolbar.js

@@ -75,6 +75,7 @@ var Toolbar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     justifyContent: "space-between",
     alignItems: "flex-start"
   }, rest), /*#__PURE__*/_react.default.createElement(_PredefinedRanges.default, {
+    wrap: true,
     className: prefix('ranges'),
     ranges: ranges,
     calendarDate: calendarDate,

package/cjs/DateRangePicker/DateRangePicker.d.ts

@@ -7,6 +7,8 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     ranges?: RangeType[];
     /** Format date */
     format?: string;
+    /** Rendered as an input, the date can be entered via the keyboard */
+    editable?: boolean;
     /** The date range that will be selected when you click on the date */
     hoverRange?: 'week' | 'month' | ((date: Date) => DateRange);
     /** Whether to click once on selected date range，Can be used with hoverRange */

package/cjs/DateRangePicker/DateRangePicker.js

@@ -55,6 +55,8 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       className = props.className,
       _props$appearance = props.appearance,
       appearance = _props$appearance === void 0 ? 'default' : _props$appearance,
+      _props$editable = props.editable,
+      editable = _props$editable === void 0 ? true : _props$editable,
       _props$cleanable = props.cleanable,
       cleanable = _props$cleanable === void 0 ? true : _props$cleanable,
       _props$character = props.character,
@@ -98,7 +100,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       onOpen = props.onOpen,
       onSelect = props.onSelect,
       renderTitle = props.renderTitle,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "showMeridian", "style", "toggleAs", "caretAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect", "renderTitle"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "editable", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "showMeridian", "style", "toggleAs", "caretAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect", "renderTitle"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       merge = _useClassNames.merge,
@@ -672,7 +674,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     as: toggleAs,
     ref: targetRef,
     appearance: appearance,
-    editable: true,
+    editable: editable,
     inputMask: _utils.DateUtils.getDateMask(rangeFormatStr),
     inputValue: value ? getDisplayString(value, true) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,

package/cjs/Dropdown/DropdownMenu.js

@@ -69,8 +69,9 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       onSelect = props.onSelect,
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? 'dropdown-menu' : _props$classPrefix,
+      className = props.className,
       children = props.children,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "activeKey", "onSelect", "classPrefix", "children"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "activeKey", "onSelect", "classPrefix", "className", "children"]);
   var nav = (0, _react.useContext)(_NavContext.default);
   var dropdown = (0, _react.useContext)(_DropdownContext.default);
 
@@ -113,7 +114,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
 
   if (!dropdown) {
-    var classes = merge(props.className, withClassPrefix());
+    var classes = merge(className, withClassPrefix());
     return /*#__PURE__*/_react.default.createElement(_DropdownContext.default.Provider, {
       value: contextValue
     }, /*#__PURE__*/_react.default.createElement(_Menubar.default, {
@@ -130,9 +131,8 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
   var _omit = (0, _omit2.default)(rest, ['trigger']),
       icon = _omit.icon,
-      className = _omit.className,
       disabled = _omit.disabled,
-      menuProps = (0, _objectWithoutPropertiesLoose2.default)(_omit, ["icon", "className", "disabled"]);
+      menuProps = (0, _objectWithoutPropertiesLoose2.default)(_omit, ["icon", "disabled"]);
 
   var Icon = rtl ? _AngleLeft.default : _AngleRight.default;
   return /*#__PURE__*/_react.default.createElement(_Menu.default, {

package/cjs/List/helper/useSortHelper.js

@@ -23,6 +23,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+var helperElementClass = 'rs-list-item-helper';
+var holderElementClass = 'rs-list-item-holder';
+
 var useSortHelper = function useSortHelper(config) {
   var autoScroll = config.autoScroll,
       pressDelay = config.pressDelay,
@@ -49,14 +52,10 @@ var useSortHelper = function useSortHelper(config) {
    * start dragging
    * */
 
-  var handlePress = (0, _react.useCallback)(function (mouseDownEvent, targetNode, curManagedItem) {
+  var handlePress = (0, _react.useCallback)(function (mouseDownEvent, _targetNode, curManagedItem) {
     var _curManagedItem$info$, _curManagedItem$info$2, _activeNodeHelper;
 
-    if (!isMounted()) return;
-    var listItemBaseClassName = targetNode.classList[0]; // get list item base className
-
-    var helperElementClass = listItemBaseClassName + "-helper";
-    var holderElementClass = listItemBaseClassName + "-holder"; // data
+    if (!isMounted()) return; // data
 
     var containerElement = containerRef.current;
     var activeNode = curManagedItem.node;
@@ -135,7 +134,6 @@ var useSortHelper = function useSortHelper(config) {
       var aTop = activeNodeOffsetEdge.top || 0;
       var cTop = containerScrollDelta.top || 0;
       var sortingOffsetY = aTop + activeNodeHolderTranslate.y + cTop;
-      var activeNodeHeight = parseFloat(activeNodeStyle.height) || 0;
 
       for (var i = 0, len = listItemManagerRefs.length; i < len; i++) {
         var _listItemManagerRefs$;
@@ -170,17 +168,24 @@ var useSortHelper = function useSortHelper(config) {
         var curEdgeOffsetTop = curEdgeOffset.top || 0;
 
         if (prvNode && currentNodeIndex > activeNodeOldIndex && sortingOffsetY + offsetY >= curEdgeOffsetTop) {
-          translate.y = -activeNodeHeight;
+          var _prvNode$edgeOffset;
+
+          var yOffset = (((_prvNode$edgeOffset = prvNode.edgeOffset) === null || _prvNode$edgeOffset === void 0 ? void 0 : _prvNode$edgeOffset.top) || 0) - curEdgeOffsetTop;
+          translate.y = yOffset;
           animatedNodesOffset[currentNodeIndex] = {
             x: 0,
-            y: currentNode.offsetHeight
+            y: -yOffset
           };
           activeNodeNextIndex = currentNodeIndex;
         } else if (nextNode && currentNodeIndex < activeNodeOldIndex && sortingOffsetY <= curEdgeOffsetTop + offsetY) {
-          translate.y = activeNodeHeight;
+          var _nextNode$edgeOffset;
+
+          var _yOffset = (((_nextNode$edgeOffset = nextNode.edgeOffset) === null || _nextNode$edgeOffset === void 0 ? void 0 : _nextNode$edgeOffset.top) || 0) - curEdgeOffsetTop;
+
+          translate.y = _yOffset;
           animatedNodesOffset[currentNodeIndex] = {
             x: 0,
-            y: -currentNode.offsetHeight
+            y: -_yOffset
           };
 
           if (activeNodeNextIndex === -1) {

package/cjs/Uploader/UploadTrigger.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { UploaderLocale } from '../locales';
-export interface UploadTriggerProps {
+import { ButtonProps } from '../Button';
+export interface UploadTriggerProps extends ButtonProps {
     as?: React.ElementType;
     name?: string;
     multiple?: boolean;

package/cjs/Uploader/UploadTrigger.js

@@ -7,27 +7,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _Ripple = _interopRequireDefault(require("../Ripple"));
-
 var _utils = require("../utils");
 
-var Button = function Button(props) {
-  return /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({}, props, {
-    type: "button"
-  }));
-};
+var _Button = _interopRequireDefault(require("../Button"));
 
 var UploadTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
-      Component = _props$as === void 0 ? Button : _props$as,
+      Component = _props$as === void 0 ? _Button.default : _props$as,
       name = props.name,
       accept = props.accept,
       multiple = props.multiple,
@@ -138,7 +132,7 @@ var UploadTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     buttonProps.onDrop = handleDrop;
   }
 
-  var trigger = children ? /*#__PURE__*/_react.default.cloneElement(_react.default.Children.only(children), buttonProps) : /*#__PURE__*/_react.default.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload, /*#__PURE__*/_react.default.createElement(_Ripple.default, null));
+  var trigger = children ? /*#__PURE__*/_react.default.cloneElement(_react.default.Children.only(children), buttonProps) : /*#__PURE__*/_react.default.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: rootRef,
     className: classes

package/cjs/Uploader/Uploader.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { UploadTriggerProps } from './UploadTrigger';
 import { WithAsProps } from '../@types/common';
 import { UploaderLocale } from '../locales';
 export interface FileType {
@@ -19,7 +20,7 @@ export interface UploaderInstance {
     root: HTMLElement;
     start: (file?: FileType) => void;
 }
-export interface UploaderProps extends WithAsProps {
+export interface UploaderProps extends WithAsProps, Omit<UploadTriggerProps, 'onChange' | 'onError' | 'onProgress'> {
     /** Uploading URL */
     action: string;
     /** File types that can be accepted. See input accept Attribute */

package/cjs/Uploader/test/Uploader.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/Uploader/test/Uploader.test.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Uploader = _interopRequireDefault(require("../Uploader"));
+
+/*#__PURE__*/
+_react.default.createElement(_Uploader.default, {
+  appearance: "primary",
+  action: "#"
+});
+
+/*#__PURE__*/
+_react.default.createElement(_Uploader.default, {
+  appearance: "primary",
+  color: "orange",
+  action: "#"
+});
+
+/*#__PURE__*/
+_react.default.createElement(_Uploader.default, {
+  size: "lg",
+  action: "#"
+});