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

fix(app): Fix robot list scroll clipping #2288

Merged
merged 2 commits into from
Sep 18, 2018
Merged

fix(app): Fix robot list scroll clipping #2288

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
4cd7389
fix(app): Fix robot list scroll clipping
Kadee80 Sep 17, 2018
02959e0
Refactor robot list
Kadee80 Sep 17, 2018
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
29 changes: 29 additions & 0 deletions app/src/components/ConnectPanel/RobotLink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// @flow
// Robot and Instrument links specific to RobotListItem
import * as React from 'react'
import {NavLink} from 'react-router-dom'

import cx from 'classnames'
import styles from './connect-panel.css'

type LinkProps = {
children: React.Node,
url: string,
className?: string,
activeClassName?: string,
}

export default function RobotLink (props: LinkProps) {
const {url} = props
const className = cx(styles.robot_link, props.className)
return (
<NavLink
to={url}
className={className}
activeClassName={styles.active}
exact
>
{props.children}
</NavLink>
)
}
72 changes: 35 additions & 37 deletions app/src/components/ConnectPanel/RobotList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import * as React from 'react'

import {
ListItem,
NotificationIcon,
Icon,
} from '@opentrons/components'

import type {Robot} from '../../robot'
import {ToggleButton} from '../controls'
import RobotLink from './RobotLink'
import styles from './connect-panel.css'

type ListProps = {
Expand Down Expand Up @@ -37,43 +37,41 @@ export function RobotListItem (props: ItemProps) {
: connect

return (
<ol className={styles.robot_group}>
<ListItem
url={`/robots/${name}`}
className={styles.robot_item}
activeClassName={styles.active}
exact
>
<NotificationIcon
name={wired ? 'usb' : 'wifi'}
className={styles.robot_item_icon}
childName={availableUpdate ? 'circle' : null}
childClassName={styles.notification}
/>
<li className={styles.robot_group}>
<RobotLink
url={`/robots/${name}`}
className={styles.robot_item}
exact
>
<NotificationIcon
name={wired ? 'usb' : 'wifi'}
className={styles.robot_item_icon}
childName={availableUpdate ? 'circle' : null}
childClassName={styles.notification}
/>

<p className={styles.robot_name}>
{name}
</p>
<p className={styles.link_text}>
{name}
</p>

<ToggleButton
toggledOn={isConnected}
onClick={onClick}
className={styles.robot_item_icon}
/>
</ListItem>
<ListItem
url={`/robots/${name}/instruments`}
className={styles.instrument_item}
activeClassName={styles.active}
>
<p className={styles.robot_name}>
Pipettes & Modules
</p>
<Icon
name='chevron-right'
className={styles.robot_item_icon}
/>
</ListItem>
</ol>
<ToggleButton
toggledOn={isConnected}
onClick={onClick}
className={styles.robot_item_icon}
/>
</RobotLink>
<RobotLink
url={`/robots/${name}/instruments`}
className={styles.instrument_item}
>
<p className={styles.link_text}>
Pipettes & Modules
</p>
<Icon
name='chevron-right'
className={styles.robot_item_icon}
/>
</RobotLink>
</li>
)
}
27 changes: 15 additions & 12 deletions app/src/components/ConnectPanel/connect-panel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,27 @@
}

.robot_group {
margin-bottom: 0.25rem;
margin-bottom: 0.5rem;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1);
}

.robot_link {
@apply --font-body-1-dark;

& > li {
max-height: 3rem;
}
display: flex;
flex-direction: row;
align-items: center;
padding: 0 0.75rem;
border-bottom: 1px solid var(--c-light-gray);
text-transform: uppercase;
}

.robot_item {
max-height: 3rem;
text-transform: uppercase;
border-bottom: 1px solid var(--c-light-gray);
height: 3rem;
}

.instrument_item {
max-height: 2.5rem;
text-transform: uppercase;
border-bottom: 1px solid var(--c-light-gray);
height: 2.5rem;
}

.robot_item_icon {
Expand All @@ -36,10 +39,10 @@
color: var(--c-orange);
}

.robot_name {
.link_text {
flex: 1;
margin: 0 0.5rem;
font-weight: bold;
font-weight: var(--fw-semibold);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
15 changes: 6 additions & 9 deletions app/src/components/ConnectPanel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,12 @@ export default connect(mapStateToProps, mapDispatchToProps)(ConnectPanel)
function ConnectPanel (props: Props) {
return (
<SidePanel title='Robots'>
<div>
<ScanStatus {...props} />
<RobotList>
{props.robots.map((robot) => (
// $FlowFixMe: flow-typed withRouter def throwing bogus errors
<RobotItem key={robot.name} {...robot} />
))}
</RobotList>
</div>
<ScanStatus {...props} />
<RobotList>
{props.robots.map((robot) => (
<RobotItem key={robot.name} {...robot} />
))}
</RobotList>
</SidePanel>
)
}
Expand Down
2 changes: 1 addition & 1 deletion components/src/nav/SidePanel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

.panel_contents {
width: var(--sidebar-width);
height: calc(100vh - 2.625rem);
height: calc(100vh - 3.5rem);
overflow-x: hidden;
overflow-y: auto;
}
Expand Down