-
Notifications
You must be signed in to change notification settings - Fork 184
chore: Button Style API refactor #3752
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1263ba8
fix: Remove validateProps from components package
teodoranemes 67b824d
Merge branch 'main' into remove-validate-props
teodoranemes 02010d8
Merge branch 'main' of github.com:cloudscape-design/components
teodoranemes 4f2b6b1
chore: Refactor Button Style API
teodoranemes 95a0f36
Merge branch 'main' into button-style-api-refactor
teodoranemes fb954cb
Merge branch 'main' into button-style-api-refactor
teodoranemes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,44 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| import { SYSTEM } from '../internal/environment'; | ||
| import customCssProps from '../internal/generated/custom-css-properties'; | ||
| import { ButtonProps } from './interfaces'; | ||
|
|
||
| export function getButtonStyles(style: ButtonProps['style']) { | ||
| if (SYSTEM !== 'core' || !style?.root) { | ||
| return undefined; | ||
| } | ||
|
|
||
| return { | ||
| borderRadius: style?.root?.borderRadius, | ||
teodoranemes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| borderWidth: style?.root?.borderWidth, | ||
| paddingBlock: style?.root?.paddingBlock, | ||
| paddingInline: style?.root?.paddingInline, | ||
| ...(style?.root?.background && { | ||
| [customCssProps.styleBackgroundActive]: style.root.background?.active, | ||
| [customCssProps.styleBackgroundDefault]: style.root.background?.default, | ||
| [customCssProps.styleBackgroundDisabled]: style.root.background?.disabled, | ||
| [customCssProps.styleBackgroundHover]: style.root.background?.hover, | ||
| }), | ||
| ...(style?.root?.borderColor && { | ||
| [customCssProps.styleBorderColorActive]: style.root.borderColor?.active, | ||
| [customCssProps.styleBorderColorDefault]: style.root.borderColor?.default, | ||
| [customCssProps.styleBorderColorDisabled]: style.root.borderColor?.disabled, | ||
| [customCssProps.styleBorderColorHover]: style.root.borderColor?.hover, | ||
| }), | ||
| ...(style?.root?.color && { | ||
| [customCssProps.styleColorActive]: style.root.color?.active, | ||
| [customCssProps.styleColorDefault]: style.root.color?.default, | ||
| [customCssProps.styleColorDisabled]: style.root.color?.disabled, | ||
| [customCssProps.styleColorHover]: style.root.color?.hover, | ||
| }), | ||
| ...(style?.root?.focusRing && { | ||
| [customCssProps.styleFocusRingBorderColor]: style.root.focusRing?.borderColor, | ||
| [customCssProps.styleFocusRingBorderRadius]: style.root.focusRing?.borderRadius, | ||
| [customCssProps.styleFocusRingBorderWidth]: style.root.focusRing?.borderWidth, | ||
| }), | ||
| ...(style?.root?.focusRing?.borderRadius && { | ||
| [customCssProps.styleFocusRingBorderRadius]: style.root.focusRing.borderRadius, | ||
| }), | ||
| }; | ||
| } | ||
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.
Minor: just out of curiosity, I know we have this for bundlers/minifiers to remove, but I don't know how complex this is allowed to be. For example, are you allowed to combine it with other conditionals like this?
Do you know if there's a way to test this?Got curious, did some research:Oh well, probably need to come up with something smarter eventually. But that's for later, this isn't a valid reason to block this PR.