shineout 3.4.4-beta.6 → 3.4.4-beta.8

package/cjs/index.js

@@ -492,5 +492,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.4.4-beta.6'
+  version: '3.4.4-beta.8'
 };

package/dist/shineout.js

@@ -11984,7 +11984,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.4.4-beta.6');
+/* harmony default export */ var version = ('3.4.4-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -26226,71 +26226,8 @@ var textarea_input = objectSpread2_default()(objectSpread2_default()(objectSprea
     resize: 'vertical'
   },
   info: {
-    position: 'absolute',
-    zIndex: 1000,
-    '&[dir=ltr]': {
-      right: '0'
-    },
-    '&[dir=rtl]': {
-      left: '0'
-    },
-    '&$bottomLeft': {
-      right: 'auto'
-    },
-    '&$bottomRight': {
-      left: 'auto'
-    },
-    top: '100%',
-    transformOrigin: '100% 0',
-    marginTop: '10px',
-    animation: 'so-input-fade .16s ease-in',
-    maxWidth: '400px',
-    padding: '5px 8px',
     background: src.textareaInfoBackgroundColor,
-    borderRadius: src.textareaBorderRadius,
-    boxShadow: "0 0 0 1px ".concat(src.textareaBorderColor),
-    fontSize: '12px',
-    color: src.textareaInfoFontColor,
-    '&::before': {
-      display: 'block',
-      position: 'absolute',
-      bottom: '100%',
-      transform: 'rotate(45deg) translateY(3px)',
-      width: '6px',
-      height: '6px',
-      borderTop: "1px solid ".concat(src.textareaBorderColor),
-      borderLeft: "1px solid ".concat(src.textareaBorderColor),
-      background: 'inherit',
-      content: "'  '"
-    },
-    '&[dir=ltr]::before': {
-      right: '4px'
-    },
-    '&[dir=rtl]::before': {
-      left: '8px'
-    },
-    '&$bottomLeft::before': {
-      left: '8px',
-      right: 'auto'
-    },
-    '&$bottomRight::before': {
-      right: '4px',
-      left: 'auto'
-    }
-  },
-  bottomLeft: {
-    left: 0
-  },
-  bottomRight: {
-    right: 0
-  },
-  infoError: {
-    boxShadow: "0 0 0 1px ".concat(src.textareaInfoErrorBorderColor),
-    color: src.textareaInfoErrorFontColor,
-    background: src.textareaInfoErrorBackgroundColor,
-    '&::before': {
-      borderColor: src.textareaInfoErrorBorderColor
-    }
+    color: src.textareaInfoFontColor
   },
   shadow: {
     position: 'absolute',
@@ -29093,7 +29030,7 @@ var usePositionStyle = function usePositionStyle(config) {
     }
     var targetPosition = position;
     var rootContainer = getContainer() || document.body;
-    var closestScrollContainer = getClosestScrollContainer(parentElRef.current);
+    var closestScrollContainer = absolute ? null : getClosestScrollContainer(parentElRef.current);
     var containerRect = rootContainer.getBoundingClientRect();
     var bodyRect = (document.documentElement || document.body).getBoundingClientRect();
     var containerScrollBarWidth = rootContainer.offsetWidth - rootContainer.clientWidth;
@@ -30134,22 +30071,23 @@ var getPopoverPosition = function getPopoverPosition(target) {
     var popupRect = popup === null || popup === void 0 ? void 0 : popup.getBoundingClientRect();
     if (verticalPoint > windowHeight / 2) position = 'top';else position = 'bottom';
 
+    // TODO: 暂时移除，另考虑方案
     // 如果渲染了弹出内容，则根据弹出内容宽度计算是否自动调整位置
-    if (popupRect) {
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > rect.left) {
-        position += '-left';
-      }
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > windowWidth - rect.right) {
-        position += '-right';
-      }
-    } else {
-      // 兜底计算
-      if (horizontalPoint > windowWidth * 0.6) {
-        position += '-right';
-      } else if (horizontalPoint < windowWidth * 0.4) {
-        position += '-left';
-      }
+    // if (popupRect && popupRect?.width) {
+    //   if (popupRect?.width / 2 > rect.left) {
+    //     position += '-left';
+    //   }
+    //   if (popupRect?.width / 2 > windowWidth - rect.right) {
+    //     position += '-right';
+    //   }
+    // } else {
+    // 兜底计算
+    if (horizontalPoint > windowWidth * 0.6) {
+      position += '-right';
+    } else if (horizontalPoint < windowWidth * 0.4) {
+      position += '-left';
     }
+    // }
   }
   return position;
 };
