feat(protocol-designer): make timeline responsive #17109
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "add_step": "Add Step", | ||
| "add_off_deck": "+ Off-deck labware", | ||
| "cancel": "cancel", | ||
| "close": "close", | ||
|
|
||
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| import { useState, useRef, useCallback, useEffect } from 'react' | ||
| import styled from 'styled-components' | ||
| import { | ||
| DIRECTION_COLUMN, | ||
| DISPLAY_FLEX, | ||
| Flex, | ||
| JUSTIFY_SPACE_BETWEEN, | ||
| Box, | ||
| } from '@opentrons/components' | ||
| import { TimelineToolbox } from './Timeline/TimelineToolbox' | ||
|
|
||
| const INITIAL_SIDEBAR_WIDTH = 350 | ||
| const MIN_SIDEBAR_WIDTH = 80 | ||
| const MAX_SIDEBAR_WIDTH = 350 | ||
|
|
||
| interface DraggableSidebarProps { | ||
| setTargetWidth: (width: number) => void | ||
| } | ||
|
|
||
| export function DraggableSidebar({ | ||
| setTargetWidth, | ||
| }: DraggableSidebarProps): JSX.Element { | ||
| const sidebarRef = useRef<HTMLDivElement>(null) | ||
| const [isResizing, setIsResizing] = useState(false) | ||
| const [sidebarWidth, setSidebarWidth] = useState(INITIAL_SIDEBAR_WIDTH) | ||
|
|
||
| const startResizing = useCallback(() => { | ||
| setIsResizing(true) | ||
| }, []) | ||
|
|
||
| const stopResizing = useCallback(() => { | ||
| setIsResizing(false) | ||
| }, []) | ||
|
|
||
| const resize = useCallback( | ||
| (mouseMoveEvent: MouseEvent) => { | ||
| if (isResizing && sidebarRef.current != null) { | ||
| const newWidth = | ||
| mouseMoveEvent.clientX - | ||
| sidebarRef.current.getBoundingClientRect().left | ||
|
|
||
| if (newWidth >= MIN_SIDEBAR_WIDTH && newWidth <= MAX_SIDEBAR_WIDTH) { | ||
| setSidebarWidth(newWidth) | ||
| setTargetWidth(newWidth) | ||
| } | ||
| } | ||
| }, | ||
| [isResizing, setTargetWidth] | ||
| ) | ||
|
|
||
| useEffect(() => { | ||
| window.addEventListener('mousemove', resize) | ||
| window.addEventListener('mouseup', stopResizing) | ||
|
|
||
| return () => { | ||
| window.removeEventListener('mousemove', resize) | ||
| window.removeEventListener('mouseup', stopResizing) | ||
| } | ||
| }, [resize, stopResizing]) | ||
|
|
||
| return ( | ||
| <Flex | ||
| flexDirection={DIRECTION_COLUMN} | ||
| justifyContent={JUSTIFY_SPACE_BETWEEN} | ||
| height="100%" | ||
| > | ||
| <SidebarContainer ref={sidebarRef} resizedWidth={sidebarWidth}> | ||
| <SidebarContent> | ||
| <TimelineToolbox sidebarWidth={sidebarWidth} /> | ||
| </SidebarContent> | ||
| <SidebarResizer dragging={isResizing} onMouseDown={startResizing} /> | ||
| </SidebarContainer> | ||
| </Flex> | ||
| ) | ||
| } | ||
|
|
||
| const SidebarContainer = styled(Box)<{ resizedWidth: number }>` | ||
| display: ${DISPLAY_FLEX}; | ||
| flex-direction: ${DIRECTION_COLUMN}; | ||
| /* background-color: #f4f4f4; */ | ||
| background-color: #ff0000; | ||
| border-right: 1px solid #ccc; | ||
| position: relative; | ||
| width: ${props => props.resizedWidth}px; | ||
| overflow: hidden; /* Prevent content overflow */ | ||
| height: 100%; | ||
| ` | ||
|
|
||
| const SidebarContent = styled(Flex)` | ||
| flex: 1; | ||
| ` | ||
|
|
||
| const SidebarResizer = styled(Flex)<{ dragging: boolean }>` | ||
| width: 0.3125rem; | ||
| cursor: ew-resize; | ||
| background-color: #ddd; | ||
| position: absolute; | ||
| top: 0; | ||
| right: 0; | ||
| bottom: 0; | ||
| margin: 0; | ||
| padding: 0; | ||
| transition: background-color 0.2s ease; | ||
|
|
||
| &:hover { | ||
| background-color: blue; /* Hover state */ | ||
| } | ||
|
|
||
| ${props => | ||
| props.dragging === true && | ||
| ` | ||
| background-color: darkblue; /* Dragging state */ | ||
| `} | ||
| ` | ||
This file contains 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 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 |
|---|---|---|
|
|
@@ -49,6 +49,7 @@ export interface ConnectedStepInfoProps { | |
| dragHovered?: boolean | ||
| openedOverflowMenuId?: string | null | ||
| setOpenedOverflowMenuId?: Dispatch<SetStateAction<string | null>> | ||
| sidebarWidth: number | ||
| } | ||
|
|
||
| export function ConnectedStepInfo(props: ConnectedStepInfoProps): JSX.Element { | ||
|
|
@@ -58,6 +59,7 @@ export function ConnectedStepInfo(props: ConnectedStepInfoProps): JSX.Element { | |
| dragHovered = false, | ||
| openedOverflowMenuId, | ||
| setOpenedOverflowMenuId, | ||
| sidebarWidth, | ||
| } = props | ||
| const { t } = useTranslation('application') | ||
| const dispatch = useDispatch<ThunkDispatch<BaseState, any, any>>() | ||
|
|
@@ -227,6 +229,7 @@ export function ConnectedStepInfo(props: ConnectedStepInfoProps): JSX.Element { | |
| step.stepName || t(`stepType.${step.stepType}`) | ||
| }`} | ||
| dragHovered={dragHovered} | ||
| sidebarWidth={sidebarWidth} | ||
| /> | ||
| </> | ||
| ) | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ interface DragDropStepProps extends ConnectedStepItemProps { | |
| orderedStepIds: string[] | ||
| openedOverflowMenuId?: string | null | ||
| setOpenedOverflowMenuId?: Dispatch<SetStateAction<string | null>> | ||
| sidebarWidth: number | ||
| } | ||
|
|
||
| interface DropType { | ||
|
|
@@ -46,6 +47,7 @@ function DragDropStep(props: DragDropStepProps): JSX.Element { | |
| stepNumber, | ||
| openedOverflowMenuId, | ||
| setOpenedOverflowMenuId, | ||
| sidebarWidth, | ||
| } = props | ||
| const stepRef = useRef<HTMLDivElement>(null) | ||
|
|
||
|
|
@@ -94,6 +96,7 @@ function DragDropStep(props: DragDropStepProps): JSX.Element { | |
| stepNumber={stepNumber} | ||
| stepId={stepId} | ||
| dragHovered={hovered} | ||
| sidebarWidth={sidebarWidth} | ||
| /> | ||
| </Box> | ||
| ) | ||
|
|
@@ -102,9 +105,10 @@ function DragDropStep(props: DragDropStepProps): JSX.Element { | |
| interface DraggableStepsProps { | ||
| orderedStepIds: StepIdType[] | ||
| reorderSteps: (steps: StepIdType[]) => void | ||
| sidebarWidth: number | ||
| } | ||
| export function DraggableSteps(props: DraggableStepsProps): JSX.Element | null { | ||
| const { orderedStepIds, reorderSteps, sidebarWidth } = props | ||
| const { t } = useTranslation('shared') | ||
| const [openedOverflowMenuId, setOpenedOverflowMenuId] = useState< | ||
| string | null | ||
|
|
@@ -146,6 +150,7 @@ export function DraggableSteps(props: DraggableStepsProps): JSX.Element | null { | |
| orderedStepIds={orderedStepIds} | ||
| openedOverflowMenuId={openedOverflowMenuId} | ||
| setOpenedOverflowMenuId={setOpenedOverflowMenuId} | ||
| sidebarWidth={sidebarWidth} | ||
| /> | ||
| ))} | ||
| <StepDragPreview /> | ||
|
|
||
Oops, something went wrong.
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.
i'll get the right value from Mel next week