rc-tree - npm Package Compare versions

Comparing version 5.4.2 to 5.4.3

es/NodeList.js

@@ -64,3 +64,3 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 function itemKey(item) {
-  var key = item.data.key,
+  var key = item.key,
       pos = item.pos;
@@ -67,0 +67,0 @@ return getKey(key, pos);

es/Tree.d.ts

@@ -185,3 +185,5 @@ import * as React from 'react';
     listRef: React.RefObject<NodeListRef>;
-    componentDidUpdate(_: Readonly<TreeProps<TreeDataType>>, prevState: Readonly<TreeState<TreeDataType>>): void;
+    componentDidMount(): void;
+    componentDidUpdate(): void;
+    onUpdated(): void;
     componentWillUnmount(): void;
@@ -188,0 +190,0 @@ static getDerivedStateFromProps(props: TreeProps, prevState: TreeState): Partial<TreeState<DataNode>>;

es/Tree.js

@@ -796,2 +796,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 
+      if (newActiveKey !== null) {
+        _this.scrollTo({
+          key: newActiveKey
+        });
+      }
+
       if (onActiveChange) {
@@ -962,10 +968,26 @@ onActiveChange(newActiveKey);
   _createClass(Tree, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.onUpdated();
+    }
+  }, {
     key: "componentDidUpdate",
-    value: function componentDidUpdate(_, prevState) {
-      var activeKey = this.state.activeKey;
+    value: function componentDidUpdate() {
+      this.onUpdated();
+    }
+  }, {
+    key: "onUpdated",
+    value: function onUpdated() {
+      var activeKey = this.props.activeKey;
 
-      if (activeKey !== null && prevState.activeKey !== activeKey) {
-        this.scrollTo({
-          key: activeKey
+      if (activeKey !== undefined && activeKey !== this.state.activeKey) {
+        this.setState({
+          activeKey: activeKey
         });
+
+        if (activeKey !== null) {
+          this.scrollTo({
+            key: activeKey
+          });
+        }
       }
@@ -1239,7 +1261,2 @@ }
         newState.loadedKeys = props.loadedKeys;
-      } // ================== activeKey ==================
-
-
-      if (needSync('activeKey')) {
-        newState.activeKey = props.activeKey;
       }
@@ -1246,0 +1263,0 @@

lib/NodeList.js

@@ -82,3 +82,3 @@ "use strict";
 function itemKey(item) {
-  var key = item.data.key,
+  var key = item.key,
       pos = item.pos;
@@ -85,0 +85,0 @@ return (0, _treeUtil.getKey)(key, pos);

lib/Tree.d.ts

@@ -185,3 +185,5 @@ import * as React from 'react';
     listRef: React.RefObject<NodeListRef>;
-    componentDidUpdate(_: Readonly<TreeProps<TreeDataType>>, prevState: Readonly<TreeState<TreeDataType>>): void;
+    componentDidMount(): void;
+    componentDidUpdate(): void;
+    onUpdated(): void;
     componentWillUnmount(): void;
@@ -188,0 +190,0 @@ static getDerivedStateFromProps(props: TreeProps, prevState: TreeState): Partial<TreeState<DataNode>>;

lib/Tree.js

@@ -825,2 +825,8 @@ "use strict";
 
+      if (newActiveKey !== null) {
+        _this.scrollTo({
+          key: newActiveKey
+        });
+      }
+
       if (onActiveChange) {
@@ -991,10 +997,26 @@ onActiveChange(newActiveKey);
   (0, _createClass2.default)(Tree, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.onUpdated();
+    }
+  }, {
     key: "componentDidUpdate",
-    value: function componentDidUpdate(_, prevState) {
-      var activeKey = this.state.activeKey;
+    value: function componentDidUpdate() {
+      this.onUpdated();
+    }
+  }, {
+    key: "onUpdated",
+    value: function onUpdated() {
+      var activeKey = this.props.activeKey;
 
-      if (activeKey !== null && prevState.activeKey !== activeKey) {
-        this.scrollTo({
-          key: activeKey
+      if (activeKey !== undefined && activeKey !== this.state.activeKey) {
+        this.setState({
+          activeKey: activeKey
         });
+
+        if (activeKey !== null) {
+          this.scrollTo({
+            key: activeKey
+          });
+        }
       }
@@ -1267,7 +1289,2 @@ }
         newState.loadedKeys = props.loadedKeys;
-      } // ================== activeKey ==================
-
-
-      if (needSync('activeKey')) {
-        newState.activeKey = props.activeKey;
       }
@@ -1274,0 +1291,0 @@

package.json

 {
   "name": "rc-tree",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "description": "tree ui component for react",
@@ -5,0 +5,0 @@ "engines": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

344407

increased by0.14%

Lines of code

7340

increased by0.52%

No dependency changes