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

Jump to bottom

fix(components): fix disabled button style in PD #16445

Merged
merged 1 commit into from
Oct 11, 2024
Merged

fix(components): fix disabled button style in PD #16445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
274 changes: 132 additions & 142 deletions components/src/atoms/buttons/LargeButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type * as React from 'react'
import { css } from 'styled-components'
import { Btn } from '../../primitives'

import { Btn } from '../../primitives'
import { BORDERS, COLORS } from '../../helix-design-system'
import { RESPONSIVENESS, SPACING, TYPOGRAPHY } from '../../ui-style-constants'
import { StyledText } from '../StyledText'
Expand All @@ -15,6 +15,7 @@ import {
JUSTIFY_SPACE_BETWEEN,
} from '../..'
import { Icon } from '../../icons'

import type { StyleProps } from '../../primitives'
import type { IconName } from '../../icons'

Expand All @@ -25,6 +26,101 @@ type LargeButtonTypes =
| 'alertStroke'
| 'alertAlt'
| 'stroke'

const LARGE_BUTTON_PROPS_BY_TYPE: Record<
LargeButtonTypes,
{
defaultBackgroundColor: string
activeBackgroundColor: string
disabledBackgroundColor: string
defaultColor: string
disabledColor: string
iconColor: string
disabledIconColor: string
focusVisibleOutlineColor: string
focusVisibleBackgroundColor: string
hoverBackgroundColor?: string
hoverColor?: string
activeIconColor?: string
activeColor?: string
}
> = {
secondary: {
defaultColor: COLORS.black90,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.blue35,
activeBackgroundColor: COLORS.blue40,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.blue50,
disabledIconColor: COLORS.grey50,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.blue40,
},
alert: {
defaultColor: COLORS.red60,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.red35,
activeBackgroundColor: COLORS.red40,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.red60,
disabledIconColor: COLORS.grey50,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.red40,
},
primary: {
defaultColor: COLORS.white,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.blue50,
activeBackgroundColor: COLORS.blue60,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.white,
disabledIconColor: COLORS.grey50,
focusVisibleOutlineColor: COLORS.blue55,
focusVisibleBackgroundColor: COLORS.blue55,
hoverBackgroundColor: COLORS.blue55,
hoverColor: COLORS.white,
},
alertStroke: {
defaultColor: COLORS.white,
disabledColor: COLORS.grey50,
activeColor: COLORS.red60,
defaultBackgroundColor: COLORS.transparent,
activeBackgroundColor: COLORS.red35,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.white,
disabledIconColor: COLORS.grey50,
activeIconColor: COLORS.red60,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.red40,
},
alertAlt: {
defaultColor: COLORS.red50,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.white,
activeBackgroundColor: COLORS.red35,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.red50,
disabledIconColor: COLORS.grey50,
activeIconColor: COLORS.red60,
activeColor: COLORS.red60,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.red40,
},
stroke: {
defaultColor: COLORS.blue50,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.white,
activeBackgroundColor: COLORS.white,
disabledBackgroundColor: COLORS.white,
iconColor: COLORS.blue50,
disabledIconColor: COLORS.grey40,
focusVisibleOutlineColor: COLORS.blue55,
focusVisibleBackgroundColor: COLORS.blue55,
hoverBackgroundColor: COLORS.white,
hoverColor: COLORS.blue55,
},
}

