shineout 3.9.11-beta.10 → 3.9.11-beta.12

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.11-beta.10'
+  version: '3.9.11-beta.12'
 };

package/dist/shineout.js

@@ -12402,7 +12402,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.11-beta.10');
+/* harmony default export */ var version = ('3.9.11-beta.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -41423,15 +41423,8 @@ var useTree = function useTree(props) {
     if (props.datum) return;
     if (!dataUpdate) return;
     setData(data);
-    var nextExpanded = props.expanded || props.defaultExpanded || [];
-    if (!defaultExpandAll && !shallowEqual(nextExpanded, expanded)) {
-      onExpand(nextExpanded);
-      updateExpanded(nextExpanded, true);
-    }
-    updateInnerCheckStatus();
-  }, [props.data]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (defaultExpandAll) {
+      // data 变化后 dataMap 已由 setData 填充，直接收集所有可展开节点
       var nextExpanded = [];
       context.dataMap.forEach(function (item, k) {
         if (item[childrenKey]) {
@@ -41440,8 +41433,15 @@ var useTree = function useTree(props) {
       });
       onExpand(nextExpanded);
       updateExpanded(nextExpanded, true);
+    } else {
+      var _nextExpanded = props.expanded || props.defaultExpanded || [];
+      if (!shallowEqual(_nextExpanded, expanded)) {
+        onExpand(_nextExpanded);
+        updateExpanded(_nextExpanded, true);
+      }
     }
-  }, [context.dataMap, props.data]);
+    updateInnerCheckStatus();
+  }, [props.data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.datum) return;
     setValue(value);
@@ -41627,11 +41627,13 @@ var Scroll = function Scroll(props) {
   };
 
   // 当滚动容器的高度为 0 时，paddingTop 为 0，避免滚动条抖动现象
+  // 优先使用 props.height 计算 paddingTop，避免动画过程中 useResize 读到中间值导致滚动条闪烁
+  var stableHeight = typeof props.height === 'number' ? props.height : height;
   var paddingTop = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    var maxHeight = Math.max(0, scrollHeight - height);
+    var maxHeight = Math.max(0, scrollHeight - stableHeight);
     if (keepScrollTop) return maxHeight;
     return height === 0 ? 0 : maxHeight;
-  }, [scrollHeight, height]);
+  }, [scrollHeight, stableHeight, height]);
   var placeStyle = {
     paddingTop: paddingTop,
     width: scrollWidth,
@@ -58224,6 +58226,7 @@ var TreeVirtual = function TreeVirtual(props) {
     iconClass = props.iconClass,
     leafClass = props.leafClass,
     nodeClass = props.nodeClass,
+    actionOnClick = props.actionOnClick,
     onNodeClick = props.onNodeClick,
     onToggle = props.onToggle,
     onChange = props.onChange;
@@ -58259,6 +58262,7 @@ var TreeVirtual = function TreeVirtual(props) {
       parentClickExpand: parentClickExpand,
       doubleClickExpand: doubleClickExpand,
       expanded: expanded,
+      actionOnClick: actionOnClick,
       onNodeClick: onNodeClick,
       onToggle: onToggle,
       onChange: onChange,
@@ -71538,7 +71542,7 @@ var TreeSelect = function TreeSelect(props0) {
     onTiledFilter === null || onTiledFilter === void 0 || onTiledFilter(trim ? text.trim() : text, from);
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (virtual && expanded) {
+    if (virtual && expanded && expanded.length > 0) {
       setVirtualExpanded(expanded);
     }
   }, [expanded]);
@@ -75553,7 +75557,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.11-beta.10'
+  version: '3.9.11-beta.12'
 });
 }();
 /******/ 	return __webpack_exports__;