Skip to content

Commit

Permalink
bugfix when dragging header
Browse files Browse the repository at this point in the history
  • Loading branch information
mariusandra committed Mar 22, 2016
1 parent dddf990 commit 103fd97
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 48 deletions.
128 changes: 102 additions & 26 deletions build/dist/react-calendar-timeline.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/dist/react-calendar-timeline.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/dist/react-calendar-timeline.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/dist/react-calendar-timeline.min.js.map

Large diffs are not rendered by default.

38 changes: 24 additions & 14 deletions modules/lib/Timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,17 @@ var ReactCalendarTimeline = function (_Component) {
}, {
key: 'handleMouseDown',
value: function handleMouseDown(e) {
this.setState({ isDragging: true, dragStartPosition: e.pageX });
var topOffset = this.state.topOffset;
var pageY = e.pageY;
var _props3 = this.props;
var headerLabelGroupHeight = _props3.headerLabelGroupHeight;
var headerLabelHeight = _props3.headerLabelHeight;

var headerHeight = headerLabelGroupHeight + headerLabelHeight;

if (pageY - topOffset > headerHeight) {
this.setState({ isDragging: true, dragStartPosition: e.pageX });
}
}
}, {
key: 'handleMouseMove',
Expand Down Expand Up @@ -685,14 +695,14 @@ var ReactCalendarTimeline = function (_Component) {
}, {
key: 'stackItems',
value: function stackItems(items, groups, canvasTimeStart, visibleTimeStart, visibleTimeEnd, width) {
var _props3 = this.props;
var keys = _props3.keys;
var dragSnap = _props3.dragSnap;
var lineHeight = _props3.lineHeight;
var headerLabelGroupHeight = _props3.headerLabelGroupHeight;
var headerLabelHeight = _props3.headerLabelHeight;
var stackItems = _props3.stackItems;
var itemHeightRatio = _props3.itemHeightRatio;
var _props4 = this.props;
var keys = _props4.keys;
var dragSnap = _props4.dragSnap;
var lineHeight = _props4.lineHeight;
var headerLabelGroupHeight = _props4.headerLabelGroupHeight;
var headerLabelHeight = _props4.headerLabelHeight;
var stackItems = _props4.stackItems;
var itemHeightRatio = _props4.itemHeightRatio;
var _state2 = this.state;
var draggingItem = _state2.draggingItem;
var dragTime = _state2.dragTime;
Expand Down Expand Up @@ -788,11 +798,11 @@ var ReactCalendarTimeline = function (_Component) {
}, {
key: 'render',
value: function render() {
var _props4 = this.props;
var items = _props4.items;
var groups = _props4.groups;
var headerLabelGroupHeight = _props4.headerLabelGroupHeight;
var headerLabelHeight = _props4.headerLabelHeight;
var _props5 = this.props;
var items = _props5.items;
var groups = _props5.groups;
var headerLabelGroupHeight = _props5.headerLabelGroupHeight;
var headerLabelHeight = _props5.headerLabelHeight;
var _state4 = this.state;
var draggingItem = _state4.draggingItem;
var resizingItem = _state4.resizingItem;
Expand Down
4 changes: 3 additions & 1 deletion modules/lib/layout/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ var Header = function (_Component) {
var time = _e$target$dataset.time;
var unit = _e$target$dataset.unit;

this.props.showPeriod((0, _moment2.default)(time - 0), unit);
if (time && unit) {
this.props.showPeriod((0, _moment2.default)(time - 0), unit);
}
}
}, {
key: 'touchStart',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-calendar-timeline",
"version": "0.7.2",
"version": "0.7.3",
"description": "react calendar timeline",
"main": "modules/index.js",
"scripts": {
Expand Down
9 changes: 8 additions & 1 deletion src/lib/Timeline.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,14 @@ export default class ReactCalendarTimeline extends Component {
}

handleMouseDown (e) {
this.setState({isDragging: true, dragStartPosition: e.pageX})
const { topOffset } = this.state
const { pageY } = e
const { headerLabelGroupHeight, headerLabelHeight } = this.props
const headerHeight = headerLabelGroupHeight + headerLabelHeight

if (pageY - topOffset > headerHeight) {
this.setState({isDragging: true, dragStartPosition: e.pageX})
}
}

handleMouseMove (e) {
Expand Down
4 changes: 3 additions & 1 deletion src/lib/layout/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ export default class Header extends Component {

periodClick (e) {
const {time, unit} = e.target.dataset
this.props.showPeriod(moment(time - 0), unit)
if (time && unit) {
this.props.showPeriod(moment(time - 0), unit)
}
}

touchStart (e) {
Expand Down

0 comments on commit 103fd97

Please sign in to comment.