Skip to content

Multi Touch #6 #111

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
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Multi Touch #6 #111

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc98ce6
supported multi touch
shundroid Aug 20, 2017
38f6f4f
preventDefault
shundroid Aug 20, 2017
f0605ad
fixed #6
shundroid Aug 21, 2017
844b8cf
fixed by eslint
shundroid Aug 21, 2017
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
106 changes: 58 additions & 48 deletions src/components/Canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@ const props = {
const actions = ['addLine', 'updateThumbnail', 'changeSize'];

class Canvas extends React.Component {
static isTouchEvent(event) {
return !!event.touches;
}
componentDidMount() {
this.updateCanvasSize();
window.addEventListener('resize', this.updateCanvasSize);
this.ctx = this.canvas.getContext('2d');
this.positions = [];
this.positions = {};
}
componentDidUpdate(prevProps) {
if (this.props.isUpdateThumbnailNeeded) {
Expand All @@ -52,20 +49,11 @@ class Canvas extends React.Component {
getLines() {
return getFrameById(this.props.frames, this.props.currentId).lines;
}
getPosition(event) {
if (Canvas.isTouchEvent(event)) {
return {
x: event.touches[0].clientX - this.canvas.offsetLeft,
y: event.touches[0].clientY - this.canvas.offsetTop
};
pushPosition(id, x, y) {
if (typeof this.positions[id] === 'undefined') {
this.positions[id] = [];
}
return {
x: event.clientX - this.canvas.offsetLeft,
y: event.clientY - this.canvas.offsetTop
};
}
pushPosition(x, y) {
this.positions.push({ x, y });
this.positions[id].push({ x, y });
}
updateCanvas() {
this.ctx.clearRect(0, 0, this.props.width, this.props.height);
Expand Down Expand Up @@ -93,19 +81,24 @@ class Canvas extends React.Component {
this.props.actions.changeSize(0, 0);
this.props.actions.changeSize(this.canvas.clientWidth, this.canvas.clientHeight);
}
penDown = event => {
mouseDown = event => {
if (this.props.isPlaying) return;
if (Canvas.isTouchEvent(event)) {
this.canvas.addEventListener('touchmove', this.penMove);
this.canvas.addEventListener('touchend', this.penUp);
window.addEventListener('touchend', this.penUp);
} else {
this.canvas.addEventListener('mousemove', this.penMove);
this.canvas.addEventListener('mouseup', this.penUp);
window.addEventListener('mouseup', this.penUp);
this.canvas.addEventListener('mousemove', this.mouseMove);
window.addEventListener('mouseup', this.mouseUp);
this.penDown(-1, event.clientX, event.clientY);
}
touchStart = event => {
if (this.props.isPlaying) return;
if (event.touches.length === 1) {
this.canvas.addEventListener('touchmove', this.touchMove);
window.addEventListener('touchend', this.touchEnd);
}
const { x, y } = this.getPosition(event);
this.pushPosition(x, y);
const touch = event.changedTouches[0];
this.penDown(touch.identifier, touch.clientX, touch.clientY);
}
penDown(id, _x, _y) {
const [x, y] = [_x - this.canvas.offsetLeft, _y - this.canvas.offsetTop];
this.pushPosition(id, x, y);
this.ctx.strokeStyle = this.props.color;
this.ctx.lineWidth = this.props.lineWidth;
this.ctx.lineCap = 'round';
Expand All @@ -118,28 +111,45 @@ class Canvas extends React.Component {
this.ctx.beginPath();
this.ctx.moveTo(x, y);
}
penMove = event => {
const { x, y } = this.getPosition(event);
this.pushPosition(x, y);
mouseMove = event => {
this.penMove(-1, event.clientX, event.clientY);
}
touchMove = event => {
event.preventDefault();
for (let i = 0; i < event.changedTouches.length; i++) {
const touch = event.changedTouches[i];
this.penMove(touch.identifier, touch.clientX, touch.clientY);
}
}
penMove(id, _x, _y) {
const [x, y] = [_x - this.canvas.offsetLeft, _y - this.canvas.offsetTop];
this.pushPosition(id, x, y);
const positions = this.positions[id];
this.ctx.beginPath();
if (positions.length >= 2) {
const pos = positions[positions.length - 2];
this.ctx.moveTo(pos.x, pos.y);
} else {
this.ctx.moveTo(x, y);
}
this.ctx.lineTo(x, y);
this.ctx.stroke();
this.ctx.beginPath();
this.ctx.moveTo(x, y);
}
penUp = event => {
if (Canvas.isTouchEvent(event)) {
this.canvas.removeEventListener('touchmove', this.penMove);
this.canvas.removeEventListener('touchend', this.penUp);
window.removeEventListener('touchend', this.penUp);
} else {
this.canvas.removeEventListener('mousemove', this.penMove);
this.canvas.removeEventListener('mouseup', this.penUp);
window.removeEventListener('mouseup', this.penUp);
mouseUp = () => {
this.canvas.removeEventListener('mousemove', this.mouseMove);
window.removeEventListener('mouseup', this.mouseUp);
this.penUp(-1);
}
touchEnd = event => {
if (event.touches.length === 0) {
this.canvas.removeEventListener('touchmove', this.touchMove);
window.removeEventListener('touchend', this.touchEnd);
}
// Todo: Dispatch an action
this.isDownPen = false;
this.props.actions.addLine(this.positions, this.props.color, this.props.lineWidth);
this.positions = [];
this.penUp(event.changedTouches[0].identifier);
}
penUp(id) {
this.props.actions.addLine(this.positions[id], this.props.color, this.props.lineWidth);
delete this.positions[id];
}
render() {
return (
Expand All @@ -150,8 +160,8 @@ class Canvas extends React.Component {
width={this.props.width}
height={this.props.height}
style={this.getStyle()}
onMouseDown={this.penDown}
onTouchStart={this.penDown} />
onMouseDown={this.mouseDown}
onTouchStart={this.touchStart} />
);
}
}
Expand Down