shineout 3.1.29 → 3.1.30

package/cjs/index.js

@@ -476,5 +476,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.1.29'
+  version: '3.1.30'
 };

package/dist/shineout.js

@@ -11952,7 +11952,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.1.29');
+/* harmony default export */ var version = ('3.1.30');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -15172,12 +15172,17 @@ var textBeforeLine = function textBeforeLine() {
     }
   };
 };
-var loading = function loading(type, styles) {
-  var buttonStyle = button_button_button(type, styles);
-  return {
-    '&$loading': objectSpread2_default()({}, buttonStyle['&$disabled'])
-  };
-};
+
+// const loading = (type: ButtonTypeWithoutLink, styles: ButtonStyleType) => {
+//   const buttonStyle = button(type, styles);
+
+//   return {
+//     '&$loading': {
+//       ...buttonStyle['&$disabled'],
+//     },
+//   };
+// };
+
 var ButtonStyle = {
   button: {
     outline: 'none',
@@ -15298,13 +15303,26 @@ var ButtonStyle = {
     cursor: 'not-allowed'
   },
   loading: {
-    cursor: 'not-allowed',
-    '&$default': objectSpread2_default()({}, loading('Secondary', '')),
-    '&$primary': objectSpread2_default()({}, loading('Primary', '')),
-    '&$success': objectSpread2_default()({}, loading('Success', '')),
-    '&$danger': objectSpread2_default()({}, loading('Danger', '')),
-    '&$warning': objectSpread2_default()({}, loading('Warning', '')),
-    '&$secondary': objectSpread2_default()({}, loading('Secondary', ''))
+    cursor: 'not-allowed'
+
+    // '&$default': {
+    //   ...loading('Secondary', ''),
+    // },
+    // '&$primary': {
+    //   ...loading('Primary', ''),
+    // },
+    // '&$success': {
+    //   ...loading('Success', ''),
+    // },
+    // '&$danger': {
+    //   ...loading('Danger', ''),
+    // },
+    // '&$warning': {
+    //   ...loading('Warning', ''),
+    // },
+    // '&$secondary': {
+    //   ...loading('Secondary', ''),
+    // },
   },
   groupItem: {},
   group: {
@@ -24852,7 +24870,6 @@ var TagStyle = {
   wrapper: {
     lineHeight: src.lineHeightDynamic
   },
-  container: {},
   inline: {
     display: 'inline-block',
     flex: 1,
@@ -24874,9 +24891,6 @@ var TagStyle = {
   small: {
     lineHeight: "calc(".concat(src.tagSmallFontSize, " + 6px)"),
     padding: "0 ".concat(src.tagSmallPaddingX),
-    '& $container': {
-      lineHeight: "calc(".concat(src.tagSmallFontSize, " + 6px)")
-    },
     '& $wrapper': {
       lineHeight: "calc(".concat(src.tagSmallFontSize, " + 6px)")
     },
@@ -29058,7 +29072,7 @@ var useButton = function useButton() {
     return mergedEventHandlers;
   };
   return {
-    disabled: disabled,
+    disabled: disabled || loading,
     getAnchorProps: getAnchorProps,
     getButtonProps: getButtonProps,
     getSpaceChildren: getSpaceChildren
@@ -35580,10 +35594,7 @@ var Tag = function Tag(props) {
     if (onClose) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: classnames_default()(tagStyle.wrapper, inlineStyle && tagStyle.inline),
-        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          className: tagStyle.container,
-          children: wrapSpan(children)
-        })
+        children: wrapSpan(children)
       });
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -44886,7 +44897,7 @@ var Gap = function Gap(props) {
     marginBottom: -Number(row),
     marginRight: -Number(column)
   };
-  var itemStyle = supportFlexGap ? undefined : objectSpread2_default()(objectSpread2_default()({}, itemStyleProps), {}, {
+  var itemStyle = supportFlexGap ? itemStyleProps : objectSpread2_default()(objectSpread2_default()({}, itemStyleProps), {}, {
     marginBottom: row,
     marginRight: column
   });
@@ -46802,9 +46813,8 @@ var Scroll = function Scroll(props) {
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
   var placeStyle = {
-    marginTop: (height > 0 && scrollHeight > 0 ? Math.max(0, Math.floor(scrollHeight - height)) : 0) - 1,
+    paddingTop: height > 0 && scrollHeight > 0 ? Math.max(0, Math.floor(scrollHeight - height)) : 0,
     width: scrollWidth,
-    height: 1,
     overflow: 'hidden'
   };
   var handleScroll = usePersistFn(function (e) {
@@ -62423,7 +62433,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.1.29'
+  version: '3.1.30'
 });
 }();
 /******/ 	return __webpack_exports__;