@kdcloudjs/kdesign 1.6.16 → 1.6.17

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/stepper/style/index.css

@@ -104,6 +104,8 @@
 .kd-inputNumber {
   width: 100px;
   height: var(--kd-c-stepper-input-middle-sizing-height, 28px);
+  --kd-c-input-wrapper-padding-left: 9px;
+  --kd-c-input-padding-left: 0;
 }
 .kd-inputNumber input {
   text-align: center;

package/lib/stepper/style/index.less

@@ -2,10 +2,13 @@
 @import './mixin.less';
 
 @inputNumber-prefix-cls: ~'@{kd-prefix}-inputNumber';
+@inputWrapper-prefix-cls: ~'@{kd-prefix}-wrapper';
 .@{inputNumber-prefix-cls} {
   width: 100px;
   height: @stepper-input-middle-sizing-height;
 
+  --kd-c-input-wrapper-padding-left: 9px;
+  --kd-c-input-padding-left: 0;
   input {
     text-align: center;
     color: @stepper-input-color;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [