rc-tree - npm Package Compare versions

Comparing version 5.4.3 to 5.4.4

es/NodeList.js

@@ -168,3 +168,3 @@ import _extends from "@babel/runtime/helpers/esm/extends";
         var keyIndex = prevData.findIndex(function (_ref) {
-          var key = _ref.data.key;
+          var key = _ref.key;
           return key === diffExpanded.key;
@@ -180,3 +180,3 @@ });
         var _keyIndex = data.findIndex(function (_ref2) {
-          var key = _ref2.data.key;
+          var key = _ref2.key;
           return key === diffExpanded.key;
@@ -183,0 +183,0 @@ });

es/Tree.js

@@ -104,9 +104,6 @@ import _extends from "@babel/runtime/helpers/esm/extends";
       window.addEventListener('dragend', _this.onWindowDragEnd);
-
-      if (onDragStart) {
-        onDragStart({
-          event: event,
-          node: convertNodePropsToEventData(node.props)
-        });
-      }
+      onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart({
+        event: event,
+        node: convertNodePropsToEventData(node.props)
+      });
     };
@@ -191,9 +188,7 @@
 
-          if (onExpand) {
-            onExpand(newExpandedKeys, {
-              node: convertNodePropsToEventData(node.props),
-              expanded: true,
-              nativeEvent: event.nativeEvent
-            });
-          }
+          onExpand === null || onExpand === void 0 ? void 0 : onExpand(newExpandedKeys, {
+            node: convertNodePropsToEventData(node.props),
+            expanded: true,
+            nativeEvent: event.nativeEvent
+          });
         }, 800);
@@ -220,9 +215,7 @@ } // Skip if drag node is self
 
-      if (onDragEnter) {
-        onDragEnter({
-          event: event,
-          node: convertNodePropsToEventData(node.props),
-          expandedKeys: expandedKeys
-        });
-      }
+      onDragEnter === null || onDragEnter === void 0 ? void 0 : onDragEnter({
+        event: event,
+        node: convertNodePropsToEventData(node.props),
+        expandedKeys: expandedKeys
+      });
     };
@@ -281,8 +274,6 @@
 
-      if (onDragOver) {
-        onDragOver({
-          event: event,
-          node: convertNodePropsToEventData(node.props)
-        });
-      }
+      onDragOver === null || onDragOver === void 0 ? void 0 : onDragOver({
+        event: event,
+        node: convertNodePropsToEventData(node.props)
+      });
     };
@@ -300,9 +291,6 @@
       var onDragLeave = _this.props.onDragLeave;
-
-      if (onDragLeave) {
-        onDragLeave({
-          event: event,
-          node: convertNodePropsToEventData(node.props)
-        });
-      }
+      onDragLeave === null || onDragLeave === void 0 ? void 0 : onDragLeave({
+        event: event,
+        node: convertNodePropsToEventData(node.props)
+      });
     };
@@ -317,3 +305,2 @@
     _this.onNodeDragEnd = function (event, node) {
-      var outsideTree = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var onDragEnd = _this.props.onDragEnd;
@@ -327,9 +314,6 @@
 
-      if (onDragEnd && !outsideTree) {
-        onDragEnd({
-          event: event,
-          node: convertNodePropsToEventData(node.props)
-        });
-      }
-
+      onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd({
+        event: event,
+        node: convertNodePropsToEventData(node.props)
+      });
       _this.dragNode = null;
@@ -376,4 +360,4 @@ };
 
-      if (onDrop && !outsideTree) {
-        onDrop(dropResult);
+      if (!outsideTree) {
+        onDrop === null || onDrop === void 0 ? void 0 : onDrop(dropResult);
       }
@@ -405,6 +389,3 @@
       var onClick = _this.props.onClick;
-
-      if (onClick) {
-        onClick(e, treeNode);
-      }
+      onClick === null || onClick === void 0 ? void 0 : onClick(e, treeNode);
     };
@@ -414,6 +395,3 @@
       var onDoubleClick = _this.props.onDoubleClick;
-
-      if (onDoubleClick) {
-        onDoubleClick(e, treeNode);
-      }
+      onDoubleClick === null || onDoubleClick === void 0 ? void 0 : onDoubleClick(e, treeNode);
     };
@@ -454,11 +432,9 @@
 
-      if (onSelect) {
-        onSelect(selectedKeys, {
-          event: 'select',
-          selected: targetSelected,
-          node: treeNode,
-          selectedNodes: selectedNodes,
-          nativeEvent: e.nativeEvent
-        });
-      }
+      onSelect === null || onSelect === void 0 ? void 0 : onSelect(selectedKeys, {
+        event: 'select',
+        selected: targetSelected,
+        node: treeNode,
+        selectedNodes: selectedNodes,
+        nativeEvent: e.nativeEvent
+      });
     };
