acud 0.0.67 → 0.0.68

package/lib/switch/index.js

@@ -15,6 +15,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = _interopRequireDefault(require("react"));
 
+var _acudIcon = require("acud-icon");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _useMergedState3 = _interopRequireDefault(require("../_util/hooks/useMergedState"));
@@ -41,12 +43,13 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
       checked = _a.checked,
       defaultChecked = _a.defaultChecked,
       disabled = _a.disabled,
-      loadingIcon = _a.loadingIcon,
+      loading = _a.loading,
+      customLoadingIcon = _a.loadingIcon,
       checkedChildren = _a.checkedChildren,
       unCheckedChildren = _a.unCheckedChildren,
       onClick = _a.onClick,
       onChange = _a.onChange,
-      restProps = __rest(_a, ["prefixCls", "className", "checked", "defaultChecked", "disabled", "loadingIcon", "checkedChildren", "unCheckedChildren", "onClick", "onChange"]);
+      restProps = __rest(_a, ["prefixCls", "className", "checked", "defaultChecked", "disabled", "loading", "loadingIcon", "checkedChildren", "unCheckedChildren", "onClick", "onChange"]);
 
   var _useMergedState = (0, _useMergedState3["default"])(false, {
     value: checked,
@@ -56,6 +59,11 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
       innerChecked = _useMergedState2[0],
       setInnerChecked = _useMergedState2[1];
 
+  var loadingIcon = loading && (customLoadingIcon || /*#__PURE__*/_react["default"].createElement(_acudIcon.OutlinedLoading, {
+    className: "".concat(prefixCls, "-loading-icon"),
+    animation: "spin"
+  }));
+
   function triggerChange(newChecked, event) {
     var mergedChecked = innerChecked;
 
@@ -73,7 +81,7 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
     onClick === null || onClick === void 0 ? void 0 : onClick(ret, e);
   }
 
-  var switchClassName = (0, _classnames["default"])(prefixCls, className, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), innerChecked), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), disabled), _classNames));
+  var switchClassName = (0, _classnames["default"])(prefixCls, className, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-checked"), innerChecked), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-loading"), loading), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-disabled"), disabled), _classNames));
   return /*#__PURE__*/_react["default"].createElement("button", (0, _extends2["default"])({}, restProps, {
     type: "button",
     role: "switch",
@@ -88,5 +96,6 @@ var Switch = /*#__PURE__*/_react["default"].forwardRef(function (_a, ref) {
 });
 
 Switch.displayName = 'Switch';
+Switch.__ACUD_SWITCH = true;
 var _default = Switch;
 exports["default"] = _default;

package/lib/switch/interface.d.ts

@@ -5,6 +5,7 @@ export interface SwitchProps extends Omit<React.HTMLAttributes<HTMLButtonElement
     className?: string;
     prefixCls?: string;
     disabled?: boolean;
+    loading?: boolean;
     checkedChildren?: React.ReactNode;
     unCheckedChildren?: React.ReactNode;
     onChange?: SwitchChangeEventHandler;
@@ -16,3 +17,6 @@ export interface SwitchProps extends Omit<React.HTMLAttributes<HTMLButtonElement
     style?: React.CSSProperties;
     title?: string;
 }
+export interface CompoundedComponent extends React.ForwardRefExoticComponent<SwitchProps & React.RefAttributes<HTMLElement>> {
+    __ACUD_SWITCH: boolean;
+}

package/lib/switch/style/index.css

@@ -148,6 +148,34 @@
 .acud-switch-checked[disabled]:after {
   background-color: #FFFFFF;
 }
+.acud-switch-checked[disabled].acud-switch-loading .acud-switch-loading-icon {
+  color: #D4E5FF;
+}
+.acud-switch-checked.acud-switch-loading .acud-switch-loading-icon {
+  color: #2468F2;
+  left: initial;
+  right: 2px;
+}
+.acud-switch-loading {
+  cursor: no-drop;
+}
+.acud-switch-loading:after {
+  cursor: no-drop;
+  -webkit-animation-name: none;
+          animation-name: none;
+}
+.acud-switch-loading:hover:after {
+  width: 16px;
+  -webkit-animation-name: none;
+          animation-name: none;
+}
+.acud-switch-loading .acud-switch-loading-icon {
+  position: absolute;
+  top: 1px;
+  z-index: 99;
+  color: #D4D6D9;
+  left: 2px;
+}
 .acud-switch-disabled {
   cursor: no-drop;
 }
@@ -162,6 +190,9 @@
   -webkit-animation-name: none;
           animation-name: none;
 }
+.acud-switch-disabled .acud-switch-loading-icon {
+  color: #F2F2F4;
+}
 .acud-switch-label {
   display: inline-block;
   padding-left: 10px;

package/lib/switch/style/index.less

@@ -96,9 +96,38 @@
             &:after {
                 background-color: @switch-handle-color;
             }
+            &.@{switch-prefix-cls}-loading {
+                .@{switch-prefix-cls}-loading-icon {
+                    color: @B2;
+                }
+            }
+        }
+        &.@{switch-prefix-cls}-loading {
+            .@{switch-prefix-cls}-loading-icon {
+                color: @B6;
+                left: initial;
+                right: 0.5 * @P;
+            }
+        }
+    }
+    &-loading {
+        cursor: no-drop;
+        &:after {
+            cursor: no-drop;
+            animation-name: none;
+        }
+        &:hover:after {
+            width: @switch-inner-width;
+            animation-name: none;
+        }
+        .@{switch-prefix-cls}-loading-icon {
+            position: absolute;
+            top: 1px;
+            z-index: 99;
+            color: @G7;
+            left: 0.5 * @P;
         }
     }
