rc-slider - npm Package Compare versions

Comparing version 10.6.0-3 to 10.6.0-4

es/Handles/Handle.js

@@ -113,6 +113,11 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 
+  // ============================= Aria =============================
+  function ignoreAriaProp(val) {
+    return valueIndex === null ? undefined : val;
+  }
+
   // ============================ Render ============================
   var handleNode = /*#__PURE__*/React.createElement("div", _extends({
     ref: ref,
-    className: cls(handlePrefixCls, _defineProperty(_defineProperty({}, "".concat(handlePrefixCls, "-").concat(valueIndex + 1), range), "".concat(handlePrefixCls, "-dragging"), dragging), classNames.handle),
+    className: cls(handlePrefixCls, _defineProperty(_defineProperty({}, "".concat(handlePrefixCls, "-").concat(valueIndex + 1), ignoreAriaProp(range)), "".concat(handlePrefixCls, "-dragging"), dragging), classNames.handle),
     style: _objectSpread(_objectSpread(_objectSpread({}, positionStyle), style), styles.handle),
@@ -125,3 +130,3 @@ onMouseDown: onInternalStartMove,
     onKeyUp: handleKeyUp,
-    tabIndex: disabled ? null : getIndex(tabIndex, valueIndex),
+    tabIndex: disabled ? null : ignoreAriaProp(getIndex(tabIndex, valueIndex)),
     role: "slider",
@@ -132,5 +137,5 @@ "aria-valuemin": min,
     "aria-disabled": disabled,
-    "aria-label": getIndex(ariaLabelForHandle, valueIndex),
-    "aria-labelledby": getIndex(ariaLabelledByForHandle, valueIndex),
-    "aria-valuetext": (_getIndex = getIndex(ariaValueTextFormatterForHandle, valueIndex)) === null || _getIndex === void 0 ? void 0 : _getIndex(value),
+    "aria-label": ignoreAriaProp(getIndex(ariaLabelForHandle, valueIndex)),
+    "aria-labelledby": ignoreAriaProp(getIndex(ariaLabelledByForHandle, valueIndex)),
+    "aria-valuetext": ignoreAriaProp((_getIndex = getIndex(ariaValueTextFormatterForHandle, valueIndex)) === null || _getIndex === void 0 ? void 0 : _getIndex(value)),
     "aria-orientation": direction === 'ltr' || direction === 'rtl' ? 'horizontal' : 'vertical'
@@ -137,0 +142,0 @@ }, restProps));

es/Handles/index.js

@@ -73,3 +73,3 @@ import _extends from "@babel/runtime/helpers/esm/extends";
     value: values[activeIndex],
-    valueIndex: 0,
+    valueIndex: null,
     dragging: draggingIndex !== -1,
@@ -80,3 +80,3 @@ render: activeHandleRender,
     },
-    tabIndex: -1,
+    tabIndex: null,
     "aria-hidden": true
@@ -83,0 +83,0 @@ })));

es/hooks/useDrag.js

 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useEvent } from 'rc-util';
 import * as React from 'react';
@@ -57,3 +58,3 @@ function getPosition(e) {
   };
-  var updateCacheValue = function updateCacheValue(valueIndex, offsetPercent) {
+  var updateCacheValue = useEvent(function (valueIndex, offsetPercent) {
     // Basic point offset
@@ -90,7 +91,3 @@
     }
-  };
-
-  // Resolve closure
-  var updateCacheValueRef = React.useRef(updateCacheValue);
-  updateCacheValueRef.current = updateCacheValue;
+  });
   var onStartMove = function onStartMove(e, valueIndex, startValues) {
@@ -134,3 +131,3 @@ e.stopPropagation();
       }
-      updateCacheValueRef.current(valueIndex, offSetPercent);
+      updateCacheValue(valueIndex, offSetPercent);
     };
@@ -137,0 +134,0 @@

es/Slider.js

@@ -239,2 +239,3 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
       if (e) {
+        handlesRef.current.focus(valueIndex);
         onStartDrag(e, valueIndex, cloneNextValues);
@@ -241,0 +242,0 @@ }

lib/Handles/Handle.js

@@ -123,6 +123,11 @@ "use strict";
 
