assui 2.0.76 → 2.0.80

package/es/keep-tab/index.js

@@ -60,6 +60,7 @@ import Badge from 'antd/es/badge';
 import Tabs from 'antd/es/tabs';
 import { useParams } from 'react-router-dom';
 import useUrlState from '@ahooksjs/use-url-state';
+import useControllableValue from 'ahooks/es/useControllableValue';
 import toArray from 'rc-util/lib/Children/toArray';
 var TabPane = Tabs.TabPane;
 var defaultBadgeProps = {};
@@ -70,11 +71,10 @@ var KeepTab = function KeepTab(props) {
   var children = props.children,
       defaultActiveKey = props.defaultActiveKey,
       saveActiveKeyName = props.saveActiveKeyName,
-      tabActiveKey = props.activeKey,
       onChange = props.onChange,
       _b = props.badgeProps,
       badgeProps = _b === void 0 ? defaultBadgeProps : _b,
-      restProps = __rest(props, ["children", "defaultActiveKey", "saveActiveKeyName", "activeKey", "onChange", "badgeProps"]);
+      restProps = __rest(props, ["children", "defaultActiveKey", "saveActiveKeyName", "onChange", "badgeProps"]);
 
   var defaultUrlParams = useParams();
 
@@ -82,21 +82,32 @@ var KeepTab = function KeepTab(props) {
       urlParams = _c[0],
       setUrlParams = _c[1];
 
+  var _d = __read(useControllableValue(props, {
+    valuePropName: 'activeKey',
+    defaultValue: defaultUrlParams[saveActiveKeyName] || defaultActiveKey
+  }), 2),
+      tabActiveKey = _d[0],
+      setTabActiveKey = _d[1];
+
   var arrayChildren = toArray(children);
   React.useEffect(function () {
-    var _a, _b;
+    var _a;
 
-    if (tabActiveKey) {
+    if (!('activeKey' in props)) {
       var resultActiveTab = find(arrayChildren, {
-        key: tabActiveKey
+        key: urlParams[saveActiveKeyName]
       });
 
       if (!resultActiveTab || resultActiveTab.props.disabled) {
         setUrlParams((_a = {}, _a[saveActiveKeyName] = arrayChildren[0].key, _a));
-        onChange === null || onChange === void 0 ? void 0 : onChange(arrayChildren[0].key);
-      } else {
-        setUrlParams((_b = {}, _b[saveActiveKeyName] = tabActiveKey, _b));
+        setTabActiveKey(arrayChildren[0].key);
       }
+    } else {
+      setTimeout(function () {
+        var _a;
+
+        setUrlParams((_a = {}, _a[saveActiveKeyName] = tabActiveKey, _a));
+      }, 50);
     }
   }, [tabActiveKey]);
 
@@ -104,10 +115,7 @@ var KeepTab = function KeepTab(props) {
     var _a;
 
     setUrlParams((_a = {}, _a[saveActiveKeyName] = nextActiveKey, _a));
-
-    if (onChange) {
-      onChange(nextActiveKey);
-    }
+    setTabActiveKey(nextActiveKey);
   };
 
   var resultChildren = arrayChildren.map(function (childItem) {
@@ -127,20 +135,12 @@ var KeepTab = function KeepTab(props) {
 
     return childItem;
   });
-  var resultTabActiveKey = {};
-
-  if (tabActiveKey) {
-    resultTabActiveKey = {
-      activeKey: tabActiveKey
-    };
-  }
-
   return /*#__PURE__*/React.createElement(Tabs, __assign({
     animated: false,
     onChange: handleTabChange,
     destroyInactiveTabPane: true,
-    defaultActiveKey: urlParams[saveActiveKeyName]
-  }, resultTabActiveKey, restProps), resultChildren);
+    activeKey: tabActiveKey
+  }, restProps), resultChildren);
 };
 
 KeepTab.defaultProps = {

package/lib/keep-tab/index.js

@@ -112,6 +112,8 @@ var react_router_dom_1 = require("react-router-dom");
 
 var use_url_state_1 = __importDefault(require("@ahooksjs/use-url-state"));
 
+var useControllableValue_1 = __importDefault(require("ahooks/es/useControllableValue"));
+
 var toArray_1 = __importDefault(require("rc-util/lib/Children/toArray"));
 
 var TabPane = tabs_1["default"].TabPane;
@@ -123,11 +125,10 @@ var KeepTab = function KeepTab(props) {
   var children = props.children,
       defaultActiveKey = props.defaultActiveKey,
       saveActiveKeyName = props.saveActiveKeyName,
-      tabActiveKey = props.activeKey,
       onChange = props.onChange,
       _b = props.badgeProps,
       badgeProps = _b === void 0 ? defaultBadgeProps : _b,
-      restProps = __rest(props, ["children", "defaultActiveKey", "saveActiveKeyName", "activeKey", "onChange", "badgeProps"]);
+      restProps = __rest(props, ["children", "defaultActiveKey", "saveActiveKeyName", "onChange", "badgeProps"]);
 
   var defaultUrlParams = react_router_dom_1.useParams();
 
@@ -135,21 +136,32 @@ var KeepTab = function KeepTab(props) {
       urlParams = _c[0],
       setUrlParams = _c[1];
 
+  var _d = __read(useControllableValue_1["default"](props, {
+    valuePropName: 'activeKey',
+    defaultValue: defaultUrlParams[saveActiveKeyName] || defaultActiveKey
+  }), 2),
+      tabActiveKey = _d[0],
+      setTabActiveKey = _d[1];
+
   var arrayChildren = toArray_1["default"](children);
   React.useEffect(function () {
-    var _a, _b;
+    var _a;
 
-    if (tabActiveKey) {
+    if (!('activeKey' in props)) {
       var resultActiveTab = lodash_1.find(arrayChildren, {
-        key: tabActiveKey
+        key: urlParams[saveActiveKeyName]
       });
 
       if (!resultActiveTab || resultActiveTab.props.disabled) {
         setUrlParams((_a = {}, _a[saveActiveKeyName] = arrayChildren[0].key, _a));
-        onChange === null || onChange === void 0 ? void 0 : onChange(arrayChildren[0].key);
-      } else {
-        setUrlParams((_b = {}, _b[saveActiveKeyName] = tabActiveKey, _b));
+        setTabActiveKey(arrayChildren[0].key);
       }
+    } else {
+      setTimeout(function () {
+        var _a;
+
+        setUrlParams((_a = {}, _a[saveActiveKeyName] = tabActiveKey, _a));
+      }, 50);
     }
   }, [tabActiveKey]);
 
@@ -157,10 +169,7 @@ var KeepTab = function KeepTab(props) {
     var _a;
 
     setUrlParams((_a = {}, _a[saveActiveKeyName] = nextActiveKey, _a));
-
-    if (onChange) {
-      onChange(nextActiveKey);
-    }
+    setTabActiveKey(nextActiveKey);
   };
 
   var resultChildren = arrayChildren.map(function (childItem) {
@@ -180,20 +189,12 @@ var KeepTab = function KeepTab(props) {
 
     return childItem;
   });
-  var resultTabActiveKey = {};
-
-  if (tabActiveKey) {
-    resultTabActiveKey = {
-      activeKey: tabActiveKey
-    };
-  }
-
   return React.createElement(tabs_1["default"], __assign({
     animated: false,
     onChange: handleTabChange,
     destroyInactiveTabPane: true,
-    defaultActiveKey: urlParams[saveActiveKeyName]
-  }, resultTabActiveKey, restProps), resultChildren);
+    activeKey: tabActiveKey
+  }, restProps), resultChildren);
 };
 
 KeepTab.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.0.76",
+  "version": "2.0.80",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -69,5 +69,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "6e4862aa641f382f96afc1d00af96c68d23f424d"
+  "gitHead": "05f837927f2f7f2f045757c1da82ff1e2b9e4956"
 }