Skip to content
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

fix(drawing): Moved creation of point timestamps from JS to UI thread #613

Merged
merged 1 commit into from
Feb 8, 2024
Merged

fix(drawing): Moved creation of point timestamps from JS to UI thread #613

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
8 changes: 4 additions & 4 deletions src/entities/drawer/ui/DrawingBoard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ const DrawingBoard: FC<Props> = props => {
points: [],
});

const onTouchStart = (x: number, y: number) => {
const drawPoint = new DrawPoint(x, y);
const onTouchStart = (x: number, y: number, time: number) => {
const drawPoint = new DrawPoint(x, y, time);

drawingValueLineRef.current = {
startTime: Date.now(),
Expand All @@ -54,8 +54,8 @@ const DrawingBoard: FC<Props> = props => {
onLog(drawPoint.scale(vector));
};

const onTouchProgress = (x: number, y: number) => {
const drawPoint = new DrawPoint(x, y);
const onTouchProgress = (x: number, y: number, time: number) => {
const drawPoint = new DrawPoint(x, y, time);

drawingValueLineRef.current.points.push(drawPoint);

Expand Down
22 changes: 14 additions & 8 deletions src/shared/ui/SketchCanvas/DrawingGesture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ type Refs = {
};

type Callbacks = {
onTouchStart: (touchInfo: Point) => void;
onTouchProgress: (touchInfo: Point, straightLine: boolean) => void;
onTouchStart: (touchInfo: Point, time: number) => void;
onTouchProgress: (
touchInfo: Point,
straightLine: boolean,
time: number,
) => void;
onTouchEnd: () => void;
};

Expand Down Expand Up @@ -76,19 +80,20 @@ function DrawingGesture(
}
})
.onBegin(event => {
runOnJS(onTouchStart)(event);
runOnJS(onTouchStart)(event, Date.now());
})
.onTouchesMove((event, manager) => {
const touchData = event.allTouches[0];
const time = Date.now();

if (isOutOfCanvas(touchData)) {
const finalPoint = normalizeCoordinates(touchData);

runOnJS(onTouchProgress)(finalPoint, true);
runOnJS(onTouchProgress)(finalPoint, true, time);

manager.end();
} else {
runOnJS(onTouchProgress)(touchData, false);
runOnJS(onTouchProgress)(touchData, false, time);
}
})
.onFinalize(() => {
Expand All @@ -99,19 +104,20 @@ function DrawingGesture(
Gesture.Pan()
.maxPointers(1)
.onBegin(event => {
runOnJS(onTouchStart)(event);
runOnJS(onTouchStart)(event, Date.now());
})
.onTouchesMove((event, manager) => {
const touchData = event.allTouches[0];
const time = Date.now();

if (isOutOfCanvas(touchData)) {
const finalPoint = normalizeCoordinates(touchData);

runOnJS(onTouchProgress)(finalPoint, true);
runOnJS(onTouchProgress)(finalPoint, true, time);

manager.end();
} else {
runOnJS(onTouchProgress)(touchData, false);
runOnJS(onTouchProgress)(touchData, false, time);
}
})
.onFinalize(() => {
Expand Down
27 changes: 15 additions & 12 deletions src/shared/ui/SketchCanvas/SketchCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export type SketchCanvasRef = {
type Props = {
initialLines: Array<Point[]>;
width: number;
onStrokeStart: (x: number, y: number) => void;
onStrokeChanged: (x: number, y: number) => void;
onStrokeStart: (x: number, y: number, time: number) => void;
onStrokeChanged: (x: number, y: number, time: number) => void;
onStrokeEnd: () => void;
};

Expand Down Expand Up @@ -53,17 +53,17 @@ const SketchCanvas = forwardRef<SketchCanvasRef, Props>((props, ref) => {
});

const onTouchStart = useCallback(
(touchInfo: Point) => {
(touchInfo: Point, time: number) => {
const path = lineSketcher.createLine(touchInfo);

canvasRef.current?.setPaths(currentPaths => [...currentPaths, path]);
callbacksRef.current.onStrokeStart(touchInfo.x, touchInfo.y);
callbacksRef.current.onStrokeStart(touchInfo.x, touchInfo.y, time);
},
[callbacksRef, lineSketcher],
);

const onTouchProgress = useCallback(
(touchInfo: Point, straightLine: boolean) => {
(touchInfo: Point, straightLine: boolean, time: number) => {
const lastDrawnPoint = lineSketcher.getLastPoint();

if (lastDrawnPoint) {
Expand All @@ -77,7 +77,7 @@ const SketchCanvas = forwardRef<SketchCanvasRef, Props>((props, ref) => {
}
}

callbacksRef.current.onStrokeChanged(touchInfo.x, touchInfo.y);
callbacksRef.current.onStrokeChanged(touchInfo.x, touchInfo.y, time);

canvasRef.current?.setPaths(currentPaths => {
const pathsCount = currentPaths.length;
Expand All @@ -99,8 +99,8 @@ const SketchCanvas = forwardRef<SketchCanvasRef, Props>((props, ref) => {
);

const createDot = useCallback(
(touchInfo: Point) => {
callbacksRef.current.onStrokeChanged(touchInfo.x, touchInfo.y);
(touchInfo: Point, time: number) => {
callbacksRef.current.onStrokeChanged(touchInfo.x, touchInfo.y, time);

canvasRef.current?.setPaths(currentPaths => {
const pathsCount = currentPaths.length;
Expand All @@ -118,10 +118,13 @@ const SketchCanvas = forwardRef<SketchCanvasRef, Props>((props, ref) => {
if (lineSketcher.getCurrentShape() === Shape.Dot) {
const firstPoint = lineSketcher.getFirstPoint() as Point;

createDot({
x: firstPoint.x + 1.5,
y: firstPoint.y + 1.5,
});
createDot(
{
x: firstPoint.x + 1.5,
y: firstPoint.y + 1.5,
},
Date.now(),
);
}

callbacksRef.current.onStrokeEnd();
Expand Down
Loading