shineout 3.8.3-beta.2 → 3.8.3-beta.4

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.3-beta.2'
+  version: '3.8.3-beta.4'
 };

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.3-beta.2');
+/* harmony default export */ var version = ('3.8.3-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -17391,14 +17391,14 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
     '&:hover': {
       borderColor: token.focusBorderColor
     }
-  }), "".concat(name, "Error"), defineProperty_default()({
+  }), "".concat(name, "Error"), defineProperty_default()(defineProperty_default()({}, "&:not($".concat(name, "Disabled)"), {
     borderColor: token.errorBorderColor,
     background: token.errorBackgroundColor,
     '&:hover': {
-      backgroundColor: token.errorHoverBackgroundColor,
-      borderColor: token.errorHoverBorderColor
+      borderColor: token.errorHoverBorderColor,
+      backgroundColor: token.errorHoverBackgroundColor
     }
-  }, "&$".concat(name, "Focus"), {
+  }), "&$".concat(name, "Focus"), {
     boxShadow: "0 0 0 2px ".concat(token.errorFocusShadow),
     borderColor: token.errorFocusBorderColor,
     background: token.errorFocusBackgroundColor
@@ -55168,9 +55168,23 @@ var UseSelectGroup = function UseSelectGroup(props) {
     }
     var groupData = {};
     dataProp.forEach(function (item, index) {
-      var group = groupBy(item, index, dataProp);
-      if (!groupData[group]) groupData[group || ''] = group ? [defineProperty_default()({}, groupKey.current, group)] : [];
-      groupData[group].push(item);
+      var groupResult = groupBy(item, index, dataProp);
+
+      // 为React组件生成唯一键
+      var groupKeyStr;
+      if ( /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(groupResult)) {
+        var _groupResult$type;
+        // 基于组件的类型和props生成唯一键
+        var componentName = typeof groupResult.type === 'string' ? groupResult.type : ((_groupResult$type = groupResult.type) === null || _groupResult$type === void 0 ? void 0 : _groupResult$type.name) || 'Component';
+        var propsHash = JSON.stringify(groupResult.props || {});
+        groupKeyStr = "".concat(componentName, "_").concat(propsHash);
+      } else {
+        groupKeyStr = String(groupResult || '');
+      }
+      if (!groupData[groupKeyStr]) {
+        groupData[groupKeyStr] = groupResult ? [defineProperty_default()({}, groupKey.current, groupResult)] : [];
+      }
+      groupData[groupKeyStr].push(item);
     });
     var newData = Object.keys(groupData).reduce(function (p, v) {
       return v ? p.concat(groupData[v]) : groupData[v].concat(p);
@@ -55470,7 +55484,7 @@ var list_List = function List(props) {
     var title = d[groupKey];
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: styles.optionGroupTitle,
-      title: title,
+      title: typeof title === 'string' ? title : undefined,
       children: title
     });
   };
@@ -57264,9 +57278,11 @@ var ColumnsList = function ColumnsList(props) {
   };
   var renderGroupTitle = function renderGroupTitle(item, key) {
     if (item[groupKey]) {
+      var title = item[groupKey];
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: styles.optionGroupTitle,
-        children: item[groupKey]
+        title: typeof title === 'string' ? title : undefined,
+        children: title
       }, key);
     }
     return null;
@@ -73105,7 +73121,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.3-beta.2'
+  version: '3.8.3-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;