Skip to content

fix(s2): ensure slider respects custom widths and correct the fillOffset #7138

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
yihuiliao merged 5 commits into from
Oct 10, 2024
+14 −3
Merged

fix(s2): ensure slider respects custom widths and correct the fillOffset #7138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b23976b
fix(s2): ensure slider respects custom widths and correct fillOffset
yihuiliao Oct 2, 2024
63261b1
remove fieldInput from track styling
yihuiliao Oct 2, 2024
a7422c3
add chromatic story replicating issue
yihuiliao Oct 3, 2024
f2c6db4
Merge branch 'main' into s2-slider-custom-width
yihuiliao Oct 3, 2024
7daa76a
fix lint
yihuiliao Oct 3, 2024
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
12 changes: 12 additions & 0 deletions packages/@react-spectrum/s2/chromatic/Slider.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@ FormatOptions.args = {
formatOptions: {style: 'currency', currency: 'JPY'}
};

export const MinMaxValue = (args: any) => (
<div style={{display: 'flex', flexDirection: 'column', alignItems: 'start', gap: 8}}>
<Slider {...args} />
</div>
);

MinMaxValue.args = {
label: 'Size',
minValue: 1,
maxValue: 5
};

export const ContextualHelpExample = (args: any) => (
<div style={{display: 'flex', flexDirection: 'column', alignItems: 'start', gap: 8}}>
<Slider {...args} />
Expand Down
5 changes: 2 additions & 3 deletions packages/@react-spectrum/s2/src/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ const output = style({
});

export let track = style({
...fieldInput(),
gridArea: 'track',
position: 'relative',
width: 'full',
Expand Down Expand Up @@ -379,7 +378,7 @@ export function SliderBase<T extends number | number[]>(props: SliderBaseProps<T
</FieldLabel>
{labelPosition === 'top' && outputValue}
</div>
<div className={style({gridArea: 'input', display: 'inline-flex', alignItems: 'center', gap: {default: 16, size: {L: 20, XL: 24}}})({size})}>
<div className={style({...fieldInput(), display: 'inline-flex', alignItems: 'center', gap: {default: 16, size: {L: 20, XL: 24}}})({size})}>
{props.children}
{labelPosition === 'side' && outputValue}
</div>
Expand Down Expand Up @@ -416,7 +415,7 @@ function Slider(props: SliderProps, ref: FocusableRef<HTMLDivElement>) {
className={track({size, labelPosition, isInForm: !!formContext})}>
{({state, isDisabled}) => {

fillOffset = fillOffset !== undefined ? clamp(fillOffset, state.getThumbMinValue(0), state.getThumbMaxValue(0)) : 0;
fillOffset = fillOffset !== undefined ? clamp(fillOffset, state.getThumbMinValue(0), state.getThumbMaxValue(0)) : state.getThumbMinValue(0);

let fillWidth = state.getThumbPercent(0) - state.getValuePercent(fillOffset);
let isRightOfOffset = fillWidth > 0;
Expand Down