@kdcloudjs/kdesign 1.6.15 → 1.6.17

package/es/tree/utils/treeUtils.js

@@ -3,12 +3,12 @@ import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
-import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
+import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
 
 var __rest = this && this.__rest || function (s, e) {
@@ -124,21 +124,52 @@ var isAllParentExpand = function isAllParentExpand(_data, pos, posData) {
   return expand;
 };
 
+export function findfilterChildrenKeys(node, allFilterKeys) {
+  var nodes = new _Set();
+
+  var loop = function loop(children) {
+    _mapInstanceProperty(children).call(children, function (child) {
+      var key = child.key;
+      var item = child;
+      allFilterKeys.add(key);
+      loop(item.children || []);
+    });
+  };
+
+  if (node) {
+    loop(node.children || []);
+  }
+
+  return nodes;
+}
 export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData) {
-  var allFilterKeys = [];
+  var allFilterKeys = new _Set();
+  var filterExpandKeys = new _Set();
 
-  _filterInstanceProperty(data).call(data, function (item) {
+  var filterKeys = _filterInstanceProperty(data).call(data, function (item) {
     return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
-  }).forEach(function (item) {
+  });
+
+  filterKeys.forEach(function (item) {
+    findfilterChildrenKeys(item, allFilterKeys);
+  });
+  filterKeys.forEach(function (item) {
     var node = _extends({}, item);
 
     while (node) {
-      allFilterKeys.push(node.key);
+      var _context3;
+
+      allFilterKeys.add(node.key);
+      !_includesInstanceProperty(_context3 = _mapInstanceProperty(filterKeys).call(filterKeys, function (i) {
+        return i.key;
+      })).call(_context3, node.key) && filterExpandKeys.add(node.key);
       node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
     }
   });
-
-  return _toConsumableArray(new _Set(allFilterKeys));
+  return {
+    allFilterKeys: _toConsumableArray(allFilterKeys),
+    filterExpandKeys: _toConsumableArray(filterExpandKeys)
+  };
 };
 export var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var posData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
@@ -147,7 +178,7 @@ export var getFilterData = function getFilterData(data, filterTreeNode, isSearch
   var allFilterKeys = null;
 
   if (isSearching) {
-    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData);
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData).allFilterKeys;
     filterData = _filterInstanceProperty(filterData).call(filterData, function (item) {
       return _includesInstanceProperty(allFilterKeys).call(allFilterKeys, item.key);
     });
@@ -298,11 +329,11 @@ export var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys
   };
 };
 export var addKeys = function addKeys() {
-  var _context3;
+  var _context4;
 
   var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return _Array$from(new _Set(_concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
+  return _Array$from(new _Set(_concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
 };
 export var getAllParentKeys = function getAllParentKeys(data) {
   var pos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -355,14 +386,14 @@ export var getPos = function getPos(data, key) {
   return node === null || node === void 0 ? void 0 : node.pos;
 };
 export var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context4;
+  var _context5;
 
   var checkedKeys = [];
   keys.forEach(function (item) {
     var pos = getPos(data, item);
     checkedKeys.push.apply(checkedKeys, _toConsumableArray(getAllChildKeys(data, pos)));
   });
-  return _Array$from(new _Set(_concatInstanceProperty(_context4 = []).call(_context4, checkedKeys, _toConsumableArray(keys))));
+  return _Array$from(new _Set(_concatInstanceProperty(_context5 = []).call(_context5, checkedKeys, _toConsumableArray(keys))));
 };
 export var getInitCheckededState = function getInitCheckededState(data) {
   var checkedKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -484,7 +515,7 @@ var updateParent = function updateParent(key, keysNodeProps, allKeys, halfChecke
 };
 
 export var getInitCheckededKeys = function getInitCheckededKeys() {
-  var _context5;
+  var _context6;
 
   var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
@@ -506,7 +537,7 @@ export var getInitCheckededKeys = function getInitCheckededKeys() {
     }
   });
   return {
-    checkedKeys: _toConsumableArray(new _Set(_concatInstanceProperty(_context5 = []).call(_context5, _toConsumableArray(checkedKeysSet), _toConsumableArray(childCheckedKeysSet)))),
+    checkedKeys: _toConsumableArray(new _Set(_concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(checkedKeysSet), _toConsumableArray(childCheckedKeysSet)))),
     halfCheckedKeys: _toConsumableArray(halfCheckedKeysSet)
   };
 };
@@ -672,6 +703,7 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
   var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
   var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
+  var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
   var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : _concatInstanceProperty(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : _concatInstanceProperty(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
 
   if (defaultExpandAll) {
@@ -695,9 +727,9 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
   }
 
   if (isSearching) {
-    var _context6;
+    var _context7;
 
-    keys = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(keys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData)));
+    keys = _concatInstanceProperty(_context7 = []).call(_context7, _toConsumableArray(searchExpandedKeys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
   }
 
   return _Array$from(new _Set(_toConsumableArray(keys)));

package/lib/_utils/usePopper.js

@@ -590,10 +590,12 @@ function usePopper(locatorElement, popperElement, props) {
         focus: 'mousedown',
         contextMenu: 'mousedown'
       };
+      popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('mouseleave', debounceHidePopper);
       Array.isArray(trigger) ? trigger.forEach(function (action) {
         return document.addEventListener(mapEvent[action], debounceHidePopper);
       }) : document.addEventListener(mapEvent[trigger], debounceHidePopper);
       return function () {
+        popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
         Array.isArray(trigger) ? trigger.forEach(function (action) {
           return document.removeEventListener(mapEvent[action], debounceHidePopper);
         }) : document.removeEventListener(mapEvent[trigger], debounceHidePopper);

package/lib/checkbox/checkbox.d.ts

@@ -1,8 +1,5 @@
 import React from 'react';
-export declare const CheckboxTypes: ["default", "square"];
-export declare type CheckboxType = typeof CheckboxTypes[number];
-export declare const CheckboxSizes: ["large", "middle", "small"];
-export declare type CheckboxSize = typeof CheckboxSizes[number];
+import type { CheckboxType, CheckboxSize } from './group';
 export interface CheckboxProps {
     checked?: boolean;
     defaultChecked?: boolean;

package/lib/checkbox/checkbox.js

@@ -11,7 +11,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.CheckboxTypes = exports.CheckboxSizes = void 0;
+exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
@@ -27,12 +27,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _group = require("./group");
+
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 
 var _utils = require("../_utils");
 
-var _type = require("../_utils/type");
-
 var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
 
 var _icon = _interopRequireDefault(require("../icon"));
@@ -56,11 +56,6 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var CheckboxTypes = (0, _type.tuple)('default', 'square');
-exports.CheckboxTypes = CheckboxTypes;
-var CheckboxSizes = (0, _type.tuple)('large', 'middle', 'small');
-exports.CheckboxSizes = CheckboxSizes;
-
 var InternalCheckbox = function InternalCheckbox(props, ref) {
   var _context, _context2, _context3, _classNames, _context4, _context5, _context6, _classNames2, _context7, _context8, _context9, _context10, _context11, _context12, _context13, _context14, _classNames4, _context15, _context16, _context17, _classNames5, _context18;
 
@@ -86,38 +81,50 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       name = CheckboxProps.name,
       rest = __rest(CheckboxProps, ["checkboxType", "className", "prefixCls", "defaultChecked", "checked", "size", "onChange", "disabled", "children", "style", "value", "indeterminate", "name"]);
 
-  var getChecked = function getChecked() {
-    return (0, _isBoolean.default)(checked) ? checked : defaultChecked;
-  };
+  var checkboxGroup = _react.default.useContext(_group.GroupContext);
 
-  var _useState = (0, _react.useState)(getChecked()),
+  var mergedDisabled = (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.disabled) || disabled;
+  var mergedCheckboxType = (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.checkboxType) || checkboxType;
+  var mergedName = (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.name) || name;
+  var initChecked = (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.groupValue) ? (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.groupValue.indexOf(value)) > -1 : (0, _isBoolean.default)(checked) ? checked : defaultChecked;
+
+  var _useState = (0, _react.useState)(initChecked),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       selected = _useState2[0],
       setSelected = _useState2[1];
 
   var labelRef = (0, _react.useRef)(null);
-  (0, _devwarning.default)(CheckboxTypes.indexOf(checkboxType) === -1, 'checkbox', "cannot found checkbox type '".concat(checkboxType, "'"));
-  (0, _devwarning.default)(CheckboxSizes.indexOf(size) === -1, 'checkbox', "cannot found size type '".concat(size, "'"));
+
+  _react.default.useEffect(function () {
+    setSelected((checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.groupValue) ? (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.groupValue.indexOf(value)) > -1 : (0, _isBoolean.default)(checked) ? checked : defaultChecked);
+  }, [checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.groupValue, checked, defaultChecked]);
+
+  (0, _devwarning.default)(_group.CheckboxTypes.indexOf(mergedCheckboxType) === -1, 'checkbox', "cannot found checkbox type '".concat(mergedCheckboxType, "'"));
+  (0, _devwarning.default)(_group.CheckboxSizes.indexOf(size) === -1, 'checkbox', "cannot found size type '".concat(size, "'"));
   var checkboxPrefixCls = getPrefixCls(prefixCls, 'checkbox', customPrefixcls);
 
   var isDefaultType = function isDefaultType() {
-    return checkboxType === 'default';
+    return mergedCheckboxType === 'default';
   };
 
   var getIndeterminate = function getIndeterminate() {
     return selected ? false : indeterminate;
   };
 
-  var getDefaultClassName = (0, _classnames.default)(className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(checkboxPrefixCls), true), (0, _defineProperty2.default)(_classNames, "".concat(checkboxPrefixCls, "-no-child"), !children), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context = "".concat(checkboxPrefixCls, "-")).call(_context, size), true && !!children), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context2 = "".concat(checkboxPrefixCls, "-")).call(_context2, checkboxType), true), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context3 = "".concat(checkboxPrefixCls, "-")).call(_context3, checkboxType, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames, "checked", selected), _classNames));
-  var getSquareClassName = (0, _classnames.default)(className, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(checkboxPrefixCls), true), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context4 = "".concat(checkboxPrefixCls, "-")).call(_context4, checkboxType), true), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context5 = "".concat(checkboxPrefixCls, "-")).call(_context5, checkboxType, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context6 = "".concat(checkboxPrefixCls, "-")).call(_context6, checkboxType, "-checked"), selected && !disabled), (0, _defineProperty2.default)(_classNames2, "checked", selected), _classNames2));
+  var getDefaultClassName = (0, _classnames.default)(className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(checkboxPrefixCls), true), (0, _defineProperty2.default)(_classNames, "".concat(checkboxPrefixCls, "-no-child"), !children), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context = "".concat(checkboxPrefixCls, "-")).call(_context, size), true && !!children), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context2 = "".concat(checkboxPrefixCls, "-")).call(_context2, mergedCheckboxType), true), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context3 = "".concat(checkboxPrefixCls, "-")).call(_context3, mergedCheckboxType, "-disabled"), mergedDisabled), (0, _defineProperty2.default)(_classNames, "checked", selected), _classNames));
+  var getSquareClassName = (0, _classnames.default)(className, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(checkboxPrefixCls), true), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context4 = "".concat(checkboxPrefixCls, "-")).call(_context4, mergedCheckboxType), true), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context5 = "".concat(checkboxPrefixCls, "-")).call(_context5, mergedCheckboxType, "-disabled"), mergedDisabled), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context6 = "".concat(checkboxPrefixCls, "-")).call(_context6, mergedCheckboxType, "-checked"), selected && !mergedDisabled), (0, _defineProperty2.default)(_classNames2, "checked", selected), _classNames2));
   var getRootClassName = isDefaultType() ? getDefaultClassName : getSquareClassName;
   var inputClassName = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(checkboxPrefixCls, "-input"), true));