@@ -547,5 +523,3 @@
 
-      if (onCheck) {
-        onCheck(checkedObj, eventObj);
-      }
+      onCheck === null || onCheck === void 0 ? void 0 : onCheck(checkedObj, eventObj);
     };
@@ -577,8 +551,6 @@
 
-            if (onLoad) {
-              onLoad(newLoadedKeys, {
-                event: 'load',
-                node: treeNode
-              });
-            }
+            onLoad === null || onLoad === void 0 ? void 0 : onLoad(newLoadedKeys, {
+              event: 'load',
+              node: treeNode
+            });
 
@@ -631,9 +603,6 @@ _this.setUncontrolledState({
       var onMouseEnter = _this.props.onMouseEnter;
-
-      if (onMouseEnter) {
-        onMouseEnter({
-          event: event,
-          node: node
-        });
-      }
+      onMouseEnter === null || onMouseEnter === void 0 ? void 0 : onMouseEnter({
+        event: event,
+        node: node
+      });
     };
@@ -643,9 +612,6 @@
       var onMouseLeave = _this.props.onMouseLeave;
-
-      if (onMouseLeave) {
-        onMouseLeave({
-          event: event,
-          node: node
-        });
-      }
+      onMouseLeave === null || onMouseLeave === void 0 ? void 0 : onMouseLeave({
+        event: event,
+        node: node
+      });
     };
@@ -672,5 +638,7 @@
 
-      if (onFocus) {
-        onFocus.apply(void 0, arguments);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
+
+      onFocus === null || onFocus === void 0 ? void 0 : onFocus.apply(void 0, args);
     };
@@ -687,5 +655,7 @@
 
-      if (onBlur) {
-        onBlur.apply(void 0, arguments);
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
       }
+
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur.apply(void 0, args);
     };
@@ -757,11 +727,8 @@
 
-      if (onExpand) {
-        onExpand(expandedKeys, {
-          node: treeNode,
-          expanded: targetExpanded,
-          nativeEvent: e.nativeEvent
-        });
-      } // Async Load data
+      onExpand === null || onExpand === void 0 ? void 0 : onExpand(expandedKeys, {
+        node: treeNode,
+        expanded: targetExpanded,
+        nativeEvent: e.nativeEvent
+      }); // Async Load data
 
-
       if (targetExpanded && loadData) {
@@ -820,5 +787,3 @@ var loadPromise = _this.onNodeLoad(treeNode);
 
-      if (onActiveChange) {
-        onActiveChange(newActiveKey);
-      }
+      onActiveChange === null || onActiveChange === void 0 ? void 0 : onActiveChange(newActiveKey);
     };
@@ -949,5 +914,3 @@
 
-      if (onKeyDown) {
-        onKeyDown(event);
-      }
+      onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
     };
@@ -954,0 +917,0 @@

es/util.js

 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -246,3 +247,5 @@ var _excluded = ["children"];
     var childrenNodes = convertDataToTree(children, processor);
-    return /*#__PURE__*/React.createElement(TreeNode, processProps(props), childrenNodes);
+    return /*#__PURE__*/React.createElement(TreeNode, _extends({
+      key: props.key
+    }, processProps(props)), childrenNodes);
   });
@@ -249,0 +252,0 @@ }

es/utils/diffUtil.js

