feat(Card): Add disabled card and clean up props #6659
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
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 |
|---|---|---|
|
|
@@ -12,20 +12,18 @@ export interface CardProps extends React.HTMLProps<HTMLElement>, OUIAProps { | |
| className?: string; | ||
| /** Sets the base component to render. defaults to article */ | ||
| component?: keyof JSX.IntrinsicElements; | ||
| /** @deprecated to make a card hoverable, use isSelectable or isSelectableRaised. */ | ||
| isHoverable?: boolean; | ||
| /** Modifies the card to include compact styling. Should not be used with isLarge. */ | ||
| isCompact?: boolean; | ||
| /** Modifies the card to include selectable styling */ | ||
| isSelectable?: boolean; | ||
| /** @beta Specifies the card is selectable, and applies the new raised styling on hover and select */ | ||
| isSelectableRaised?: boolean; | ||
| /** Modifies the card to include selected styling */ | ||
| isSelected?: boolean; | ||
| /** @beta Modifies a raised selectable card to have disabled styling */ | ||
| isDisabledRaised?: boolean; | ||
| /** Modifies the card to include flat styling */ | ||
| isFlat?: boolean; | ||
| /** Modifies the card to include rounded styling */ | ||
|
|
@@ -56,12 +54,11 @@ export const Card: React.FunctionComponent<CardProps> = ({ | |
| className = '', | ||
| component = 'article', | ||
| isHoverable = false, | ||
| isCompact = false, | ||
| isSelectable = false, | ||
| isSelectableRaised = false, | ||
| isSelected = false, | ||
| isDisabledRaised = false, | ||
| isFlat = false, | ||
| isExpanded = false, | ||
| isRounded = false, | ||
|
|
@@ -79,6 +76,20 @@ export const Card: React.FunctionComponent<CardProps> = ({ | |
| console.warn('Card: Cannot use isCompact with isLarge. Defaulting to isCompact'); | ||
| isLarge = false; | ||
| } | ||
|
|
||
| const getSelectableModifiers = () => { | ||
| if (isDisabledRaised) { | ||
| return css(styles.modifiers.nonSelectableRaised); | ||
| } | ||
| if (isSelectableRaised) { | ||
| return css(styles.modifiers.selectableRaised, isSelected && styles.modifiers.selectedRaised); | ||
| } | ||
| if (isSelectable || isHoverable) { | ||
| return css(styles.modifiers.selectable, isSelected && styles.modifiers.selected); | ||
| } | ||
| return ''; | ||
| }; | ||
|
|
||
| return ( | ||
| <CardContext.Provider | ||
| value={{ | ||
|
|
@@ -90,22 +101,17 @@ export const Card: React.FunctionComponent<CardProps> = ({ | |
| id={id} | ||
| className={css( | ||
| styles.card, | ||
|
Contributor
There was a problem hiding this comment. @mcoker, could someone apply
Contributor
There was a problem hiding this comment. @tlabaj yep, they're separate. While you could use them together, it isn't necessary since |
||
| isCompact && styles.modifiers.compact, | ||
| isExpanded && styles.modifiers.expanded, | ||
| isFlat && styles.modifiers.flat, | ||
| isRounded && styles.modifiers.rounded, | ||
| isLarge && styles.modifiers.displayLg, | ||
| isFullHeight && styles.modifiers.fullHeight, | ||
| isPlain && styles.modifiers.plain, | ||
| getSelectableModifiers(), | ||
| className | ||
| )} | ||
| tabIndex={isSelectable || isSelectableRaised ? '0' : undefined} | ||
| {...props} | ||
| {...ouiaProps} | ||
| > | ||
|
|
||
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
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.
so, is this prop deprecated?
Uh oh!
There was an error while loading. Please reload this page.
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.
Are we going to keep supporting the original plain variation of selectable cards? If not I'd say the next breaking release we update
isSelectableto use the raised styling and removeisSelectableRaised(I'm just not sure if that really falls under the "deprecated" flag indication though). If we will keep the original styling I think we should bring back in the enum for the style variations and keep usingisSelectableas is.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.
Yes. I was confused at first. I thought the original variant prop also set the card to be selectable.