shineout 3.4.3-beta.10 → 3.4.3-beta.11

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.3-beta.10'
+  version: '3.4.3-beta.11'
 };

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.3-beta.10');
+/* harmony default export */ var version = ('3.4.3-beta.11');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -14167,6 +14167,7 @@ var spinTokens = {
   spinTipFontColor: 'Brand-6',
   spinVerticalMargin: 'Spacing-4',
   spinHorizontalMargin: 'Spacing-4',
+  spinColor: 'Brand-6',
   spinBackgroundColor: 'Neutral-fill-1'
 };
 /* harmony default export */ var spin = (spinTokens);
@@ -22993,6 +22994,7 @@ var useSliderStyle = styled(slider_slider, 'slider');
 /* harmony default export */ var shineout_style_src_slider = ((/* unused pure expression or super */ null && (useSliderStyle)));
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/default.ts
 
+
 var Default = function Default() {
   var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 12;
   var animationDelay = {};
@@ -23020,7 +23022,7 @@ var Default = function Default() {
       '& div': {
         height: '55%',
         margin: '0 auto',
-        background: '#197AFA',
+        background: src.spinColor,
         borderRadius: 5,
         animation: '$keyframesFade 1s infinite ease-in-out both'
       }
@@ -23030,6 +23032,7 @@ var Default = function Default() {
 };
 /* harmony default export */ var spin_default = (Default);
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/chasing-dots.ts
+
 var duration = 2;
 /* harmony default export */ var chasing_dots = ({
   position: 'relative',
@@ -23045,7 +23048,7 @@ var duration = 2;
     height: '60%',
     borderRadius: '100%',
     animation: "$chasing-dots-2 ".concat(duration, "s ease-in-out infinite "),
-    fill: '#197AFA',
+    fill: src.spinColor,
     '&:last-child': {
       top: 'auto',
       bottom: 0,
@@ -23054,6 +23057,7 @@ var duration = 2;
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/cube-grid.ts
+
 var delayRange = 0.4;
 /* harmony default export */ var cube_grid = ({
   // margin: 'auto',
@@ -23062,7 +23066,7 @@ var delayRange = 0.4;
     height: '33.3333%',
     float: 'left',
     animation: '$cube-grid 1.3s infinite ease-in-out',
-    background: '#197AFA',
+    background: src.spinColor,
     boxSizing: 'border-box',
     '&:nth-child(1)': {
       animationDelay: "".concat(delayRange * 0.5, "s")
@@ -23094,6 +23098,7 @@ var delayRange = 0.4;
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/double-bounce.ts
+
 /* harmony default export */ var double_bounce = ({
   position: 'relative',
   // margin: 'auto',
@@ -23107,7 +23112,7 @@ var delayRange = 0.4;
     borderRadius: '50%',
     opacity: 0.6,
     animation: '$double-bounce 2s ease-in-out infinite',
-    background: '#197AFA',
+    background: src.spinColor,
     '&:last-child': {
       animationDelay: '-1s'
     }
@@ -23115,6 +23120,7 @@ var delayRange = 0.4;
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/fading-circle.ts
 
+
 var circleCount = 12;
 var loop = function loop() {
   var keyframes = {};
@@ -23146,12 +23152,13 @@ var loop = function loop() {
     }
   }, loop()),
   '& svg': {
-    fill: '#197AFA',
+    fill: src.spinColor,
     animation: '$fading-circle 1.2s infinite ease-in-out both'
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/scale-circle.ts
 
+
 var scale_circle_circleCount = 12;
 var scale_circle_loop = function loop() {
   var keyframes = {};
@@ -23183,11 +23190,12 @@ var scale_circle_loop = function loop() {
     }
   }, scale_circle_loop()),
   '& svg': {
-    fill: '#197AFA',
+    fill: src.spinColor,
     animation: '$scale-circle 1.2s infinite ease-in-out both'
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/four-dots.ts
+
 /* harmony default export */ var four_dots = ({
   // margin: 'auto',
   position: 'relative',
@@ -23204,7 +23212,7 @@ var scale_circle_loop = function loop() {
       borderRadius: '100%'
     },
     '& svg': {
-      fill: '#197AFA'
+      fill: src.spinColor
     },
     '&:nth-child(1)': {
       top: '10%',
@@ -23228,32 +23236,36 @@ var scale_circle_loop = function loop() {
   }
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/plane.ts
+
 /* harmony default export */ var plane = ({
   // margin: 'auto',
   boxSizing: 'border-box',
   animation: '$plane 1s linear infinite',
-  background: '#197AFA'
+  background: src.spinColor
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/pulse.ts
+
 /* harmony default export */ var pulse = ({
   // margin: 'auto',
   boxSizing: 'border-box',
   borderRadius: '100%',
   animation: '$pulse 1s linear infinite',
-  background: '#197AFA'
+  background: src.spinColor
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/ring.ts
+
 /* harmony default export */ var ring = ({
   // margin: 'auto',
   boxSizing: 'border-box',
   position: 'relative',
   borderStyle: 'solid',
-  borderColor: '#197AFA',
+  borderColor: src.spinColor,
   borderRadius: '50%',
   animation: '$ring 1s linear infinite',
   borderTopColor: 'transparent'
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/tree-bounce.ts
+
 /* harmony default export */ var tree_bounce = ({
   // margin: 'auto',
   textAlign: 'center',
@@ -23265,7 +23277,7 @@ var scale_circle_loop = function loop() {
     },
     animation: '$three-bounce 1.4s ease-in-out 0s infinite both',
     '& svg': {
-      fill: '#197AFA'
+      fill: src.spinColor
     },
     '&:nth-child(1)': {
       animationDelay: '-0.32s'
@@ -23277,6 +23289,7 @@ var scale_circle_loop = function loop() {
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/wave.ts
 
+
 var wave_loop = function loop() {
   var count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 5;
   var animationDelay = {};
@@ -23296,7 +23309,7 @@ var wave_loop = function loop() {
     display: 'inline-block',
     height: '100%',
     marginRight: '2px',
-    background: '#197AFA',
+    background: src.spinColor,
     animation: '$wave 1.2s infinite ease-in-out',
     ':last-child': {
       marginRight: 0
@@ -23304,6 +23317,7 @@ var wave_loop = function loop() {
   }, wave_loop())
 });
 ;// CONCATENATED MODULE: ../shineout-style/src/spin/chasing-ring.ts
+
 /* harmony default export */ var chasing_ring = ({
   position: 'relative',
   // margin: 'auto',
@@ -23318,7 +23332,7 @@ var wave_loop = function loop() {
     border: '1px solid transparent',
     borderRadius: '100%',
     transformOrigin: '50% 50%',
-    borderTopColor: '#197AFA',
+    borderTopColor: src.spinColor,
     '&:nth-child(1)': {
       animation: '$chasing-ring-1 2s infinite'
     },
@@ -30731,17 +30745,26 @@ function sub(num1, num2) {
 
 
 
+
+
 var base_range = range;
 var Spin = function Spin(props) {
-  var _jssStyle$spin;
+  var _jssStyle$spin, _ref;
   var _props$count = props.count,
     count = _props$count === void 0 ? 0 : _props$count,
     render = props.render,
-    _props$size = props.size,
-    size = _props$size === void 0 ? 40 : _props$size,
+    sizeProps = props.size,
     className = props.className,
     jssStyle = props.jssStyle;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$spin = jssStyle.spin) === null || _jssStyle$spin === void 0 ? void 0 : _jssStyle$spin.call(jssStyle);
+  var config = useConfig();
+  var getSpinSize = function getSpinSize() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var size = spin.size;
+    return size;
+  };
+  var size = (_ref = sizeProps !== null && sizeProps !== void 0 ? sizeProps : getSpinSize()) !== null && _ref !== void 0 ? _ref : 40;
   var style = Object.assign({
     width: size,
     height: size
@@ -31075,8 +31098,9 @@ var ChasingRing = function ChasingRing(props) {
 
 
 
+
 var spin_Spin = function Spin() {
-  var _ref, _jssStyle$spin;
+  var _ref, _ref2, _jssStyle$spin;
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var jssStyle = props.jssStyle,
     className = props.className,
@@ -31084,13 +31108,45 @@ var spin_Spin = function Spin() {
     style = props.style,
     loading = props.loading,
     nameProps = props.name,
-    tip = props.tip,
+    tipProps = props.tip,
     tipClassName = props.tipClassName,
-    color = props.color,
-    _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'vertical' : _props$mode;
+    colorProps = props.color,
+    modeProps = props.mode;
   var config = useConfig();
-  var name = (_ref = nameProps !== null && nameProps !== void 0 ? nameProps : config.spin) !== null && _ref !== void 0 ? _ref : 'default';
+  var getSpinName = function getSpinName() {
+    var spin = config.spin;
+    if (!spin) return;
+    if (typeof spin === 'string') {
+      return spin;
+    }
+    if (typeof_default()(spin) === 'object') {
+      var _name = spin.name;
+      return _name;
+    }
+    return;
+  };
+  var getSpinTip = function getSpinTip() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var tip = spin.tip;
+    return tip;
+  };
+  var getSpinColor = function getSpinColor() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var color = spin.color;
+    return color;
+  };
+  var getSpinMode = function getSpinMode() {
+    var spin = config.spin;
+    if (!spin || typeof_default()(spin) !== 'object') return;
+    var mode = spin.mode;
+    return mode;
+  };
+  var name = (_ref = nameProps !== null && nameProps !== void 0 ? nameProps : getSpinName()) !== null && _ref !== void 0 ? _ref : 'default';
+  var tip = tipProps !== null && tipProps !== void 0 ? tipProps : getSpinTip();
+  var color = colorProps !== null && colorProps !== void 0 ? colorProps : getSpinColor();
+  var mode = (_ref2 = modeProps !== null && modeProps !== void 0 ? modeProps : getSpinMode()) !== null && _ref2 !== void 0 ? _ref2 : 'vertical';
   var spinStyle = (jssStyle === null || jssStyle === void 0 || (_jssStyle$spin = jssStyle.spin) === null || _jssStyle$spin === void 0 ? void 0 : _jssStyle$spin.call(jssStyle)) || {};
   var contentClass = classnames_default()(className, spinStyle.content, defineProperty_default()(defineProperty_default()({}, spinStyle.vertical, mode === 'vertical'), spinStyle.horizontal, mode === 'horizontal'));
   var renderSpin = function renderSpin() {
@@ -31098,6 +31154,7 @@ var spin_Spin = function Spin() {
     if (spins[n]) {
       var Comp = spins[n];
       return /*#__PURE__*/(0,jsx_runtime.jsx)(Comp, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
+        color: color,
         style: style
       }));
     }
@@ -31115,7 +31172,7 @@ var spin_Spin = function Spin() {
     });
   };
   var renderContent = function renderContent() {
-    if ('tip' in props) {
+    if (tip) {
       return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: contentClass,
         children: [renderSpin(), tip && renderTip()]
@@ -37027,6 +37084,7 @@ var useTag = function useTag(props) {
     setDismiss(Done);
   };
   var handleClose = function handleClose(e) {
+    e.stopPropagation();
     if (disabled || dismiss !== Finish) {
       return;
     }
@@ -65193,7 +65251,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.3-beta.10'
+  version: '3.4.3-beta.11'
 });
 }();
 /******/ 	return __webpack_exports__;