@base-ui/react 1.6.0 → 1.7.0

package/slider/utils/getPushedThumbValues.d.ts

@@ -1,25 +1,8 @@
-interface GetPushedThumbValuesParams {
-  values: readonly number[];
-  index: number;
-  nextValue: number;
-  min: number;
-  max: number;
-  step: number;
-  minStepsBetweenValues: number;
-  initialValues?: readonly number[] | undefined;
-}
 /**
  * Returns a new array of slider values where attempting to move the thumb at `index`
  * beyond its neighbours "pushes" them while respecting `minStepsBetweenValues`.
+ *
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
  */
-export declare function getPushedThumbValues({
-  values,
-  index,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues,
-  initialValues
-}: GetPushedThumbValuesParams): number[];
-export {};
+export declare function getPushedThumbValues(values: readonly number[], index: number, nextValue: number, min: number, max: number, step: number, minStepsBetweenValues: number, initialValues?: readonly number[] | undefined): number[];

package/slider/utils/getPushedThumbValues.js

@@ -8,20 +8,11 @@ var _clamp = require("../../internals/clamp");
 /**
  * Returns a new array of slider values where attempting to move the thumb at `index`
  * beyond its neighbours "pushes" them while respecting `minStepsBetweenValues`.
+ *
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
  */
