shineout 3.9.7-beta.1 → 3.9.7-beta.3

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.9.7-beta.1'
+  version: '3.9.7-beta.3'
 };

package/dist/shineout.js

@@ -12401,7 +12401,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.9.7-beta.1');
+/* harmony default export */ var version = ('3.9.7-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -23406,6 +23406,9 @@ var progressStyle = {
     flex: 1,
     minWidth: 0,
     overflow: 'hidden',
+    '&:has($lineSuccess)': {
+      position: 'relative'
+    },
     '$lineDefault &': {
       height: src.progressLineHeight,
       borderRadius: src.progressLineHeight
@@ -23416,6 +23419,20 @@ var progressStyle = {
     },
     background: src.progressBackground
   },
+  lineSuccess: {
+    position: 'absolute',
+    transition: 'width 0.32s linear',
+    left: 0,
+    top: 0,
+    height: '100%',
+    boxSizing: 'border-box',
+    borderRadius: 'inherit',
+    zIndex: 2,
+    backgroundColor: src.progressSuccessFrontBackgroundColor,
+    '& + $lineFront': {
+      zIndex: 1
+    }
+  },
   lineFront: {
     position: 'relative',
     transition: 'width 0.32s linear',
@@ -23564,6 +23581,12 @@ var progressStyle = {
     '$wrapperDanger &': {
       stroke: src.progressDangerFrontBackgroundColor
     }
+  },
+  circleSuccess: {
+    transform: 'rotate(-90deg)',
+    transformOrigin: '50% 50%',
+    transition: 'stroke-dashoffset .32s ease 0s,stroke-dasharray .32s ease 0s,stroke .32s,stroke-width .06s ease .32s',
+    stroke: src.progressSuccessFrontBackgroundColor
   }
 };
 /* harmony default export */ var progress_progress = (progressStyle);
@@ -35549,7 +35572,7 @@ var useDragMock = function useDragMock(props) {
     var deltaY = event.clientY - dragInfo.lastY;
     dragInfo.lastX = event.clientX;
     dragInfo.lastY = event.clientY;
-    (_props$onDragMove = props.onDragMove) === null || _props$onDragMove === void 0 || _props$onDragMove.call(props, deltaX, deltaY);
+    (_props$onDragMove = props.onDragMove) === null || _props$onDragMove === void 0 || _props$onDragMove.call(props, deltaX, deltaY, event);
   });
   var handleMouseUp = usePersistFn(function (event) {
     var _props$onDragEnd;
@@ -61972,6 +61995,8 @@ var LinePopUp = function LinePopUp(props) {
 
 
 
+
+
 var Line = function Line(props) {
   var _props$jssStyle;
   var _props$shape = props.shape,
@@ -61981,7 +62006,8 @@ var Line = function Line(props) {
     _props$type = props.type,
     type = _props$type === void 0 ? 'info' : _props$type,
     iconSize = props.iconSize,
-    popup = props.popup;
+    popup = props.popup,
+    success = props.success;
   var progressClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 ? void 0 : _props$jssStyle.progress();
   var isInner = shape === 'line-inner';
   var isInnerRight = isInner && value < 10;
@@ -62010,21 +62036,41 @@ var Line = function Line(props) {
       return p ? "".concat(p, ",").concat(col) : col;
     }, ''), ")");
   }
+
+  // Success progress bar style
+  var successStyle = success ? {
+    width: "".concat(success.value / 100 * 100, "%"),
+    borderRadius: props.strokeWidth && props.strokeWidth / 2
+  } : undefined;
+  if (successStyle && success) {
+    if (typeof success.color === 'string') {
+      successStyle.background = success.color;
+      successStyle.backgroundSize = '1em 1em';
+    } else if (typeof_default()(success.color) === 'object') {
+      successStyle.background = "linear-gradient(to right, ".concat(analyzeColor(success.color).reduce(function (p, v) {
+        var col = "".concat(v.color, " ").concat(v.pos);
+        return p ? "".concat(p, ",").concat(col) : col;
+      }, ''), ")");
+    }
+  }
   var children = props.children ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: classnames_default()(progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.content),
     children: props.children
   }) : null;
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, extractProps(props, 'mouse')), {}, {
     className: mc,
     style: props.style,
-    children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.lineBg,
       style: bgStyle,
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      children: [success && successStyle && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.lineSuccess,
+        style: successStyle
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.lineFront,
         style: frontStyle,
         children: isInner && children
-      })
+      })]
     }), isDefaultPop ? /*#__PURE__*/(0,jsx_runtime.jsx)(line_popup, {
       value: value,
       jssStyle: props.jssStyle,
@@ -62034,7 +62080,7 @@ var Line = function Line(props) {
       style: iconStyle,
       children: [type === 'info' && icons_config.progress.InfoLine, type === 'warning' && icons_config.progress.WarningLine, type === 'success' && icons_config.progress.SuccessLine, type === 'danger' && icons_config.progress.DangerLine]
     })]
