Skip to content

issue #3. Move leave and add enter handlers to DrawArea component #4

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

Open
SandakovMM wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issue #3. Move leave and add enter handlers to DrawArea component #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions ui/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ class App extends React.Component {
operations: [],
isLmbPressed: false
};
this.onMouseLeaveDrawingArea = this.onMouseLeaveDrawingArea.bind(this);
this.onDrawingAreaMouseDown = this.onDrawingAreaMouseDown.bind(this);
this.onDrawingAreaMouseUp = this.onDrawingAreaMouseUp.bind(this);
this.onDrawingAreaMouseMove = this.onDrawingAreaMouseMove.bind(this);

this.onMouseLeaveDrawingArea = this.onMouseLeaveDrawingArea.bind(this);
this.onMouseEnterDrawingArea = this.onMouseEnterDrawingArea.bind(this);
}

onDrawingAreaMouseDown(x, y, button) {
Expand All @@ -42,10 +44,16 @@ class App extends React.Component {
});
}

onMouseLeaveDrawingArea() {
onMouseLeaveDrawingArea(x, y) {
this.setState({isLmbPressed: false}) // Always false for now
}

onMouseEnterDrawingArea(x, y, button, buttons) {
if (buttons != 0) {
this.onDrawingAreaMouseDown(x, y, button)
}
}

onDrawingAreaMouseMove(dx, dy, newX, newY) {
this.setState(state => {
if (state.isLmbPressed) {
Expand All @@ -59,14 +67,14 @@ class App extends React.Component {
render() {
return (
<div className="App">
<div className={'drawing-area-container'}
onMouseLeave={this.onMouseLeaveDrawingArea}
>
<div className={'drawing-area-container'}>
<DrawingArea
offset={drawingAreaOffset}
onMouseDown={this.onDrawingAreaMouseDown}
onMouseUp={this.onDrawingAreaMouseUp}
onMouseMove={this.onDrawingAreaMouseMove}
onMouseLeave={this.onMouseLeaveDrawingArea}
onMouseEnter={this.onMouseEnterDrawingArea}
operations={this.state.operations}
/>
</div>
Expand Down
18 changes: 18 additions & 0 deletions ui/src/components/DrawingArea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class DrawingArea extends React.Component {
this.handleMouseDown = this.handleMouseDown.bind(this);
this.handleMouseUp = this.handleMouseUp.bind(this);
this.handleMouseMove = this.handleMouseMove.bind(this);
this.handleMouseLeave = this.handleMouseLeave.bind(this);
this.handleMouseEnter = this.handleMouseEnter.bind(this);
}

componentDidMount() {
Expand Down Expand Up @@ -58,13 +60,29 @@ class DrawingArea extends React.Component {
}
}

handleMouseLeave(e) {
if (this.props.onMouseLeave) {
const {worldX, worldY} = this.toWorldCoord(e.clientX, e.clientY);
this.props.onMouseLeave(worldX, worldY);
}
}

handleMouseEnter(e) {
if (this.props.onMouseEnter) {
const {worldX, worldY} = this.toWorldCoord(e.clientX, e.clientY);
this.props.onMouseEnter(worldX, worldY, e.button, e.buttons);
}
}

render() {
return <div className="drawing-area-canvas">
<canvas
ref={this.canvasRef}
onMouseDown={this.handleMouseDown}
onMouseUp={this.handleMouseUp}
onMouseMove={this.handleMouseMove}
onMouseLeave={this.handleMouseLeave}
onMouseEnter={this.handleMouseEnter}
style={{width: '100%', height: '100%'}}
/>
</div>;
Expand Down