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

Change disabled button style #77

Merged
merged 5 commits into from
Nov 21, 2023
+4 −6
Merged

Change disabled button style #77

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbb5ea4
Remove background on disabled button
brichet Nov 9, 2023
fb2b587
Change the default disabled opacity
brichet Nov 10, 2023
0c639e5
remove background style for disabled buttons on hover and active, and…
brichet Nov 17, 2023
27a334f
Add code comment
fcollonval Nov 20, 2023
8c23506
Update button.styles.ts
fcollonval Nov 21, 2023
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
2 changes: 0 additions & 2 deletions packages/components/src/button/button.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ export const buttonStyles: (
appearanceBehavior(
'accent',
css`
:host([appearance='accent'][disabled]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason for changing the accent type case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency.
And maybe we should also remove the background-color property of :host([disabled]) too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep it for now as in the opposite of the stealth appearance, the background-color is controlled by the toolkit.

:host([appearance='accent'][disabled]:hover),
:host([appearance='accent'][disabled]:active) {
background: ${accentFillRest};
Expand Down Expand Up @@ -661,7 +660,6 @@ export const buttonStyles: (
appearanceBehavior(
'stealth',
css`
:host([appearance='stealth'][disabled]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the all block including on hover and on active case as the goal is to avoid style change when the button is disabled.

:host([appearance='stealth'][disabled]:hover),
:host([appearance='stealth'][disabled]:active) {
background: ${neutralFillStealthRest};
Expand Down
7 changes: 6 additions & 1 deletion packages/components/src/design-tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export {
designUnit,
direction,
DirectionalStyleSheetBehavior,
disabledOpacity,
fillColor,
focusStrokeInner,
focusStrokeInnerRecipe,
Expand Down Expand Up @@ -174,6 +173,12 @@ export {

const { create } = DesignToken;

/**
* The default disabled opacity.
*/
export const disabledOpacity =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually as the design token are shared, you should only call withDefault on the imported token:

import { disabledOpacity } from '@microsoft/fast-components';
export { disabledOpacity } from '@microsoft/fast-components';

disabledOpacity.withDefault(0.3);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I didn't know about that.

DesignToken.create<number>('opacity').withDefault(0.4);

/*
* The error palette is built using the same color algorithm as the accent palette
* But by copying the algorithm from @microsoft/fast-components at commit 03d711f222bd816834a5e1d60256d3e083b27c27
Expand Down