shineout 3.8.0-beta.22 → 3.8.0-beta.24

package/cjs/empty/empty.type.d.ts

@@ -1,5 +1,19 @@
+/// <reference types="react" />
 import { EmptyProps as UnStyledEmptyProps } from '@sheinx/base';
 /**
  * @title Empty
  */
-export type EmptyProps = Omit<UnStyledEmptyProps, 'jssStyle'>;
+export interface EmptyProps extends Omit<UnStyledEmptyProps, 'jssStyle' | 'icon' | 'description'> {
+    /**
+     * @en Empty state icon. Enhanced in v3.8.0 to support global configuration via setConfig
+     * @cn 空状态图标。3.8.0版本增强，支持通过setConfig进行全局配置
+     * @version 3.8.0
+     */
+    icon?: React.ReactNode;
+    /**
+     * @en Description, if false, the description will not be displayed. Enhanced in v3.8.0 to support global configuration via setConfig
+     * @cn 描述，若为false则不显示描述。3.8.0版本增强，支持通过setConfig进行全局配置
+     * @version 3.8.0
+     */
+    description?: React.ReactNode | boolean;
+}

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.8.0-beta.22'
+  version: '3.8.0-beta.24'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.0-beta.22');
+/* harmony default export */ var version = ('3.8.0-beta.24');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -14610,6 +14610,7 @@ var skeletonTokens = {
   skeletonHeight: 'Size-8',
   skeletonBackgroundColor: 'Neutral-fill-2',
   skeletonBackgroundRadius: 'Radius-default',
+  skeletonButtonMarginTop: 'Spacing-32',
   skeletonAnimationFromColor: 'Neutral-fill-2',
   skeletonAnimationToColor: 'Neutral-fill-3'
 };
