shineout 3.9.7-beta.2 → 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.2'
+  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.2');
+/* harmony default export */ var version = ('3.9.7-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -35572,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;
@@ -63160,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);
@@ -63171,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];
@@ -63213,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;
@@ -63249,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,
@@ -63306,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,
@@ -63328,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)]
@@ -63349,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,
@@ -74958,7 +75031,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.7-beta.2'
+  version: '3.9.7-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;