shineout 1.8.5 → 1.8.7-beta.2

package/css/Alert/index.d.ts

@@ -5,59 +5,59 @@ export interface AlertProps extends StandardProps {
 
   /**
    * Content, text or react component
-   * 
+   *
    * 内容，文字或react组件
-   * 
+   *
    * default: -
    */
   children?: React.ReactNode;
 
   /**
    * When the type is true, the status icon is displayed according to the type property. If you need to display a custom icon, pass in ReactElement.
-   * 
+   *
    * 为true时，根据type属性显示状态图标。如果需要显示自定义图标，传入ReactElement。
-   * 
+   *
    * default: -
    */
   icon?: React.ReactElement | boolean;
 
   /**
    * The size for icon
-   * 
+   *
    * icon 的尺寸
-   * 
+   *
    * default: 14
    */
   iconSize?: number;
 
   /**
    * When onClose is empty, no close is displayed. If you need to close and do not need to handle callbacks, set it true.
-   * 
+   *
    * 当 onClose 为空时，不显示关闭。如果需要关闭又不需要处理回调，设置为true即可
-   * 
+   *
    * default: -
    */
   onClose?: (() => void) | boolean;
 
   /**
    * types
-   * 
+   *
    * 类型
-   * 
+   *
    * default: *warning*
-   * 
+   *
    */
-  type?: 'success' | 'info' | 'warning' | 'danger' | 'error';
+  type?: 'success' | 'info' | 'warning' | 'danger' | 'error' | 'confirmwarning';
 
   /**
    * show close button
-   * 
+   *
    * 是否隐藏关闭按钮
-   * 
+   *
    * default: false
    */
   hideClose?: boolean,
 }
 
 declare class Alert extends React.Component<AlertProps> {}
-export default Alert
+export default Alert

package/css/Alert/styles/alert.css

@@ -134,7 +134,8 @@
   fill: var(--success-color, #00cc66);
 }
 .so-alert-danger,