@@ -33797,6 +33735,9 @@ var useTip = function useTip(props) {
     jssStyle = props.jssStyle;
   var config = useConfig();
   var dfp = config.direction === 'rtl' ? 'bottom-right' : 'bottom-left';
+  if (typeof popover === 'string') {
+    dfp = popover;
+  }
   var styles = popoverProps !== null && popoverProps !== void 0 && popoverProps.style && popoverProps !== null && popoverProps !== void 0 && (_popoverProps$style = popoverProps.style) !== null && _popoverProps$style !== void 0 && _popoverProps$style.width ? popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.style : Object.assign({
     minWidth: 200,
     maxWidth: 400
@@ -39473,8 +39414,18 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
 
 
 
+var defaultFormat = function defaultFormat(d) {
+  return d;
+};
+var defaultRenderItem = function defaultRenderItem(d) {
+  return d;
+};
 var checkbox_group_Group = function Group(props0) {
   var _jssStyle$checkbox;
+  var _props0$format = props0.format,
+    format = _props0$format === void 0 ? defaultFormat : _props0$format,
+    _props0$renderItem = props0.renderItem,
+    renderItem = _props0$renderItem === void 0 ? defaultRenderItem : _props0$renderItem;
   var props = use_with_form_config(props0);
   var children = props.children,
     className = props.className,
@@ -39498,7 +39449,7 @@ var checkbox_group_Group = function Group(props0) {
     prediction: props.prediction,
     separator: props.separator,
     disabled: disabled,
-    format: props.format,
+    format: format,
     keygen: props.keygen,
     data: props.data || []
   };
@@ -39518,7 +39469,6 @@ var checkbox_group_Group = function Group(props0) {
     return datum.check(d);
   });
   var getContent = function getContent(d, index) {
-    var renderItem = props.renderItem;
     if (typeof renderItem === 'string' && d) {
       return d[renderItem];
     }
@@ -39565,14 +39515,6 @@ var checkbox_group_Group = function Group(props0) {
     });
   }
 };
-checkbox_group_Group.defaultProps = {
-  format: function format(d) {
-    return d;
-  },
-  renderItem: function renderItem(d) {
-    return d;
-  }
-};
 /* harmony default export */ var checkbox_group = (checkbox_group_Group);
 ;// CONCATENATED MODULE: ./src/checkbox/group.tsx
 
@@ -45309,7 +45251,7 @@ var textarea_defaultInfo = function defaultInfo(num, msg) {
   return new Error(text);
 };
 var textarea_Textarea = function Textarea(props0) {
-  var _jssStyle$textarea, _ref, _ref2;
+  var _jssStyle$textarea, _ref, _ref2, _infoState$error;
   var props = use_with_form_config(props0);
   var info = props.info,
     suffix = props.suffix,
@@ -45400,36 +45342,48 @@ var textarea_Textarea = function Textarea(props0) {
 
   // forwardProps
   var forwardProps = removeProps(resetProps, objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, inputAbleParams), autosizeParams), tipProps), formatParams), innerTitleProps));
