Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 52 additions & 1 deletion packages/@react-spectrum/s2/chromatic/RangeSlider.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@

import {Content, Footer, Heading, Text} from '../src/Content';
import {ContextualHelp} from '../src/ContextualHelp';
import {generatePowerset} from '@react-spectrum/story-utils';
import {Link} from '../src/Link';
import type {Meta, StoryObj} from '@storybook/react';
import {RangeSlider} from '../src/RangeSlider';
import {RangeSlider, RangeSliderProps} from '../src/RangeSlider';
import {shortName} from './utils';
import {SliderInput} from '../src/SliderInput';
import {style} from '../style/spectrum-theme' with {type: 'macro'};

const meta: Meta<typeof RangeSlider> = {
component: RangeSlider,
Expand All @@ -39,6 +43,53 @@ export const Example: Story = {
}
};

let editableStates = [
{isEditable: [false, true]},
{
value: [
{start: 0, end: 50},
{start: 25, end: 75},
{start: 50, end: 100}
]
},
{size: ['S', 'M', 'L', 'XL']},
{labelPosition: ['top', 'side']},
{isEmphasized: true},
{isDisabled: true}
];

let editableCombinations = generatePowerset(
editableStates,
v => v.isDisabled && (v.isEmphasized || v.value.start !== 0)
);

export const Editable: Story = {
render: (args: RangeSliderProps) => (
<div
className={style({
display: 'grid',
gridTemplateColumns: 'repeat(6, minmax(0, 260px))',
gridAutoFlow: 'row',
alignItems: 'center',
justifyItems: 'start',
gap: 24,
width: '100vw'
})}>
{editableCombinations.map(c => {
let {isEditable, ...sliderProps} = c;
let key = Object.keys(c)
.map(k => (k === 'value' ? `${c[k].start}-${c[k].end}` : shortName(k, c[k])))
.join(' ');
return (
<RangeSlider key={key} label="Label" {...args} {...sliderProps}>
{isEditable ? <SliderInput /> : null}
</RangeSlider>
);
})}
</div>
)
};

