@sheinx/base 3.2.0-rc.4 → 3.2.0-rc.5

package/cjs/sticky/sticky.js

@@ -25,6 +25,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var cssSupport = _hooks.util.cssSupport;
 var supportSticky = cssSupport('position', 'sticky');
 var defaultZIndex = 900;
+var events = ['scroll', 'pageshow', 'load', 'resize'];
 
 // const getFirstScrollParent = (el: HTMLElement) => {
 //   let parent = el.parentNode as HTMLElement;
@@ -43,17 +44,19 @@ var defaultZIndex = 900;
 // };
 
 var Sticky = function Sticky(props) {
-  var _props$style;
   var children = props.children,
     top = props.top,
     bottom = props.bottom;
-  var css = props.css || props.target;
+  // 是否使用css sticky
+  var css = (props.css || props.target) && supportSticky;
+  var forceUpdate = (0, _hooks.useRender)();
   var _useRef = (0, _react.useRef)({
       target: null,
       div: null,
-      observer: null,
+      position: '',
+      targetObserver: null,
       parentObserver: null,
-      isTop: false
+      fixedObserver: null
     }),
     context = _useRef.current;
   var _useState = (0, _react.useState)({}),
@@ -68,12 +71,7 @@ var Sticky = function Sticky(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     parentVisible = _useState6[0],
     setParentVisible = _useState6[1];
-  var forceRender = (0, _hooks.useRender)();
   var elementRef = (0, _react.useRef)(null);
-  var elementSize = (0, _hooks.useResize)({
-    targetRef: elementRef,
-    timer: 0
-  });
   var getTarget = function getTarget() {
     var scrollContainer = props.scrollContainer;
     if (typeof scrollContainer === 'string') {
@@ -83,22 +81,19 @@ var Sticky = function Sticky(props) {
     if (scrollContainer && scrollContainer.nodeType === 1) {
       return scrollContainer;
     }
-    return document.body;
+    return null;
   };
+
+  // window resize 时需要重新计算底部附着的位置
   var updateStyle = (0, _hooks.usePersistFn)(function () {
-    if (context.div && !context.isTop && show) {
-      var shouldFixed = context.target === document.body;
+    if (context.div && context.position === 'bottom' && show) {
       var scrollRect = context.target.getBoundingClientRect();
       var targetRect = elementRef.current.getBoundingClientRect();
       var targetLeft = targetRect.left;
-      var width = targetRect.width,
-        height = targetRect.height;
       if (typeof bottom === 'number') {
         var outRootRect = context.target.getBoundingClientRect();
         var _style = {
-          position: shouldFixed ? 'fixed' : 'absolute',
-          width: "".concat(width, "px"),
-          height: "".concat(height, "px"),
+          position: 'absolute',
           top: "".concat(scrollRect.bottom - (props.bottom || 0) - outRootRect.top, "px"),
           left: "".concat(targetLeft - outRootRect.left, "px"),
           transform: 'translateY(-100%)'
@@ -107,30 +102,22 @@ var Sticky = function Sticky(props) {
       }
     }
   });
-  var handlePosition = (0, _hooks.usePersistFn)(function (entries) {
+
+  // 有滚动容器时的定位
+  var handleTargetPosition = (0, _hooks.usePersistFn)(function (entries) {
     var entry = entries[0];
     var scrollRect = entry.rootBounds;
     var targetRect = entry.boundingClientRect;
-    var shouldFixed = context.target === document.body;
     if (!entry.isIntersecting) {
       var targetLeft = targetRect.left;
-      var outRootRect = shouldFixed ? {
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0
-      } : context.div.getBoundingClientRect();
-      var width = targetRect.width,
-        height = targetRect.height;
+      var outRootRect = context.div.getBoundingClientRect();
       if (scrollRect && targetRect.bottom < scrollRect.bottom) {
         // top in
-        context.isTop = true;
+        context.position = 'top';
         if (typeof top === 'number') {
           setShow(true);
           var _style2 = {
-            position: shouldFixed ? 'fixed' : 'absolute',
-            width: "".concat(width, "px"),
-            height: "".concat(height, "px"),
+            position: 'absolute',
             top: "".concat(scrollRect.top - outRootRect.top, "px"),
             left: "".concat(targetLeft - outRootRect.left, "px")
           };
@@ -138,16 +125,13 @@ var Sticky = function Sticky(props) {
         }
       } else if (scrollRect) {
         // bottom in
-        context.isTop = false;
+        context.position = 'bottom';
         if (typeof bottom === 'number') {
           setShow(true);
-          var _outRootRect = context.target.getBoundingClientRect();
           var _style3 = {
-            position: shouldFixed ? 'fixed' : 'absolute',
-            width: "".concat(width, "px"),
-            height: "".concat(height, "px"),
-            top: "".concat(scrollRect.bottom - _outRootRect.top, "px"),
-            left: "".concat(targetLeft - _outRootRect.left, "px"),
+            position: 'absolute',
+            top: "".concat(scrollRect.bottom - outRootRect.top, "px"),
+            left: "".concat(targetLeft - outRootRect.left, "px"),
             transform: 'translateY(-100%)'
           };
           setStyle(_style3);
@@ -156,8 +140,11 @@ var Sticky = function Sticky(props) {
     }
     if (entry.isIntersecting) {
       setShow(false);
+      context.position = '';
     }
   });
+
+  // 父元素是否可见
   var handleParentVisible = (0, _hooks.usePersistFn)(function (entries) {
     var entry = entries[0];
     if (entry.isIntersecting) {
@@ -166,35 +153,118 @@ var Sticky = function Sticky(props) {
       setParentVisible(false);
     }
   });
-  var cleanEvents = function cleanEvents() {
-    if (context.observer) {
-      context.observer.disconnect();
-      context.observer = null;
+  var setFixedStyle = (0, _hooks.usePersistFn)(function (s, m) {
+    var l = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    if (s !== show) {
+      setShow(s);
     }
-    if (context.parentObserver) {
-      context.parentObserver.disconnect();
-      context.parentObserver = null;
+    if (s && m) {
+      var newStyle = _defineProperty(_defineProperty({
+        position: 'fixed'
+      }, m, m === 'top' ? top : bottom), "left", l);
+      if (!_hooks.util.shallowEqual(style, newStyle)) {
+        setStyle(newStyle);
+      }
+    }
+  });
+
+  // 无滚动容器的时候，body 滚动 resize 计算
+  var handleFixedPosition = (0, _hooks.usePersistFn)(function () {
+    if (css || context.target) return;
+    var element = elementRef.current;
+    if (!parentVisible) {
+      setFixedStyle(false);
+      return;
+    }
+    if (!element) return;
+    var selfRect = element.getBoundingClientRect();
+    if (selfRect === null) return;
+    // If the element is hidden, the width and height will be 0
+    if (selfRect && selfRect.width === 0 && selfRect.height === 0) return;
+    var scrollRect = document.body.getBoundingClientRect();
+    var top = props.top,
+      bottom = props.bottom;
+    if (top !== undefined && Math.ceil(selfRect.top) <= top) {
+      setFixedStyle(true, 'top', selfRect.left);
+      return;
+    } else if (bottom !== undefined && Math.ceil(selfRect.bottom) + bottom > scrollRect.bottom) {
+      setFixedStyle(true, 'bottom', selfRect.left);
+      return;
+    } else {
+      setFixedStyle(false);
+    }
+  });
+
+  // 无滚动容器时内滚场景触发
+  var handleFixedInter = (0, _hooks.usePersistFn)(function (entries) {
+    if (!parentVisible) {
+      setFixedStyle(false);
+      return;
+    }
+    var entry = entries[0];
+    var scrollRect = entry.rootBounds;
+    var targetRect = entry.boundingClientRect;
+    if (scrollRect && scrollRect.top === 0 && scrollRect.bottom === 0) {
+      return;
+    }
+    if (!entry.isIntersecting) {
+      var targetLeft = targetRect.left;
+      var outRootRect = document.body.getBoundingClientRect();
+      if (scrollRect && targetRect.bottom < scrollRect.bottom) {
+        // top in
+        if (typeof top === 'number') {
+          setFixedStyle(true, 'top', targetLeft - outRootRect.left);
+        }
+      } else if (scrollRect) {
+        // bottom in
+        if (typeof bottom === 'number') {
+          setFixedStyle(true, 'bottom', targetLeft - outRootRect.left);
+        }
+      }
+    }
+    if (entry.isIntersecting) {
+      setFixedStyle(false);
+    }
+  });
+  var elementSize = (0, _hooks.useResize)({
+    targetRef: elementRef,
+    timer: 10,
+    cb: handleFixedPosition
+  });
+  var cancelFixedObserver = function cancelFixedObserver() {
+    if (context.fixedObserver) {
+      context.fixedObserver.disconnect();
+      context.fixedObserver = null;
+    }
+  };
+  var createFixedObserver = function createFixedObserver() {
+    cancelFixedObserver();
+    context.fixedObserver = new IntersectionObserver(handleFixedInter, {
+      root: null,
+      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      threshold: 1.0
+    });
+  };
+  var cancelObserver = function cancelObserver() {
+    if (context.targetObserver) {
+      context.targetObserver.disconnect();
+      context.targetObserver = null;
     }
-    window.removeEventListener('resize', updateStyle);
   };
   var createObserver = function createObserver() {
-    var target = getTarget();
-    if (!context.div && target !== document.body) {
+    if (!context.div) {
       context.div = document.createElement('div');
       context.div.style.position = 'relative';
     }
-    if (target && target !== context.target) {
-      forceRender();
-      context.target = target;
-      cleanEvents();
+    if (context.target) {
       if (context.div) {
         // append div
-        if (target === document.body) {
-          document.body.appendChild(context.div);
+        if (context.target === document.body) {
+          document.body.insertBefore(context.div, document.body.firstChild);
         } else {
-          target.parentNode.insertBefore(context.div, target);
+          context.target.parentNode.insertBefore(context.div, context.target);
         }
-        var _style4 = window.getComputedStyle(target);
+        var _style4 = window.getComputedStyle(context.target);
         if (_style4.position === 'absolute' || _style4.position === 'fixed') {
           context.div.style.position = _style4.position;
           context.div.style.top = _style4.top;
@@ -203,59 +273,109 @@ var Sticky = function Sticky(props) {
           context.div.style.bottom = _style4.bottom;
         }
       }
+      cancelFixedObserver();
       if (window.IntersectionObserver) {
-        var observer = new IntersectionObserver(handlePosition, {
-          root: target,
+        var observer = new IntersectionObserver(handleTargetPosition, {
+          root: context.target,
           rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
           threshold: 1.0
         });
-        context.observer = observer;
-        context.parentObserver = new IntersectionObserver(handleParentVisible, {
-          root: target,
-          rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
-          threshold: 0
-        });
+        context.targetObserver = observer;
       }
     }
   };
+  var cancelParentObserver = function cancelParentObserver() {
+    if (context.parentObserver) {
+      context.parentObserver.disconnect();
+      context.parentObserver = null;
+    }
+  };
+  var createParentObserver = function createParentObserver() {
+    if (!props.parent) return;
+    cancelParentObserver();
+    context.parentObserver = new IntersectionObserver(handleParentVisible, {
+      root: context.target,
+      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      threshold: 0
+    });
+    context.parentObserver.observe(props.parent);
+  };
+
+  // 存在滚动容器时的定位
+  var createTargetEvents = function createTargetEvents() {
+    createObserver();
+    window.addEventListener('resize', updateStyle);
+  };
+  var cancelTargetEvents = function cancelTargetEvents() {
+    cancelObserver();
+    window.removeEventListener('resize', updateStyle);
+    if (context.div) {
+      context.div.remove();
+      context.div = null;
+    }
+  };
+  var createFixedEvents = function createFixedEvents() {
+    createFixedObserver();
+    events.forEach(function (event) {
+      window.addEventListener(event, handleFixedPosition);
+    });
+  };
+  var cancelFixedEvents = function cancelFixedEvents() {
+    cancelFixedObserver();
+    events.forEach(function (event) {
+      window.removeEventListener(event, handleFixedPosition);
+    });
+  };
   var handleElementRef = function handleElementRef(el) {
     if (el) {
       elementRef.current = el;
-      if (el && context.observer) {
-        context.observer.observe(el);
+      if (context.targetObserver) {
+        if (!el) {
+          context.targetObserver.disconnect();
+        } else {
+          context.targetObserver.observe(el);
+        }
+      }
+      if (context.fixedObserver) {
+        if (!el) {
+          context.fixedObserver.disconnect();
+        } else {
+          context.fixedObserver.observe(el);
+        }
       }
     }
   };
-  (0, _react.useEffect)(function () {
-    if (!css) {
-      createObserver();
-      window.addEventListener('resize', updateStyle);
+  (0, _react.useLayoutEffect)(function () {
+    if (css) return;
+    var target = getTarget();
+    if (context.target !== target) {
+      context.target = target;
+      forceUpdate();
     }
-    return function () {
-      cleanEvents();
-      if (context.div) {
-        context.div.remove();
-        context.div = null;
-      }
-    };
-  }, [css]);
-  (0, _react.useEffect)(function () {
-    if (props.parent && context.parentObserver) {
+    if (context.target) {
+      createTargetEvents();
+      return cancelTargetEvents;
+    } else {
+      // fixed 布局
+      createFixedEvents();
+      return cancelFixedEvents;
+    }
+  }, [css, top, bottom]);
+  (0, _react.useLayoutEffect)(function () {
+    if (props.parent && !css) {
+      // createParentObserver 用到context.target
+      createParentObserver();
       context.parentObserver.observe(props.parent);
     }
-    return function () {
-      if (context.parentObserver) {
-        context.parentObserver.disconnect();
-      }
-    };
-  }, [props.parent]);
+    return cancelParentObserver;
+  }, [props.parent, css, context.target, top, bottom]);
 
   // 纯css方法 直接使用css
   // js方法
   // 1. 不指定滚动容器 基于document.body 使用fixed + js计算
   // 2. 指定滚动容器 在滚动容器上方插入一个dom占位 基于该dom渲染和定位
   // 3. 使用 intersectionObserver 来判断是否需要sticky
-  if (css && supportSticky) {
+  if (css) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: props.className,
       style: _objectSpread(_objectSpread({
@@ -279,12 +399,14 @@ var Sticky = function Sticky(props) {
     })
   }) : null;
   var isFixed = style.position === 'fixed';
+  var hideStyle = {
+    opacity: 0,
+    pointerEvents: 'none'
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [isFixed ? StickyEl : context.target && context.div && /*#__PURE__*/(0, _reactDom.createPortal)(StickyEl, context.div), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: props.className,
-      style: _objectSpread(_objectSpread({}, props.style), {}, {
-        opacity: show && parentVisible ? 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.opacity
-      }),
+      style: _objectSpread(_objectSpread({}, props.style), show && parentVisible ? hideStyle : {}),
       ref: handleElementRef,
       children: children
     })]

package/cjs/table/thead.js

@@ -169,10 +169,7 @@ var _default = exports.default = function _default(props) {
         style: fixedStyle,
         dir: config.direction,
         children: [showSelectAll && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          style: {
-            lineHeight: 1,
-            verticalAlign: 'middle'
-          },
+          className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
           children: props.radio ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, {
             disabled: props.disabled === true,
             checked: props.datum.getCheckedStatus(props.treeCheckAll ? props.treeColumnsName : undefined),

package/cjs/table/tr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAKvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,aAAa,GACb,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,CACjB;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IACjC,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,gBAyRzB,CAAC;AAEF,eAAe,EAAE,CAAC"}
+{"version":3,"file":"tr.d.ts","sourceRoot":"","sources":["tr.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAKvD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG7D,UAAU,OACR,SAAQ,IAAI,CACV,UAAU,EACR,UAAU,GACV,cAAc,GACd,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,aAAa,GACb,SAAS,GACT,OAAO,GACP,YAAY,GACZ,cAAc,GACd,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,cAAc,CACjB;IACD,GAAG,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IACjC,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACnD,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACtD,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,EAAE,UAAW,OAAO,gBAwRzB,CAAC;AAEF,eAAe,EAAE,CAAC"}

package/cjs/table/tr.js

@@ -51,7 +51,7 @@ var Tr = function Tr(props) {
           transform: "translate3d(".concat(0 - props.fixRightNum, "px, 0, 0)")
         };
       }
-      var right = props.colgroup.slice(index + 1 + colSpan).reduce(function (a, b) {
+      var right = props.colgroup.slice(index + colSpan).reduce(function (a, b) {
         return (a || 0) + (b || 0);
       }, 0);
       return {

package/cjs/tag/tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["tag.tsx"],"names":[],"mappings":";AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,YAAY,CAAC;AAOlD,QAAA,MAAM,GAAG;YAAW,QAAQ;;CAgI3B,CAAC;AAIF,eAAe,GAAG,CAAC"}
+{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["tag.tsx"],"names":[],"mappings":";AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQlD,QAAA,MAAM,GAAG;YAAW,QAAQ;;CAgI3B,CAAC;AAIF,eAAe,GAAG,CAAC"}

package/cjs/tag/tag.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
 var _useTag2 = _interopRequireDefault(require("./use-tag"));
+var _hooks = require("@sheinx/hooks");
 var _tagInput = _interopRequireDefault(require("./tag-input"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "inlineStyle", "onKeyUp", "onCompleted", "onEnterPress", "closable"];
@@ -79,15 +80,15 @@ var Tag = function Tag(props) {
     if (onClose) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: (0, _classnames.default)(tagStyle.wrapper, inlineStyle && tagStyle.inline),
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: tagStyle.container,
-          children: children
+          children: _hooks.util.wrapSpan(children)
         })
       });
     }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames.default)(tagStyle.wrapper, inlineStyle && tagStyle.inline),
-      children: children
+      children: _hooks.util.wrapSpan(children)
     });
   };
   var renderInput = function renderInput() {

package/cjs/textarea/textarea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textarea.d.ts","sourceRoot":"","sources":["textarea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0B,MAAM,OAAO,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;;AA8LhD,wBAAoC"}
+{"version":3,"file":"textarea.d.ts","sourceRoot":"","sources":["textarea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0B,MAAM,OAAO,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;;AA+LhD,wBAAoC"}

package/cjs/textarea/textarea.js

@@ -139,6 +139,7 @@ var Textarea = function Textarea(props0) {
     if (!res) return null;
     var isError = res instanceof Error;
     var text = isError ? res.message : res;
+    if (!isError && !focused) return null;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: {
         minWidth: 'auto'

package/cjs/transfer/transfer-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfer-list.d.ts","sourceRoot":"","sources":["transfer-list.tsx"],"names":[],"mappings":";AACA,OAAO,EAAQ,YAAY,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,QAAA,MAAM,YAAY,oGAgMjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"transfer-list.d.ts","sourceRoot":"","sources":["transfer-list.tsx"],"names":[],"mappings":";AACA,OAAO,EAAQ,YAAY,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,QAAA,MAAM,YAAY,oGAoMjB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/cjs/transfer/transfer-list.js

@@ -157,7 +157,13 @@ var TransferList = function TransferList(props) {
         value: value,
         onSelected: onSelectChange
       });
-      if (custom) return custom;
+      if (custom) return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: listClass,
+        style: _objectSpread(_objectSpread({}, listStyle), {}, {
+          height: listHeight
+        }),
+        children: custom
+      });
     }
     if (data && data.length === 0) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/cjs/transfer/transfer.js

@@ -158,7 +158,7 @@ var Transfer = function Transfer(props) {
       simple: simple,
       disabled: disabled,
       value: listValue,
-      selectedKeys: selectedKeys,
+      selectedKeys: listValue,
       itemClass: itemClass,
       customRender: children,
       searchPlaceholder: placeholder,

package/cjs/tree/tree-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-content.d.ts","sourceRoot":"","sources":["tree-content.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAmB,MAAM,eAAe,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAOvD,QAAA,MAAM,WAAW,mGA+MhB,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"tree-content.d.ts","sourceRoot":"","sources":["tree-content.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAmB,MAAM,eAAe,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAOvD,QAAA,MAAM,WAAW,mGAiNhB,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/cjs/tree/tree-content.js

@@ -53,7 +53,8 @@ var NodeContent = function NodeContent(props) {
   var contentStyle = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.tree()) || {};
   var rootClass = (0, _classnames.default)(contentStyle.contentWrapper, _defineProperty(_defineProperty({}, contentStyle.childnode, data[childrenKey] && data[childrenKey].length > 0), contentStyle.inlineContent, inlineNode));
   var contentClass = (0, _classnames.default)(contentStyle.content, _hooks.util.isString(contentClassProp) && contentClassProp, _hooks.util.isFunc(contentClassProp) && contentClassProp(data));
-  var textClass = (0, _classnames.default)(contentStyle.text, disabled ? contentStyle.textDisabled : '');
+  // const textClass = classNames(contentStyle.text, disabled ? contentStyle.textDisabled : '');
+  var textClass = (0, _classnames.default)(contentStyle.text);
   var hasExpandIcons = expandIcons !== undefined;
   var children = data[childrenKey];
   var hasChildren = children && children.length > 0;
@@ -62,9 +63,9 @@ var NodeContent = function NodeContent(props) {
     if (highlight) {
       dataProps['data-active'] = active;
     }
-    if (disabled) {
-      dataProps['data-disabled'] = disabled;
-    }
+    // if (disabled) {
+    //   dataProps['data-disabled'] = disabled;
+    // }
     return dataProps;
   };
   var handleIndicatorClick = function handleIndicatorClick() {
@@ -81,7 +82,7 @@ var NodeContent = function NodeContent(props) {
     }
   };
   var handleNodeClick = function handleNodeClick() {
-    if (disabled) return;
+    // if (disabled) return;
     if (parentClickExpand && hasChildren) {
       handleIndicatorClick();
     } else {
@@ -168,6 +169,7 @@ var NodeContent = function NodeContent(props) {
     dir: config.direction,
     children: [renderIndicator(), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", _objectSpread(_objectSpread(_objectSpread({
       dir: config.direction,
+      "data-expanded": expanded,
       ref: bindContent,
       className: contentClass
     }, contentDataProps()), contentEvent), {}, {

package/cjs/tree/tree-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-node.d.ts","sourceRoot":"","sources":["tree-node.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAiC,YAAY,EAAE,MAAM,eAAe,CAAC;AAkB5E,QAAA,MAAM,IAAI,gGAgST,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"tree-node.d.ts","sourceRoot":"","sources":["tree-node.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAiC,YAAY,EAAE,MAAM,eAAe,CAAC;AAkB5E,QAAA,MAAM,IAAI,gGAqST,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/cjs/tree/tree-node.js

@@ -221,6 +221,10 @@ var Node = function Node(props) {
       onChange: onChange,
       onToggle: onToggle,
       onNodeClick: onNodeClick,
+      onDragOver: onDragOver,
+      onDragLeave: onDragLeave,
+      onDragStart: onDragStart,
+      onDragEnd: onDragEnd,
       bindNode: bindNode,
       childrenClassName: childrenClass(data),
       childrenKey: childrenKey,

package/cjs/tree/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAA4B,MAAM,eAAe,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,QAAA,MAAM,IAAI,4FAmOT,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAA4B,MAAM,eAAe,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,QAAA,MAAM,IAAI,4FAyOT,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/cjs/tree/tree.js

@@ -75,6 +75,10 @@ var Tree = function Tree(props) {
     onDragStart = props.onDragStart,
     propsDatum = props.datum,
     rest = _objectWithoutProperties(props, _excluded);
+  var _useRef = (0, _react.useRef)({
+      mounted: false
+    }),
+    context = _useRef.current;
   var _useTree = (0, _hooks.useTree)({
       mode: mode,
       value: value,
@@ -190,6 +194,11 @@ var Tree = function Tree(props) {
     }
   };
   (0, _react.useEffect)(function () {
+    // 首次渲染不更新
+    if (!context.mounted) {
+      return;
+    }
+    if (!props.expanded) return;
     handleUpdateExpanded(expanded);
   }, [expanded]);
   (0, _react.useEffect)(function () {
@@ -198,6 +207,7 @@ var Tree = function Tree(props) {
   }, [active]);
   (0, _react.useEffect)(function () {
     if (getDatum) getDatum(datum);
+    context.mounted = true;
   }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
     className: rootClass

package/cjs/tree/tree.type.d.ts

@@ -24,7 +24,6 @@ export type TreeClasses = {
     children: string;
     leaf: string;
     placement: string;
-    textDisabled: string;
 };
 export type JsstyleType = {
     tree: () => TreeClasses;