rsuite 4.9.3 → 4.10.2

package/es/CheckTreePicker/CheckTreePicker.js

@@ -471,11 +471,11 @@ function (_React$Component) {
       nextState.value = value;
     }
 
-    if (compareArray(expandItemValues, prevState.expandItemValues)) {
+    if (compareArray(expandItemValues, prevState.expandItemValues) && _isArray(expandItemValues)) {
       nextState.expandItemValues = expandItemValues;
     }
 
-    if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues)) {
+    if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues) && _isArray(uncheckableItemValues)) {
       nextState.uncheckableItemValues = uncheckableItemValues;
     }
 
@@ -542,7 +542,7 @@ function (_React$Component) {
 
     if (compareArray(value, prevState.value)) {
       this.unserializeLists({
-        check: value,
+        check: value !== null && value !== void 0 ? value : [],
         expand: expandItemValues
       });
       this.setState({
@@ -556,7 +556,7 @@ function (_React$Component) {
   _proto.updateExpandItemValuesChange = function updateExpandItemValuesChange(prevState) {
     var expandItemValues = this.props.expandItemValues;
 
-    if (compareArray(expandItemValues, prevState.expandItemValues)) {
+    if (compareArray(expandItemValues, prevState.expandItemValues) && _isArray(expandItemValues)) {
       this.unserializeLists({
         expand: expandItemValues
       });
@@ -573,7 +573,7 @@ function (_React$Component) {
         expandItemValues = _this$state3.expandItemValues;
     var uncheckableItemValues = this.props.uncheckableItemValues;
 
-    if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues)) {
+    if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues) && _isArray(uncheckableItemValues)) {
       this.flattenNodes(data);
       this.unserializeLists({
         check: selectedValues,
@@ -625,6 +625,7 @@ function (_React$Component) {
 
     if (isEveryChildChecked(node, this.nodes, this.props)) {
       this.nodes[node.refKey].checkAll = true;
+      this.nodes[node.refKey].check = true;
       return CHECK_STATE.CHECK;
     }
 
@@ -844,7 +845,7 @@ function (_React$Component) {
     });
   }
   /**
-   * 过滤选中的values中不包含 uncheckableItemValues 的那些值
+   * 过滤选中的 values 中不包含 uncheckableItemValues 的那些值
    * @param {*} values
    */
   ;
@@ -1005,7 +1006,7 @@ function (_React$Component) {
   };
 
   _proto.toggleNode = function toggleNode(key, node, toggleValue) {
-    // 如果该节点处于 disabledChecbox，则忽略该值
+    // 如果该节点处于 disabledCheckbox，则忽略该值
     if (!node.uncheckable) {
       this.nodes[node.refKey][key] = toggleValue;
     }

package/es/MultiCascader/DropdownMenu.js

@@ -146,7 +146,7 @@ function (_React$Component) {
       className: classes,
       componentClass: "li",
       indeterminate: cascade && !active && this.utils.isSomeChildChecked(node, value),
-      onSelectItem: this.handleSelect.bind(this, layer, node),
+      onSelectItem: this.handleSelect.bind(this, layer),
       onCheck: onCheck,
       checkable: !uncheckable
     }, renderMenuItem ? renderMenuItem(label, node) : label, children ? React.createElement("span", {

package/es/MultiCascader/MultiCascader.d.ts

@@ -41,6 +41,14 @@ export interface MultiCascaderProps<ValueType = any> extends FormControlPickerPr
     event: React.SyntheticEvent<HTMLElement>
   ) => void;
 
+  /** Called after the checkbox state changes */
+  onCheck?: (
+    value: ValueType,
+    item: any,
+    checked: boolean,
+    event: React.SyntheticEvent<HTMLElement>
+  ) => void;
+
   /** Called when clean */
   onClean?: (event: React.SyntheticEvent<HTMLElement>) => void;
 

package/es/MultiCascader/MultiCascader.js

@@ -37,9 +37,10 @@ function (_React$Component) {
     _this.handleCheck = function (item, event, checked) {
       var _this$props = _this.props,
           valueKey = _this$props.valueKey,
-          onChange = _this$props.onChange,
           cascade = _this$props.cascade,
-          uncheckableItemValues = _this$props.uncheckableItemValues;
+          uncheckableItemValues = _this$props.uncheckableItemValues,
+          onChange = _this$props.onChange,
+          onCheck = _this$props.onCheck;
       var itemValue = item[valueKey];
       var value = [];
 
@@ -64,6 +65,7 @@ function (_React$Component) {
       }
 
       onChange === null || onChange === void 0 ? void 0 : onChange(value, event);
+      onCheck === null || onCheck === void 0 ? void 0 : onCheck(value, item, checked, event);
     };
 
     _this.handleChangeForSearchItem = function (value, checked, event) {
@@ -543,7 +545,8 @@ MultiCascader.propTypes = _extends({}, listPickerPropTypes, {
   renderMenuItem: PropTypes.func,
   renderMenu: PropTypes.func,
   onSearch: PropTypes.func,
-  onSelect: PropTypes.func
+  onSelect: PropTypes.func,
+  onCheck: PropTypes.func
 });
 MultiCascader.defaultProps = _extends({}, listPickerDefaultProps, {
   searchable: true,

package/es/Overlay/OverlayTrigger.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AnimationEventProps, StandardProps, TypeAttributes } from '../@types/common';
 
-export type OverlayTriggerTrigger = 'click' | 'hover' | 'focus' | 'active' | 'none';
+export type OverlayTriggerTrigger = 'click' | 'contextMenu' | 'hover' | 'focus' | 'active' | 'none';
 
 export interface TriggerProps extends AnimationEventProps, StandardProps {
   /** Triggering events */

package/es/Overlay/OverlayTrigger.js

@@ -49,7 +49,7 @@ function (_React$Component) {
       var trigger = _this.props.trigger;
       _this.mouseEnteredToSpeaker = false;
 
-      if (!isOneOf('click', trigger) && !isOneOf('active', trigger)) {
+      if (!isOneOf('click', trigger) && !isOneOf('active', trigger) && !isOneOf('contextMenu', trigger)) {
         _this.hideWithCheck();
       }
     };
@@ -113,6 +113,10 @@ function (_React$Component) {
       }
     };
 
+    _this.preventDefault = function (event) {
+      event.preventDefault();
+    };
+
     _this.handleDelayedShow = function () {
       var _this$props2 = _this.props,
           delayShow = _this$props2.delayShow,
@@ -216,6 +220,8 @@ function (_React$Component) {
 
     if (isOneOf('click', trigger)) {
       overlayProps.onHide = createChainedFunction(this.hide, onHide);
+    } else if (isOneOf('contextMenu', trigger)) {
+      overlayProps.onHide = createChainedFunction(this.hide, onHide);
     } else if (isOneOf('active', trigger)) {
       overlayProps.onHide = createChainedFunction(this.hide, onHide);
     }
@@ -245,6 +251,7 @@ function (_React$Component) {
         children = _this$props5.children,
         speaker = _this$props5.speaker,
         onClick = _this$props5.onClick,
+        onContextMenu = _this$props5.onContextMenu,
         trigger = _this$props5.trigger,
         onMouseOver = _this$props5.onMouseOver,
         onMouseOut = _this$props5.onMouseOut,
@@ -264,6 +271,10 @@ function (_React$Component) {
         props.onClick = createChainedFunction(this.toggleHideAndShow, props.onClick);
       }
 
+      if (isOneOf('contextMenu', trigger)) {
+        props.onContextMenu = createChainedFunction(this.preventDefault, this.toggleHideAndShow, triggerProps.onContextMenu, onContextMenu);
+      }
+
       if (isOneOf('active', trigger)) {
         props.onClick = createChainedFunction(this.handleDelayedShow, props.onClick);
       }

package/es/Table/styles/common.less

@@ -166,11 +166,12 @@
     border-style: solid;
     border-width: 0;
     border-color: @table-border-color;
-    display: block;
     overflow: hidden;
     position: absolute;
     white-space: normal;
     background: @table-body-background;
+    display: table;
+    table-layout: fixed;
 
     &.first {
       border-left-width: 0;

package/es/utils/treeUtils.js

@@ -146,7 +146,11 @@ export function treeDeprecatedWarning(props, keys) {
  */
 
 export function compareArray(a, b) {
-  return _isArray(a) && _isArray(b) && !shallowEqualArray(a, b);
+  if (!(_isArray(a) && _isArray(b))) {
+    return a !== b;
+  }
+
+  return !shallowEqualArray(a, b);
 }
 /**
  * 获取 expandAll 的 value

package/lib/CheckTreePicker/CheckTreePicker.js

@@ -505,11 +505,11 @@ function (_React$Component) {
       nextState.value = value;
     }
 
-    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues)) {
+    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues) && (0, _isArray2.default)(expandItemValues)) {
       nextState.expandItemValues = expandItemValues;
     }
 
-    if ((0, _treeUtils.compareArray)(uncheckableItemValues, prevState.uncheckableItemValues)) {
+    if ((0, _treeUtils.compareArray)(uncheckableItemValues, prevState.uncheckableItemValues) && (0, _isArray2.default)(uncheckableItemValues)) {
       nextState.uncheckableItemValues = uncheckableItemValues;
     }
 
@@ -576,7 +576,7 @@ function (_React$Component) {
 
     if ((0, _treeUtils.compareArray)(value, prevState.value)) {
       this.unserializeLists({
-        check: value,
+        check: value !== null && value !== void 0 ? value : [],
         expand: expandItemValues
       });
       this.setState({
@@ -590,7 +590,7 @@ function (_React$Component) {
   _proto.updateExpandItemValuesChange = function updateExpandItemValuesChange(prevState) {
     var expandItemValues = this.props.expandItemValues;
 
-    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues)) {
+    if ((0, _treeUtils.compareArray)(expandItemValues, prevState.expandItemValues) && (0, _isArray2.default)(expandItemValues)) {
       this.unserializeLists({
         expand: expandItemValues
       });
@@ -607,7 +607,7 @@ function (_React$Component) {
         expandItemValues = _this$state3.expandItemValues;
     var uncheckableItemValues = this.props.uncheckableItemValues;
 
-    if ((0, _treeUtils.compareArray)(uncheckableItemValues, prevState.uncheckableItemValues)) {
+    if ((0, _treeUtils.compareArray)(uncheckableItemValues, prevState.uncheckableItemValues) && (0, _isArray2.default)(uncheckableItemValues)) {
       this.flattenNodes(data);
       this.unserializeLists({
         check: selectedValues,
@@ -659,6 +659,7 @@ function (_React$Component) {
 
     if ((0, _utils2.isEveryChildChecked)(node, this.nodes, this.props)) {
       this.nodes[node.refKey].checkAll = true;
+      this.nodes[node.refKey].check = true;
       return _constants.CHECK_STATE.CHECK;
     }
 
@@ -878,7 +879,7 @@ function (_React$Component) {
     });
   }
   /**
-   * 过滤选中的values中不包含 uncheckableItemValues 的那些值
+   * 过滤选中的 values 中不包含 uncheckableItemValues 的那些值
    * @param {*} values
    */
   ;
@@ -1039,7 +1040,7 @@ function (_React$Component) {
   };
 
   _proto.toggleNode = function toggleNode(key, node, toggleValue) {
-    // 如果该节点处于 disabledChecbox，则忽略该值
+    // 如果该节点处于 disabledCheckbox，则忽略该值
     if (!node.uncheckable) {
       this.nodes[node.refKey][key] = toggleValue;
     }

package/lib/MultiCascader/DropdownMenu.js

@@ -168,7 +168,7 @@ function (_React$Component) {
       className: classes,
       componentClass: "li",
       indeterminate: cascade && !active && this.utils.isSomeChildChecked(node, value),
-      onSelectItem: this.handleSelect.bind(this, layer, node),
+      onSelectItem: this.handleSelect.bind(this, layer),
       onCheck: onCheck,
       checkable: !uncheckable
     }, renderMenuItem ? renderMenuItem(label, node) : label, children ? React.createElement("span", {

package/lib/MultiCascader/MultiCascader.d.ts

@@ -41,6 +41,14 @@ export interface MultiCascaderProps<ValueType = any> extends FormControlPickerPr
     event: React.SyntheticEvent<HTMLElement>
   ) => void;
 
+  /** Called after the checkbox state changes */
+  onCheck?: (
+    value: ValueType,
+    item: any,
+    checked: boolean,
+    event: React.SyntheticEvent<HTMLElement>
+  ) => void;
+
   /** Called when clean */
   onClean?: (event: React.SyntheticEvent<HTMLElement>) => void;
 

package/lib/MultiCascader/MultiCascader.js

@@ -66,9 +66,10 @@ function (_React$Component) {
     _this.handleCheck = function (item, event, checked) {
       var _this$props = _this.props,
           valueKey = _this$props.valueKey,
-          onChange = _this$props.onChange,
           cascade = _this$props.cascade,
-          uncheckableItemValues = _this$props.uncheckableItemValues;
+          uncheckableItemValues = _this$props.uncheckableItemValues,
+          onChange = _this$props.onChange,
+          onCheck = _this$props.onCheck;
       var itemValue = item[valueKey];
       var value = [];
 
@@ -93,6 +94,7 @@ function (_React$Component) {
       }
 
       onChange === null || onChange === void 0 ? void 0 : onChange(value, event);
+      onCheck === null || onCheck === void 0 ? void 0 : onCheck(value, item, checked, event);
     };
 
     _this.handleChangeForSearchItem = function (value, checked, event) {
@@ -569,7 +571,8 @@ MultiCascader.propTypes = (0, _extends3.default)({}, _propTypes2.listPickerPropT
   renderMenuItem: _propTypes.default.func,
   renderMenu: _propTypes.default.func,
   onSearch: _propTypes.default.func,
-  onSelect: _propTypes.default.func
+  onSelect: _propTypes.default.func,
+  onCheck: _propTypes.default.func
 });
 MultiCascader.defaultProps = (0, _extends3.default)({}, _propTypes2.listPickerDefaultProps, {
   searchable: true,

package/lib/Overlay/OverlayTrigger.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AnimationEventProps, StandardProps, TypeAttributes } from '../@types/common';
 
-export type OverlayTriggerTrigger = 'click' | 'hover' | 'focus' | 'active' | 'none';
+export type OverlayTriggerTrigger = 'click' | 'contextMenu' | 'hover' | 'focus' | 'active' | 'none';
 
 export interface TriggerProps extends AnimationEventProps, StandardProps {
   /** Triggering events */

package/lib/Overlay/OverlayTrigger.js

@@ -70,7 +70,7 @@ function (_React$Component) {
       var trigger = _this.props.trigger;
       _this.mouseEnteredToSpeaker = false;
 
-      if (!(0, _isOneOf.default)('click', trigger) && !(0, _isOneOf.default)('active', trigger)) {
+      if (!(0, _isOneOf.default)('click', trigger) && !(0, _isOneOf.default)('active', trigger) && !(0, _isOneOf.default)('contextMenu', trigger)) {
         _this.hideWithCheck();
       }
     };
@@ -134,6 +134,10 @@ function (_React$Component) {
       }
     };
 
+    _this.preventDefault = function (event) {
+      event.preventDefault();
+    };
+
     _this.handleDelayedShow = function () {
       var _this$props2 = _this.props,
           delayShow = _this$props2.delayShow,
@@ -236,6 +240,8 @@ function (_React$Component) {
 
     if ((0, _isOneOf.default)('click', trigger)) {
       overlayProps.onHide = (0, _createChainedFunction.default)(this.hide, onHide);
+    } else if ((0, _isOneOf.default)('contextMenu', trigger)) {
+      overlayProps.onHide = (0, _createChainedFunction.default)(this.hide, onHide);
     } else if ((0, _isOneOf.default)('active', trigger)) {
       overlayProps.onHide = (0, _createChainedFunction.default)(this.hide, onHide);
     }
@@ -265,6 +271,7 @@ function (_React$Component) {
         children = _this$props5.children,
         speaker = _this$props5.speaker,
         onClick = _this$props5.onClick,
+        onContextMenu = _this$props5.onContextMenu,
         trigger = _this$props5.trigger,
         onMouseOver = _this$props5.onMouseOver,
         onMouseOut = _this$props5.onMouseOut,
@@ -284,6 +291,10 @@ function (_React$Component) {
         props.onClick = (0, _createChainedFunction.default)(this.toggleHideAndShow, props.onClick);
       }
 
+      if ((0, _isOneOf.default)('contextMenu', trigger)) {
+        props.onContextMenu = (0, _createChainedFunction.default)(this.preventDefault, this.toggleHideAndShow, triggerProps.onContextMenu, onContextMenu);
+      }
+
       if ((0, _isOneOf.default)('active', trigger)) {
         props.onClick = (0, _createChainedFunction.default)(this.handleDelayedShow, props.onClick);
       }

package/lib/Table/styles/common.less

@@ -166,11 +166,12 @@
     border-style: solid;
     border-width: 0;
     border-color: @table-border-color;
-    display: block;
     overflow: hidden;
     position: absolute;
     white-space: normal;
     background: @table-body-background;
+    display: table;
+    table-layout: fixed;
 
     &.first {
       border-left-width: 0;

package/lib/utils/treeUtils.js

@@ -185,7 +185,11 @@ function treeDeprecatedWarning(props, keys) {
 
 
 function compareArray(a, b) {
-  return (0, _isArray2.default)(a) && (0, _isArray2.default)(b) && !(0, _shallowEqualArray.default)(a, b);
+  if (!((0, _isArray2.default)(a) && (0, _isArray2.default)(b))) {
+    return a !== b;
+  }
+
+  return !(0, _shallowEqualArray.default)(a, b);
 }
 /**
  * 获取 expandAll 的 value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "4.9.3",
+  "version": "4.10.2",
   "description": "A suite of react components",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -57,13 +57,13 @@
     "classnames": ">=2.0.0",
     "date-fns": "^1.30.1",
     "dom-lib": "^1.2.1",
-    "element-resize-event": "^3.0.3",
+    "element-resize-event": "^3.0.6",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2",
     "react-lifecycles-compat": "^3.0.4",
     "react-virtualized": "^9.21.0",
     "recompose": "^0.30.0",
-    "rsuite-table": "^3.14.4",
+    "rsuite-table": "^3.15.1",
     "schema-typed": "^1.5.1"
   },
   "peerDependencies": {

package/src/CheckTreePicker/CheckTreePicker.tsx

@@ -195,11 +195,14 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
       nextState.value = value;
     }
 
-    if (compareArray(expandItemValues, prevState.expandItemValues)) {
+    if (compareArray(expandItemValues, prevState.expandItemValues) && _.isArray(expandItemValues)) {
       nextState.expandItemValues = expandItemValues;
     }
 
-    if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues)) {
+    if (
+      compareArray(uncheckableItemValues, prevState.uncheckableItemValues) &&
+      _.isArray(uncheckableItemValues)
+    ) {
       nextState.uncheckableItemValues = uncheckableItemValues;
     }
 
@@ -258,7 +261,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
     const { value } = this.props;
     if (compareArray(value, prevState.value)) {
       this.unserializeLists({
-        check: value,
+        check: value ?? [],
         expand: expandItemValues
       });
       this.setState({
@@ -271,7 +274,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
 
   updateExpandItemValuesChange(prevState: CheckTreePickerState) {
     const { expandItemValues } = this.props;
-    if (compareArray(expandItemValues, prevState.expandItemValues)) {
+    if (compareArray(expandItemValues, prevState.expandItemValues) && _.isArray(expandItemValues)) {
       this.unserializeLists({
         expand: expandItemValues
       });
@@ -284,7 +287,10 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
   updateUncheckableItemValuesChange(prevState: CheckTreePickerState) {
     const { data, selectedValues, expandItemValues } = this.state;
     const { uncheckableItemValues } = this.props;
-    if (compareArray(uncheckableItemValues, prevState.uncheckableItemValues)) {
+    if (
+      compareArray(uncheckableItemValues, prevState.uncheckableItemValues) &&
+      _.isArray(uncheckableItemValues)
+    ) {
       this.flattenNodes(data);
       this.unserializeLists({
         check: selectedValues,
@@ -343,6 +349,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
 
     if (isEveryChildChecked(node, this.nodes, this.props)) {
       this.nodes[node.refKey].checkAll = true;
+      this.nodes[node.refKey].check = true;
       return CHECK_STATE.CHECK;
     }
 
@@ -481,6 +488,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
     const checkItems = [];
     Object.keys(this.nodes).map((refKey: string) => {
       const node = this.nodes[refKey];
+
       if (selectedValues.some((value: any) => shallowEqual(node[valueKey], value))) {
         checkItems.push(node);
       }
@@ -531,7 +539,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
   }
 
   /**
-   * 过滤选中的values中不包含 uncheckableItemValues 的那些值
+   * 过滤选中的 values 中不包含 uncheckableItemValues 的那些值
    * @param {*} values
    */
   filterSelectedValues(values: any[]) {
@@ -743,7 +751,7 @@ class CheckTreePicker extends React.Component<CheckTreePickerProps, CheckTreePic
   }
 
   toggleNode(key: string, node: Node, toggleValue: boolean) {
-    // 如果该节点处于 disabledChecbox，则忽略该值
+    // 如果该节点处于 disabledCheckbox，则忽略该值
     if (!node.uncheckable) {
       this.nodes[node.refKey][key] = toggleValue;
     }