diff --git a/src/containers/rect-mode.jsx b/src/containers/rect-mode.jsx index 4e75c3bf..daed7954 100644 --- a/src/containers/rect-mode.jsx +++ b/src/containers/rect-mode.jsx @@ -5,7 +5,6 @@ import bindAll from 'lodash.bindall'; import Modes from '../modes/modes'; import {changeMode} from '../reducers/modes'; -import {clearHoveredItem, setHoveredItem} from '../reducers/hover'; import {clearSelectedItems, setSelectedItems} from '../reducers/selected-items'; import {getSelectedLeafItems} from '../helper/selection'; @@ -26,10 +25,6 @@ class RectMode extends React.Component { } } componentWillReceiveProps (nextProps) { - if (this.tool && nextProps.hoveredItemId !== this.props.hoveredItemId) { - this.tool.setPrevHoveredItemId(nextProps.hoveredItemId); - } - if (nextProps.isRectModeActive && !this.props.isRectModeActive) { this.activateTool(); } else if (!nextProps.isRectModeActive && this.props.isRectModeActive) { @@ -41,8 +36,6 @@ class RectMode extends React.Component { } activateTool () { this.tool = new RectTool( - this.props.setHoveredItem, - this.props.clearHoveredItem, this.props.setSelectedItems, this.props.clearSelectedItems, this.props.onUpdateSvg @@ -65,27 +58,17 @@ class RectMode extends React.Component { } RectMode.propTypes = { - clearHoveredItem: PropTypes.func.isRequired, clearSelectedItems: PropTypes.func.isRequired, handleMouseDown: PropTypes.func.isRequired, - hoveredItemId: PropTypes.number, isRectModeActive: PropTypes.bool.isRequired, onUpdateSvg: PropTypes.func.isRequired, - setHoveredItem: PropTypes.func.isRequired, setSelectedItems: PropTypes.func.isRequired }; const mapStateToProps = state => ({ - isRectModeActive: state.scratchPaint.mode === Modes.RECT, - hoveredItemId: state.scratchPaint.hoveredItemId + isRectModeActive: state.scratchPaint.mode === Modes.RECT }); const mapDispatchToProps = dispatch => ({ - setHoveredItem: hoveredItemId => { - dispatch(setHoveredItem(hoveredItemId)); - }, - clearHoveredItem: () => { - dispatch(clearHoveredItem()); - }, clearSelectedItems: () => { dispatch(clearSelectedItems()); }, diff --git a/src/helper/tools/rect-tool.js b/src/helper/tools/rect-tool.js index 03d15449..feb662b8 100644 --- a/src/helper/tools/rect-tool.js +++ b/src/helper/tools/rect-tool.js @@ -6,16 +6,12 @@ import log from '../../log/log'; */ class RectTool extends paper.Tool { /** - * @param {function} setHoveredItem Callback to set the hovered item - * @param {function} clearHoveredItem Callback to clear the hovered item * @param {function} setSelectedItems Callback to set the set of selected items in the Redux state * @param {function} clearSelectedItems Callback to clear the set of selected items in the Redux state * @param {!function} onUpdateSvg A callback to call when the image visibly changes */ - constructor (setHoveredItem, clearHoveredItem, setSelectedItems, clearSelectedItems, onUpdateSvg) { + constructor (setSelectedItems, clearSelectedItems, onUpdateSvg) { super(); - this.setHoveredItem = setHoveredItem; - this.clearHoveredItem = clearHoveredItem; this.setSelectedItems = setSelectedItems; this.clearSelectedItems = clearSelectedItems; this.onUpdateSvg = onUpdateSvg; @@ -28,16 +24,6 @@ class RectTool extends paper.Tool { this.onMouseDrag = this.handleMouseDrag; this.onMouseUp = this.handleMouseUp; } - /** - * To be called when the hovered item changes. When the select tool hovers over a - * new item, it compares against this to see if a hover item change event needs to - * be fired. - * @param {paper.Item} prevHoveredItemId ID of the highlight item that indicates the mouse is - * over a given item currently - */ - setPrevHoveredItemId (prevHoveredItemId) { - this.prevHoveredItemId = prevHoveredItemId; - } handleMouseDown () { log.warn('Rectangle tool not yet implemented'); }