show multiple lines of markers
Summary: Multiple markers might got truncated, now the list expands on hover Reviewed By: jknoxville Differential Revision: D15939404 fbshipit-source-id: 2640f200dc17876391e04eeced59bc7a2d925113
This commit is contained in:
committed by
Facebook Github Bot
parent
c86a6809cb
commit
ab6fe68a70
@@ -48,9 +48,15 @@ const Point = styled(FlexRow)(props => ({
|
|||||||
right: 10,
|
right: 10,
|
||||||
cursor: props.onClick ? 'pointer' : 'default',
|
cursor: props.onClick ? 'pointer' : 'default',
|
||||||
borderRadius: 3,
|
borderRadius: 3,
|
||||||
alignItems: 'center',
|
alignItems: 'flex-start',
|
||||||
|
lineHeight: '16px',
|
||||||
':hover': {
|
':hover': {
|
||||||
background: props.onClick ? colors.light02 : 'transparent',
|
background: `linear-gradient(to top, rgba(255,255,255,0) 0, #ffffff 10px)`,
|
||||||
|
paddingBottom: 5,
|
||||||
|
zIndex: 2,
|
||||||
|
'> span': {
|
||||||
|
whiteSpace: 'initial',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'::before': {
|
'::before': {
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
@@ -68,6 +74,7 @@ const Point = styled(FlexRow)(props => ({
|
|||||||
border: '1px solid rgba(0,0,0,0.2)',
|
border: '1px solid rgba(0,0,0,0.2)',
|
||||||
backgroundColor: props.threadColor,
|
backgroundColor: props.threadColor,
|
||||||
marginRight: 6,
|
marginRight: 6,
|
||||||
|
zIndex: 3,
|
||||||
boxShadow: props.selected
|
boxShadow: props.selected
|
||||||
? `0 0 0 2px ${colors.macOSTitleBarIconSelected}`
|
? `0 0 0 2px ${colors.macOSTitleBarIconSelected}`
|
||||||
: null,
|
: null,
|
||||||
@@ -90,11 +97,13 @@ const Time = styled('span')({
|
|||||||
color: colors.light30,
|
color: colors.light30,
|
||||||
fontWeight: '300',
|
fontWeight: '300',
|
||||||
marginRight: 4,
|
marginRight: 4,
|
||||||
|
marginTop: -2,
|
||||||
});
|
});
|
||||||
|
|
||||||
const Code = styled(Text)({
|
const Code = styled(Text)({
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
textOverflow: 'ellipsis',
|
textOverflow: 'ellipsis',
|
||||||
|
marginTop: -1,
|
||||||
});
|
});
|
||||||
|
|
||||||
type TimePoint = {
|
type TimePoint = {
|
||||||
@@ -194,7 +203,6 @@ export default class MarkerTimeline extends Component<Props, State> {
|
|||||||
key={i}
|
key={i}
|
||||||
threadColor={p.color}
|
threadColor={p.color}
|
||||||
cut={p.isCut}
|
cut={p.isCut}
|
||||||
title={p.markerNames.length > 1 ? p.markerNames.join(', ') : null}
|
|
||||||
positionY={p.positionY}
|
positionY={p.positionY}
|
||||||
onClick={onClick ? () => onClick(p.markerKeys) : undefined}
|
onClick={onClick ? () => onClick(p.markerKeys) : undefined}
|
||||||
selected={p.markerKeys.includes(this.props.selected)}
|
selected={p.markerKeys.includes(this.props.selected)}
|
||||||
|
|||||||
Reference in New Issue
Block a user