-.so-alert-error {
+.so-alert-error,
+.so-alert-confirmwarning {
   border-color: var(--alert-danger-border-color, #ebccd1);
   background-color: var(--alert-danger-bg, #f2dede);
   color: var(--alert-danger-text-color, #a94442);
@@ -142,14 +143,17 @@
           box-shadow: var(--alert-danger-box-shadow, 'none');
 }
 .so-alert-danger hr,
-.so-alert-error hr {
+.so-alert-error hr,
+.so-alert-confirmwarning hr {
   border-top-color: var(--alert-danger-border-darken-5-color, #e4b9c0);
 }
 .so-alert-danger .alert-link,
-.so-alert-error .alert-link {
+.so-alert-error .alert-link,
+.so-alert-confirmwarning .alert-link {
   color: var(--alert-danger-text-darken-10-color, #843534);
 }
 .so-alert-danger .so-alert-icon path,
-.so-alert-error .so-alert-icon path {
+.so-alert-error .so-alert-icon path,
+.so-alert-confirmwarning .so-alert-icon path {
   fill: var(--danger-color, #f85555);
 }

package/css/Cascader/Result.js

@@ -96,7 +96,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/css/DataList/List.js

@@ -133,7 +133,8 @@ function (_Component) {
         keygen = _this$props2.keygen,
         fixed = _this$props2.fixed,
         rowsInView = _this$props2.rowsInView,
-        lineHeight = _this$props2.lineHeight;
+        lineHeight = _this$props2.lineHeight,
+        value = _this$props2.value;
     if (isEmpty) return _react.default.createElement("div", {
       className: (0, _styles.listClass)('item', 'empty')
     }, empty || (0, _locale.getLocale)('noData'));
@@ -143,7 +144,8 @@ function (_Component) {
       data: data,
       keygen: keygen,
       renderItem: this.renderItem,
-      itemsInView: rowsInView
+      itemsInView: rowsInView,
+      force: value
     });
   };
 
@@ -210,7 +212,8 @@ Index.propTypes = {
   fixed: _propTypes.default.bool,
   rowsInView: _propTypes.default.number,
   height: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-  lineHeight: _propTypes.default.number
+  lineHeight: _propTypes.default.number,
+  value: _propTypes.default.array
 };
 Index.defaultProps = {
   size: 'default',

package/css/EditableArea/EditableArea.js

@@ -110,7 +110,6 @@ function (_React$PureComponent) {
   _proto.renderTextarea = function renderTextarea() {
     var showTextarea = this.state.showTextarea;
     var _this$props = this.props,
-        delay = _this$props.delay,
         placeholder = _this$props.placeholder,
         maxHeight = _this$props.maxHeight,
         value = _this$props.value;
@@ -122,7 +121,7 @@ function (_React$PureComponent) {
       autosize: true,
       value: value,
       rows: 1,
-      delay: delay,
+      delay: 0,
       onChange: this.onChange,
       onBlur: this.onBlur,
       onFocus: this.handleFocus,

package/css/Modal/Panel.js

@@ -222,10 +222,9 @@ function (_PureComponent) {
         position = _this$props7.position,
         bodyStyle = _this$props7.bodyStyle,
         _this$props7$from = _this$props7.from,
-        from = _this$props7$from === void 0 ? null : _this$props7$from,
-        type = _this$props7.type;
+        from = _this$props7$from === void 0 ? null : _this$props7$from;
     var style = {
-      padding: noPadding === true || from === 'method' && type === 'normal' ? 0 : padding
+      padding: noPadding === true ? 0 : padding
     };
     if (position) style.overflow = 'auto';
     if (bodyStyle) style = Object.assign(style, bodyStyle);

package/css/Modal/styles/modal.css

@@ -314,6 +314,12 @@
   width: var(--modal-divider-width, 100%);
   background: var(--modal-divider-color, #ddd);
 }
+.so-modal-mask > .so-card.so-modal-normal .so-modal-body {
+  padding-left: var(--modal-icon-body-padding-right, 40px);
+}
+.so-modal-mask > .so-card.so-modal-normal.so-modal-rtl .so-modal-body {
+  padding-right: var(--modal-icon-body-padding-right, 40px);
+}
 .so-modal-mask > .so-card.so-modal-rtl {
   direction: rtl;
   text-align: right;

package/css/Popover/Confirm.js

@@ -138,7 +138,7 @@ Confirm.propTypes = (0, _objectSpread2.default)({}, (0, _proptypes.getProps)(_pr
   icon: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.node])
 });
 Confirm.defaultProps = {
-  type: 'warning',
+  type: 'confirmwarning',
   icon: true,
   okType: 'danger'
 };

package/css/Popover/Content.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Panel = _interopRequireDefault(require("./Panel"));
+
+function Content(props) {
+  // eslint-disable-next-line
+  return _react.default.createElement(_Panel.default, (0, _extends2.default)({}, props, {
+    useTextStyle: true
+  }));
+}
+
+var _default = Content;
+exports.default = _default;

package/css/Popover/Panel.js

@@ -295,7 +295,8 @@ function (_Component) {
         children = _this$props4.children,
         type = _this$props4.type,
         visible = _this$props4.visible,
-        showArrow = _this$props4.showArrow;
+        showArrow = _this$props4.showArrow,
+        useTextStyle = _this$props4.useTextStyle;
     var show = typeof visible === 'boolean' ? visible : this.state.show;
 
     if (!this.isRendered && !show || !this.parentElement || !children) {
@@ -329,7 +330,7 @@ function (_Component) {
 
     this.element.className = (0, _classnames.default)((0, _styles.popoverClass)('_', position, type), this.props.className, this.id);
     var childrened = (0, _is.isFunc)(children) ? children(this.handleHide) : children;
-    if (typeof childrened === 'string') childrened = _react.default.createElement("span", {
+    if (typeof childrened === 'string' || useTextStyle) childrened = _react.default.createElement("span", {
       className: (0, _styles.popoverClass)('text')
     }, childrened);
     return _reactDom.default.createPortal([showArrow && _react.default.createElement("div", {
@@ -373,7 +374,8 @@ Panel.propTypes = {
   showArrow: _propTypes.default.bool,
   bindChain: _propTypes.default.func,
   zIndex: _propTypes.default.number,
-  clickToCancelDelay: _propTypes.default.bool
+  clickToCancelDelay: _propTypes.default.bool,
+  useTextStyle: _propTypes.default.bool
 };
 Panel.defaultProps = {
   background: '',

package/css/Popover/index.d.ts

@@ -131,7 +131,7 @@ export interface PopoverProps extends StandardProps {
    *
    * default: none
    */
-  type?: 'success' | 'info' | 'warning' | 'danger';
+  type?: 'success' | 'info' | 'warning' | 'danger' | 'confirmwarning';
 
   /**
    * Old API, out of date
@@ -232,8 +232,15 @@ declare class PopoverConfirm extends React.Component<PopoverConfirmProps, {}> {
   render(): JSX.Element;
 }
 
-declare class Popover extends React.Component<PopoverProps, {}> {
+declare class PopoverContent extends React.Component<PopoverProps, {}> {
+  render(): JSX.Element;
+}
+
+export type ContentProps = Omit<PopoverProps, 'content'>;
+
+declare class Popover extends React.Component<ContentProps, {}> {
   static Confirm: typeof PopoverConfirm;
+  static Content: typeof PopoverContent;
 
   render(): JSX.Element;
 }

package/css/Popover/index.js

@@ -17,6 +17,8 @@ var _Panel = _interopRequireDefault(require("./Panel"));
 
 var _Confirm = _interopRequireDefault(require("./Confirm"));
 
+var _Content = _interopRequireDefault(require("./Content"));
+
 var Component = (0, _Container.default)(events);
 
 function Popover(props) {
@@ -28,5 +30,6 @@ function Popover(props) {
 Popover.displayName = 'ShineoutPopover';
 Popover.Confirm = _Confirm.default;
 Popover.Confirm.displayName = 'ShineoutPopoverConfirm';
+Popover.Content = _Content.default;
 var _default = Popover;
 exports.default = _default;

package/css/Popover/styles/popover.css

@@ -308,9 +308,6 @@
   margin-bottom: 8px;
   font-size: var(--font-size-base, 14px);
 }
-.so-popover-confirm .so-popover-mention .so-alert-warning .so-alert-icon path {
-  fill: var(--danger-color, #f85555);
-}
 .so-popover-text {
   display: inline-block;
   max-width: var(--popover-text-max-width, 320px);

package/css/Select/Result.js

@@ -114,7 +114,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/css/Table/SeperateTable.js

@@ -225,6 +225,22 @@ function (_PureComponent) {
 
   };
 
+  _proto.setTop = function setTop(scrollHeight, fullHeight, top) {
+    var _this2 = this;
+
+    var offsetLeft = this.state.offsetLeft;
+    this.tbody.style.marginTop = scrollHeight * top + "px";
+    this.lastScrollTop = fullHeight * top;
+    (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + this.lastScrollTop + "px");
+    setTimeout(function () {
+      _this2.setState({
+        scrollTop: top
+      });
+
+      _this2.lastScrollArgs[1] = top;
+    });
+  };
+
   _proto.checkScrollToIndex = function checkScrollToIndex(index, outerHeight) {
     var _this$props3 = this.props,
         data = _this$props3.data,
@@ -245,7 +261,7 @@ function (_PureComponent) {
   };
 
   _proto.ajustBottom = function ajustBottom(dataChange) {
-    var _this2 = this;
+    var _this3 = this;
 
     var reachBottom = this.lastScrollArgs[1] === 1;
     var drag = this.lastScrollArgs[8];
@@ -254,7 +270,7 @@ function (_PureComponent) {
       if (this.ajustBottomScroll) return;
       this.ajustBottomScroll = true;
       setTimeout(function () {
-        _this2.handleScroll.apply(_this2, _this2.lastScrollArgs);
+        _this3.handleScroll.apply(_this3, _this3.lastScrollArgs);
       });
     }
   };
@@ -314,11 +330,9 @@ function (_PureComponent) {
   };
 
   _proto.resetHeight = function resetHeight() {
-    var _this3 = this;
+    var _this4 = this;
 
-    var _this$state2 = this.state,
-        scrollTop = _this$state2.scrollTop,
-        offsetLeft = _this$state2.offsetLeft;
+    var scrollTop = this.state.scrollTop;
     var _this$props4 = this.props,
         treeColumnsName = _this$props4.treeColumnsName,
         changedByExpand = _this$props4.changedByExpand;
@@ -349,32 +363,16 @@ function (_PureComponent) {
           if (fullHeight <= scrollHeight) {
             index = 0;
           } else {
-            this.tbody.style.marginTop = scrollHeight + "px";
-            (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-            this.lastScrollTop = fullHeight;
+            this.setTop(scrollHeight, fullHeight, 1);
             return;
           }
         }
       }
 
       if (index === 0) {
-        this.lastScrollTop = 0;
-        setTimeout(function () {
-          _this3.setState({
-            scrollTop: 0
-          });
-        });
-        this.tbody.style.marginTop = '0px';
-        (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", '0px');
+        this.setTop(scrollHeight, fullHeight, 0);
       } else if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
-        this.tbody.style.marginTop = scrollHeight + "px";
-        (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-        this.lastScrollTop = fullHeight;
-        setTimeout(function () {
-          _this3.setState({
-            scrollTop: 1
-          });
-        });
+        this.setTop(scrollHeight, fullHeight, 1);
       } else {
         var keepTop = this.lastScrollTop - this.lastScrollArgs[1] * scrollHeight; // keepTop = scrollTopLength - scrollTopLength/fullHeight * scrollHeight
         // keepTop = (1 - scrollHeight / fullHeight) * scrollTopLength
@@ -382,18 +380,14 @@ function (_PureComponent) {
         var scrollTopLength = keepTop / (1 - scrollHeight / fullHeight);
         this.lastScrollTop = scrollTopLength;
         var st = this.lastScrollTop / fullHeight;
-        this.tbody.style.marginTop = st * scrollHeight + "px";
-        (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + this.lastScrollTop + "px");
-        setTimeout(function () {
-          _this3.setState({
-            scrollTop: st
-          });
-        });
+        this.setTop(scrollHeight, fullHeight, st);
       }
     } else if (this.lastScrollTop - height < 1) {
       setTimeout(function () {
-        _this3.setState({
-          scrollTop: _this3.lastScrollTop / fullHeight
+        _this4.lastScrollArgs[1] = _this4.lastScrollTop / fullHeight;
+
+        _this4.setState({
+          scrollTop: _this4.lastScrollTop / fullHeight
         });
       });
     }
@@ -637,14 +631,14 @@ function (_PureComponent) {
         innerScrollAttr = _this$props7.innerScrollAttr,
         bordered = _this$props7.bordered,
         others = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
-    var _this$state3 = this.state,
-        colgroup = _this$state3.colgroup,
-        scrollTop = _this$state3.scrollTop,
-        scrollLeft = _this$state3.scrollLeft,
-        offsetLeft = _this$state3.offsetLeft,
-        offsetRight = _this$state3.offsetRight,
-        currentIndex = _this$state3.currentIndex,
-        resize = _this$state3.resize;
+    var _this$state2 = this.state,
+        colgroup = _this$state2.colgroup,
+        scrollTop = _this$state2.scrollTop,
+        scrollLeft = _this$state2.scrollLeft,
+        offsetLeft = _this$state2.offsetLeft,
+        offsetRight = _this$state2.offsetRight,
+        currentIndex = _this$state2.currentIndex,
+        resize = _this$state2.resize;
     var contentWidth = this.getContentWidth();
     var minWidthSup = columns.find(function (d) {
       return d.minWidth;
@@ -753,9 +747,9 @@ function (_PureComponent) {
     var _this$props9 = this.props,
         fixed = _this$props9.fixed,
         hideHeader = _this$props9.hideHeader;
-    var _this$state4 = this.state,
-        scrollLeft = _this$state4.scrollLeft,
-        floatFixed = _this$state4.floatFixed;
+    var _this$state3 = this.state,
+        scrollLeft = _this$state3.scrollLeft,
+        floatFixed = _this$state3.floatFixed;
     var floatClass = [];
 
     if (floatFixed) {

package/css/Table/SimpleTable.js

@@ -100,6 +100,7 @@ function (_PureComponent) {
   };
 
   _proto.resetColGroup = function resetColGroup() {
+    this.lastColGroup = this.state.colgroup || this.lastColGroup;
     this.setState({
       colgroup: undefined,
       resize: true
@@ -178,7 +179,7 @@ function (_PureComponent) {
       },
       className: (0, _styles.tableClass)(bordered && 'table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
-      colgroup: colgroup,
+      colgroup: colgroup || this.lastColGroup,
       columns: columns,
       resizable: columnResizable
     }), _react.default.createElement(_Thead.default, (0, _extends2.default)({}, this.props, {

package/css/Table/TreeExpand.js

@@ -169,7 +169,7 @@ var _default = function _default(WrappedComponent) {
       }).length === 0;
       var treeIndent = this.getTreeIndent();
       return _react.default.createElement(WrappedComponent, (0, _extends2.default)({}, this.props, {
-        changedByExpand: this.changedByExpand,
+        changedByExpand: this.changedByExpand || this.props.changedByExpand,
         data: data,
         onTreeExpand: this.handleTreeExpand,
         treeExpandKeys: expandKeys,
@@ -187,7 +187,8 @@ var _default = function _default(WrappedComponent) {
     treeColumnsName: _propTypes.default.string,
     defaultTreeExpandKeys: _propTypes.default.array,
     treeExpandKeys: _propTypes.default.array,
-    onTreeExpand: _propTypes.default.func
+    onTreeExpand: _propTypes.default.func,
+    changedByExpand: _propTypes.default.bool
   });
   TreeExpand.defaultProps = {
     defaultTreeExpandKeys: []

package/css/Table/index.d.ts

@@ -542,6 +542,15 @@ export interface TableProps<Value, TRD> extends StandardProps, ListItemStandardP
    */
   columnResizable?: boolean
 
+  /**
+   * Enable in specific scenarios (tree data expansion is controlled) Used to change the default behavior of scroll reset
+   *
+   * 在特定场景（树形数据展开受控)下开启 用来改变滚动条重置的默认行为
+   *
+   * default: false
+   */
+ changedByExpand?: boolean
+
 }
 
 declare class Table<Value = any, TRD = TableRowData> extends React.Component<TableProps<Value, TRD>, {}> {

package/css/Table/index.js

@@ -33,7 +33,7 @@ var _TreeExpand = _interopRequireDefault(require("./TreeExpand"));
 
 var TableWithPagination = (0, _pagable.default)(_Table.default);
 var TableWithTree = (0, _TreeExpand.default)(_Table.default);
-var TableWithPT = (0, _func.compose)(_TreeExpand.default, _pagable.default)(_Table.default);
+var TableWithPT = (0, _func.compose)(_pagable.default, _TreeExpand.default)(_Table.default);
 
 var _default =
 /*#__PURE__*/

package/css/TreeSelect/Result.js

@@ -89,7 +89,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/css/TreeSelect/TreeSelect.js

@@ -294,7 +294,9 @@ function (_PureComponent) {
         data = _this$props7.data,
         absolute = _this$props7.absolute,
         height = _this$props7.height,
-        zIndex = _this$props7.zIndex;
+        zIndex = _this$props7.zIndex,
+        compressed = _this$props7.compressed,
+        value = _this$props7.value;
     var props = {};
     ['mode', 'data', 'datum', 'defaultExpanded', 'defaultExpandAll', 'disabled', 'expanded', 'keygen', 'loader', 'onExpand', 'renderItem', 'line', 'parentClickExpand', 'childrenKey', 'expandIcons'].forEach(function (k) {
       props[k] = _this3.props[k];
@@ -331,7 +333,8 @@ function (_PureComponent) {
         overflowY: 'auto'
       },
       fixed: "min",
-      zIndex: zIndex
+      zIndex: zIndex,
+      value: multiple && !compressed ? value : undefined
     }, _react.default.createElement("div", {
       className: (0, _styles.treeSelectClass)('tree-wrapper')
     }, content));

package/css/icons/index.js

@@ -59,6 +59,7 @@ var _default = {
   Recovery: icon(recovery),
   Warning: icon(warning),
   Check: icon(check),
-  Preview: icon(preview)
+  Preview: icon(preview),
+  Confirmwarning: icon(warning)
 };
 exports.default = _default;

package/css/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.5' }
+export default { utils, version: '1.8.7-beta.2' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

@@ -222,6 +222,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.8.5'
+  version: '1.8.7-beta.2'
 };
 exports.default = _default;

package/css/utils/dom/element.js

@@ -214,15 +214,15 @@ var addResizeObserver = function addResizeObserver(el, handler, options) {
             width = _entry$0$contentRect.width,
             height = _entry$0$contentRect.height;
 
-        if (direction === 'x') {
+        if (width && direction === 'x') {
           if (lastWidth !== width) {
             handler(entry);
           }
         } else if (direction === 'y') {
-          if (lastHeight !== height) {
+          if (height && lastHeight !== height) {
             handler(entry);
           }
-        } else {
+        } else if (width && height) {
           handler(entry, {
             x: lastWidth !== width,
             y: lastHeight !== height

package/css/utils/proptypes.js

@@ -15,7 +15,7 @@ function getProps(PropTypes) {
     grid: PropTypes.oneOfType([PropTypes.number, PropTypes.object]),
     placeholder: PropTypes.oneOfType([PropTypes.string, PropTypes.element, PropTypes.func]),
     size: PropTypes.oneOf(['small', 'default', 'large']),
-    type: PropTypes.oneOf(['primary', 'default', 'secondary', 'success', 'info', 'warning', 'error', 'danger', 'link'])
+    type: PropTypes.oneOf(['primary', 'default', 'secondary', 'success', 'info', 'warning', 'error', 'danger', 'link', 'confirmwarning'])
   };
 
   for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {

package/css/utils/validate/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
 var _Datum = _interopRequireDefault(require("../../Datum"));
@@ -58,7 +60,10 @@ function getRule(rules, props) {
 
   if (other.min !== undefined || other.max !== undefined) {
     if (type === 'number' || type === 'integer') {
-      return (0, _range.default)(props);
+      return (0, _range.default)((0, _objectSpread2.default)({}, props, {
+        min: other.min,
+        max: other.max
+      }));
     }
 
     return (0, _rangeLength.default)(props);