Skip to content

spinbutton: update internal padding for small size #25286

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
spmonahan merged 6 commits into from
Oct 24, 2022
Merged

spinbutton: update internal padding for small size #25286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0fbf839
spinbutton: update internal padding for small size
spmonahan Oct 18, 2022
b8d1ad6
fix typo
spmonahan Oct 18, 2022
dbdb69d
update internal padding so it does not affect external layout
spmonahan Oct 19, 2022
66fdb06
remove negative margin
spmonahan Oct 21, 2022
6a96942
fix lint warning
spmonahan Oct 21, 2022
1a2d7ef
Update packages/react-components/react-spinbutton/src/components/Spin…
spmonahan Oct 24, 2022
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-spinbutton-76d708a4-ab34-43c6-a831-8aca052df11b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "feat: updates internal SpinButton padding",
"packageName": "@fluentui/react-spinbutton",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion packages/react-components/react-spinbutton/src/components/SpinButton/useSpinButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export const useSpinButton_unstable = (props: SpinButtonProps, ref: React.Ref<HT
ref,
autoComplete: 'off',
role: 'spinbutton',
appearance: appearance,
appearance,
type: 'text',
...nativeProps.primary,
},
Expand Down
21 changes: 14 additions & 7 deletions packages/react-components/react-spinbutton/src/components/SpinButton/useSpinButtonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ const useRootStyles = makeStyles({
},
},

small: {
paddingLeft: tokens.spacingHorizontalS,
},

// intentionally empty
medium: {},

outline: {
'::before': {
...shorthands.border('1px', 'solid', tokens.colorNeutralStroke1),
Expand Down Expand Up @@ -198,15 +205,14 @@ const useButtonStyles = makeStyles({
...shorthands.borderRadius(0, tokens.borderRadiusMedium, 0, 0),
},

// TODO: revisit these padding numbers for aligning the icon.
// Padding values aren't perfect.
// The icon doesn't align perfectly with the Figma designs.
// It's set in a 16x16px square but the artwork is inset from that
// so I've had to compute the numbers by handle.
// Padding values numbers don't align with design specs
// but visually the padding aligns.
// The icons are set in a 16x16px square but the artwork is inset from that
// so these padding values are computed by hand.
// Additionally the design uses fractional values so these are
// rounded to the nearest integer.
incrementButtonSmall: {
...shorthands.padding('3px', '5px', '0px', '5px'),
...shorthands.padding('3px', '6px', '0px', '4px'),
},

incrementButtonMedium: {
Expand All @@ -222,7 +228,7 @@ const useButtonStyles = makeStyles({
},

decrementButtonSmall: {
...shorthands.padding('0px', '5px', '3px', '5px'),
...shorthands.padding('0px', '6px', '3px', '4px'),
},

decrementButtonMedium: {
Expand Down Expand Up @@ -433,6 +439,7 @@ export const useSpinButtonStyles_unstable = (state: SpinButtonState): SpinButton
state.root.className, // Get the classes from useInputStyles_unstable
spinButtonClassNames.root,
rootStyles.base,
rootStyles[size],
appearance === 'outline' && rootStyles.outline,
appearance === 'underline' && rootStyles.underline,
filled && rootStyles.filled,
Expand Down