interface LargeButtonProps extends StyleProps {
/** used for form submission */
type?: 'submit'
Expand All @@ -50,109 +146,16 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {

const computedDisabled = disabled || ariaDisabled

const LARGE_BUTTON_PROPS_BY_TYPE: Record<
LargeButtonTypes,
{
defaultBackgroundColor: string
activeBackgroundColor: string
disabledBackgroundColor: string
defaultColor: string
disabledColor: string
iconColor: string
disabledIconColor: string
focusVisibleOutlineColor: string
focusVisibleBackgroundColor: string
hoverBackgroundColor?: string
hoverColor?: string
activeIconColor?: string
activeColor?: string
}
> = {
secondary: {
defaultColor: COLORS.black90,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.blue35,
activeBackgroundColor: COLORS.blue40,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.blue50,
disabledIconColor: COLORS.grey50,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.blue40,
},
alert: {
defaultColor: COLORS.red60,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.red35,
activeBackgroundColor: COLORS.red40,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.red60,
disabledIconColor: COLORS.grey50,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.red40,
},
primary: {
defaultColor: COLORS.white,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.blue50,
activeBackgroundColor: COLORS.blue60,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.white,
disabledIconColor: COLORS.grey50,
focusVisibleOutlineColor: COLORS.blue55,
focusVisibleBackgroundColor: COLORS.blue55,
hoverBackgroundColor: COLORS.blue55,
hoverColor: COLORS.white,
},
alertStroke: {
defaultColor: COLORS.white,
disabledColor: COLORS.grey50,
activeColor: COLORS.red60,
defaultBackgroundColor: COLORS.transparent,
activeBackgroundColor: COLORS.red35,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.white,
disabledIconColor: COLORS.grey50,
activeIconColor: COLORS.red60,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.red40,
},
alertAlt: {
defaultColor: COLORS.red50,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.white,
activeBackgroundColor: COLORS.red35,
disabledBackgroundColor: COLORS.grey35,
iconColor: COLORS.red50,
disabledIconColor: COLORS.grey50,
activeIconColor: COLORS.red60,
activeColor: COLORS.red60,
focusVisibleOutlineColor: COLORS.blue50,
focusVisibleBackgroundColor: COLORS.red40,
},
stroke: {
defaultColor: COLORS.blue50,
disabledColor: COLORS.grey50,
defaultBackgroundColor: COLORS.white,
activeBackgroundColor: COLORS.white,
disabledBackgroundColor: COLORS.white,
iconColor: COLORS.blue50,
disabledIconColor: COLORS.grey40,
focusVisibleOutlineColor: COLORS.blue55,
focusVisibleBackgroundColor: COLORS.blue55,
hoverBackgroundColor: COLORS.white,
hoverColor: COLORS.blue55,
},
}
const activeColorFor = (
style: keyof typeof LARGE_BUTTON_PROPS_BY_TYPE
): string =>
LARGE_BUTTON_PROPS_BY_TYPE[style].activeColor
LARGE_BUTTON_PROPS_BY_TYPE[style].activeColor != null
? `color: ${LARGE_BUTTON_PROPS_BY_TYPE[style].activeColor}`
: ''
const activeIconStyle = (
style: keyof typeof LARGE_BUTTON_PROPS_BY_TYPE
): string =>
LARGE_BUTTON_PROPS_BY_TYPE[style].activeIconColor
LARGE_BUTTON_PROPS_BY_TYPE[style].activeIconColor != null
? `color: ${LARGE_BUTTON_PROPS_BY_TYPE[style].activeIconColor}`
: ''

Expand All @@ -178,9 +181,8 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {

const LARGE_BUTTON_STYLE = css`
color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].defaultColor};
background-color: ${
LARGE_BUTTON_PROPS_BY_TYPE[buttonType].defaultBackgroundColor
};
background-color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType]
.defaultBackgroundColor};
cursor: ${CURSOR_POINTER};
padding: ${SPACING.spacing16} ${SPACING.spacing24};
text-align: ${TYPOGRAPHY.textAlignLeft};
Expand All @@ -189,9 +191,8 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {
border: ${computedBorderStyle()};

&:active {
background-color: ${
LARGE_BUTTON_PROPS_BY_TYPE[buttonType].activeBackgroundColor
};
background-color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType]
.activeBackgroundColor};
${activeColorFor(buttonType)};
}
&:active #btn-icon {
Expand All @@ -200,15 +201,12 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {

&:hover {
color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].hoverColor};
background-color: ${
LARGE_BUTTON_PROPS_BY_TYPE[buttonType].hoverBackgroundColor
};
background-color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType]
.hoverBackgroundColor};

border: ${
buttonType === 'stroke'
? `2px solid ${COLORS.blue55}`
: `${computedBorderStyle()}`
};
border: ${buttonType === 'stroke'
? `2px solid ${COLORS.blue55}`
: `${computedBorderStyle()}`};
}

&:focus-visible {
Expand All @@ -217,16 +215,15 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {

&:disabled {
color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledColor};
background-color: ${
LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
};
background-color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType]
.disabledBackgroundColor};
}

&[aria-disabled='true'] {
color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledColor};
background-color: ${
LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
};
background-color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType]
.disabledBackgroundColor};
border: none;
}

@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
Expand All @@ -240,48 +237,41 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {
gap: ${SPACING.spacing60};

&:active {
background-color: ${
computedDisabled
? LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
: LARGE_BUTTON_PROPS_BY_TYPE[buttonType].activeBackgroundColor
};
background-color: ${computedDisabled
? LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
: LARGE_BUTTON_PROPS_BY_TYPE[buttonType].activeBackgroundColor};
${!computedDisabled && activeColorFor(buttonType)};
outline: ${BORDERS.borderRadius4} solid
${
computedDisabled
? LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
: LARGE_BUTTON_PROPS_BY_TYPE[buttonType].activeBackgroundColor
};
outline: 4px solid
${computedDisabled
? LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
: LARGE_BUTTON_PROPS_BY_TYPE[buttonType].activeBackgroundColor};
}

&:active #btn-icon {
${activeIconStyle(buttonType)};
}

&:focus-visible {
background-color: ${
computedDisabled
? LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
: LARGE_BUTTON_PROPS_BY_TYPE[buttonType].focusVisibleBackgroundColor
};
background-color: ${computedDisabled
? LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
: LARGE_BUTTON_PROPS_BY_TYPE[buttonType].focusVisibleBackgroundColor};
${!computedDisabled && activeColorFor(buttonType)};
padding: calc(${SPACING.spacing24} + ${SPACING.spacing2});
border: ${computedBorderStyle()};
outline: ${
computedDisabled
? 'none'
: `3px solid
${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].focusVisibleOutlineColor}`
};
outline: ${computedDisabled
? 'none'
: `3px solid
${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].focusVisibleOutlineColor}`};
background-clip: padding-box;
box-shadow: none;
}

&:disabled {
color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledColor};
background-color: ${
LARGE_BUTTON_PROPS_BY_TYPE[buttonType].disabledBackgroundColor
};
background-color: ${LARGE_BUTTON_PROPS_BY_TYPE[buttonType]
.disabledBackgroundColor};
}
}
`

const appliedIconColor = computedDisabled
Expand All @@ -307,7 +297,7 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {
>
{buttonText}
</StyledText>
{iconName ? (
{iconName != null ? (
<Icon
name={iconName}
aria-label={`${iconName} icon`}
Expand Down
12 changes: 6 additions & 6 deletions protocol-designer/src/pages/CreateNewProtocolWizard/WizardBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import type * as React from 'react'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
import {
ALIGN_END,
BORDERS,
Btn,
COLORS,
DIRECTION_COLUMN,
Flex,
SPACING,
COLORS,
JUSTIFY_SPACE_BETWEEN,
LargeButton,
SPACING,
StyledText,
ALIGN_END,
BORDERS,
TYPOGRAPHY,
Btn,
JUSTIFY_SPACE_BETWEEN,
} from '@opentrons/components'
import temporaryImg from '../../assets/images/placeholder_image_delete.png'
import { BUTTON_LINK_STYLE } from '../../atoms'
Expand Down
Loading