+  // ============================= Aria =============================
+  function ignoreAriaProp(val) {
+    return valueIndex === null ? undefined : val;
+  }
+
   // ============================ Render ============================
   var handleNode = /*#__PURE__*/React.createElement("div", (0, _extends2.default)({
     ref: ref,
-    className: (0, _classnames.default)(handlePrefixCls, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(handlePrefixCls, "-").concat(valueIndex + 1), range), "".concat(handlePrefixCls, "-dragging"), dragging), classNames.handle),
+    className: (0, _classnames.default)(handlePrefixCls, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(handlePrefixCls, "-").concat(valueIndex + 1), ignoreAriaProp(range)), "".concat(handlePrefixCls, "-dragging"), dragging), classNames.handle),
     style: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, positionStyle), style), styles.handle),
@@ -135,3 +140,3 @@ onMouseDown: onInternalStartMove,
     onKeyUp: handleKeyUp,
-    tabIndex: disabled ? null : (0, _util.getIndex)(tabIndex, valueIndex),
+    tabIndex: disabled ? null : ignoreAriaProp((0, _util.getIndex)(tabIndex, valueIndex)),
     role: "slider",
@@ -142,5 +147,5 @@ "aria-valuemin": min,
     "aria-disabled": disabled,
-    "aria-label": (0, _util.getIndex)(ariaLabelForHandle, valueIndex),
-    "aria-labelledby": (0, _util.getIndex)(ariaLabelledByForHandle, valueIndex),
-    "aria-valuetext": (_getIndex = (0, _util.getIndex)(ariaValueTextFormatterForHandle, valueIndex)) === null || _getIndex === void 0 ? void 0 : _getIndex(value),
+    "aria-label": ignoreAriaProp((0, _util.getIndex)(ariaLabelForHandle, valueIndex)),
+    "aria-labelledby": ignoreAriaProp((0, _util.getIndex)(ariaLabelledByForHandle, valueIndex)),
+    "aria-valuetext": ignoreAriaProp((_getIndex = (0, _util.getIndex)(ariaValueTextFormatterForHandle, valueIndex)) === null || _getIndex === void 0 ? void 0 : _getIndex(value)),
     "aria-orientation": direction === 'ltr' || direction === 'rtl' ? 'horizontal' : 'vertical'
@@ -147,0 +152,0 @@ }, restProps));

lib/Handles/index.js

@@ -83,3 +83,3 @@ "use strict";
     value: values[activeIndex],
-    valueIndex: 0,
+    valueIndex: null,
     dragging: draggingIndex !== -1,
@@ -90,3 +90,3 @@ render: activeHandleRender,
     },
-    tabIndex: -1,
+    tabIndex: null,
     "aria-hidden": true
@@ -93,0 +93,0 @@ })));

lib/hooks/useDrag.js

@@ -11,2 +11,3 @@ "use strict";
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _rcUtil = require("rc-util");
 var React = _interopRequireWildcard(require("react"));
@@ -68,3 +69,3 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
   };
-  var updateCacheValue = function updateCacheValue(valueIndex, offsetPercent) {
+  var updateCacheValue = (0, _rcUtil.useEvent)(function (valueIndex, offsetPercent) {
     // Basic point offset
@@ -101,7 +102,3 @@
     }
-  };
-
-  // Resolve closure
-  var updateCacheValueRef = React.useRef(updateCacheValue);
-  updateCacheValueRef.current = updateCacheValue;
+  });
   var onStartMove = function onStartMove(e, valueIndex, startValues) {
@@ -145,3 +142,3 @@ e.stopPropagation();
       }
-      updateCacheValueRef.current(valueIndex, offSetPercent);
+      updateCacheValue(valueIndex, offSetPercent);
     };
@@ -148,0 +145,0 @@

lib/Slider.js

@@ -248,2 +248,3 @@ "use strict";
       if (e) {
+        handlesRef.current.focus(valueIndex);
         onStartDrag(e, valueIndex, cloneNextValues);
@@ -250,0 +251,0 @@ }

package.json

 {
   "name": "rc-slider",
-  "version": "10.6.0-3",
+  "version": "10.6.0-4",
   "description": "Slider UI component for React",
@@ -5,0 +5,0 @@ "keywords": [

No alert changes

Improved metrics

Total package byte prevSize

155764

increased by0.23%

Lines of code

3467

increased by0.17%

No dependency changes