-  var checkedWrapperClassName = (0, _classnames.default)((_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context7 = "".concat(checkboxPrefixCls, "-")).call(_context7, checkboxType, "-no-child"), !children), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context8 = "".concat(checkboxPrefixCls, "-")).call(_context8, checkboxType, "-wrapper"), true), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context9 = "".concat(checkboxPrefixCls, "-")).call(_context9, checkboxType, "-wrapper-size"), !!children), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context10 = "".concat(checkboxPrefixCls, "-")).call(_context10, checkboxType, "-margin"), !!children), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context11 = "".concat(checkboxPrefixCls, "-")).call(_context11, checkboxType, "-checked"), selected), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context12 = "".concat(checkboxPrefixCls, "-")).call(_context12, checkboxType, "-indeterminate"), getIndeterminate()), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context13 = "".concat(checkboxPrefixCls, "-")).call(_context13, checkboxType, "-disabled"), disabled && !selected), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context14 = "".concat(checkboxPrefixCls, "-")).call(_context14, checkboxType, "-checked-disabled"), disabled && selected), _classNames4));
-  var triangleClassName = (0, _classnames.default)((_classNames5 = {}, (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context15 = "".concat(checkboxPrefixCls, "-")).call(_context15, checkboxType, "-triangle"), !selected), (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context16 = "".concat(checkboxPrefixCls, "-")).call(_context16, checkboxType, "-triangle-checked"), selected), (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context17 = "".concat(checkboxPrefixCls, "-")).call(_context17, checkboxType, "-triangle-disabled"), disabled), _classNames5));
-  var innerIconClassName = (0, _classnames.default)((0, _defineProperty2.default)({}, (0, _concat.default)(_context18 = "".concat(checkboxPrefixCls, "-")).call(_context18, checkboxType, "-inner"), true));
+  var checkedWrapperClassName = (0, _classnames.default)((_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context7 = "".concat(checkboxPrefixCls, "-")).call(_context7, mergedCheckboxType, "-no-child"), !children), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context8 = "".concat(checkboxPrefixCls, "-")).call(_context8, mergedCheckboxType, "-wrapper"), true), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context9 = "".concat(checkboxPrefixCls, "-")).call(_context9, mergedCheckboxType, "-wrapper-size"), !!children), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context10 = "".concat(checkboxPrefixCls, "-")).call(_context10, mergedCheckboxType, "-margin"), !!children), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context11 = "".concat(checkboxPrefixCls, "-")).call(_context11, mergedCheckboxType, "-checked"), selected), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context12 = "".concat(checkboxPrefixCls, "-")).call(_context12, mergedCheckboxType, "-indeterminate"), getIndeterminate()), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context13 = "".concat(checkboxPrefixCls, "-")).call(_context13, mergedCheckboxType, "-disabled"), mergedDisabled && !selected), (0, _defineProperty2.default)(_classNames4, (0, _concat.default)(_context14 = "".concat(checkboxPrefixCls, "-")).call(_context14, mergedCheckboxType, "-checked-disabled"), mergedDisabled && selected), _classNames4));
+  var triangleClassName = (0, _classnames.default)((_classNames5 = {}, (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context15 = "".concat(checkboxPrefixCls, "-")).call(_context15, mergedCheckboxType, "-triangle"), !selected), (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context16 = "".concat(checkboxPrefixCls, "-")).call(_context16, mergedCheckboxType, "-triangle-checked"), selected), (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context17 = "".concat(checkboxPrefixCls, "-")).call(_context17, mergedCheckboxType, "-triangle-disabled"), mergedDisabled), _classNames5));
+  var innerIconClassName = (0, _classnames.default)((0, _defineProperty2.default)({}, (0, _concat.default)(_context18 = "".concat(checkboxPrefixCls, "-")).call(_context18, mergedCheckboxType, "-inner"), true));
   var handleChange = (0, _react.useCallback)(function (e) {
     onChange && onChange(e);
-    setSelected(e.target.checked);
+    (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.onCheckboxGroupChange) && (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.onCheckboxGroupChange(value, e.target.checked));
+
+    if (!(checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.isControlled)) {
+      setSelected(e.target.checked);
+    }
   }, [onChange]);
   (0, _react.useEffect)(function () {
     (0, _isBoolean.default)(checked) && checked !== selected && setSelected(checked);
@@ -158,7 +165,7 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
         className: innerIconClassName
       }, /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "right-bold",
-        className: (0, _concat.default)(_context19 = "".concat(checkboxPrefixCls, "-")).call(_context19, checkboxType, "-inner-icon")
+        className: (0, _concat.default)(_context19 = "".concat(checkboxPrefixCls, "-")).call(_context19, mergedCheckboxType, "-inner-icon")
       })), /*#__PURE__*/_react.default.createElement("input", {
         type: "checkbox",
         className: inputClassName,
@@ -166,8 +173,8 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
         ref: ref,
         value: value,
         checked: selected,
-        disabled: disabled,
-        name: name
+        disabled: mergedDisabled,
+        name: mergedName
       })), children && /*#__PURE__*/_react.default.createElement("span", {
         className: "".concat(checkboxPrefixCls, "-children")
       }, children), !isDefaultType() && /*#__PURE__*/_react.default.createElement("span", {
@@ -176,7 +183,7 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
         className: innerIconClassName
       }, /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "right-bold",
-        className: (0, _concat.default)(_context20 = "".concat(checkboxPrefixCls, "-")).call(_context20, checkboxType, "-inner-icon")
+        className: (0, _concat.default)(_context20 = "".concat(checkboxPrefixCls, "-")).call(_context20, mergedCheckboxType, "-inner-icon")
       }))))
     );
   };

