Skip to content

fix(Slider): fixed customSteps spacing to respect min/max #6231

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

Merged
tlabaj merged 2 commits into from
Sep 1, 2021
Merged

fix(Slider): fixed customSteps spacing to respect min/max #6231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f04383
fix(Slider): fixed customSteps spacing to respect min/max
evwilkin Aug 26, 2021
1fe5760
fixed customSteps allows value greater than max
evwilkin Aug 26, 2021
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
36 changes: 23 additions & 13 deletions packages/react-core/src/components/Slider/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,15 @@ export const Slider: React.FunctionComponent<SliderProps> = ({

/* If custom steps are discrete, snap to closest step value */
if (!areCustomStepsContinuous && customSteps) {
const stepIndex = customSteps.findIndex(stepObj => stepObj.value >= newPercentage);
if (customSteps[stepIndex].value === newPercentage) {
const numSteps = customSteps.length - 1;
const percentagePerStep = 100 / numSteps;
const customStepPercentage = newPercentage / percentagePerStep;
const stepIndex = customSteps.findIndex(stepObj => stepObj.value >= customStepPercentage);
if (customSteps[stepIndex].value === customStepPercentage) {
snapValue = customSteps[stepIndex].value;
} else {
const midpoint = (customSteps[stepIndex].value + customSteps[stepIndex - 1].value) / 2;
if (midpoint > newPercentage) {
if (midpoint > customStepPercentage) {
snapValue = customSteps[stepIndex - 1].value;
} else {
snapValue = customSteps[stepIndex].value;
Expand Down Expand Up @@ -306,10 +309,11 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
}
};

const getStepValue = (val: number, min: number, max: number) => ((val - min) * 100) / (max - min);
const buildSteps = () => {
const builtSteps = [];
for (let i = min; i <= max; i = i + step) {
const stepValue = ((i - min) * 100) / (max - min);
const stepValue = getStepValue(i, min, max);

// If we boundaries but not ticks just generate the needed steps
// so that we don't pullute them DOM with empty divs
Expand Down Expand Up @@ -340,15 +344,21 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
</div>
{customSteps && (
<div className={css(styles.sliderSteps)} aria-hidden="true">
{customSteps.map(stepObj => (
<SliderStep
key={stepObj.value}
value={stepObj.value}
label={stepObj.label}
isLabelHidden={stepObj.isLabelHidden}
isActive={stepObj.value <= localValue}
/>
))}
{customSteps.map(stepObj => {
const minValue = customSteps[0].value;
const maxValue = customSteps[customSteps.length - 1].value;
const stepValue = getStepValue(stepObj.value, minValue, maxValue);

return (
<SliderStep
key={stepObj.value}
value={stepValue}
label={stepObj.label}
isLabelHidden={stepObj.isLabelHidden}
isActive={stepObj.value <= localValue}
/>
);
})}
</div>
)}
{!customSteps && (showTicks || showBoundaries) && (
Expand Down