@@ -38,9 +38,7 @@ export function findExpandedKeys() {
 export function getExpandRange(shorter, longer, key) {
-  var shorterStartIndex = shorter.findIndex(function (_ref) {
-    var data = _ref.data;
+  var shorterStartIndex = shorter.findIndex(function (data) {
     return data.key === key;
   });
   var shorterEndNode = shorter[shorterStartIndex + 1];
-  var longerStartIndex = longer.findIndex(function (_ref2) {
-    var data = _ref2.data;
+  var longerStartIndex = longer.findIndex(function (data) {
     return data.key === key;
@@ -50,5 +48,4 @@ });
   if (shorterEndNode) {
-    var longerEndIndex = longer.findIndex(function (_ref3) {
-      var data = _ref3.data;
-      return data.key === shorterEndNode.data.key;
+    var longerEndIndex = longer.findIndex(function (data) {
+      return data.key === shorterEndNode.key;
     });
@@ -55,0 +52,0 @@ return longer.slice(longerStartIndex + 1, longerEndIndex);

lib/NodeList.js

@@ -185,3 +185,3 @@ "use strict";
         var keyIndex = prevData.findIndex(function (_ref) {
-          var key = _ref.data.key;
+          var key = _ref.key;
           return key === diffExpanded.key;
@@ -197,3 +197,3 @@ });
         var _keyIndex = data.findIndex(function (_ref2) {
-          var key = _ref2.data.key;
+          var key = _ref2.key;
           return key === diffExpanded.key;
@@ -200,0 +200,0 @@ });

lib/Tree.js

@@ -137,9 +137,6 @@ "use strict";
       window.addEventListener('dragend', _this.onWindowDragEnd);
-
-      if (onDragStart) {
-        onDragStart({
-          event: event,
-          node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
-        });
-      }
+      onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart({
+        event: event,
+        node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
+      });
     };
@@ -222,9 +219,7 @@
 
-          if (onExpand) {
-            onExpand(newExpandedKeys, {
-              node: (0, _treeUtil.convertNodePropsToEventData)(node.props),
-              expanded: true,
-              nativeEvent: event.nativeEvent
-            });
-          }
+          onExpand === null || onExpand === void 0 ? void 0 : onExpand(newExpandedKeys, {
+            node: (0, _treeUtil.convertNodePropsToEventData)(node.props),
+            expanded: true,
+            nativeEvent: event.nativeEvent
+          });
         }, 800);
@@ -251,9 +246,7 @@ } // Skip if drag node is self
 
-      if (onDragEnter) {
-        onDragEnter({
-          event: event,
-          node: (0, _treeUtil.convertNodePropsToEventData)(node.props),
-          expandedKeys: expandedKeys
-        });
-      }
+      onDragEnter === null || onDragEnter === void 0 ? void 0 : onDragEnter({
+        event: event,
+        node: (0, _treeUtil.convertNodePropsToEventData)(node.props),
+        expandedKeys: expandedKeys
+      });
     };
@@ -312,8 +305,6 @@
 
-      if (onDragOver) {
-        onDragOver({
-          event: event,
-          node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
-        });
-      }
+      onDragOver === null || onDragOver === void 0 ? void 0 : onDragOver({
+        event: event,
+        node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
+      });
     };
@@ -331,9 +322,6 @@
       var onDragLeave = _this.props.onDragLeave;
-
-      if (onDragLeave) {
-        onDragLeave({
-          event: event,
-          node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
-        });
-      }
+      onDragLeave === null || onDragLeave === void 0 ? void 0 : onDragLeave({
+        event: event,
+        node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
+      });
     };
@@ -348,3 +336,2 @@
     _this.onNodeDragEnd = function (event, node) {
-      var outsideTree = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var onDragEnd = _this.props.onDragEnd;
@@ -358,9 +345,6 @@
 
-      if (onDragEnd && !outsideTree) {
-        onDragEnd({
-          event: event,
-          node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
-        });
-      }
-
+      onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd({
+        event: event,
+        node: (0, _treeUtil.convertNodePropsToEventData)(node.props)
+      });
       _this.dragNode = null;
@@ -405,4 +389,4 @@ };
 
-      if (onDrop && !outsideTree) {
-        onDrop(dropResult);
+      if (!outsideTree) {
+        onDrop === null || onDrop === void 0 ? void 0 : onDrop(dropResult);
       }
@@ -434,6 +418,3 @@
       var onClick = _this.props.onClick;
-
-      if (onClick) {
-        onClick(e, treeNode);
-      }
+      onClick === null || onClick === void 0 ? void 0 : onClick(e, treeNode);
     };
@@ -443,6 +424,3 @@
       var onDoubleClick = _this.props.onDoubleClick;
-
-      if (onDoubleClick) {
-        onDoubleClick(e, treeNode);
-      }
+      onDoubleClick === null || onDoubleClick === void 0 ? void 0 : onDoubleClick(e, treeNode);
     };
@@ -483,11 +461,9 @@
 
-      if (onSelect) {
-        onSelect(selectedKeys, {
-          event: 'select',
-          selected: targetSelected,
-          node: treeNode,
-          selectedNodes: selectedNodes,
-          nativeEvent: e.nativeEvent
-        });
-      }
+      onSelect === null || onSelect === void 0 ? void 0 : onSelect(selectedKeys, {
+        event: 'select',
+        selected: targetSelected,
+        node: treeNode,
+        selectedNodes: selectedNodes,
+        nativeEvent: e.nativeEvent
+      });
     };
@@ -576,5 +552,3 @@
 
-      if (onCheck) {
-        onCheck(checkedObj, eventObj);
-      }
+      onCheck === null || onCheck === void 0 ? void 0 : onCheck(checkedObj, eventObj);
     };
@@ -606,8 +580,6 @@
 
-            if (onLoad) {
-              onLoad(newLoadedKeys, {
-                event: 'load',
-                node: treeNode
-              });
-            }
+            onLoad === null || onLoad === void 0 ? void 0 : onLoad(newLoadedKeys, {
+              event: 'load',
+              node: treeNode
+            });
 
