Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/protocol_visualization.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"active": "Active",
"deck_view": "Deck view",
"deck_view": "Deck View",
"destination_labware": "Destination labware",
"destination_tips": "Destination tips",
"destination_well_view": "Destination well view",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.container {
display: flex;
width: 100%;
min-width: 200px;
max-width: 400px;
min-width: 10.75rem;
max-width: 37.5rem;
flex-direction: column;
gap: var(--spacing-8);
}
27 changes: 16 additions & 11 deletions app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
COLORS,
DeckFromLayers,
FixedTrashText,
Flex,

Check failure on line 8 in app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckView.tsx

View workflow job for this annotation

GitHub Actions / js checks

'Flex' is defined but never used
FlexTrash,
NO_WRAP,
RobotCoordinateSpaceWithRef,
SingleSlotFixture,
SlotLabels,
Expand All @@ -25,13 +26,13 @@
import { getSlotInLocationStack } from '@opentrons/step-generation'

import { POTENTIAL_TRASH_COMMAND_TYPES } from './consants'
import styles from './deckview.module.css'
import { DeckViewDetails } from './DeckViewDetails'
import {
getActiveLayer,
getBackgroundColor,
getIsCutoutA1Active,
} from './utils'
import styles from './visualization.module.css'

import type { Dispatch, SetStateAction } from 'react'
import type { StagingAreaLocation, TrashCutoutId } from '@opentrons/components'
Expand Down Expand Up @@ -135,16 +136,20 @@
: 0

return (
<div className={styles.deck_view_padding}>
<div className={styles.deck_view_container}>
<Flex justifyContent="space-between" with="100%">
<StyledText desktopStyle="bodyLargeSemiBold">
{t('deck_view')}
</StyledText>
<StyledText color={COLORS.grey60} desktopStyle="bodyDefaultRegular">
{t('step', { number: selectedCommandIndex })}
</StyledText>
</Flex>
<div className={styles.deck_view_container}>
<div className={styles.header_container}>
<StyledText desktopStyle="bodyLargeSemiBold">
{t('deck_view')}
</StyledText>
<StyledText
color={COLORS.grey60}
desktopStyle="bodyDefaultRegular"
whiteSpace={NO_WRAP}
>
{t('step', { number: selectedCommandIndex })}
</StyledText>
</div>
<div className={styles.body_container}>
<RobotCoordinateSpaceWithRef
height="100%"
width="100%"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ export function VisualizerContainer(
milliSecondsPerFrame={milliSecondsPerFrame}
setMilliSecondsPerFrame={setMilliSecondsPerFrame}
/>

<DeckView
commands={analysis.commands}
liquids={liquids}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
.deck_view_container {
display: flex;
width: 100%;
height: 100%;
flex-direction: column;
border-radius: var(--border-radius-8);
background-color: var(--white);
container-name: deckview-container;
container-type: inline-size;
gap: var(--spacing-16);
overflow-y: hidden;
}

.header_container {
position: sticky;
top: 0;
left: 0;
display: flex;
width: 100%;
flex-shrink: 0;
align-items: center;
justify-content: space-between;
padding: var(--spacing-12);
gap: var(--spacing-16);
overflow-x: hidden;
}

@container deckview-container (min-width:284px) {
.header_container {
flex-direction: column;
align-items: flex-start;
gap: var(--spacing-4);
justify-self: unset;
}
}

@container deckview-container (min-width:680px) {
.header_container {
flex-direction: row;
align-items: center;
justify-content: space-between;
gap: var(--spacing-16);
}
}

.body_container {
position: relative;
display: flex;
width: 100%;
min-width: 23.75rem; /* 380px */
min-height: 13rem; /* 208px */
max-height: 31.875rem; /* 510px */
flex-direction: column;
flex-grow: 1;
flex-shrink: 0;
align-items: center;
justify-content: center;
padding: var(--spacing-16);
overflow-x: auto;
overflow-y: auto;
}

@container deckview-container (min-width: 680px) {
.body_container {
width: 100%;
max-width: 100%;
height: 100%;
max-height: 100%;
flex-shrink: 1;
align-items: center;
justify-content: center;
padding: var(--spacing-24);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,6 @@
pointer-events: auto;
}

.deck_view_container {
width: 100%;
height: 100%;
padding: 28px 32px;
border-radius: var(--border-radius-8);
background-color: var(--white);
gap: var(--spacing-20);
}

.detail_container {
display: flex;
height: 100%;
Expand Down
Loading