Remove react-dnd as it was interfering with text selection. Move content
warning mentions preview into area where actual content would be
This commit is contained in:
@ -1,6 +1,5 @@
|
||||
import ColumnHeader from './column_header';
|
||||
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||
import { DragSource } from 'react-dnd';
|
||||
|
||||
const easingOutQuint = (x, t, b, c, d) => c*((t=t/d-1)*t*t*t*t + 1) + b;
|
||||
|
||||
@ -37,22 +36,9 @@ const style = {
|
||||
flexDirection: 'column'
|
||||
};
|
||||
|
||||
const columnSource = {
|
||||
beginDrag (props) {
|
||||
return {};
|
||||
}
|
||||
};
|
||||
|
||||
const collect = (connect, monitor) => ({
|
||||
connectDragSource: connect.dragSource(),
|
||||
isDragging: monitor.isDragging()
|
||||
});
|
||||
|
||||
const Column = React.createClass({
|
||||
|
||||
propTypes: {
|
||||
connectDragSource: React.PropTypes.func.isRequired,
|
||||
isDragging: React.PropTypes.bool.isRequired,
|
||||
heading: React.PropTypes.string,
|
||||
icon: React.PropTypes.string,
|
||||
children: React.PropTypes.node
|
||||
@ -72,7 +58,7 @@ const Column = React.createClass({
|
||||
},
|
||||
|
||||
render () {
|
||||
const { heading, icon, children, connectDragSource, isDragging } = this.props;
|
||||
const { heading, icon, children } = this.props;
|
||||
|
||||
let header = '';
|
||||
|
||||
@ -80,8 +66,8 @@ const Column = React.createClass({
|
||||
header = <ColumnHeader icon={icon} type={heading} onClick={this.handleHeaderClick} />;
|
||||
}
|
||||
|
||||
return connectDragSource(
|
||||
<div className='column' style={{...style, opacity: isDragging ? '0.5' : '1' }} onWheel={this.handleWheel}>
|
||||
return (
|
||||
<div className='column' style={style} onWheel={this.handleWheel}>
|
||||
{header}
|
||||
{children}
|
||||
</div>
|
||||
@ -90,4 +76,4 @@ const Column = React.createClass({
|
||||
|
||||
});
|
||||
|
||||
export default DragSource('column', columnSource, collect)(Column);
|
||||
export default Column;
|
||||
|
Reference in New Issue
Block a user