-  });
+  }));
 };
 /* harmony default export */ var line = (Line);
 ;// CONCATENATED MODULE: ../base/src/progress/circle.tsx
@@ -62045,6 +62091,8 @@ var Line = function Line(props) {
 
 
 
+
+
 var Circle = function Circle(props) {
   var _props$jssStyle;
   var _props$value = props.value,
@@ -62058,7 +62106,8 @@ var Circle = function Circle(props) {
     size = _props$size === void 0 ? 64 : _props$size,
     _props$strokeLinecap = props.strokeLinecap,
     strokeLinecap = _props$strokeLinecap === void 0 ? 'round' : _props$strokeLinecap,
-    iconSize = props.iconSize;
+    iconSize = props.iconSize,
+    success = props.success;
   var progressClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 ? void 0 : _props$jssStyle.progress();
   var iconStyle = {
     width: iconSize,
@@ -62076,8 +62125,13 @@ var Circle = function Circle(props) {
   }, props.style);
   var width = value === 0 && strokeLinecap === 'round' ? 0 : strokeWidth;
   var objColor = color && typeof_default()(color) === 'object';
+
+  // Success circle calculation
+  var successDasharray = success ? [p * (success.value / 100), p * (1 - success.value / 100)] : null;
+  var successWidth = success && success.value === 0 && strokeLinecap === 'round' ? 0 : strokeWidth;
+  var objSuccessColor = (success === null || success === void 0 ? void 0 : success.color) && typeof_default()(success.color) === 'object';
   var mc = classnames_default()(props.className, progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.rootClass, progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.circle, progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.wrapper, type === 'success' && (progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.wrapperSuccess), type === 'info' && (progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.wrapperInfo), type === 'warning' && (progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.wrapperWarning), type === 'danger' && (progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.wrapperDanger));
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, extractProps(props, 'mouse')), {}, {
     className: mc,
     style: style,
     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("svg", {
@@ -62096,6 +62150,20 @@ var Circle = function Circle(props) {
             }, c.pos);
           })
         })
+      }) : null, objSuccessColor && success !== null && success !== void 0 && success.color && typeof_default()(success.color) === 'object' ? /*#__PURE__*/(0,jsx_runtime.jsx)("defs", {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("linearGradient", {
+          id: "progress-success-linear",
+          x1: "50%",
+          x2: "50%",
+          y1: "0%",
+          y2: "100%",
+          children: analyzeColor(success.color).map(function (c) {
+            return /*#__PURE__*/(0,jsx_runtime.jsx)("stop", {
+              offset: c.pos,
+              stopColor: c.color
+            }, c.pos);
+          })
+        })
       }) : null, /*#__PURE__*/(0,jsx_runtime.jsx)("circle", {
         className: progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.circleBg,
         cx: cx,
@@ -62118,6 +62186,18 @@ var Circle = function Circle(props) {
         strokeDasharray: dasharray,
         strokeLinecap: strokeLinecap,
         strokeWidth: width
+      }), success && successDasharray && /*#__PURE__*/(0,jsx_runtime.jsx)("circle", {
+        className: progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.circleSuccess,
+        cx: cx,
+        cy: cy,
+        r: r,
+        fill: "transparent",
+        style: {
+          stroke: objSuccessColor ? "url('#progress-success-linear')" : typeof success.color === 'string' ? success.color : undefined
+        },
+        strokeDasharray: successDasharray,
+        strokeLinecap: strokeLinecap,
+        strokeWidth: successWidth
       })]
     }), !showIcon && props.children && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: progressClasses === null || progressClasses === void 0 ? void 0 : progressClasses.content,
