merged with master

1 files changed, 7 insertions, 15 deletions

diff --git a/src/client/views/InkingStroke.tsx b/src/client/views/InkingStroke.tsx
index d724421d3..615f8af7e 100644
--- a/src/client/views/InkingStroke.tsx
+++ b/src/client/views/InkingStroke.tsx
@@ -6,6 +6,8 @@ import React = require("react");
 
 
 interface StrokeProps {
+    offsetX: number;
+    offsetY: number;
     id: string;
     line: Array<{ x: number, y: number }>;
     color: string;
@@ -21,23 +23,14 @@ export class InkingStroke extends React.Component<StrokeProps> {
     @observable private _strokeColor: string = this.props.color;
     @observable private _strokeWidth: string = this.props.width;
 
-    private _canvasColor: string = "#cdcdcd";
-
-    deleteStroke = (e: React.MouseEvent): void => {
+    deleteStroke = (e: React.PointerEvent): void => {
         if (InkingControl.Instance.selectedTool === InkTool.Eraser && e.buttons === 1) {
             this.props.deleteCallback(this.props.id);
         }
     }
 
     parseData = (line: Array<{ x: number, y: number }>): string => {
-        if (line.length === 0) {
-            return "";
-        }
-        const pathData = "M " +
-            line.map(p => {
-                return p.x + " " + p.y;
-            }).join(" L ");
-        return pathData;
+        return !line.length ? "" : "M " + line.map(p => (p.x + this.props.offsetX) + " " + (p.y + this.props.offsetY)).join(" L ");
     }
 
     createStyle() {
@@ -52,15 +45,14 @@ export class InkingStroke extends React.Component<StrokeProps> {
         }
     }
 
-
     render() {
         let pathStyle = this.createStyle();
         let pathData = this.parseData(this.props.line);
 
+        let pointerEvents: any = InkingControl.Instance.selectedTool == InkTool.Eraser ? "all" : "none";
         return (
-            <path className={(this._strokeTool === InkTool.Highlighter) ? "highlight" : ""}
-                d={pathData} style={pathStyle} strokeLinejoin="round" strokeLinecap="round"
-                onMouseOver={this.deleteStroke} onMouseDown={this.deleteStroke} />
+            <path d={pathData} style={{ ...pathStyle, pointerEvents: pointerEvents }} strokeLinejoin="round" strokeLinecap="round"
+                onPointerOver={this.deleteStroke} onPointerDown={this.deleteStroke} />
         )
     }
 }
\ No newline at end of file