Skip to content

Commit 495aea9

Browse files
authored
Merge pull request hypeserver#51 from michaeljonsampson/fix_clicking_edge_of_day_cell
Fix clicking edge of day cell
2 parents d5ebc00 + 5838b05 commit 495aea9

File tree

2 files changed

+34
-16
lines changed

2 files changed

+34
-16
lines changed

lib/DayCell.js

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,28 @@ var DayCell = (function (_Component) {
133133

134134
var stateStyle = this.getStateStyles();
135135
var classes = this.getClassNames(classNames);
136+
var dayWrapperStyles = {
137+
width: styles['Day'].width,
138+
height: styles['Day'].height,
139+
display: styles['Day'].display
140+
};
136141

137142
return _react2['default'].createElement(
138143
'span',
139144
{
140-
onMouseEnter: this.handleMouseEvent.bind(this),
141-
onMouseLeave: this.handleMouseEvent.bind(this),
142-
onMouseDown: this.handleMouseEvent.bind(this),
143-
onMouseUp: this.handleMouseEvent.bind(this),
144-
onClick: this.handleSelect.bind(this),
145-
className: classes,
146-
style: onlyClasses ? undefined : _extends({}, styles['Day'], stateStyle) },
147-
dayMoment.date()
145+
style: dayWrapperStyles,
146+
onClick: this.handleSelect.bind(this) },
147+
_react2['default'].createElement(
148+
'span',
149+
{
150+
onMouseEnter: this.handleMouseEvent.bind(this),
151+
onMouseLeave: this.handleMouseEvent.bind(this),
152+
onMouseDown: this.handleMouseEvent.bind(this),
153+
onMouseUp: this.handleMouseEvent.bind(this),
154+
className: classes,
155+
style: onlyClasses ? undefined : _extends({}, styles['Day'], stateStyle) },
156+
dayMoment.date()
157+
)
148158
);
149159
}
150160
}]);

src/DayCell.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,25 @@ class DayCell extends Component {
9797
const { styles } = this;
9898
const stateStyle = this.getStateStyles();
9999
const classes = this.getClassNames(classNames);
100+
const dayWrapperStyles = {
101+
width: styles['Day'].width,
102+
height: styles['Day'].height,
103+
display: styles['Day'].display
104+
};
100105

101106
return (
102107
<span
103-
onMouseEnter={ this.handleMouseEvent.bind(this) }
104-
onMouseLeave={ this.handleMouseEvent.bind(this) }
105-
onMouseDown={ this.handleMouseEvent.bind(this) }
106-
onMouseUp={ this.handleMouseEvent.bind(this) }
107-
onClick={ this.handleSelect.bind(this) }
108-
className={ classes }
109-
style={onlyClasses ? undefined : {...styles['Day'], ...stateStyle}}>
110-
{ dayMoment.date() }
108+
style={dayWrapperStyles}
109+
onClick={ this.handleSelect.bind(this) }>
110+
<span
111+
onMouseEnter={ this.handleMouseEvent.bind(this) }
112+
onMouseLeave={ this.handleMouseEvent.bind(this) }
113+
onMouseDown={ this.handleMouseEvent.bind(this) }
114+
onMouseUp={ this.handleMouseEvent.bind(this) }
115+
className={ classes }
116+
style={onlyClasses ? undefined : {...styles['Day'], ...stateStyle}}>
117+
{ dayMoment.date() }
118+
</span>
111119
</span>
112120
);
113121
}

0 commit comments

Comments
 (0)