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(app): fix styling of read-only deck configurator #14116

Merged
merged 2 commits into from
Dec 7, 2023
Merged

fix(app): fix styling of read-only deck configurator #14116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a82bb6
fix(app): fix styling of read-only deck configurator
ncdiehl11 Dec 6, 2023
caeb7cd
clean up css to remove copied code
ncdiehl11 Dec 7, 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
18 changes: 14 additions & 4 deletions components/src/hardware-sim/DeckConfigurator/StagingAreaConfigFixture.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@ export function StagingAreaConfigFixture(
foreignObjectProps={{ flex: '1' }}
>
<Btn
css={STAGING_AREA_CONFIG_STYLE}
cursor={handleClickRemove != null ? 'pointer' : 'none'}
css={
handleClickRemove != null
? STAGING_AREA_CONFIG_STYLE_EDITABLE
: STAGING_AREA_CONFIG_STYLE_READ_ONLY
}
cursor={handleClickRemove != null ? 'pointer' : 'default'}
onClick={
handleClickRemove != null
? () => handleClickRemove(fixtureLocation)
Expand All @@ -56,13 +60,15 @@ export function StagingAreaConfigFixture(
<Text css={TYPOGRAPHY.smallBodyTextSemiBold}>
{STAGING_AREA_DISPLAY_NAME}
</Text>
<Icon name="remove" color={COLORS.white} size="2rem" />
{handleClickRemove != null ? (
<Icon name="remove" color={COLORS.white} size="2rem" />
) : null}
</Btn>
</RobotCoordsForeignObject>
)
}

const STAGING_AREA_CONFIG_STYLE = css`
const STAGING_AREA_CONFIG_STYLE_READ_ONLY = css`
display: ${DISPLAY_FLEX};
align-items: ${ALIGN_CENTER};
background-color: ${COLORS.grey2};
Expand All @@ -71,6 +77,10 @@ const STAGING_AREA_CONFIG_STYLE = css`
grid-gap: ${SPACING.spacing8};
justify-content: ${JUSTIFY_CENTER};
width: 100%;
`

const STAGING_AREA_CONFIG_STYLE_EDITABLE = css`
${STAGING_AREA_CONFIG_STYLE_READ_ONLY}

&:active {
background-color: ${COLORS.darkBlack90};
Expand Down
18 changes: 14 additions & 4 deletions components/src/hardware-sim/DeckConfigurator/TrashBinConfigFixture.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ export function TrashBinConfigFixture(
foreignObjectProps={{ flex: '1' }}
>
<Btn
css={TRASH_BIN_CONFIG_STYLE}
cursor={handleClickRemove != null ? 'pointer' : 'none'}
css={
handleClickRemove != null
? TRASH_BIN_CONFIG_STYLE_EDTIABLE
: TRASH_BIN_CONFIG_STYLE_READ_ONLY
}
cursor={handleClickRemove != null ? 'pointer' : 'default'}
onClick={
handleClickRemove != null
? () => handleClickRemove(fixtureLocation)
Expand All @@ -62,13 +66,15 @@ export function TrashBinConfigFixture(
<Text css={TYPOGRAPHY.smallBodyTextSemiBold}>
{TRASH_BIN_DISPLAY_NAME}
</Text>
<Icon name="remove" color={COLORS.white} size="2rem" />
{handleClickRemove != null ? (
<Icon name="remove" color={COLORS.white} size="2rem" />
) : null}
</Btn>
</RobotCoordsForeignObject>
)
}

const TRASH_BIN_CONFIG_STYLE = css`
const TRASH_BIN_CONFIG_STYLE_READ_ONLY = css`
display: ${DISPLAY_FLEX};
align-items: ${ALIGN_CENTER};
background-color: ${COLORS.grey2};
Expand All @@ -77,6 +83,10 @@ const TRASH_BIN_CONFIG_STYLE = css`
justify-content: ${JUSTIFY_CENTER};
grid-gap: ${SPACING.spacing8};
width: 100%;
`

const TRASH_BIN_CONFIG_STYLE_EDTIABLE = css`
${TRASH_BIN_CONFIG_STYLE_READ_ONLY}

&:active {
background-color: ${COLORS.darkBlack90};
Expand Down
18 changes: 14 additions & 4 deletions components/src/hardware-sim/DeckConfigurator/WasteChuteConfigFixture.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ export function WasteChuteConfigFixture(
foreignObjectProps={{ flex: '1' }}
>
<Btn
css={WASTE_CHUTE_CONFIG_STYLE}
cursor={handleClickRemove != null ? 'pointer' : 'none'}
css={
handleClickRemove != null
? WASTE_CHUTE_CONFIG_STYLE_EDITABLE
: WASTE_CHUTE_CONFIG_STYLE_READ_ONLY
}
cursor={handleClickRemove != null ? 'pointer' : 'default'}
onClick={
handleClickRemove != null
? () => handleClickRemove(fixtureLocation)
Expand All @@ -65,13 +69,15 @@ export function WasteChuteConfigFixture(
<Text css={TYPOGRAPHY.smallBodyTextSemiBold}>
{WASTE_CHUTE_DISPLAY_NAME}
</Text>
<Icon name="remove" color={COLORS.white} size="2rem" />
{handleClickRemove != null ? (
<Icon name="remove" color={COLORS.white} size="2rem" />
) : null}
</Btn>
</RobotCoordsForeignObject>
)
}

const WASTE_CHUTE_CONFIG_STYLE = css`
const WASTE_CHUTE_CONFIG_STYLE_READ_ONLY = css`
display: ${DISPLAY_FLEX};
align-items: ${ALIGN_CENTER};
background-color: ${COLORS.grey2};
Expand All @@ -80,6 +86,10 @@ const WASTE_CHUTE_CONFIG_STYLE = css`
justify-content: ${JUSTIFY_CENTER};
grid-gap: ${SPACING.spacing8};
width: 100%;
`

const WASTE_CHUTE_CONFIG_STYLE_EDITABLE = css`
${WASTE_CHUTE_CONFIG_STYLE_READ_ONLY}

&:active {
background-color: ${COLORS.darkBlack90};
Expand Down
Loading