package/lib/checkbox/group.d.ts

@@ -3,10 +3,20 @@ export declare const CheckboxTypes: ["default", "square"];
 export declare type CheckboxType = typeof CheckboxTypes[number];
 export declare const CheckboxSizes: ["large", "middle", "small"];
 export declare type CheckboxSize = typeof CheckboxSizes[number];
+export declare type CheckboxValueType = string | number;
+export interface CheckboxGroupContext {
+    name?: string;
+    isControlled?: boolean;
+    groupValue?: Array<CheckboxValueType>;
+    checkboxType?: CheckboxType;
+    disabled?: boolean;
+    onCheckboxGroupChange?: (checkedValue: CheckboxValueType, isChecked: boolean) => void;
+}
+export declare const GroupContext: React.Context<CheckboxGroupContext | null>;
 export interface CheckboxGroupProps {
     name?: string;
     size?: CheckboxSize;
-    value?: string[];
+    value?: Array<CheckboxValueType>;
     checkboxType?: CheckboxType;
     disabled?: boolean;
     defaultValue?: string[] | string;

package/lib/checkbox/group.js

@@ -11,18 +11,14 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.CheckboxTypes = exports.CheckboxSizes = void 0;
+exports.default = exports.GroupContext = exports.CheckboxTypes = exports.CheckboxSizes = void 0;
 
-var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
-
-var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -37,12 +33,8 @@ var _type = require("../_utils/type");
 
 var _arrayUtil = require("../_utils/arrayUtil");
 
-var _isArray = _interopRequireDefault(require("lodash/isArray"));
-
 var _checkbox = _interopRequireDefault(require("./checkbox"));
 
-var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
-
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -55,6 +47,10 @@ exports.CheckboxTypes = CheckboxTypes;
 var CheckboxSizes = (0, _type.tuple)('large', 'middle', 'small');
 exports.CheckboxSizes = CheckboxSizes;
 
+var GroupContext = /*#__PURE__*/_react.default.createContext(null);
+
+exports.GroupContext = GroupContext;
+
 var CheckboxGroup = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   // const CheckboxGroup = (props: CheckboxGroupProps): FunctionComponentElement<CheckboxGroupProps> => {
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
@@ -76,111 +72,89 @@ var CheckboxGroup = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       defaultValue = CheckboxProps.defaultValue,
       value = CheckboxProps.value,
       name = CheckboxProps.name;
+  var initData = value || (Array.isArray(defaultValue) ? defaultValue : typeof defaultValue !== 'undefined' ? [defaultValue] : []);
 
-  var _React$useState = _react.default.useState(defaultValue),
+  var _React$useState = _react.default.useState([]),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       groupValue = _React$useState2[0],
       setGroupValue = _React$useState2[1];
 
+  var innerValue = _react.default.useRef(initData);
+
   _react.default.useEffect(function () {
-    if (value) {
-      setGroupValue(value);
-    }
-  }, [value]);
+    innerValue.current = value || (Array.isArray(defaultValue) ? defaultValue : typeof defaultValue !== 'undefined' ? [defaultValue] : []);
+    setGroupValue(innerValue.current);
+  }, [value, defaultValue]);
 
