From e08c0d5b228c8ca1103bb0d7368f3f65bb24b675 Mon Sep 17 00:00:00 2001 From: Fawn Date: Wed, 15 Jan 2020 17:49:37 -0500 Subject: abstracted mobile ink overlay stuff into its own component --- src/client/views/GestureOverlay.tsx | 53 +++---------------------------------- 1 file changed, 3 insertions(+), 50 deletions(-) (limited to 'src/client/views') diff --git a/src/client/views/GestureOverlay.tsx b/src/client/views/GestureOverlay.tsx index 7e74d1d33..81284b543 100644 --- a/src/client/views/GestureOverlay.tsx +++ b/src/client/views/GestureOverlay.tsx @@ -21,6 +21,7 @@ import { MainView } from "./MainView"; import { DocServer } from "../DocServer"; import { GestureContent, MobileInkBoxContent } from "../../server/Message"; import { Point } from "../northstar/model/idea/idea"; +import MobileInkOverlay from "../../mobile/MobileInkOverlay"; @observer export default class GestureOverlay extends Touchable { @@ -32,8 +33,6 @@ export default class GestureOverlay extends Touchable { @observable public Width: number = 5; @observable private showMobileInkOverlay: boolean = false; - @observable private mobileInkOverlaySize: { width: number, height: number } = { width: 500, height: 700 }; - @observable private mobileInkOverlayPosition: { x: number, y: number } = { x: 300, y: 0 }; private _d1: Doc | undefined; private thumbIdentifier?: number; @@ -247,55 +246,9 @@ export default class GestureOverlay extends Touchable { ); } - drawStrokeToMobileInkBox = (content: GestureContent) => { - console.log(content); - const { points, bounds } = content; - - const B = { - right: bounds.right + this.mobileInkOverlayPosition.x, - left: bounds.left + this.mobileInkOverlayPosition.x, - bottom: bounds.bottom + this.mobileInkOverlayPosition.y, - top: bounds.top + this.mobileInkOverlayPosition.y, - width: bounds.width, - height: bounds.height - }; - - const target = document.elementFromPoint(points[0].X, points[0].Y); - target?.dispatchEvent( - new CustomEvent("dashOnGesture", - { - bubbles: true, - detail: { - points: points, - gesture: GestureUtils.Gestures.Stroke, - bounds: B - } - } - ) - ); - } - @action enableMobileInkBox = (content: MobileInkBoxContent) => { - const { enableBox, width, height } = content; - console.log("enable box?", enableBox, width, height); - this.showMobileInkOverlay = enableBox; - this.mobileInkOverlaySize = { width: width ? width : 0, height: height ? height : 0 }; - this.mobileInkOverlayPosition = { x: 300, y: 25 }; // TODO put at center of screen - - } - - @computed get mobileInkOverlay() { - return ( -
- ); + this.showMobileInkOverlay = content.enableBox; } render() { @@ -304,7 +257,7 @@ export default class GestureOverlay extends Touchable { {this.currentStroke} {this.props.children} {this._palette} - {this.showMobileInkOverlay ? this.mobileInkOverlay : <>} + {this.showMobileInkOverlay ? : <>} ); } } -- cgit v1.2.3-70-g09d2