@@ -23493,7 +23494,7 @@ var radioStyle = objectSpread2_default()(objectSpread2_default()({}, animations)
     color: src.radioIconColor,
     backgroundColor: src.radioIconBackgroundColor,
     border: '1px solid currentColor',
-    '$wrapperChecked &': {
+    '$wrapperChecked > $indicatorWrapper > &': {
       backgroundColor: src.radioIconCheckedBackgroundColor,
       color: src.radioIconCheckedColor,
       '&::after': {
@@ -24325,7 +24326,7 @@ var skeletonStyle = objectSpread2_default()(objectSpread2_default()({}, skeleton
     '& $textItem, & $image, & $buttonItem': {
       backgroundImage: "linear-gradient(90deg, ".concat(src.skeletonAnimationFromColor, " 25%, ").concat(src.skeletonAnimationToColor, " 37%, ").concat(src.skeletonAnimationFromColor, " 63%)"),
       backgroundSize: '400% 100%',
-      animation: '$skeleton-animation 1.4s ease infinite'
+      animation: '$skeleton-animation 1.5s cubic-bezier(0, 0, 1, 1) infinite'
     }
   },
   content: {
@@ -24374,7 +24375,7 @@ var skeletonStyle = objectSpread2_default()(objectSpread2_default()({}, skeleton
   button: {
     display: 'flex',
     '$text + &': {
-      marginTop: src.skeletonMargin
+      marginTop: src.skeletonButtonMarginTop
     }
   },
   buttonItem: {
@@ -26638,12 +26639,15 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
     '$sticky > &': {
       zIndex: headerIndex
     },
-    '& table th': {
+    '$wrapper & table th': {
       zIndex: fixedFixedIndex + 1,
       '&$cellFixedLeft': {
         position: 'sticky',
         top: 'auto',
         zIndex: fixedFixedIndex + 2
+      },
+      '&$cellFixedRight': {
+        zIndex: fixedFixedIndex + 3
       }
     }
   },
@@ -26665,7 +26669,10 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
         '&$cellFixedLeft': {
           position: 'sticky',
           top: 'auto',
-          zIndex: fixedIndex + 1
+          zIndex: fixedIndex
+        },
+        '&$cellFixedRight': {
+          zIndex: fixedIndex
         }
       }
     },
@@ -26719,10 +26726,13 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({
     borderBottom: 'none'
   },
   cellFixedLeft: {
-    position: 'sticky'
+    position: 'sticky',
+    // 快速横滚，有可能出现非固定列遮挡了固定列的短暂一瞬间，因此加上这个zIndex
+    zIndex: fixedIndex + 1
   },
   cellFixedRight: {
-    position: 'sticky'
+    position: 'sticky',
+    zIndex: fixedFixedIndex
   },
   cellAlignLeft: {
     textAlign: 'left'
@@ -28227,7 +28237,8 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     width: '100%',
     boxSizing: 'border-box',
     position: 'relative',
-    flexWrap: 'wrap'
+    flexWrap: 'wrap',
+    minHeight: "calc(".concat(src.lineHeightDynamic, " + ").concat(src.inputPaddingY, " * 2)")
   }, textarea_wrapper)
 }, textarea_resetWrapper), {}, {
   textarea: {
@@ -28247,7 +28258,6 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     backgroundColor: 'transparent',
     resize: 'none',
     boxSizing: 'border-box',
-    minHeight: "calc(".concat(src.lineHeightDynamic, " + ").concat(src.inputPaddingY, " * 2)"),
     // why: 为了让滚动条的轨道不遮盖右上角和右下角的圆角; 注: chrome >= 121才支持scrollbar-color
     scrollbarColor: "".concat(src.inputBorderColor, " transparent"),
     '&$resize': {
@@ -32483,7 +32493,8 @@ var Popover = function Popover(props) {
     _props$zIndex = props.zIndex,
     zIndex = _props$zIndex === void 0 ? 1060 : _props$zIndex;
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
-      rendered: false
+      rendered: false,
+      hasOpened: false
     }),
     context = _React$useRef.current;
   var config = useConfig();
@@ -32597,8 +32608,16 @@ var Popover = function Popover(props) {
     });
   }
   context.rendered = true;
-  var childrened = isFunc(children) ? children(closePop) : children;
+
+  // Track if popover has ever been opened
+  if (open && !context.hasOpened) {
+    context.hasOpened = true;
+  }
+
+  // Only execute functional children after popover has been opened at least once
+  var childrened = isFunc(children) ? context.hasOpened ? children(closePop) : null : children;
   var containerStyle = {
+    display: open ? undefined : 'none',
     borderColor: props.border,
     backgroundColor: props.background
   };
@@ -35481,6 +35500,34 @@ function removeStack(id, removeListener) {
   }
   delete components[id];
 }
+
+// 检测容器是否高度受限
+var isRootHeightConstrained = function isRootHeightConstrained(root, targetElement) {
+  if (!root || root === document.body) {
+    var bodyRect = document.body.getBoundingClientRect();
+    var _targetRect = targetElement.getBoundingClientRect();
+    // body的底部和targetElement的顶部永远不可能有相交，则是受限的
+    if (bodyRect.bottom < _targetRect.top) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  // 当root的overflow是auto或hidden，则认为不是受限的
+  var rootStyle = window.getComputedStyle(root);
+  if (rootStyle.overflow === 'auto' || rootStyle.overflow === 'hidden') {
+    return false;
+  }
+
+  // 当root的底部与targetElement的顶部永远不可能有相交，则是受限的
+  var rootRect = root.getBoundingClientRect();
+  var targetRect = targetElement.getBoundingClientRect();
+  if (rootRect.top > targetRect.bottom || rootRect.bottom < targetRect.top) {
+    return true;
+  }
+  return false;
+};
 function getObserver(obj, id) {
   var _obj$container = obj.container,
     container = _obj$container === void 0 ? null : _obj$container,
@@ -35490,6 +35537,10 @@ function getObserver(obj, id) {
     offscreen = obj.offscreen,
     noRemove = obj.noRemove;
   var fixedContainer = getClosestPositionedContainer(element, ['fixed', 'absolute']);
+
+  // 获取最优的观察器配置
+  var candidateRoot = fixedContainer || container;
+  var observerRoot = isRootHeightConstrained(candidateRoot, element) ? null : candidateRoot;
   var observer = new IntersectionObserver(function (entries) {
     entries.forEach(function (en) {
       if (en.isIntersecting || en.intersectionRatio > 0) {
@@ -35501,7 +35552,7 @@ function getObserver(obj, id) {
       }
     });
   }, {
-    root: fixedContainer || container,
+    root: observerRoot,
     rootMargin: "".concat(offset, "px")
   });
   obj.observer = observer;
@@ -49440,7 +49491,8 @@ var Modal = function Modal(props) {
       onAnimationEnd: handleAnimationEnd,
       style: {
         background: props.maskBackground,
-        zIndex: props.zIndex
+        zIndex: props.zIndex,
+        display: !visible && !animation ? 'none' : undefined
       },
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.mask
@@ -56707,7 +56759,8 @@ var Radio = function Radio(props) {
   var inputProps = getInputProps();
   var rootProps = getRootProps({
     className: rootClass,
-    style: style
+    style: style,
+    needStopPropagation: true
   });
   var indicatorProps = getIndicatorProps();
   var simpleRadio = /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
@@ -60325,6 +60378,7 @@ ProgressComp.displayName = 'ShineoutProgress';
 
 
 var radio_group_context_groupContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)({});
+radio_group_context_groupContext.displayName = 'RadioGroupContext';
 /* harmony default export */ var radio_group_context = (radio_group_context_groupContext);
 ;// CONCATENATED MODULE: ../base/src/radio/radio.tsx
 
@@ -60428,7 +60482,6 @@ var useListSelectSingle = function useListSelectSingle(props) {
 
 
 
-
 var radio_group_defaultFormat = function defaultFormat(d) {
   return d;
 };
@@ -60530,7 +60583,11 @@ var radio_group_Group = function Group(props0) {
   var Radios = props.data === undefined ? /*#__PURE__*/(0,jsx_runtime.jsx)(radio_group_context.Provider, {
     value: providerValue,
     children: children
-  }) : /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+  }) :
+  /*#__PURE__*/
+  // 传一个空的providerValue目的是为了避免父级Radio向下传递的GroupContext.Consumer影响
+  (0,jsx_runtime.jsxs)(radio_group_context.Provider, {
+    value: {},
     children: [props.data.map(function (d, i) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
         jssStyle: jssStyle,
@@ -63767,7 +63824,8 @@ var useTableVirtual = function useTableVirtual(props) {
     setRowHeight: setRowHeight,
     scrollToIndex: scrollToIndex,
     scrollColumnByLeft: scrollColumnByLeft,
-    scrollColumnIntoView: scrollColumnIntoView
+    scrollColumnIntoView: scrollColumnIntoView,
+    rowSpanInfo: rowSpanInfo
   };
 };
 /* harmony default export */ var use_table_virtual = (useTableVirtual);
@@ -65081,6 +65139,7 @@ var Tr = function Tr(props) {
       return expandInstance;
     }
     if (col.type === 'checkbox') {
+      var selectData = props.selectData || data;
       var instance = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper,
         children: props.radio ? /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_radio_radio, {
@@ -65092,9 +65151,9 @@ var Tr = function Tr(props) {
           disabled: props.disabled,
           onChange: function onChange(value) {
             if (value) {
-              props.datum.add(data);
+              props.datum.add(selectData);
             } else {
-              props.datum.remove(data);
+              props.datum.remove(selectData);
             }
           }
         }) : /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox, {
@@ -65106,11 +65165,11 @@ var Tr = function Tr(props) {
           checked: props.isSelect,
           onChange: function onChange(_value, check) {
             if (check) {
-              props.datum.add(data, props.treeCheckAll ? {
+              props.datum.add(selectData, props.treeCheckAll ? {
                 childrenKey: props.treeColumnsName
               } : undefined);
             } else {
-              props.datum.remove(data, props.treeCheckAll ? {
+              props.datum.remove(selectData, props.treeCheckAll ? {
                 childrenKey: props.treeColumnsName
               } : undefined);
             }
@@ -65302,6 +65361,17 @@ var Tr = function Tr(props) {
     var rowIndex = index + currentIndex;
     var originKey = getKey(props.keygen, item, rowIndex);
     var trRenderKey = props.loader || (_props$rowEvents = props.rowEvents) !== null && _props$rowEvents !== void 0 && _props$rowEvents.draggable ? originKey : "".concat(originKey, "-").concat(rowIndex);
+
+    // 在虚拟列表模式下，使用 virtualRowSpanInfo 来获取正确的选择数据
+    var selectData = item;
+    if (props.virtualRowSpanInfo && props.fullData) {
+      // rowSpanIndexArray[rowIndex] 表示第 rowIndex 行所属合并组的起始行索引
+      var selectIndex = props.virtualRowSpanInfo.rowSpanIndexArray[rowIndex];
+      selectData = props.fullData[selectIndex];
+    } else {
+      // 非虚拟列表模式使用原有逻辑
+      selectData = rowSelectMergeStartData[index];
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsx)(tr, {
       originKey: originKey,
       row: rowData[index],
@@ -65329,7 +65399,8 @@ var Tr = function Tr(props) {
       striped: props.striped,
       radio: props.radio,
       hover: hover,
-      isSelect: props.datum.check(rowSelectMergeStartData[index]),
+      isSelect: props.datum.check(selectData),
+      selectData: selectData,
       handleCellHover: handleCellHover
       // to update
       ,
@@ -66017,7 +66088,9 @@ var emptyRef = {
               currentIndex: virtualInfo.startIndex,
               data: virtualInfo.data,
               setRowHeight: virtualInfo.setRowHeight,
-              scrolling: scrolling
+              scrolling: scrolling,
+              virtualRowSpanInfo: virtualInfo.rowSpanInfo,
+              fullData: treeData
             }))]
           }), showFoot ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: footWrapperClass,
@@ -72618,7 +72691,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.22'
+  version: '3.8.0-beta.24'
 });
 }();
 /******/ 	return __webpack_exports__;