-  var getInfo = function getInfo() {
+  var getInfoState = function getInfoState() {
     var notNumber = typeof info !== 'number';
     if (typeof info !== 'function' && typeof_default()(info) !== 'object' && notNumber) return null;
     var infoContent;
-    var infoPosition;
     if (typeof_default()(info) === 'object') {
       infoContent = info.content;
-      infoPosition = info.position;
     } else {
       infoContent = info;
     }
     var notContentNumber = typeof infoContent !== 'number';
     var textInfo = notContentNumber ? infoContent : textarea_defaultInfo.bind(null, infoContent);
-    var res = textInfo(inputAbleProps.value);
-    // empty
-    if (!res) return null;
-    var isError = res instanceof Error;
-    var text = isError ? res.message : res;
+    var error = textInfo(inputAbleProps.value);
+    if (!error) return null;
+    var isError = error instanceof Error;
+    var text = isError ? error.message : error;
     if (!isError && !focused) return null;
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    return {
+      text: text,
+      error: error
+    };
+  };
+  var infoState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(getInfoState, [info, inputAbleProps.value, focused]);
+  var infoPopoverProps = {
+    popover: resetProps.popover || (typeof_default()(info) === 'object' ? info.position : 'bottom-right'),
+    popoverProps: Object.assign({
       style: {
-        minWidth: 'auto'
-      },
-      dir: config.direction,
-      className: classnames_default()(textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.info, !!isError && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.infoError), infoPosition === 'bottom-left' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.bottomLeft), infoPosition === 'bottom-right' && (textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.bottomRight)),
-      children: text
-    }, 'info');
+        width: 'auto'
+      }
+    }, resetProps.popoverProps),
+    error: infoState !== null && infoState !== void 0 && infoState.error && (infoState === null || infoState === void 0 ? void 0 : infoState.error) instanceof Error ? infoState === null || infoState === void 0 || (_infoState$error = infoState.error) === null || _infoState$error === void 0 ? void 0 : _infoState$error.message : undefined,
+    tip: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: textareaClasses === null || textareaClasses === void 0 ? void 0 : textareaClasses.info,
+      children: infoState === null || infoState === void 0 ? void 0 : infoState.text
+    })
   };
+  var infoPopoverNode = use_tip(objectSpread2_default()(objectSpread2_default()({}, infoPopoverProps), {}, {
+    focused: focused,
+    rootRef: rootRef,
+    jssStyle: jssStyle
+  }));
   var mergeSuffix = /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
-    children: [suffix, getInfo(), tipNode, isFunc(renderFooter) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    children: [suffix, tipNode, (infoState === null || infoState === void 0 ? void 0 : infoState.text) && infoPopoverNode, isFunc(renderFooter) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       onMouseDown: function onMouseDown(e) {
         e.preventDefault();
       },
@@ -54583,8 +54537,18 @@ var useListSelectSingle = function useListSelectSingle(props) {
 
 
 
+var radio_group_defaultFormat = function defaultFormat(d) {
+  return d;
+};
+var radio_group_defaultRenderItem = function defaultRenderItem(d) {
+  return d;
+};
 var radio_group_Group = function Group(props0) {
   var _jssStyle$radio;
+  var _props0$format = props0.format,
+    format = _props0$format === void 0 ? radio_group_defaultFormat : _props0$format,
+    _props0$renderItem = props0.renderItem,
+    renderItem = _props0$renderItem === void 0 ? radio_group_defaultRenderItem : _props0$renderItem;
   var props = use_with_form_config(props0);
   var children = props.children,
     className = props.className,
@@ -54608,7 +54572,7 @@ var radio_group_Group = function Group(props0) {
     onChange: inputAbleProps.onChange,
     prediction: props.prediction,
     disabled: disabled,
-    format: props.format,
+    format: format,
     keygen: props.keygen,
     data: props.data || []
   };
@@ -54623,7 +54587,6 @@ var radio_group_Group = function Group(props0) {
     return datum.check(d);
   });
   var getContent = function getContent(d, index) {
-    var renderItem = props.renderItem;
     if (typeof renderItem === 'string') {
       return d[renderItem];
     }
@@ -54698,14 +54661,6 @@ var radio_group_Group = function Group(props0) {
     children: Radios
   });
 };
-radio_group_Group.defaultProps = {
-  format: function format(d) {
-    return d;
-  },
-  renderItem: function renderItem(d) {
-    return d;
-  }
-};
 /* harmony default export */ var radio_group = (radio_group_Group);
 ;// CONCATENATED MODULE: ./src/radio/group.tsx
 
@@ -65280,7 +65235,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.4-beta.6'
+  version: '3.4.4-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;