+  var isControlled = typeof value !== 'undefined';
   var checkboxGroupPrefixCls = getPrefixCls(prefixCls, 'checkbox-group', customPrefixcls); // 按钮样式前缀
 
-  (0, _devwarning.default)((0, _arrayUtil.isArrayValueRepeat)(value), 'checkboxGroup', "variable value's value should be unique ");
-
-  var getDisabled = function getDisabled(optionDisabled) {
-    return (0, _isBoolean.default)(optionDisabled) ? optionDisabled : disabled;
-  };
-
-  var getChecked = function getChecked(props, value) {
-    return (0, _isArray.default)(value) ? (0, _includes.default)(value).call(value, (props === null || props === void 0 ? void 0 : props.value) || props) || (0, _includes.default)(value).call(value, String((props === null || props === void 0 ? void 0 : props.value) || props)) : String(value) === String((props === null || props === void 0 ? void 0 : props.value) || props);
-  };
+  (0, _devwarning.default)((0, _arrayUtil.isArrayValueRepeat)(groupValue), 'checkboxGroup', "variable value's value should be unique ");
 
   var getReduceItem = function getReduceItem(targetValue) {
-    var index = value.indexOf(targetValue);
-    (0, _splice.default)(value).call(value, index, 1);
-    return value;
+    var _context;
+
+    return (0, _filter.default)(_context = innerValue.current).call(_context, function (d) {
+      return d !== targetValue;
+    });
   };
 
   var getAddItem = function getAddItem(targetValue) {
-    return (0, _concat.default)(value).call(value, targetValue);
-  };
+    var _context2;
 
