Skip to content

Slider: Made min-max clamp only apply if clamping would change the value #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Anders2303 wants to merge 5 commits into
base: main
Choose a base branch
from
+28 −22
Open

Slider: Made min-max clamp only apply if clamping would change the value #1897

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26e0019
Slider: Made min-max clamp only apply if clamping would change the value
Anders2303 Sep 11, 2026
2f9254f
Made sure controlled slider value is prioritized
Anders2303 Sep 15, 2026
5e74118
Merge branch 'main' into lib/slider-only-clamp-on-change
Anders2303 Sep 15, 2026
874bed0
Merge branch 'main' into lib/slider-only-clamp-on-change
Anders2303 Sep 15, 2026
e5cca5f
Merge branch 'main' into lib/slider-only-clamp-on-change
Anders2303 Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions frontend/src/lib/components/Slider/slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
.value();
}, [defaultedProps.markers, defaultedProps.max, defaultedProps.min]);

const isDualSlider = Array.isArray(internalValue);
// Prioritize the controlled value if possible
const activeValue = props.value ?? internalValue;
const isDualSlider = Array.isArray(activeValue);

const { minLocked, maxLocked, setMinLocked, setMaxLocked } = useLockState({
isDualSlider,
Expand Down Expand Up @@ -283,7 +285,7 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
);

useLockedValueUpdate({
value: internalValue,
value: activeValue,
min: defaultedProps.min,
max: defaultedProps.max,
minLocked,
Expand All @@ -292,7 +294,7 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
});

useUnlockOnValueChange({
value: internalValue,
value: activeValue,
min: defaultedProps.min,
max: defaultedProps.max,
minLocked,
Expand All @@ -302,38 +304,38 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
});

function onValueChangeInternal(newValue: number | number[], eventDetails: SliderBase.Root.ChangeEventDetails) {
const activeValue = isDualSliderValue(newValue) ? newValue[eventDetails.activeThumbIndex] : newValue;
const prevActiveValue = isDualSliderValue(internalValue)
? internalValue[eventDetails.activeThumbIndex]
: internalValue;
const thumbValue = isDualSliderValue(newValue) ? newValue[eventDetails.activeThumbIndex] : newValue;
const prevThumbValue = isDualSliderValue(activeValue)
? activeValue[eventDetails.activeThumbIndex]
: activeValue;

if (isDualSliderValue(newValue)) {
if (eventDetails.activeThumbIndex === 0 && activeValue > defaultedProps.min) {
if (eventDetails.activeThumbIndex === 0 && thumbValue > defaultedProps.min) {
setMinLocked(false);
} else if (eventDetails.activeThumbIndex === 1 && activeValue < defaultedProps.max) {
} else if (eventDetails.activeThumbIndex === 1 && thumbValue < defaultedProps.max) {
setMaxLocked(false);
}
} else {
if (activeValue > defaultedProps.min) {
if (thumbValue > defaultedProps.min) {
setMinLocked(false);
}
if (activeValue < defaultedProps.max) {
if (thumbValue < defaultedProps.max) {
setMaxLocked(false);
}
}

if (defaultedProps.snapToMarkers && !allMarkers.includes(activeValue)) {
if (defaultedProps.snapToMarkers && !allMarkers.includes(thumbValue)) {
let snapTarget: SnapTarget = "nearest";

// For keyboard movement, we should always go a new marker marker
if (eventDetails.reason === "keyboard") {
snapTarget = prevActiveValue - activeValue < 0 ? "next" : "prev";
snapTarget = prevThumbValue - thumbValue < 0 ? "next" : "prev";
}

const snappedValue = getSnappedValue(allMarkers, newValue, snapTarget);

// Only apply the snapped value if necessary
if (!isEqual(snappedValue, internalValue)) {
if (!isEqual(snappedValue, activeValue)) {
updateValue(snappedValue, eventDetails);
}
} else {
Expand All @@ -344,7 +346,7 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
const showThumbValueLabels = defaultedProps.valueLabelDisplay === "auto" && (isHovered || isFocused);

const [valueToClamp, setValueToClamp] = React.useState<null | number | number[]>(null);
let clampedValue = isDualSlider ? clone(internalValue as number[]) : ([internalValue, internalValue] as number[]);
let clampedValue = isDualSlider ? clone(activeValue as number[]) : ([activeValue, activeValue] as number[]);

if (prevMin !== defaultedProps.min || prevMax !== defaultedProps.max) {
setPrevMin(defaultedProps.min);
Expand All @@ -362,7 +364,11 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
clampedValue[1] = defaultedProps.max;
}

setValueToClamp(isDualSlider ? clampedValue : clampedValue[0]);
const newValue = isDualSlider ? clampedValue : clampedValue[0];

if (!isEqual(newValue, activeValue)) {
setValueToClamp(isDualSlider ? clampedValue : clampedValue[0]);
}
}

React.useEffect(() => {
Expand All @@ -379,7 +385,7 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
{...baseProps}
className={resolveClassNames(baseProps.className, "px-2xs grid items-center")}
ref={wrapperRef}
value={internalValue}
value={activeValue}
onValueChange={onValueChangeInternal}
style={
{
Expand Down Expand Up @@ -484,7 +490,7 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
index={0}
size={componentSize}
showValue={showThumbValueLabels}
sliderValue={internalValue}
sliderValue={activeValue}
inputRefs={inputRefs}
disabled={state.disabled}
min={defaultedProps.min}
Expand All @@ -503,7 +509,7 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
index={1}
size={componentSize}
showValue={showThumbValueLabels}
sliderValue={internalValue}
sliderValue={activeValue}
inputRefs={inputRefs}
disabled={state.disabled}
min={defaultedProps.min}
Expand Down Expand Up @@ -573,15 +579,15 @@ export const Slider = React.forwardRef<HTMLDivElement, SliderProps<number | numb
disabled={props.disabled}
labelFormat={markerLabelFormatFunc}
onClick={(v) => {
if (!isDualSliderValue(internalValue)) {
if (!isDualSliderValue(activeValue)) {
updateValue(v, { reason: "marker-clicked" }, true);
inputRefs[0].current?.focus();
} else {
const nearestThumbIndex = minBy([0, 1], (idx) =>
Math.abs(internalValue[idx] - v),
Math.abs(activeValue[idx] - v),
)!;

const newValue = [...internalValue];
const newValue = [...activeValue];
newValue[nearestThumbIndex] = v;

updateValue(newValue, { reason: "marker-clicked" }, true);
Expand Down
Loading