@@ -660,9 +632,6 @@ _this.setUncontrolledState({
       var onMouseEnter = _this.props.onMouseEnter;
-
-      if (onMouseEnter) {
-        onMouseEnter({
-          event: event,
-          node: node
-        });
-      }
+      onMouseEnter === null || onMouseEnter === void 0 ? void 0 : onMouseEnter({
+        event: event,
+        node: node
+      });
     };
@@ -672,9 +641,6 @@
       var onMouseLeave = _this.props.onMouseLeave;
-
-      if (onMouseLeave) {
-        onMouseLeave({
-          event: event,
-          node: node
-        });
-      }
+      onMouseLeave === null || onMouseLeave === void 0 ? void 0 : onMouseLeave({
+        event: event,
+        node: node
+      });
     };
@@ -701,5 +667,7 @@
 
-      if (onFocus) {
-        onFocus.apply(void 0, arguments);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
+
+      onFocus === null || onFocus === void 0 ? void 0 : onFocus.apply(void 0, args);
     };
@@ -716,5 +684,7 @@
 
-      if (onBlur) {
-        onBlur.apply(void 0, arguments);
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
       }
+
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur.apply(void 0, args);
     };
@@ -786,11 +756,8 @@
 
-      if (onExpand) {
-        onExpand(expandedKeys, {
-          node: treeNode,
-          expanded: targetExpanded,
-          nativeEvent: e.nativeEvent
-        });
-      } // Async Load data
+      onExpand === null || onExpand === void 0 ? void 0 : onExpand(expandedKeys, {
+        node: treeNode,
+        expanded: targetExpanded,
+        nativeEvent: e.nativeEvent
+      }); // Async Load data
 
-
       if (targetExpanded && loadData) {
@@ -849,5 +816,3 @@ var loadPromise = _this.onNodeLoad(treeNode);
 
-      if (onActiveChange) {
-        onActiveChange(newActiveKey);
-      }
+      onActiveChange === null || onActiveChange === void 0 ? void 0 : onActiveChange(newActiveKey);
     };
@@ -978,5 +943,3 @@
 
-      if (onKeyDown) {
-        onKeyDown(event);
-      }
+      onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
     };
@@ -983,0 +946,0 @@

lib/util.js

@@ -26,2 +26,4 @@ "use strict";
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -277,3 +279,5 @@
     var childrenNodes = convertDataToTree(children, processor);
-    return /*#__PURE__*/_react.default.createElement(_TreeNode.default, processProps(props), childrenNodes);
+    return /*#__PURE__*/_react.default.createElement(_TreeNode.default, (0, _extends2.default)({
+      key: props.key
+    }, processProps(props)), childrenNodes);
   });
@@ -280,0 +284,0 @@ }

lib/utils/diffUtil.js

@@ -47,9 +47,7 @@ "use strict";
 function getExpandRange(shorter, longer, key) {
-  var shorterStartIndex = shorter.findIndex(function (_ref) {
-    var data = _ref.data;
+  var shorterStartIndex = shorter.findIndex(function (data) {
     return data.key === key;
   });
   var shorterEndNode = shorter[shorterStartIndex + 1];
-  var longerStartIndex = longer.findIndex(function (_ref2) {
-    var data = _ref2.data;
+  var longerStartIndex = longer.findIndex(function (data) {
     return data.key === key;
@@ -59,5 +57,4 @@ });
   if (shorterEndNode) {
-    var longerEndIndex = longer.findIndex(function (_ref3) {
-      var data = _ref3.data;
-      return data.key === shorterEndNode.data.key;
+    var longerEndIndex = longer.findIndex(function (data) {
+      return data.key === shorterEndNode.key;
     });
@@ -64,0 +61,0 @@ return longer.slice(longerStartIndex + 1, longerEndIndex);

package.json

 {
   "name": "rc-tree",
-  "version": "5.4.3",
+  "version": "5.4.4",
   "description": "tree ui component for react",
@@ -80,4 +80,4 @@ "engines": {
     "rc-util": "^5.16.1",
-    "rc-virtual-list": "^3.4.1"
+    "rc-virtual-list": "^3.4.2"
   }
 }

README.md

@@ -41,2 +41,3 @@ # rc-tree
 ## Usage
+> Note: `import "rc-tree/assets/index.css"`
 
@@ -43,0 +44,0 @@ see examples

No alert changes

Improved metrics

Number of lines in readme file

142

0.71%

Worsened metrics

Total package byte prevSize

343409

-0.29%

Number of package files

60

-1.64%

Lines of code

7278

-0.84%

Dependency changes

• Updated

  rc-virtual-list@^3.4.2