@lemon-fe/components 0.0.14 → 0.0.17

package/es/SiderTree/index.d.ts

@@ -15,7 +15,6 @@ interface Props<KeyType> extends Omit<TreeProps, 'onSelect' | 'selectedKeys' | '
         selectedNodes: DataNode[];
         nativeEvent: MouseEvent;
     }) => void;
-    onTabChange?: (tab: number) => void;
     selectedKeys?: KeyType[];
     defaultSelectedKeys?: KeyType[];
     defaultExpandAll?: boolean;

package/es/SiderTree/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["tabs", "children"],
-    _excluded2 = ["data", "showSearch", "placeholder", "onSelect", "operation", "onTabChange"];
+    _excluded2 = ["data", "showSearch", "placeholder", "onSelect", "operation"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -31,13 +31,27 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import React, { Children, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useDebounce } from '@lemon-fe/hooks';
 import Tree from 'rc-tree';
 import { Empty, Input, Tabs } from 'antd';
 import classNames from 'classnames';
 import { PREFIX_CLS } from '../constants';
-import TreeNodeTitle from './TreeNodeTitle';
+import TreeNodeTitle from './TreeNodeTitle'; // 不使用Children.map的原因是由于它会给子节点生成一个key与tabs的activeTabKey无法对应
+
+var mapChildren = function mapChildren(children, cb) {
+  var nodes = [];
+
+  if (Array.isArray(children)) {
+    nodes = children;
+  } else {
+    nodes = [children];
+  }
+
+  return nodes.filter(function (item) {
+    return item !== null;
+  }).map(cb);
+};
 
 function SiderTreeTabs(props) {
   var tabs = props.tabs,
@@ -72,11 +86,11 @@ function SiderTreeTabs(props) {
         }, item.title);
       }));
     }
-  }), Children.map(children, function (child, index) {
+  }), mapChildren(children, function (child, index) {
     var tab = tabs[index];
     return /*#__PURE__*/React.createElement(Tabs.TabPane, {
       tab: tab.title,
-      key: tab.key || tab.title
+      key: getKey(tab)
     }, child);
   }));
 }
@@ -88,7 +102,6 @@ export default function SiderTree(props) {
       mPlaceholder = props.placeholder,
       _onSelect = props.onSelect,
       operation = props.operation,
-      onTabChange = props.onTabChange,
       restProps = _objectWithoutProperties(props, _excluded2);
 
   var prefixCls = "".concat(PREFIX_CLS, "-tree");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.0.14",
+  "version": "0.0.17",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -16,7 +16,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@lemon-fe/hooks": "^0.0.14",
+    "@lemon-fe/hooks": "^0.0.17",
     "antd": "^4.17.0",
     "classnames": "^2.2.6",
     "lodash": "^4.17.21",
@@ -39,5 +39,5 @@
     "@types/lodash": "^4.14.179",
     "@types/react-resizable": "^1.7.4"
   },
-  "gitHead": "09bdbf46bb3c39d934a98d0d759ae31d89c0e6cf"
+  "gitHead": "fc8e8d101d44aef4f8c4f7121ac80f8feb1e35e6"
 }