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

refactor(app): add and use deck map component in interventionmodal #15570

Merged
merged 9 commits into from
Jul 5, 2024
Merged

refactor(app): add and use deck map component in interventionmodal #15570

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ecd3295
fix a logic error that prevented recovery from running
sfoster1 Jul 3, 2024
340dc82
refactor(app): separate StandIn story util
sfoster1 Jul 5, 2024
ef2cde7
feat(app): add DeckMapContent
sfoster1 Jul 5, 2024
7b2d00b
and after all, why not? it's mine, isn't it?
sfoster1 Jul 2, 2024
eb1b5d5
refactor: use intervention map in drop tip wizard
sfoster1 Jul 2, 2024
f11485d
refactor: use deckmap in error recovery
sfoster1 Jul 2, 2024
c060b23
fix up remaining tests
sfoster1 Jul 3, 2024
ea5c4be
fix up some render issues
sfoster1 Jul 3, 2024
67a36a8
docs page: allow non-specified onSelect
sfoster1 Jul 5, 2024
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
Prev Previous commit
Next Next commit
and after all, why not? it's mine, isn't it? 
my own? my... precious?
  • Loading branch information
@sfoster1
sfoster1 committed Jul 5, 2024
commit 7b2d00bdb762d4fbf03a191773ff6638f2132863
37 changes: 21 additions & 16 deletions app/src/molecules/InterventionModal/DeckMapContent.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,24 +108,29 @@ const meta: Meta<React.ComponentProps<typeof DeckMapContent>> = {
if: { arg: 'kind', eq: 'intervention' },
},
highlightLabwareEventuallyIn: {
if: { arg: 'kind', eq: 'intervention' },
if: { arg: 'kind', eq: 'intervention' },
},
},
decorators: [
(Story) => (
<Box css={css`
border: 4px solid #000000;
border-radius: ${BORDERS.borderRadius8};
max-width: 47rem;
@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
max-width: 62rem;
max-height: 33.5rem;
}
`}>
<TwoColumn ><StandInContent /><Story />
</TwoColumn>
</Box>)
]
decorators: [
Story => (
<Box
css={css`
border: 4px solid #000000;
border-radius: ${BORDERS.borderRadius8};
max-width: 47rem;
@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
max-width: 62rem;
max-height: 33.5rem;
}
`}
>
<TwoColumn>
<StandInContent />
<Story />
</TwoColumn>
</Box>
),
],
}

export default meta
Expand Down
11 changes: 3 additions & 8 deletions components/src/molecules/LocationIcon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { css } from 'styled-components'

import { Icon } from '../../icons'
import { Flex, Text } from '../../primitives'
import { ALIGN_CENTER } from '../../styles'
import { ALIGN_CENTER, JUSTIFY_CENTER } from '../../styles'
import { RESPONSIVENESS, SPACING, TYPOGRAPHY } from '../../ui-style-constants'
import { BORDERS, COLORS } from '../../helix-design-system'

Expand Down Expand Up @@ -36,6 +36,7 @@ const LOCATION_ICON_STYLE = css<{
width: ${props => props.width ?? 'max-content'};
padding: ${SPACING.spacing2} ${SPACING.spacing4};
border-radius: ${BORDERS.borderRadius4};
justify-content: ${JUSTIFY_CENTER};
height: max-content;

@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
Expand All @@ -48,13 +49,7 @@ const LOCATION_ICON_STYLE = css<{
`

const SLOT_NAME_TEXT_STYLE = css`
font-size: ${TYPOGRAPHY.fontSizeCaption};
line-height: ${TYPOGRAPHY.lineHeightNormal};
font-weight: ${TYPOGRAPHY.fontWeightBold};

@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
${TYPOGRAPHY.smallBodyTextBold}
}
${TYPOGRAPHY.smallBodyTextBold}
`

export function LocationIcon({
Expand Down