-  var onCheckboxChange = function onCheckboxChange(ev, item) {
-    var _a;
+    return innerValue.current.indexOf(targetValue) > -1 ? innerValue.current : (0, _concat.default)(_context2 = innerValue.current).call(_context2, targetValue);
+  };
 
-    var val = ev.target.value;
-    var checked = ev.target.checked;
+  var onCheckboxChange = function onCheckboxChange(checkedValue, isChecked) {
     var newVal = [];
 
-    if (checked) {
-      newVal = getAddItem(val);
+    if (isChecked) {
+      newVal = getAddItem(checkedValue);
     } else {
-      newVal = getReduceItem(val);
+      newVal = getReduceItem(checkedValue);
+    }
+
+    if (!isControlled) {
+      innerValue.current = newVal;
     }
 
-    setGroupValue(newVal);
     onChange && onChange(newVal);
-    ((_a = item.props) === null || _a === void 0 ? void 0 : _a.onChange) && item.props.onChange(ev);
+  };
+
+  var context = {
+    groupValue: groupValue,
+    disabled: disabled,
+    name: name,
+    isControlled: isControlled,
+    checkboxType: checkboxType,
+    onCheckboxGroupChange: function onCheckboxGroupChange(checkedValue, isChecked) {
+      onCheckboxChange(checkedValue, isChecked);
+    }
   };
 
   var renderByOptions = function renderByOptions() {
     return (0, _map.default)(options).call(options, function (option, index) {
       return /*#__PURE__*/_react.default.createElement(_checkbox.default, {
         size: size,
-        disabled: getDisabled(option.disabled),
+        disabled: option.disabled,
         key: index,
         name: name,
-        defaultChecked: getChecked(option, defaultValue),
-        checked: getChecked(option, groupValue),
+        defaultChecked: option.defaultValue,
+        checked: option.checked,
         checkboxType: checkboxType,
         value: (option === null || option === void 0 ? void 0 : option.value) || option,
-        onChange: function onChange(e) {
-          return onCheckboxChange(e, option);
-        }
+        onChange: option.onChange
       }, option.label || option);
     });
   };
 
-  var renderChildren = function renderChildren() {
-    var _context;
-
-    return (0, _map.default)(_context = _react.default.Children).call(_context, children, function (item) {
-      var _a, _b;
-
-      var groupProps = {};
-      groupProps = {
-        name: name,
-        size: size,
-        onChange: function onChange(e) {
-          return onCheckboxChange(e, item);
-        },
-        checkboxType: checkboxType || ((_a = item.props) === null || _a === void 0 ? void 0 : _a.checkboxType),
-        disabled: (0, _isBoolean.default)(disabled) ? disabled : (_b = item.props) === null || _b === void 0 ? void 0 : _b.disabled,
-        checked: getChecked(item.props, groupValue),
-        defaultChecked: getChecked(item.props, defaultValue)
-      };
-      return /*#__PURE__*/_react.default.cloneElement(item, (0, _extends2.default)((0, _extends2.default)({}, item.props), groupProps));
-    });
-  };
-
-  var renderCheckbox = function renderCheckbox() {
-    if ((0, _isArray.default)(options)) {
-      return renderByOptions();
-    } else if (children) {
-      return renderChildren();
-    }
-  };
-
   return /*#__PURE__*/_react.default.createElement("ul", {
     className: (0, _classnames.default)(checkboxGroupPrefixCls, className),
     style: style,
     ref: ref
-  }, renderCheckbox());
+  }, /*#__PURE__*/_react.default.createElement(GroupContext.Provider, {
+    value: context
+  }, options && options.length > 0 ? renderByOptions() : children));
 });
 
 var _default = /*#__PURE__*/_react.default.memo(CheckboxGroup);