-function getPushedThumbValues({
-  values,
-  index,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues,
-  initialValues
-}) {
-  if (values.length === 0) {
-    return [];
-  }
+function getPushedThumbValues(values, index, nextValue, min, max, step, minStepsBetweenValues, initialValues) {
   const nextValues = values.slice();
   const minValueDifference = step * minStepsBetweenValues;
   const lastIndex = nextValues.length - 1;
@@ -32,7 +23,7 @@ function getPushedThumbValues({
   for (let i = index + 1; i <= lastIndex; i += 1) {
     const minAllowed = nextValues[i - 1] + minValueDifference;
     const maxAllowed = max - (lastIndex - i) * minValueDifference;
-    const initialValue = baseInitialValues[i] ?? nextValues[i];
+    const initialValue = baseInitialValues[i];
     let candidate = Math.max(nextValues[i], minAllowed);
     if (initialValue < candidate) {
       candidate = Math.max(initialValue, minAllowed);
@@ -42,7 +33,7 @@ function getPushedThumbValues({
   for (let i = index - 1; i >= 0; i -= 1) {
     const maxAllowed = nextValues[i + 1] - minValueDifference;
     const minAllowed = min + i * minValueDifference;
-    const initialValue = baseInitialValues[i] ?? nextValues[i];
+    const initialValue = baseInitialValues[i];
     let candidate = Math.min(nextValues[i], maxAllowed);
     if (initialValue > candidate) {
       candidate = Math.min(initialValue, maxAllowed);

package/slider/utils/getPushedThumbValues.mjs

@@ -1,21 +1,13 @@
 import { clamp } from "../../internals/clamp.mjs";
+
 /**
  * Returns a new array of slider values where attempting to move the thumb at `index`
  * beyond its neighbours "pushes" them while respecting `minStepsBetweenValues`.
+ *
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
  */
-export function getPushedThumbValues({
-  values,
-  index,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues,
-  initialValues
-}) {
-  if (values.length === 0) {
-    return [];
-  }
+export function getPushedThumbValues(values, index, nextValue, min, max, step, minStepsBetweenValues, initialValues) {
   const nextValues = values.slice();
   const minValueDifference = step * minStepsBetweenValues;
   const lastIndex = nextValues.length - 1;
@@ -26,7 +18,7 @@ export function getPushedThumbValues({
   for (let i = index + 1; i <= lastIndex; i += 1) {
     const minAllowed = nextValues[i - 1] + minValueDifference;
     const maxAllowed = max - (lastIndex - i) * minValueDifference;
-    const initialValue = baseInitialValues[i] ?? nextValues[i];
+    const initialValue = baseInitialValues[i];
     let candidate = Math.max(nextValues[i], minAllowed);
     if (initialValue < candidate) {
       candidate = Math.max(initialValue, minAllowed);
@@ -36,7 +28,7 @@ export function getPushedThumbValues({
   for (let i = index - 1; i >= 0; i -= 1) {
     const maxAllowed = nextValues[i + 1] - minValueDifference;
     const minAllowed = min + i * minValueDifference;
-    const initialValue = baseInitialValues[i] ?? nextValues[i];
+    const initialValue = baseInitialValues[i];
     let candidate = Math.min(nextValues[i], maxAllowed);
     if (initialValue > candidate) {
       candidate = Math.min(initialValue, maxAllowed);

package/slider/utils/getSliderValue.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSliderValue = getSliderValue;
 var _clamp = require("../../internals/clamp");
-var _replaceArrayItemAtIndex = require("./replaceArrayItemAtIndex");
+var _asc = require("./asc");
 function getSliderValue(valueInput, index, min, max, range, values) {
-  let newValue = valueInput;
-  newValue = (0, _clamp.clamp)(newValue, min, max);
-  if (range) {
-    newValue = (0, _replaceArrayItemAtIndex.replaceArrayItemAtIndex)(values, index,
-    // Bound the new value to the thumb's neighbours.
-    (0, _clamp.clamp)(newValue, values[index - 1] ?? -Infinity, values[index + 1] ?? Infinity));
+  const clamped = (0, _clamp.clamp)(valueInput, min, max);
+  if (!range) {
+    return clamped;
   }
-  return newValue;
+  const output = values.slice();
+  // Bound the new value to the thumb's neighbours.
+  output[index] = (0, _clamp.clamp)(clamped, values[index - 1] ?? -Infinity, values[index + 1] ?? Infinity);
+  return output.sort(_asc.asc);
 }

package/slider/utils/getSliderValue.mjs

@@ -1,12 +1,12 @@
 import { clamp } from "../../internals/clamp.mjs";
-import { replaceArrayItemAtIndex } from "./replaceArrayItemAtIndex.mjs";
+import { asc } from "./asc.mjs";
 export function getSliderValue(valueInput, index, min, max, range, values) {
-  let newValue = valueInput;
-  newValue = clamp(newValue, min, max);
-  if (range) {
-    newValue = replaceArrayItemAtIndex(values, index,
-    // Bound the new value to the thumb's neighbours.
-    clamp(newValue, values[index - 1] ?? -Infinity, values[index + 1] ?? Infinity));
+  const clamped = clamp(valueInput, min, max);
+  if (!range) {
+    return clamped;
   }
-  return newValue;
+  const output = values.slice();
+  // Bound the new value to the thumb's neighbours.
+  output[index] = clamp(clamped, values[index - 1] ?? -Infinity, values[index + 1] ?? Infinity);
+  return output.sort(asc);
 }

package/slider/utils/resolveThumbCollision.d.mts

@@ -1,30 +1,11 @@
 import { SliderRootContext } from "../root/SliderRootContext.mjs";
-export interface ResolveThumbCollisionParams {
-  behavior: SliderRootContext['thumbCollisionBehavior'];
-  values: readonly number[];
-  currentValues?: readonly number[] | null | undefined;
-  initialValues?: readonly number[] | null | undefined;
-  pressedIndex: number;
-  nextValue: number;
-  min: number;
-  max: number;
-  step: number;
-  minStepsBetweenValues: number;
-}
 export interface ResolveThumbCollisionResult {
   value: number | number[];
   thumbIndex: number;
   didSwap: boolean;
 }
-export declare function resolveThumbCollision({
-  behavior,
-  values,
-  currentValues,
-  initialValues,
-  pressedIndex,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues
-}: ResolveThumbCollisionParams): ResolveThumbCollisionResult;
+/**
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
+ */
+export declare function resolveThumbCollision(behavior: SliderRootContext['thumbCollisionBehavior'], values: readonly number[], currentValues: readonly number[] | null | undefined, initialValues: readonly number[] | null | undefined, pressedIndex: number, nextValue: number, min: number, max: number, step: number, minStepsBetweenValues: number): ResolveThumbCollisionResult;

package/slider/utils/resolveThumbCollision.d.ts

@@ -1,30 +1,11 @@
 import { SliderRootContext } from "../root/SliderRootContext.js";
-export interface ResolveThumbCollisionParams {
-  behavior: SliderRootContext['thumbCollisionBehavior'];
-  values: readonly number[];
-  currentValues?: readonly number[] | null | undefined;
-  initialValues?: readonly number[] | null | undefined;
-  pressedIndex: number;
-  nextValue: number;
-  min: number;
-  max: number;
-  step: number;
-  minStepsBetweenValues: number;
-}
 export interface ResolveThumbCollisionResult {
   value: number | number[];
   thumbIndex: number;
   didSwap: boolean;
 }
-export declare function resolveThumbCollision({
-  behavior,
-  values,
-  currentValues,
-  initialValues,
-  pressedIndex,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues
-}: ResolveThumbCollisionParams): ResolveThumbCollisionResult;
+/**
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
+ */
+export declare function resolveThumbCollision(behavior: SliderRootContext['thumbCollisionBehavior'], values: readonly number[], currentValues: readonly number[] | null | undefined, initialValues: readonly number[] | null | undefined, pressedIndex: number, nextValue: number, min: number, max: number, step: number, minStepsBetweenValues: number): ResolveThumbCollisionResult;

package/slider/utils/resolveThumbCollision.js

@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.resolveThumbCollision = resolveThumbCollision;
 var _clamp = require("../../internals/clamp");
 var _getPushedThumbValues = require("./getPushedThumbValues");
-function resolveThumbCollision({
-  behavior,
-  values,
-  currentValues,
-  initialValues,
-  pressedIndex,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues
-}) {
+/**
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
+ */
+function resolveThumbCollision(behavior, values, currentValues, initialValues, pressedIndex, nextValue, min, max, step, minStepsBetweenValues) {
   const activeValues = currentValues ?? values;
   const baselineValues = initialValues ?? values;
   const range = activeValues.length > 1;
@@ -29,19 +22,30 @@ function resolveThumbCollision({
     };
   }
   const minValueDifference = step * minStepsBetweenValues;
+
+  // `push` does its own copy/bounds/rounding pass in `getPushedThumbValues`, so it must not
+  // pay for the neighbor-clamp setup below (this is the hottest path — `push` is the default).
+  if (behavior === 'push') {
+    return {
+      value: (0, _getPushedThumbValues.getPushedThumbValues)(activeValues, pressedIndex, nextValue, min, max, step, minStepsBetweenValues),
+      thumbIndex: pressedIndex,
+      didSwap: false
+    };
+  }
+
+  // Shared by `swap` and `none`.
+  const candidateValues = activeValues.slice();
+  const previousNeighbor = candidateValues[pressedIndex - 1];
+  const nextNeighbor = candidateValues[pressedIndex + 1];
+  const lowerBound = previousNeighbor != null ? previousNeighbor + minValueDifference : min;
+  const upperBound = nextNeighbor != null ? nextNeighbor - minValueDifference : max;
+  const pressedValueAfterClamp = Number((0, _clamp.clamp)(nextValue, lowerBound, upperBound).toFixed(12));
+  candidateValues[pressedIndex] = pressedValueAfterClamp;
   switch (behavior) {
     case 'swap':
       {
         const pressedInitialValue = activeValues[pressedIndex];
         const epsilon = 1e-7;
-        const candidateValues = activeValues.slice();
-        const previousNeighbor = candidateValues[pressedIndex - 1];
-        const nextNeighbor = candidateValues[pressedIndex + 1];
-        const lowerBound = previousNeighbor != null ? previousNeighbor + minValueDifference : min;
-        const upperBound = nextNeighbor != null ? nextNeighbor - minValueDifference : max;
-        const constrainedValue = (0, _clamp.clamp)(nextValue, lowerBound, upperBound);
-        const pressedValueAfterClamp = Number(constrainedValue.toFixed(12));
-        candidateValues[pressedIndex] = pressedValueAfterClamp;
         const movingForward = nextValue > pressedInitialValue;
         const movingBackward = nextValue < pressedInitialValue;
         const shouldSwapForward = movingForward && nextNeighbor != null && nextValue >= nextNeighbor - epsilon;
@@ -70,60 +74,25 @@ function resolveThumbCollision({
         } else {
           nextValueForTarget = Math.min(nextValue, candidateValues[targetIndex]);
         }
-        const adjustedValues = (0, _getPushedThumbValues.getPushedThumbValues)({
-          values: candidateValues,
-          index: targetIndex,
-          nextValue: nextValueForTarget,
-          min,
-          max,
-          step,
-          minStepsBetweenValues,
-          initialValues: initialValuesForPush
-        });
+        const adjustedValues = (0, _getPushedThumbValues.getPushedThumbValues)(candidateValues, targetIndex, nextValueForTarget, min, max, step, minStepsBetweenValues, initialValuesForPush);
         const neighborIndex = shouldSwapForward ? targetIndex - 1 : targetIndex + 1;
-        if (neighborIndex >= 0 && neighborIndex < adjustedValues.length) {
-          const previousValue = adjustedValues[neighborIndex - 1];
-          const nextValueAfter = adjustedValues[neighborIndex + 1];
-          let neighborLowerBound = previousValue != null ? previousValue + minValueDifference : min;
-          neighborLowerBound = Math.max(neighborLowerBound, min + neighborIndex * minValueDifference);
-          let neighborUpperBound = nextValueAfter != null ? nextValueAfter - minValueDifference : max;
-          neighborUpperBound = Math.min(neighborUpperBound, max - (adjustedValues.length - 1 - neighborIndex) * minValueDifference);
-          const restoredValue = (0, _clamp.clamp)(pressedValueAfterClamp, neighborLowerBound, neighborUpperBound);
-          adjustedValues[neighborIndex] = Number(restoredValue.toFixed(12));
-        }
+        const previousValue = adjustedValues[neighborIndex - 1];
+        const nextValueAfter = adjustedValues[neighborIndex + 1];
+        let neighborLowerBound = previousValue != null ? previousValue + minValueDifference : min;
+        neighborLowerBound = Math.max(neighborLowerBound, min + neighborIndex * minValueDifference);
+        let neighborUpperBound = nextValueAfter != null ? nextValueAfter - minValueDifference : max;
+        neighborUpperBound = Math.min(neighborUpperBound, max - (adjustedValues.length - 1 - neighborIndex) * minValueDifference);
+        const restoredValue = (0, _clamp.clamp)(pressedValueAfterClamp, neighborLowerBound, neighborUpperBound);
+        adjustedValues[neighborIndex] = Number(restoredValue.toFixed(12));
         return {
           value: adjustedValues,
           thumbIndex: targetIndex,
           didSwap: true
         };
       }
-    case 'push':
-      {
-        const nextValues = (0, _getPushedThumbValues.getPushedThumbValues)({
-          values: activeValues,
-          index: pressedIndex,
-          nextValue,
-          min,
-          max,
-          step,
-          minStepsBetweenValues
-        });
-        return {
-          value: nextValues,
-          thumbIndex: pressedIndex,
-          didSwap: false
-        };
-      }
     case 'none':
     default:
       {
-        const candidateValues = activeValues.slice();
-        const previousNeighbor = candidateValues[pressedIndex - 1];
-        const nextNeighbor = candidateValues[pressedIndex + 1];
-        const lowerBound = previousNeighbor != null ? previousNeighbor + minValueDifference : min;
-        const upperBound = nextNeighbor != null ? nextNeighbor - minValueDifference : max;
-        const constrainedValue = (0, _clamp.clamp)(nextValue, lowerBound, upperBound);
-        candidateValues[pressedIndex] = Number(constrainedValue.toFixed(12));
         return {
           value: candidateValues,
           thumbIndex: pressedIndex,

package/slider/utils/resolveThumbCollision.mjs

@@ -1,17 +1,10 @@
 import { clamp } from "../../internals/clamp.mjs";
 import { getPushedThumbValues } from "./getPushedThumbValues.mjs";
-export function resolveThumbCollision({
-  behavior,
-  values,
-  currentValues,
-  initialValues,
-  pressedIndex,
-  nextValue,
-  min,
-  max,
-  step,
-  minStepsBetweenValues
-}) {
+/**
+ * Positional arguments are deliberate: property names of an options object don't
+ * minify, so passing them positionally keeps this internal helper smaller in the bundle.
+ */
+export function resolveThumbCollision(behavior, values, currentValues, initialValues, pressedIndex, nextValue, min, max, step, minStepsBetweenValues) {
   const activeValues = currentValues ?? values;
   const baselineValues = initialValues ?? values;
   const range = activeValues.length > 1;
@@ -23,19 +16,30 @@ export function resolveThumbCollision({
     };
   }
   const minValueDifference = step * minStepsBetweenValues;
+
+  // `push` does its own copy/bounds/rounding pass in `getPushedThumbValues`, so it must not
+  // pay for the neighbor-clamp setup below (this is the hottest path — `push` is the default).
+  if (behavior === 'push') {
+    return {
+      value: getPushedThumbValues(activeValues, pressedIndex, nextValue, min, max, step, minStepsBetweenValues),
+      thumbIndex: pressedIndex,
+      didSwap: false
+    };
+  }
+
+  // Shared by `swap` and `none`.
+  const candidateValues = activeValues.slice();
+  const previousNeighbor = candidateValues[pressedIndex - 1];
+  const nextNeighbor = candidateValues[pressedIndex + 1];
+  const lowerBound = previousNeighbor != null ? previousNeighbor + minValueDifference : min;
+  const upperBound = nextNeighbor != null ? nextNeighbor - minValueDifference : max;
+  const pressedValueAfterClamp = Number(clamp(nextValue, lowerBound, upperBound).toFixed(12));
+  candidateValues[pressedIndex] = pressedValueAfterClamp;
   switch (behavior) {
     case 'swap':
       {
         const pressedInitialValue = activeValues[pressedIndex];
         const epsilon = 1e-7;
-        const candidateValues = activeValues.slice();
-        const previousNeighbor = candidateValues[pressedIndex - 1];
-        const nextNeighbor = candidateValues[pressedIndex + 1];
-        const lowerBound = previousNeighbor != null ? previousNeighbor + minValueDifference : min;
-        const upperBound = nextNeighbor != null ? nextNeighbor - minValueDifference : max;
-        const constrainedValue = clamp(nextValue, lowerBound, upperBound);
-        const pressedValueAfterClamp = Number(constrainedValue.toFixed(12));
-        candidateValues[pressedIndex] = pressedValueAfterClamp;
         const movingForward = nextValue > pressedInitialValue;
         const movingBackward = nextValue < pressedInitialValue;
         const shouldSwapForward = movingForward && nextNeighbor != null && nextValue >= nextNeighbor - epsilon;
@@ -64,60 +68,25 @@ export function resolveThumbCollision({
         } else {
           nextValueForTarget = Math.min(nextValue, candidateValues[targetIndex]);
         }
-        const adjustedValues = getPushedThumbValues({
-          values: candidateValues,
-          index: targetIndex,
-          nextValue: nextValueForTarget,
-          min,
-          max,
-          step,
-          minStepsBetweenValues,
-          initialValues: initialValuesForPush
-        });
+        const adjustedValues = getPushedThumbValues(candidateValues, targetIndex, nextValueForTarget, min, max, step, minStepsBetweenValues, initialValuesForPush);
         const neighborIndex = shouldSwapForward ? targetIndex - 1 : targetIndex + 1;
-        if (neighborIndex >= 0 && neighborIndex < adjustedValues.length) {
-          const previousValue = adjustedValues[neighborIndex - 1];
-          const nextValueAfter = adjustedValues[neighborIndex + 1];
-          let neighborLowerBound = previousValue != null ? previousValue + minValueDifference : min;
-          neighborLowerBound = Math.max(neighborLowerBound, min + neighborIndex * minValueDifference);
-          let neighborUpperBound = nextValueAfter != null ? nextValueAfter - minValueDifference : max;
-          neighborUpperBound = Math.min(neighborUpperBound, max - (adjustedValues.length - 1 - neighborIndex) * minValueDifference);
-          const restoredValue = clamp(pressedValueAfterClamp, neighborLowerBound, neighborUpperBound);
-          adjustedValues[neighborIndex] = Number(restoredValue.toFixed(12));
-        }
+        const previousValue = adjustedValues[neighborIndex - 1];
+        const nextValueAfter = adjustedValues[neighborIndex + 1];
+        let neighborLowerBound = previousValue != null ? previousValue + minValueDifference : min;
+        neighborLowerBound = Math.max(neighborLowerBound, min + neighborIndex * minValueDifference);
+        let neighborUpperBound = nextValueAfter != null ? nextValueAfter - minValueDifference : max;
+        neighborUpperBound = Math.min(neighborUpperBound, max - (adjustedValues.length - 1 - neighborIndex) * minValueDifference);
+        const restoredValue = clamp(pressedValueAfterClamp, neighborLowerBound, neighborUpperBound);
+        adjustedValues[neighborIndex] = Number(restoredValue.toFixed(12));
         return {
           value: adjustedValues,
           thumbIndex: targetIndex,
           didSwap: true
         };
       }
-    case 'push':
-      {
-        const nextValues = getPushedThumbValues({
-          values: activeValues,
-          index: pressedIndex,
-          nextValue,
-          min,
-          max,
-          step,
-          minStepsBetweenValues
-        });
-        return {
-          value: nextValues,
-          thumbIndex: pressedIndex,
-          didSwap: false
-        };
-      }
     case 'none':
     default:
       {
-        const candidateValues = activeValues.slice();
-        const previousNeighbor = candidateValues[pressedIndex - 1];
-        const nextNeighbor = candidateValues[pressedIndex + 1];
-        const lowerBound = previousNeighbor != null ? previousNeighbor + minValueDifference : min;
-        const upperBound = nextNeighbor != null ? nextNeighbor - minValueDifference : max;
-        const constrainedValue = clamp(nextValue, lowerBound, upperBound);
-        candidateValues[pressedIndex] = Number(constrainedValue.toFixed(12));
         return {
           value: candidateValues,
           thumbIndex: pressedIndex,

package/slider/utils/test-utils.d.mts

@@ -2,15 +2,5 @@ type Touches = Array<Pick<Touch, 'identifier' | 'clientX' | 'clientY'>>;
 export declare function createTouches(touches: Touches): {
   changedTouches: Touch[];
 };
-export declare function getHorizontalSliderRect(width?: number): {
-  width: number;
-  height: number;
-  bottom: number;
-  left: number;
-  x: number;
-  y: number;
-  top: number;
-  right: number;
-  toJSON(): void;
-};
+export declare function getHorizontalSliderRect(width?: number): DOMRect;
 export {};

package/slider/utils/test-utils.d.ts

@@ -2,15 +2,5 @@ type Touches = Array<Pick<Touch, 'identifier' | 'clientX' | 'clientY'>>;
 export declare function createTouches(touches: Touches): {
   changedTouches: Touch[];
 };
-export declare function getHorizontalSliderRect(width?: number): {
-  width: number;
-  height: number;
-  bottom: number;
-  left: number;
-  x: number;
-  y: number;
-  top: number;
-  right: number;
-  toJSON(): void;
-};
+export declare function getHorizontalSliderRect(width?: number): DOMRect;
 export {};

package/slider/utils/test-utils.js

@@ -16,15 +16,5 @@ function createTouches(touches) {
   };
 }
 function getHorizontalSliderRect(width = 100) {
-  return {
-    width,
-    height: 10,
-    bottom: 10,
-    left: 0,
-    x: 0,
-    y: 0,
-    top: 0,
-    right: width,
-    toJSON() {}
-  };
+  return new DOMRect(0, 0, width, 10);
 }

package/slider/utils/test-utils.mjs

@@ -9,15 +9,5 @@ export function createTouches(touches) {
   };
 }
 export function getHorizontalSliderRect(width = 100) {
-  return {
-    width,
-    height: 10,
-    bottom: 10,
-    left: 0,
-    x: 0,
-    y: 0,
-    top: 0,
-    right: width,
-    toJSON() {}
-  };
+  return new DOMRect(0, 0, width, 10);
 }

package/slider/utils/validateMinimumDistance.js

@@ -8,12 +8,11 @@ function validateMinimumDistance(values, step, minStepsBetweenValues) {
   if (!Array.isArray(values)) {
     return true;
   }
-  const distances = values.reduce((acc, val, index, vals) => {
-    if (index === vals.length - 1) {
-      return acc;
+  const minDistance = step * minStepsBetweenValues;
+  for (let i = 0; i < values.length - 1; i += 1) {
+    if (!(Math.abs(values[i] - values[i + 1]) >= minDistance)) {
+      return false;
     }
-    acc.push(Math.abs(val - vals[index + 1]));
-    return acc;
-  }, []);
-  return Math.min(...distances) >= step * minStepsBetweenValues;
+  }
+  return true;
 }

package/slider/utils/validateMinimumDistance.mjs

@@ -2,12 +2,11 @@ export function validateMinimumDistance(values, step, minStepsBetweenValues) {
   if (!Array.isArray(values)) {
     return true;
   }
-  const distances = values.reduce((acc, val, index, vals) => {
-    if (index === vals.length - 1) {
-      return acc;
+  const minDistance = step * minStepsBetweenValues;
+  for (let i = 0; i < values.length - 1; i += 1) {
+    if (!(Math.abs(values[i] - values[i + 1]) >= minDistance)) {
+      return false;
     }
-    acc.push(Math.abs(val - vals[index + 1]));
-    return acc;
-  }, []);
-  return Math.min(...distances) >= step * minStepsBetweenValues;
+  }
+  return true;
 }

package/slider/value/SliderValue.js

@@ -30,24 +30,14 @@ const SliderValue = exports.SliderValue = /*#__PURE__*/React.forwardRef(function
     thumbMap,
     state,
     values,
-    formatOptionsRef,
+    format,
     locale
   } = (0, _SliderRootContext.useSliderRootContext)();
-  let htmlFor = '';
-  for (const thumbMetadata of thumbMap.values()) {
-    if (thumbMetadata?.inputId) {
-      htmlFor += `${thumbMetadata.inputId} `;
-    }
-  }
-  const outputFor = htmlFor.trim() === '' ? undefined : htmlFor.trim();
-  const formattedValues = React.useMemo(() => {
-    const arr = [];
-    for (let i = 0; i < values.length; i += 1) {
-      arr.push((0, _formatNumber.formatNumber)(values[i], locale, formatOptionsRef.current ?? undefined));
-    }
-    return arr;
-  }, [formatOptionsRef, locale, values]);
-  const defaultDisplayValue = values.map((v, i) => formattedValues[i] || v).join(' – ');
+  const outputFor = Array.from(thumbMap.values(), ({
+    inputId
+  }) => inputId).join(' ').trim() || undefined;
+  const formattedValues = React.useMemo(() => values.map(v => (0, _formatNumber.formatNumber)(v, locale, format)), [format, locale, values]);
+  const defaultDisplayValue = formattedValues.join(' – ');
   const element = (0, _useRenderElement.useRenderElement)('output', componentProps, {
     state,
     ref: forwardedRef,