shineout 3.9.7-beta.4 → 3.9.7-beta.5

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.7-beta.4'
+  version: '3.9.7-beta.5'
 };

package/dist/shineout.js

@@ -12401,7 +12401,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.7-beta.4');
+/* harmony default export */ var version = ('3.9.7-beta.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -58022,16 +58022,23 @@ var Tree = function Tree(props) {
     return props.height || styleHeight;
   };
   var handleUpdateActive = function handleUpdateActive(active, item) {
-    setActive(active);
-    if (active !== props.active) {
-      propSetActive === null || propSetActive === void 0 || propSetActive(active, item);
+    var fromUser = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    if (isActiveControlled && fromUser) {
+      // 受控模式下,用户点击时只调用外部回调,不更新内部状态
+      if (active !== props.active) {
+        propSetActive === null || propSetActive === void 0 || propSetActive(active, item);
+      }
+      return;
     }
+
+    // 其他情况(非受控模式,或受控模式下由 props.active 变化触发),更新内部状态和节点
+    setActive(active);
     datum.updateMap.forEach(function (update, id) {
       update('active', id === active);
     });
   };
   var handleNodeClick = function handleNodeClick(node, id) {
-    handleUpdateActive(id, node);
+    handleUpdateActive(id, node, true);
     if (onClick) {
       onClick(node, id, datum.getPath(id));
     }
@@ -75042,7 +75049,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.7-beta.4'
+  version: '3.9.7-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;