feat: Slider component #164
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| import { style } from '@vanilla-extract/css'; | ||
| import { | ||
| type SliderState, | ||
| // type SliderThumbState, | ||
| applyThemeVars, | ||
| assignPartialVars, | ||
| defaultRadiusVarValues, | ||
| defaultSizesVarValues, | ||
| genericColorVars, | ||
| semanticColorVars, | ||
| sliderColorVars, | ||
| sliderSpaceVars, | ||
| sliderStateVars, | ||
| sliderThumbStateVars, | ||
| sliderTrackStateVars, | ||
| type ThemeContext, | ||
| } from '../../src'; | ||
| import type { SliderThumbState } from '../../src/components/slider/types'; | ||
|
There was a problem hiding this comment. Is there a reason you're not importing from root? I see it commented out above |
||
|
|
||
| export const Slider: ThemeContext['Slider'] = { | ||
| slider: { | ||
| container: style( | ||
| applyThemeVars<SliderState>(sliderStateVars, [ | ||
| { | ||
| vars: assignPartialVars(sliderSpaceVars, { | ||
| gridGap: defaultSizesVarValues.v04, | ||
raechelo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }), | ||
| }, | ||
| ]), | ||
| ), | ||
| min: style( | ||
| applyThemeVars<SliderState>(sliderStateVars, [ | ||
| { | ||
| vars: assignPartialVars( | ||
| { | ||
| color: sliderColorVars, | ||
| space: sliderSpaceVars, | ||
| }, | ||
| { | ||
| color: { | ||
| color: genericColorVars.condition.base.v2, | ||
| }, | ||
| space: { | ||
| margin: 'auto 0', | ||
| }, | ||
| }, | ||
| ), | ||
| }, | ||
| ]), | ||
| ), | ||
| max: style( | ||
| applyThemeVars<SliderState>(sliderStateVars, [ | ||
| { | ||
| vars: assignPartialVars( | ||
| { | ||
| color: sliderColorVars, | ||
| space: sliderSpaceVars, | ||
| }, | ||
| { | ||
| color: { | ||
| color: genericColorVars.condition.base.v2, | ||
| }, | ||
| space: { | ||
| margin: 'auto 0', | ||
| }, | ||
| }, | ||
| ), | ||
| }, | ||
| ]), | ||
| ), | ||
| }, | ||
| thumb: { | ||
| container: style( | ||
| applyThemeVars<SliderThumbState>(sliderThumbStateVars, [ | ||
| { | ||
| vars: assignPartialVars(sliderSpaceVars, { | ||
| width: defaultSizesVarValues.v05, | ||
| }), | ||
| }, | ||
| ]), | ||
| ), | ||
| thumb: style( | ||
| applyThemeVars<SliderThumbState>(sliderThumbStateVars, [ | ||
| { | ||
| vars: assignPartialVars( | ||
| { | ||
| color: sliderColorVars, | ||
| space: sliderSpaceVars, | ||
| }, | ||
| { | ||
| color: { | ||
| color: semanticColorVars.background.highlight.bold, | ||
| }, | ||
| space: { | ||
| height: defaultSizesVarValues.v05, | ||
| width: defaultSizesVarValues.v05, | ||
| borderRadius: defaultRadiusVarValues.round, | ||
| }, | ||
| }, | ||
| ), | ||
| }, | ||
| { | ||
| query: { isHovered: true }, | ||
| vars: assignPartialVars(sliderColorVars, { | ||
| boxShadow: `0px 0px 0 6px rgb(from ${semanticColorVars.background.highlight.bold} r g b / 0.25)`, | ||
raechelo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }), | ||
| }, | ||
| ]), | ||
| ), | ||
| }, | ||
| track: { | ||
| container: style( | ||
| applyThemeVars<SliderState>(sliderTrackStateVars, [ | ||
| { | ||
| vars: assignPartialVars( | ||
| { | ||
| color: sliderColorVars, | ||
| space: sliderSpaceVars, | ||
| }, | ||
| { | ||
| color: { | ||
| color: semanticColorVars.background.surface.overlay, | ||
| }, | ||
| space: { | ||
| trackHeight: defaultSizesVarValues.v02, | ||
| trackMargin: `${defaultSizesVarValues.v04} 0`, | ||
| }, | ||
| }, | ||
| ), | ||
| }, | ||
| ]), | ||
| ), | ||
| }, | ||
| input: { | ||
| container: style( | ||
| applyThemeVars<SliderState>(sliderStateVars, [ | ||
| { | ||
| vars: assignPartialVars(sliderSpaceVars, { | ||
| gap: defaultSizesVarValues.v03, | ||
| }), | ||
| }, | ||
| ]), | ||
| ), | ||
| }, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // __private-exports | ||
| export { | ||
| Slider, | ||
| SliderContext, | ||
| SliderThumb, | ||
| SliderTrack, | ||
| } from './slider'; | ||
| export { | ||
| sliderColorVars, | ||
| sliderSpaceVars, | ||
| sliderStateVars, | ||
| sliderThumbStateVars, | ||
| sliderTrackStateVars, | ||
| } from './slider.css'; | ||
| export { | ||
| type LabelAlignment, | ||
| type SliderClassNames, | ||
| type SliderProps, | ||
| type SliderRenderProps, | ||
| type SliderState, | ||
| type SliderThumbProps, | ||
| } from './types'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| import { | ||
| createContainer, | ||
| createThemeContract, | ||
| style, | ||
| } from '@vanilla-extract/css'; | ||
| import type { SliderClassNames } from './types'; | ||
| import { layers, typographyVars } from '../../styles'; | ||
| import { containerQueries } from '@/utils'; | ||
|
There was a problem hiding this comment. Let's hold off on using import aliases for the moment |
||
|
|
||
| const sliderContainers = { | ||
| input: createContainer(), | ||
| }; | ||
|
|
||
| export const sliderColorVars = createThemeContract({ | ||
| color: '', | ||
|
There was a problem hiding this comment. If fontColor maps to the CSS color, what does color map to? Note to investigate further |
||
| thumb: '', | ||
| fontColor: '', | ||
| boxShadow: '', | ||
| }); | ||
|
|
||
| export const sliderSpaceVars = createThemeContract({ | ||
| gap: '', | ||
| gridGap: '', | ||
| height: '', | ||
| width: '', | ||
| borderRadius: '', | ||
| trackHeight: '', | ||
| trackMargin: '', | ||
| margin: '', | ||
| }); | ||
|
|
||
| export const sliderStateVars = createThemeContract({ | ||
| alignLabel: '', | ||
| orientation: '', | ||
| isDisabled: '', | ||
| }); | ||
|
|
||
| export const sliderThumbStateVars = createThemeContract({ | ||
| isDisabled: '', | ||
| isFocused: '', | ||
| isHovered: '', | ||
| isDragging: '', | ||
| isFocusVisible: '', | ||
| alignLabel: '', | ||
| orientation: '', | ||
| }); | ||
|
|
||
| export const sliderTrackStateVars = createThemeContract({ | ||
| alignLabel: '', | ||
| isDisabled: '', | ||
| isHovered: '', | ||
| orientation: '', | ||
| }); | ||
|
|
||
| export const sliderClassNames: SliderClassNames = { | ||
| slider: { | ||
| container: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| display: 'grid', | ||
| gridTemplateAreas: `'label input' | ||
| 'track track' | ||
| 'min max'`, | ||
| gridTemplateColumns: '1fr auto', | ||
| '@container': containerQueries(sliderStateVars, { | ||
| query: { alignLabel: 'left' }, | ||
| display: 'grid', | ||
raechelo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| gridTemplateAreas: `'label min track max input'`, | ||
| gridTemplateColumns: 'auto auto 4fr auto auto', | ||
raechelo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| gap: sliderSpaceVars.gridGap, | ||
| margin: 'auto 0', | ||
|
There was a problem hiding this comment. Curious about why you've hardcoded this here and others were variable. We'll want to look at other components to see which way it should be |
||
| }), | ||
| }, | ||
| }, | ||
| }), | ||
| label: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| gridArea: 'label', | ||
| }, | ||
| }, | ||
| }), | ||
| min: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| gridArea: 'min', | ||
| fontFamily: typographyVars.mono, | ||
| color: sliderColorVars.color, | ||
| '@container': containerQueries(sliderStateVars, { | ||
| query: { alignLabel: 'left' }, | ||
| margin: sliderSpaceVars.margin, | ||
| }), | ||
| }, | ||
| }, | ||
| }), | ||
| max: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| gridArea: 'max', | ||
| fontFamily: typographyVars.mono, | ||
| marginLeft: 'auto', | ||
| color: sliderColorVars.color, | ||
| '@container': containerQueries(sliderStateVars, { | ||
| query: { alignLabel: 'left' }, | ||
| margin: sliderSpaceVars.margin, | ||
| }), | ||
| }, | ||
| }, | ||
| }), | ||
| }, | ||
| track: { | ||
| container: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| gridArea: 'track', | ||
| background: sliderColorVars.color, | ||
| height: sliderSpaceVars.trackHeight, | ||
| margin: sliderSpaceVars.trackMargin, | ||
| '@container': containerQueries(sliderTrackStateVars, { | ||
| query: { alignLabel: 'left' }, | ||
| margin: 'auto 0', | ||
| }), | ||
| }, | ||
| }, | ||
| }), | ||
| }, | ||
| thumb: { | ||
| container: style({ | ||
| ' input': { | ||
|
There was a problem hiding this comment. looks like this is the line that is causing the build to fail. I wasn't sure how to properly address this issue, because the RAC component has an grandchild element of 
There was a problem hiding this comment. fwiw, this is how RAC implements the component. You can see the same 
There was a problem hiding this comment. We'll look at this together. But the rule that you appear to be breaking is that (aside from pseudo selectors), styles can only target the current element: |
||
| width: sliderSpaceVars.width, | ||
| }, | ||
| }), | ||
| thumb: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| width: sliderSpaceVars.width, | ||
| height: sliderSpaceVars.height, | ||
| borderRadius: sliderSpaceVars.borderRadius, | ||
| backgroundColor: sliderColorVars.color, | ||
| boxShadow: sliderColorVars.boxShadow, | ||
| }, | ||
| }, | ||
| }), | ||
| }, | ||
| input: { | ||
| container: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| containerName: sliderContainers.input, | ||
| gridArea: 'input', | ||
| display: 'flex', | ||
| flexDirection: 'row', | ||
| gap: sliderSpaceVars.gap, | ||
| }, | ||
| }, | ||
| }), | ||
| }, | ||
| group: { | ||
| container: style({ | ||
| '@layer': { | ||
| [layers.components.l1]: { | ||
| gridArea: 'input', | ||
| }, | ||
| }, | ||
| }), | ||
| }, | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I eyeballed all the styles from the pic, so I doubt they're fully accurate. If anything should be tweaked, I am happy to do so!