@@ -62127,7 +62207,7 @@ var Circle = function Circle(props) {
       style: iconStyle,
       children: [type === 'info' && icons_config.progress.InfoCircle, type === 'warning' && icons_config.progress.WarningCircle, type === 'success' && icons_config.progress.SuccessCircle, type === 'danger' && icons_config.progress.DangerCircle]
     })]
-  });
+  }));
 };
 /* harmony default export */ var circle = (Circle);
 ;// CONCATENATED MODULE: ../base/src/progress/progress.tsx
@@ -63080,6 +63160,12 @@ var useSlider = function useSlider(props) {
       context.clickLock = false;
     }, 100);
   });
+  var isDisabled = use_persist_fn(function (value) {
+    if (typeof props.disabled === 'function') {
+      return props.disabled(value);
+    }
+    return !!props.disabled;
+  });
   var handleDragEnd = use_persist_fn(function () {
     lockClick();
     var start = getValueFromRate(rate[0], scale, step);
@@ -63091,20 +63177,56 @@ var useSlider = function useSlider(props) {
       props.onChange(end);
     }
   });
-  var handleDragMove = use_persist_fn(function (deltaX, deltaY) {
+  var handleDragMove = use_persist_fn(function (deltaX, deltaY, mouseEvent) {
     setRate(function (r) {
       var target = trackRef.current;
       if (!target) return r;
       var newRate = toConsumableArray_default()(r);
       var v = context.dragIndex === 0 ? r[0] : r[1];
-      var max = props.vertical ? target.clientHeight : target.clientWidth;
-      var delta = props.vertical ? deltaY * -1 : deltaX * (isReserve ? -1 : 1);
-      var rate = Math.max(v + delta / max, 0);
+      var rate;
+
+      // If disabled function is used and we have mouse event, use absolute position
+      if (typeof props.disabled === 'function' && mouseEvent) {
+        var rect = target.getBoundingClientRect();
+        var currentIndicatorRate = v;
+
+        // Calculate mouse position rate
+        var mouseRate;
+        if (props.vertical) {
+          mouseRate = (rect.bottom - mouseEvent.clientY) / rect.height;
+        } else {
+          mouseRate = isReserve ? (rect.right - mouseEvent.clientX) / rect.width : (mouseEvent.clientX - rect.left) / rect.width;
+        }
+
+        // Only allow movement if mouse crossed the indicator position
+        if (mouseRate > currentIndicatorRate) {
+          // Mouse is to the right/top, allow moving right/up
+          rate = Math.max(Math.min(mouseRate, 1), 0);
+        } else if (mouseRate < currentIndicatorRate) {
+          // Mouse is to the left/bottom, allow moving left/down
+          rate = Math.max(Math.min(mouseRate, 1), 0);
+        } else {
+          // Mouse is at same position, no change
+          return r;
+        }
+      } else {
+        // Normal delta-based movement
+        var max = props.vertical ? target.clientHeight : target.clientWidth;
+        var delta = props.vertical ? deltaY * -1 : deltaX * (isReserve ? -1 : 1);
+        rate = Math.max(v + delta / max, 0);
+      }
       if (rate > 1) {
         rate = 1;
         if (typeof props.onIncrease === 'function') props.onIncrease();
       }
       newRate[context.dragIndex] = rate;
+
+      // Check if the new value would be disabled
+      var newValue = getValueFromRate(newRate[context.dragIndex], scale, step);
+      if (isDisabled(newValue)) {
+        // Stay at current position to prevent flickering
+        return r;
+      }
       if (newRate[0] > newRate[1]) {
         context.dragIndex = context.dragIndex === 0 ? 1 : 0;
         var temp = newRate[0];
@@ -63133,6 +63255,9 @@ var useSlider = function useSlider(props) {
     var rect = target.getBoundingClientRect();
     var rate = !props.vertical ? (isReserve ? rect.right - e.clientX : e.clientX - rect.left) / rect.width : (rect.bottom - e.clientY) / rect.height;
     var value = getValueFromRate(rate, scale, step);
+
+    // Check if the clicked value would be disabled
+    if (isDisabled(value)) return;
     if (props.range) {
       var _start = startValue;
       var _end = endValue;
@@ -63169,8 +63294,10 @@ var useSlider = function useSlider(props) {
     handleEndMouseDown: handleEndMouseDown,
     handleTrackClick: handleTrackClick
   });
-  var start = dragInfo.isDragging ? rate[0] : getRateFromValue(startValue, scale);
-  var end = dragInfo.isDragging ? rate[1] : getRateFromValue(endValue, scale);
+
+  // During dragging, optionally snap to quantized values in discrete mode
+  var start = dragInfo.isDragging ? props.discrete ? getRateFromValue(getValueFromRate(rate[0], scale, step), scale) : rate[0] : getRateFromValue(startValue, scale);
+  var end = dragInfo.isDragging ? props.discrete ? getRateFromValue(getValueFromRate(rate[1], scale, step), scale) : rate[1] : getRateFromValue(endValue, scale);
   var innerStyle = getTrackInnerStyle(start, end);
   return {
     func: func,
@@ -63226,7 +63353,9 @@ var Slider = function Slider(props0) {
       step: step,
       vertical: !!props.vertical,
       onIncrease: props.onIncrease,
-      direction: config.direction
+      direction: config.direction,
+      disabled: props.disabled,
+      discrete: props.discrete
     }),
     func = _useSlider.func,
     trackRef = _useSlider.trackRef,
@@ -63248,12 +63377,20 @@ var Slider = function Slider(props0) {
       children: formated
     });
   };
+  var isDisabled = function isDisabled(value) {
+    if (typeof props.disabled === 'function') {
+      return props.disabled(value);
+    }
+    return !!props.disabled;
+  };
   var renderIndicator = function renderIndicator(position) {
     if (!props.range && position === 0) return null;
     var handleEndMouseDown = position === 0 ? func.handleStartMouseDown : func.handleEndMouseDown;
+    var value = position === 0 ? startValue : endValue;
+    var disabled = isDisabled(value);
     return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        onMouseDown: props.disabled ? undefined : handleEndMouseDown,
+        onMouseDown: disabled ? undefined : handleEndMouseDown,
         className: classnames_default()(sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.indicator, position === 0 ? sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.indicatorStart : sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.indicatorEnd, dragIndex === position && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.indicatorActive), tipType === 'hover' && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.indicatorHover)),
         dir: config.direction
       }), renderIndicatorValue(position)]
@@ -63269,14 +63406,30 @@ var Slider = function Slider(props0) {
   var verticalStyle = props.vertical ? {
     height: height
   } : {};
+
+  // For boolean disabled, use it directly; for function disabled, check all values
+  var isWholeDisabled = function isWholeDisabled() {
+    if (typeof props.disabled === 'boolean' || props.disabled === undefined) {
+      return !!props.disabled;
+    }
+    // For function disabled, the component is not fully disabled (individual indicators are)
+    return false;
+  };
+  var shouldDisableTrackClick = function shouldDisableTrackClick() {
+    if (typeof props.disabled === 'boolean' || props.disabled === undefined) {
+      return !!props.disabled;
+    }
+    // For function disabled, allow track clicks
+    return false;
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
     id: fieldId,
-    className: classnames_default()(sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.rootClass, sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.wrapper, props.autoHide && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.autoHide), props.disabled && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.disabled), props.vertical && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.vertical), props.className),
+    className: classnames_default()(sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.rootClass, sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.wrapper, props.autoHide && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.autoHide), isWholeDisabled() && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.disabled), props.vertical && (sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.vertical), props.className),
     style: objectSpread2_default()(objectSpread2_default()({}, verticalStyle), props.style),
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.track,
       ref: trackRef,
-      onClick: props.disabled ? undefined : func.handleTrackClick,
+      onClick: shouldDisableTrackClick() ? undefined : func.handleTrackClick,
       children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: sliderClasses === null || sliderClasses === void 0 ? void 0 : sliderClasses.trackInner,
         style: innerStyle,
@@ -74878,7 +75031,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.7-beta.1'
+  version: '3.9.7-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;