export const ContextualHelpExample: Story = {
render: (args: any) => <RangeSlider {...args} />,
args: {
Expand Down
53 changes: 52 additions & 1 deletion packages/@react-spectrum/s2/chromatic/Slider.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@

import {Content, Footer, Heading, Text} from '../src/Content';
import {ContextualHelp} from '../src/ContextualHelp';
import {generatePowerset} from '@react-spectrum/story-utils';
import {Link} from '../src/Link';
import type {Meta, StoryObj} from '@storybook/react';
import {Slider} from '../src/Slider';
import {shortName} from './utils';
import {Slider, SliderProps} from '../src/Slider';
import {SliderInput} from '../src/SliderInput';
import {style} from '../style/spectrum-theme' with {type: 'macro'};

const meta: Meta<typeof Slider> = {
Expand Down Expand Up @@ -85,6 +88,54 @@ export const MinMaxValue: Story = {
}
};

let editableStates = [
{isEditable: [false, true]},
{value: [0, 0.5, 1]},
{size: ['S', 'M', 'L', 'XL']},
{labelPosition: ['top', 'side']},
{isEmphasized: true},
{isDisabled: true}
];

let editableCombinations = generatePowerset(
editableStates,
v => v.isDisabled && (v.isEmphasized || v.value !== 0)
);

export const Editable: Story = {
render: (args: SliderProps) => (
<div
className={style({
display: 'grid',
gridTemplateColumns: 'repeat(6, minmax(0, 260px))',
gridAutoFlow: 'row',
alignItems: 'center',
justifyItems: 'start',
gap: 24,
width: '100vw'
})}>
{editableCombinations.map(c => {
let {isEditable, ...sliderProps} = c;
let key = Object.keys(c)
.map(k => shortName(k, c[k]))
.join(' ');
return (
<Slider
key={key}
label="Label"
maxValue={1}
step={0.01}
formatOptions={{style: 'percent'}}
{...args}
{...sliderProps}>
{isEditable ? <SliderInput /> : null}
</Slider>
);
})}
</div>
)
};

export const ContextualHelpExample: Story = {
render: args => (
<div style={{display: 'flex', flexDirection: 'column', alignItems: 'start', gap: 8}}>
Expand Down
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/exports/RangeSlider.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
export {RangeSlider, RangeSliderContext} from '../src/RangeSlider';
export {SliderInput} from '../src/SliderInput';
export type {RangeSliderProps} from '../src/RangeSlider';
export type {SliderInputProps} from '../src/SliderInput';
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/exports/Slider.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
export {Slider, SliderContext} from '../src/Slider';
export {SliderInput} from '../src/SliderInput';
export type {SliderProps} from '../src/Slider';
export type {SliderInputProps} from '../src/SliderInput';
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/exports/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export {
} from '../src/SideNav';
export {SideNavPanel, SideNavPanelContext} from '../src/SideNavPanel';
export {Slider, SliderContext} from '../src/Slider';
export {SliderInput} from '../src/SliderInput';
export {Skeleton, useIsSkeleton} from '../src/Skeleton';
export {SkeletonCollection} from '../src/SkeletonCollection';
export {StatusLight, StatusLightContext} from '../src/StatusLight';
Expand Down Expand Up @@ -266,6 +267,7 @@ export type {SearchFieldProps} from '../src/SearchField';
export type {SegmentedControlProps, SegmentedControlItemProps} from '../src/SegmentedControl';
export type {SelectBoxProps, SelectBoxGroupProps} from '../src/SelectBoxGroup';
export type {SliderProps} from '../src/Slider';
export type {SliderInputProps} from '../src/SliderInput';
export type {RangeCalendarProps} from '../src/RangeCalendar';
export type {RangeSliderProps} from '../src/RangeSlider';
export type {
Expand Down
7 changes: 6 additions & 1 deletion packages/@react-spectrum/s2/src/Field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ export const FieldGroup = forwardRef(function FieldGroup(
onPointerDown={e => {
// Forward focus to input element when clicking on a non-interactive child (e.g. icon or padding)
if (
!e.defaultPrevented &&
e.pointerType === 'mouse' &&
!(getEventTarget(e) as Element).closest('button,input,textarea,[role="button"]')
) {
Expand All @@ -267,7 +268,11 @@ export const FieldGroup = forwardRef(function FieldGroup(
}}
onTouchEnd={e => {
let target = getEventTarget(e) as HTMLElement;
if (!target.isContentEditable && !target.closest('button,input,textarea,[role="button"]')) {
if (
!e.defaultPrevented &&
!target.isContentEditable &&
!target.closest('button,input,textarea,[role="button"]')
) {
e.preventDefault();
(e.currentTarget.querySelector('input, textarea') as HTMLElement)?.focus();
}
Expand Down
125 changes: 64 additions & 61 deletions packages/@react-spectrum/s2/src/RangeSlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {useFocusableRef} from './useDOMRef';
import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
import {useSpectrumContextProps} from './useSpectrumContextProps';

export interface RangeSliderProps extends Omit<SliderBaseProps<RangeValue<number>>, 'children'> {
export interface RangeSliderProps extends SliderBaseProps<RangeValue<number>> {
/**
* The name of the start input element, used when submitting an HTML form. See
* [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefname).
Expand Down Expand Up @@ -93,65 +93,68 @@ export const RangeSlider = /*#__PURE__*/ forwardRef(function RangeSlider(
defaultValue={defaultThumbValues}
onChange={v => props.onChange?.({start: v[0], end: v[1]})}
onChangeEnd={v => props.onChangeEnd?.({start: v[0], end: v[1]})}
sliderRef={domRef}>
<SliderTrack className={track({size, labelPosition, isInForm: !!formContext})}>
{({state, isDisabled}) => (
<>
<div className={upperTrack({isDisabled, trackStyle})}>
<SliderFill className={filledTrack({isDisabled, isEmphasized, trackStyle})} />
</div>
<SliderThumb
className={thumbContainer}
index={0}
name={props.startName}
form={props.form}
aria-label={stringFormatter.format('slider.minimum')}
ref={lowerThumbRef}
style={renderProps =>
pressScale(lowerThumbRef, {
transform: 'translate(-50%, -50%)',
zIndex: state.getThumbPercent(0) === 1 ? 1 : undefined
})({...renderProps, isPressed: renderProps.isDragging})
}>
{renderProps => (
<div className={thumbHitArea({size})}>
<div
className={thumb({
...renderProps,
size,
thumbStyle
})}
/>
</div>
)}
</SliderThumb>
<SliderThumb
className={thumbContainer}
index={1}
name={props.endName}
form={props.form}
aria-label={stringFormatter.format('slider.maximum')}
ref={upperThumbRef}
style={renderProps =>
pressScale(upperThumbRef, {
transform: 'translate(-50%, -50%)'
})({...renderProps, isPressed: renderProps.isDragging})
}>
{renderProps => (
<div className={thumbHitArea({size})}>
<div
className={thumb({
...renderProps,
size,
thumbStyle
})}
/>
</div>
)}
</SliderThumb>
</>
)}
</SliderTrack>
</SliderBase>
sliderRef={domRef}
track={
<SliderTrack
className={track({size, labelPosition, isInForm: !!formContext, isRange: true})}>
{({state, isDisabled}) => (
<>
<div className={upperTrack({isDisabled, trackStyle})}>
<SliderFill className={filledTrack({isDisabled, isEmphasized, trackStyle})} />
</div>
<SliderThumb
className={thumbContainer}
index={0}
name={props.startName}
form={props.form}
aria-label={stringFormatter.format('slider.minimum')}
ref={lowerThumbRef}
style={renderProps =>
pressScale(lowerThumbRef, {
transform: 'translate(-50%, -50%)',
zIndex: state.getThumbPercent(0) === 1 ? 1 : undefined
})({...renderProps, isPressed: renderProps.isDragging})
}>
{renderProps => (
<div className={thumbHitArea({size})}>
<div
className={thumb({
...renderProps,
size,
thumbStyle
})}
/>
</div>
)}
</SliderThumb>
<SliderThumb
className={thumbContainer}
index={1}
name={props.endName}
form={props.form}
aria-label={stringFormatter.format('slider.maximum')}
ref={upperThumbRef}
style={renderProps =>
pressScale(upperThumbRef, {
transform: 'translate(-50%, -50%)'
})({...renderProps, isPressed: renderProps.isDragging})
}>
{renderProps => (
<div className={thumbHitArea({size})}>
<div
className={thumb({
...renderProps,
size,
thumbStyle
})}
/>
</div>
)}
</SliderThumb>
</>
)}
</SliderTrack>
}
/>
);
});
Loading
Loading