package/lib/checkbox/index.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" />
 import { CheckboxProps } from './checkbox';
 import Group from './group';
-export { CheckboxProps, CheckboxSizes, CheckboxTypes } from './checkbox';
+export { CheckboxSizes, CheckboxTypes, CheckboxSize, CheckboxType, CheckboxValueType } from './group';
 export { CheckboxGroupProps } from './group';
+export { CheckboxProps } from './checkbox';
 interface CompoundedComponent extends React.ForwardRefExoticComponent<CheckboxProps & React.RefAttributes<HTMLElement>> {
     Group: typeof Group;
 }

package/lib/checkbox/index.js

@@ -14,13 +14,13 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "CheckboxSizes", {
   enumerable: true,
   get: function get() {
-    return _checkbox.CheckboxSizes;
+    return _group.CheckboxSizes;
   }
 });
 Object.defineProperty(exports, "CheckboxTypes", {
   enumerable: true,
   get: function get() {
-    return _checkbox.CheckboxTypes;
+    return _group.CheckboxTypes;
   }
 });
 Object.defineProperty(exports, "Group", {
@@ -31,9 +31,9 @@ Object.defineProperty(exports, "Group", {
 });
 exports.default = void 0;
 
-var _checkbox = _interopRequireWildcard(require("./checkbox"));
+var _checkbox = _interopRequireDefault(require("./checkbox"));
 
-var _group = _interopRequireDefault(require("./group"));
+var _group = _interopRequireWildcard(require("./group"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 

package/lib/date-picker/range/input-range.js

@@ -167,7 +167,7 @@ function InputDate(props, ref) {
   }
 
   var getSuffixNode = function getSuffixNode() {
-    if (isMouseEnter && (startHoverValue || endHoverValue || startText || endText)) {
+    if (isMouseEnter && (startHoverValue || endHoverValue || startText || endText) && allowClear) {
       return clearNode;
     }
 

package/lib/date-picker/single/input-date.js

@@ -87,7 +87,7 @@ function InputDate(props, ref) {
   var placeholder = (0, _utils.getPlaceholder)(picker, locale, propsPlaceholder);
 
   var getSuffixNode = function getSuffixNode() {
-    if (isMouseEnter && (hoverValue || text)) {
+    if (isMouseEnter && (hoverValue || text) && allowClear) {
       return null;
     }
 

package/lib/modal/style/index.css

@@ -160,6 +160,8 @@
       -ms-flex-align: center;
           align-items: center;
   height: var(--kd-c-modal-header-sizing-height, 50px);
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
 }
 .kd-modal-container-box .kd-modal-header .kd-modal-title-container {
   display: -webkit-box;
@@ -242,6 +244,8 @@
           align-items: center;
   font-size: var(--kd-c-modal-footer-font-size, 14px);
   color: var(--kd-c-modal-footer-text-color, var(--kd-g-color-text-secondary, #666));
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
 }
 .kd-modal-margin-btn {
   margin-right: var(--kd-c-modal-footer-button-spacing, 12px);

package/lib/modal/style/index.less

@@ -58,6 +58,7 @@
       padding: @modal-header-sizing-padding-vertical @modal-header-sizing-padding-horizontal;
       align-items: center;
       height: @modal-header-sizing-height;
+      flex-shrink: 0;
       .@{modal-prefix-cls}-title-container {
         display: flex;
         justify-content: center;
@@ -113,6 +114,7 @@
       align-items: center;
       font-size: @modal-footer-font-size;
       color: @modal-footer-font-color;
+      flex-shrink: 0;
     }
     // each(@modal-footer-type-set, {
     //   .@{modal-prefix-cls}-@{key}-footer {