Skip to content
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

fix(react-color picker) Thumb design #33743

Merged
merged 7 commits into from
Jan 30, 2025
Merged

fix(react-color picker) Thumb design #33743

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4314b8
fix(react-color-picker): made thumb design according to partners ask
ValentinaKozlova Jan 28, 2025
f2a376e
update snapshot tests
ValentinaKozlova Jan 29, 2025
651be52
change files
ValentinaKozlova Jan 29, 2025
18b67c8
Update packages/react-components/react-color-picker-preview/library/s…
ValentinaKozlova Jan 30, 2025
f42ce59
Update packages/react-components/react-color-picker-preview/library/s…
ValentinaKozlova Jan 30, 2025
e4f0663
Update packages/react-components/react-color-picker-preview/library/s…
ValentinaKozlova Jan 30, 2025
e6a061e
Update packages/react-components/react-color-picker-preview/library/s…
ValentinaKozlova Jan 30, 2025
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-color-picker-preview-66c948a0-e330-4f71-a4f0-d9d7cf4ed771.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: thumb design for ColorPicker - partner's ask",
"packageName": "@fluentui/react-color-picker-preview",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion ...onents/react-color-picker-preview/library/src/components/AlphaSlider/AlphaSlider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('AlphaSlider', () => {
<div>
<div
class="fui-ColorSlider fui-AlphaSlider"
style="--fui-AlphaSlider--direction: 90deg; --fui-AlphaSlider--progress: 100%; --fui-AlphaSlider__thumb--color: transparent; --fui-AlphaSlider__rail--color: hsl(0 100%, 50%);"
style="--fui-AlphaSlider--direction: 90deg; --fui-AlphaSlider--progress: 100%; --fui-AlphaSlider__thumb--color: hsla(0 100%, 50%, 1); --fui-AlphaSlider__rail--color: hsl(0 100%, 50%);"
>
<input
class="fui-ColorSlider__input fui-AlphaSlider__input"
Expand Down
2 changes: 1 addition & 1 deletion ...ents/react-color-picker-preview/library/src/components/AlphaSlider/useAlphaSliderState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const useAlphaSliderState_unstable = (state: AlphaSliderState, props: Alp
const rootVariables = {
[alphaSliderCSSVars.sliderDirectionVar]: sliderDirection,
[alphaSliderCSSVars.sliderProgressVar]: `${valuePercent}%`,
[alphaSliderCSSVars.thumbColorVar]: `transparent`,
[alphaSliderCSSVars.thumbColorVar]: `hsla(${hslColor.h} ${hslColor.s * 100}%, ${hslColor.l * 100}%, ${hslColor.a})`,
[alphaSliderCSSVars.railColorVar]: `hsl(${hslColor.h} ${hslColor.s * 100}%, ${hslColor.l * 100}%)`,
};

Expand Down
5 changes: 4 additions & 1 deletion ...ct-color-picker-preview/library/src/components/AlphaSlider/useAlphaSliderStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ const useStyles = makeStyles({
*/
const useThumbStyles = makeStyles({
thumb: {
backgroundColor: `var(${alphaSliderCSSVars.thumbColorVar})`,
backgroundColor: tokens.colorNeutralBackground1,
[`${thumbPositionVar}`]: `clamp(var(${innerThumbRadiusVar}), var(${alphaSliderCSSVars.sliderProgressVar}), calc(100% - var(${innerThumbRadiusVar})))`,
'::before': {
backgroundColor: `var(${alphaSliderCSSVars.thumbColorVar})`,
},
},
horizontal: {
transform: 'translateX(-50%)',
Expand Down
2 changes: 1 addition & 1 deletion ...components/react-color-picker-preview/library/src/components/ColorArea/ColorArea.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('ColorArea', () => {
<div>
<div
class="fui-ColorArea"
style="--fui-AreaX--progress: 100%; --fui-AreaY--progress: 50%; --fui-Area__thumb--color: transparent; --fui-Area--main-color: hsl(324, 100%, 50%);"
style="--fui-AreaX--progress: 100%; --fui-AreaY--progress: 50%; --fui-Area__thumb--color: rgb(128, 0, 76); --fui-Area--main-color: hsl(324, 100%, 50%);"
>
<div
class="fui-ColorArea__thumb"
Expand Down
3 changes: 2 additions & 1 deletion ...ct-components/react-color-picker-preview/library/src/components/ColorArea/useColorArea.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { tinycolor } from '@ctrl/tinycolor';
import { useId, slot, useMergedRefs, mergeCallbacks, getIntrinsicElementProps } from '@fluentui/react-utilities';
import type { ColorAreaProps, ColorAreaState } from './ColorArea.types';
import type { HsvColor } from '../../types/color';
Expand Down Expand Up @@ -153,7 +154,7 @@ export const useColorArea_unstable = (props: ColorAreaProps, ref: React.Ref<HTML
const rootVariables = {
[colorAreaCSSVars.areaXProgressVar]: `${saturation}%`,
[colorAreaCSSVars.areaYProgressVar]: `${value}%`,
[colorAreaCSSVars.thumbColorVar]: 'transparent',
[colorAreaCSSVars.thumbColorVar]: tinycolor(hsvColor).toRgbString(),
[colorAreaCSSVars.mainColorVar]: `hsl(${hsvColor.h}, 100%, 50%)`,
};
const state: ColorAreaState = {
Expand Down
5 changes: 3 additions & 2 deletions .../react-color-picker-preview/library/src/components/ColorArea/useColorAreaStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ const useThumbStyles = makeStyles({
outlineStyle: 'none',
forcedColorAdjust: 'none',
borderRadius: tokens.borderRadiusCircular,
boxShadow: `0 0 0 calc(var(${thumbSizeVar}) * .18) ${tokens.colorNeutralBackground1} inset`,
border: `1px solid ${tokens.colorNeutralForeground4}`,
boxShadow: tokens.shadow4,
backgroundColor: `var(${colorAreaCSSVars.thumbColorVar})`,
transform: 'translate(-50%, 50%)',
[`${thumbPositionXVar}`]: `clamp(var(${innerThumbRadiusVar}), var(${colorAreaCSSVars.areaXProgressVar}), calc(100% - var(${innerThumbRadiusVar})))`,
Expand All @@ -67,7 +68,7 @@ const useThumbStyles = makeStyles({
borderRadius: tokens.borderRadiusCircular,
boxSizing: 'border-box',
content: "''",
border: `calc(var(${thumbSizeVar}) * .05) solid ${tokens.colorNeutralStroke1Pressed}`,
border: `2px solid ${tokens.colorNeutralBackground1}`,
},
},
focusIndicator: createFocusOutlineStyle({
Expand Down
10 changes: 4 additions & 6 deletions ...ct-color-picker-preview/library/src/components/ColorSlider/useColorSliderStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,17 @@ const useThumbStyles = makeStyles({
outlineStyle: 'none',
forcedColorAdjust: 'none',
borderRadius: tokens.borderRadiusCircular,
boxShadow: `0 0 0 calc(var(${thumbSizeVar}) * .18) ${tokens.colorNeutralBackground1} inset`,
border: `1px solid ${tokens.colorNeutralForeground4}`,
boxShadow: tokens.shadow4,
backgroundColor: `var(${colorSliderCSSVars.thumbColorVar})`,
[`${thumbPositionVar}`]: `clamp(var(${innerThumbRadiusVar}), var(${colorSliderCSSVars.sliderProgressVar}), calc(100% - var(${innerThumbRadiusVar})))`,
'::before': {
position: 'absolute',
top: '0px',
left: '0px',
bottom: '0px',
right: '0px',
inset: '0px',
borderRadius: tokens.borderRadiusCircular,
boxSizing: 'border-box',
content: "''",
border: `calc(var(${thumbSizeVar}) * .05) solid ${tokens.colorNeutralStroke1Pressed}`,
border: `2px solid ${tokens.colorNeutralBackground1}`,
},
},
horizontal: {
Expand Down