fix(react-slider): Export internal CSS vars #33682
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "patch", | ||
| "comment": "fix: exported internal CSS variables", | ||
| "packageName": "@fluentui/react-slider", | ||
| "email": "[email protected]", | ||
| "dependentChangeType": "patch" | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -12,21 +12,31 @@ export const sliderClassNames: SlotClassNames<SliderSlots> = { | |
| }; | ||
|
|
||
| // Internal CSS variables | ||
| const thumbPositionVar = `--fui-Slider__thumb--position`; | ||
|
|
||
| export const sliderCSSVars = { | ||
| sliderDirectionVar: `--fui-Slider--direction`, | ||
| sliderInnerThumbRadiusVar: `--fui-Slider__inner-thumb--radius`, | ||
| sliderProgressVar: `--fui-Slider--progress`, | ||
| sliderProgressColorVar: `--fui-Slider__progress--color`, | ||
| sliderRailSizeVar: `--fui-Slider__rail--size`, | ||
| sliderRailColorVar: `--fui-Slider__rail--color`, | ||
| sliderStepsPercentVar: `--fui-Slider--steps-percent`, | ||
| sliderThumbColorVar: `--fui-Slider__thumb--color`, | ||
| sliderThumbSizeVar: `--fui-Slider__thumb--size`, | ||
| }; | ||
|
|
||
|
There was a problem hiding this comment. deconstructing all the vars out here saves a bunch of code below. 61 vars with sliderCSSVars prefix. There was a problem hiding this comment. I added it this way because of this comment: There was a problem hiding this comment. If there is good reason to remove the destructuring, that's fine. |
||
| const { | ||
| sliderDirectionVar, | ||
| sliderInnerThumbRadiusVar, | ||
| sliderProgressVar, | ||
| sliderProgressColorVar, | ||
| sliderRailSizeVar, | ||
| sliderRailColorVar, | ||
| sliderStepsPercentVar, | ||
| sliderThumbColorVar, | ||
| sliderThumbSizeVar, | ||
| } = sliderCSSVars; | ||
|
|
||
| /** | ||
| * Styles for the root slot | ||
|
|
@@ -41,64 +51,64 @@ const useRootStyles = makeStyles({ | |
| }, | ||
|
|
||
| small: { | ||
| [sliderThumbSizeVar]: '16px', | ||
| [sliderInnerThumbRadiusVar]: '5px', | ||
| [sliderRailSizeVar]: '2px', | ||
| minHeight: '24px', | ||
| }, | ||
|
|
||
| medium: { | ||
| [sliderThumbSizeVar]: '20px', | ||
| [sliderInnerThumbRadiusVar]: '6px', | ||
| [sliderRailSizeVar]: '4px', | ||
| minHeight: '32px', | ||
| }, | ||
|
|
||
| horizontal: { | ||
| minWidth: '120px', | ||
| // 3x3 grid with the rail and thumb in the center cell [2,2] and the hidden input stretching across all cells | ||
| gridTemplateRows: `1fr var(${sliderThumbSizeVar}) 1fr`, | ||
| gridTemplateColumns: `1fr calc(100% - var(${sliderThumbSizeVar})) 1fr`, | ||
| }, | ||
|
|
||
| vertical: { | ||
| minHeight: '120px', | ||
| // 3x3 grid with the rail and thumb in the center cell [2,2] and the hidden input stretching across all cells | ||
| gridTemplateRows: `1fr calc(100% - var(${sliderThumbSizeVar})) 1fr`, | ||
| gridTemplateColumns: `1fr var(${sliderThumbSizeVar}) 1fr`, | ||
| }, | ||
|
|
||
| enabled: { | ||
| [sliderRailColorVar]: tokens.colorNeutralStrokeAccessible, | ||
| [sliderProgressColorVar]: tokens.colorCompoundBrandBackground, | ||
| [sliderThumbColorVar]: tokens.colorCompoundBrandBackground, | ||
| ':hover': { | ||
| [sliderThumbColorVar]: tokens.colorCompoundBrandBackgroundHover, | ||
| [sliderProgressColorVar]: tokens.colorCompoundBrandBackgroundHover, | ||
| }, | ||
| ':active': { | ||
| [sliderThumbColorVar]: tokens.colorCompoundBrandBackgroundPressed, | ||
| [sliderProgressColorVar]: tokens.colorCompoundBrandBackgroundPressed, | ||
| }, | ||
| '@media (forced-colors: active)': { | ||
| [sliderRailColorVar]: 'CanvasText', | ||
| [sliderThumbColorVar]: 'Highlight', | ||
| [sliderProgressColorVar]: 'Highlight', | ||
| ':hover': { | ||
| [sliderThumbColorVar]: 'Highlight', | ||
| [sliderProgressColorVar]: 'Highlight', | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| disabled: { | ||
| [sliderThumbColorVar]: tokens.colorNeutralForegroundDisabled, | ||
| [sliderRailColorVar]: tokens.colorNeutralBackgroundDisabled, | ||
| [sliderProgressColorVar]: tokens.colorNeutralForegroundDisabled, | ||
| '@media (forced-colors: active)': { | ||
| [sliderRailColorVar]: 'GrayText', | ||
| [sliderCSSVars.sliderThumbColorVar]: 'GrayText', | ||
| [sliderCSSVars.sliderProgressColorVar]: 'GrayText', | ||
| }, | ||
| }, | ||
|
|
||
|
|
@@ -129,9 +139,9 @@ const useRailStyles = makeStyles({ | |
| // Background gradient represents the progress of the slider | ||
| backgroundImage: `linear-gradient( | ||
| var(${sliderDirectionVar}), | ||
| var(${sliderProgressColorVar}) 0%, | ||
| var(${sliderProgressColorVar}) var(${sliderProgressVar}), | ||
| var(${sliderRailColorVar}) var(${sliderProgressVar}) | ||
| )`, | ||
| outlineWidth: '1px', | ||
| outlineStyle: 'solid', | ||
|
|
@@ -162,19 +172,19 @@ const useRailStyles = makeStyles({ | |
|
|
||
| horizontal: { | ||
| width: '100%', | ||
| height: `var(${sliderRailSizeVar})`, | ||
| '::before': { | ||
| left: '-1px', | ||
| right: '-1px', | ||
| height: `var(${sliderRailSizeVar})`, | ||
| }, | ||
| }, | ||
|
|
||
| vertical: { | ||
| width: `var(${sliderRailSizeVar})`, | ||
| height: '100%', | ||
| '::before': { | ||
| width: `var(${sliderRailSizeVar})`, | ||
| top: '-1px', | ||
| bottom: '-1px', | ||
| }, | ||
|
|
@@ -189,20 +199,20 @@ const useThumbStyles = makeStyles({ | |
| // Ensure the thumb stays within the track boundaries. | ||
| // When the value is at 0% or 100%, the distance from the track edge | ||
| // to the thumb center equals the inner thumb radius. | ||
| [`${thumbPositionVar}`]: `clamp(var(${sliderInnerThumbRadiusVar}), var(${sliderProgressVar}), calc(100% - var(${sliderInnerThumbRadiusVar})))`, | ||
| gridRowStart: '2', | ||
| gridRowEnd: '2', | ||
| gridColumnStart: '2', | ||
| gridColumnEnd: '2', | ||
| position: 'absolute', | ||
| width: `var(${sliderThumbSizeVar})`, | ||
| height: `var(${sliderThumbSizeVar})`, | ||
| pointerEvents: 'none', | ||
| outlineStyle: 'none', | ||
| forcedColorAdjust: 'none', | ||
| borderRadius: tokens.borderRadiusCircular, | ||
| boxShadow: `0 0 0 calc(var(${sliderThumbSizeVar}) * .2) ${tokens.colorNeutralBackground1} inset`, | ||
| backgroundColor: `var(${sliderThumbColorVar})`, | ||
| '::before': { | ||
| position: 'absolute', | ||
| top: '0px', | ||
|
|
@@ -212,12 +222,12 @@ const useThumbStyles = makeStyles({ | |
| borderRadius: tokens.borderRadiusCircular, | ||
| boxSizing: 'border-box', | ||
| content: "''", | ||
| border: `calc(var(${sliderThumbSizeVar}) * .05) solid ${tokens.colorNeutralStroke1}`, | ||
| }, | ||
| }, | ||
| disabled: { | ||
| '::before': { | ||
| border: `calc(var(${sliderThumbSizeVar}) * .05) solid ${tokens.colorNeutralForegroundDisabled}`, | ||
| }, | ||
| }, | ||
| horizontal: { | ||
|
|
@@ -248,12 +258,12 @@ const useInputStyles = makeStyles({ | |
| cursor: 'default', | ||
| }, | ||
| horizontal: { | ||
| height: `var(${sliderThumbSizeVar})`, | ||
| width: '100%', | ||
| }, | ||
| vertical: { | ||
| height: '100%', | ||
| width: `var(${sliderThumbSizeVar})`, | ||
| '-webkit-appearance': 'slider-vertical', | ||
| }, | ||
| }); | ||
|
|
||
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,47 @@ | ||
| import * as React from 'react'; | ||
| import { useId, Label, Slider, makeStyles, sliderCSSVars, tokens } from '@fluentui/react-components'; | ||
|
|
||
| const { sliderProgressColorVar, sliderRailColorVar, sliderThumbColorVar, sliderThumbSizeVar } = sliderCSSVars; | ||
|
|
||
| const useStyles = makeStyles({ | ||
| enabled: { | ||
| [sliderProgressColorVar]: '#ff0764', | ||
| [sliderRailColorVar]: tokens.colorNeutralForeground1, | ||
| [sliderThumbColorVar]: '#ff0764', | ||
| ':hover': { | ||
| [sliderThumbColorVar]: '#d60d58', | ||
| [sliderProgressColorVar]: '#d60d58', | ||
| ':active': { | ||
| [sliderThumbColorVar]: '#b91150', | ||
| [sliderProgressColorVar]: '#b91150', | ||
| }, | ||
| }, | ||
| }, | ||
| thumb: { | ||
| [sliderThumbSizeVar]: '16px', | ||
| boxShadow: `0 0 0 calc(var(${sliderThumbSizeVar}) * .2) ${tokens.colorTransparentBackground} inset`, | ||
| '::before': { | ||
| content: 'unset', | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| export const Customized = () => { | ||
| const id = useId(); | ||
| const styles = useStyles(); | ||
|
|
||
| return ( | ||
| <> | ||
| <Label htmlFor={id}>Customized slider</Label> | ||
| <Slider className={styles.enabled} thumb={{ className: styles.thumb }} defaultValue={20} size="small" id={id} /> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| Customized.parameters = { | ||
| docs: { | ||
| description: { | ||
| story: 'Customized slider using its variables', | ||
| }, | ||
| }, | ||
| }; |
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
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.
🕵🏾♀️ visual regressions to review in the fluentuiv9 Visual Regression Report
Avatar Converged 2 screenshots
Drawer 1 screenshots