-
     &-disabled {
         cursor: no-drop;
         &:after {
@@ -110,6 +139,9 @@
             width: @switch-inner-width;
             animation-name: none;
         }
+        .@{switch-prefix-cls}-loading-icon {
+            color: @G9;
+        }
     }
 
     &-label {

package/lib/tooltip/index.js

@@ -63,7 +63,7 @@ var PresetColorRegex = new RegExp("^(".concat(PresetColorTypes.join('|'), ")(-in
 function getDisabledCompatibleChildren(element, prefixCls) {
   var elementType = element.type;
 
-  if ((elementType.__ANT_BUTTON === true || elementType.__ANT_SWITCH === true || elementType.__ANT_CHECKBOX === true || element.type === 'button') && element.props.disabled) {
+  if ((elementType.__ACUD_BUTTON === true || elementType.__ACUD_SWITCH === true || elementType.__ACUD_CHECKBOX === true || element.type === 'button') && element.props.disabled) {
     // Pick some layout related style properties up to span
     var _splitObject = splitObject(element.props.style, ['position', 'left', 'right', 'top', 'bottom', 'float', 'display', 'zIndex']),
         picked = _splitObject.picked,

package/lib/transfer/index.js

@@ -40,8 +40,7 @@ function transfer(props) {
       prefixCls = _props$prefixCls === void 0 ? 'acud-transfer' : _props$prefixCls,
       _props$displayType = props.displayType,
       displayType = _props$displayType === void 0 ? 'single' : _props$displayType,
-      _props$targetKeys = props.targetKeys,
-      targetKeys = _props$targetKeys === void 0 ? [] : _props$targetKeys,
+      targetKeys = props.targetKeys,
       onChange = props.onChange,
       _props$locale = props.locale,
       locale = _props$locale === void 0 ? {} : _props$locale,
@@ -76,11 +75,16 @@ function transfer(props) {
     return expansionArr;
   }, [dataSource]);
 
-  var _React$useState = React.useState(targetKeys),
+  var _React$useState = React.useState(targetKeys || []),
       _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
       tKeys = _React$useState2[0],
       setTKeys = _React$useState2[1];
 
+  React.useEffect(function () {
+    if (Array.isArray(targetKeys)) {
+      setTKeys(targetKeys);
+    }
+  }, [targetKeys]);
   React.useEffect(function () {
     onChange && onChange(tKeys);
   }, [tKeys]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "0.0.67",
+    "version": "0.0.68",
     "description": "acg react 组件库",
     "main": "lib/index.js",
     "module": "es/index.js",
@@ -25,7 +25,7 @@
         "pub": "npm publish"
     },
     "dependencies": {
-        "acud-icon": "^0.0.21",
+        "acud-icon": "^0.0.22",
         "aiflow": "^2.0.4",
         "array-tree-filter": "^2.1.0",
         "classnames": "2.2.6",