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

Fix #269 - Fix column resizer overlays trace header #280

Merged
merged 3 commits into from
Dec 17, 2018
Merged

Fix #269 - Fix column resizer overlays trace header #280

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec3b7f9
Fix #269 - Column resizer overlays trace header
tiffon Nov 25, 2018
2cbac94
Merge branch 'master' into issue-269-column-resizer
tiffon Nov 30, 2018
c874464
Merge branch 'master' into issue-269-column-resizer
tiffon Dec 15, 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
9 changes: 9 additions & 0 deletions ...r-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ limitations under the License.
display: flex;
flex: none;
justify-content: center;
margin-right: 0.5rem;
}

.TimelineCollapser--tooltipTitle {
Expand All @@ -27,7 +28,15 @@ limitations under the License.

.TimelineCollapser--btn,
.TimelineCollapser--btn-expand {
color: rgba(0, 0, 0, 0.5);
cursor: pointer;
margin-right: 0.3rem;
padding: 0.1rem;
}

.TimelineCollapser--btn:hover,
.TimelineCollapser--btn-expand:hover {
color: rgba(0, 0, 0, 0.85);
}

.TimelineCollapser--btn-expand {
Expand Down
49 changes: 22 additions & 27 deletions .../src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ limitations under the License.
*/

.TimelineColumnResizer {
bottom: 0;
left: 0;
position: absolute;
right: 0;
top: 0;
}

.TimelineColumnResizer--wrapper {
Expand All @@ -28,31 +28,30 @@ limitations under the License.
}

.TimelineColumnResizer--dragger {
border-left: 1px solid transparent;
bottom: 0;
border-left: 2px solid transparent;
cursor: col-resize;
position: fixed;
height: 5000px;
position: absolute;
top: 0;
width: 5px;
}

.TimelineColumnResizer--dragger:hover {
border-left: 1px solid #999;
border-left: 2px solid rgba(0, 0, 0, 0.3);
}

.TimelineColumnResizer--wrapper.isDraggingLeft > .TimelineColumnResizer--dragger,
.TimelineColumnResizer--wrapper.isDraggingRight > .TimelineColumnResizer--dragger {
/* #808 === rgb(136, 0, 136) */
.TimelineColumnResizer.isDraggingLeft > .TimelineColumnResizer--dragger,
.TimelineColumnResizer.isDraggingRight > .TimelineColumnResizer--dragger {
background: rgba(136, 0, 136, 0.05);
width: auto;
width: unset;
}

.TimelineColumnResizer--wrapper.isDraggingLeft > .TimelineColumnResizer--dragger {
.TimelineColumnResizer.isDraggingLeft > .TimelineColumnResizer--dragger {
border-left: 2px solid #808;
border-right: 1px solid #999;
}

.TimelineColumnResizer--wrapper.isDraggingRight > .TimelineColumnResizer--dragger {
.TimelineColumnResizer.isDraggingRight > .TimelineColumnResizer--dragger {
border-left: 1px solid #999;
border-right: 2px solid #808;
}
Expand All @@ -66,8 +65,8 @@ limitations under the License.
content: ' ';
}

.TimelineColumnResizer--wrapper.isDraggingLeft > .TimelineColumnResizer--dragger::before,
.TimelineColumnResizer--wrapper.isDraggingRight > .TimelineColumnResizer--dragger::before {
.TimelineColumnResizer.isDraggingLeft > .TimelineColumnResizer--dragger::before,
.TimelineColumnResizer.isDraggingRight > .TimelineColumnResizer--dragger::before {
left: -2000px;
right: -2000px;
}
Expand All @@ -80,25 +79,21 @@ limitations under the License.

.TimelineColumnResizer--gripIcon::before,
.TimelineColumnResizer--gripIcon::after {
position: absolute;
content: ' ';
top: -15px;
bottom: 3px;
right: 8px;
border-right: 1px solid #ccc;
content: ' ';
height: 9px;
position: absolute;
right: 9px;
top: 25px;
}

.TimelineColumnResizer--gripIcon::after {
right: 4px;
right: 5px;
}

.TimelineColumnResizer--wrapper:hover > .TimelineColumnResizer--gripIcon::before,
.TimelineColumnResizer--wrapper:hover > .TimelineColumnResizer--gripIcon::after {
border-right: 1px solid #999;
tiffon marked this conversation as resolved.
Show resolved Hide resolved
}
.TimelineColumnResizer--wrapper.isDraggingLeft > .TimelineColumnResizer--gripIcon::before,
.TimelineColumnResizer--wrapper.isDraggingRight > .TimelineColumnResizer--gripIcon::before,
.TimelineColumnResizer--wrapper.isDraggingLeft > .TimelineColumnResizer--gripIcon::after,
.TimelineColumnResizer--wrapper.isDraggingRight > .TimelineColumnResizer--gripIcon::after {
.TimelineColumnResizer.isDraggingLeft > .TimelineColumnResizer--gripIcon::before,
.TimelineColumnResizer.isDraggingRight > .TimelineColumnResizer--gripIcon::before,
.TimelineColumnResizer.isDraggingLeft > .TimelineColumnResizer--gripIcon::after,
.TimelineColumnResizer.isDraggingRight > .TimelineColumnResizer--gripIcon::after {
border-right: 1px solid rgba(136, 0, 136, 0.5);
}
31 changes: 15 additions & 16 deletions ...i/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,14 @@ export default class TimelineColumnResizer extends React.PureComponent<
render() {
let left;
let draggerStyle;
let wrapperCls = '';
let isDraggingCls = '';
const { position } = this.props;
const { dragPosition } = this.state;
left = `${position * 100}%`;
const gripStyle = { left };

if (this._dragManager.isDragging() && this._rootElm && dragPosition != null) {
const { position } = this.props;
wrapperCls = cx({
isDraggingCls = cx({
isDraggingLeft: dragPosition < position,
isDraggingRight: dragPosition > position,
});
Expand All @@ -110,21 +113,17 @@ export default class TimelineColumnResizer extends React.PureComponent<
const draggerRight = `calc(${(1 - Math.max(position, dragPosition)) * 100}% - 1px)`;
draggerStyle = { left: draggerLeft, right: draggerRight };
} else {
const { position } = this.props;
left = `${position * 100}%`;
draggerStyle = { left };
draggerStyle = gripStyle;
}
return (
<div className="TimelineColumnResizer" ref={this._setRootElm}>
<div className={`TimelineColumnResizer--wrapper ${wrapperCls}`} style={{ left }}>
<div className="TimelineColumnResizer--gripIcon" />
<div
aria-hidden
className="TimelineColumnResizer--dragger"
onMouseDown={this._dragManager.handleMouseDown}
style={draggerStyle}
/>
</div>
<div className={`TimelineColumnResizer ${isDraggingCls}`} ref={this._setRootElm}>
<div className="TimelineColumnResizer--gripIcon" style={gripStyle} />
<div
aria-hidden
className="TimelineColumnResizer--dragger"
onMouseDown={this._dragManager.handleMouseDown}
style={draggerStyle}
/>
</div>
);
}
Expand Down
1 change: 0 additions & 1 deletion .../components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ describe('<TimelineColumnResizer>', () => {
it('renders without exploding', () => {
expect(wrapper).toBeDefined();
expect(wrapper.find('.TimelineColumnResizer').length).toBe(1);
expect(wrapper.find('.TimelineColumnResizer--wrapper').length).toBe(1);
expect(wrapper.find('.TimelineColumnResizer--gripIcon').length).toBe(1);
expect(wrapper.find('.TimelineColumnResizer--dragger').length).toBe(1);
});
Expand Down