aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-03-08 17:53:36 -0500
committerbob <bcz@cs.brown.edu>2019-03-08 17:53:36 -0500
commitb52a583deffe7a3729e182840c0e3f1b1a4e4433 (patch)
tree498c86c8b184f9307b3043c8d3cfab7796ba97c3 /src/client
parentd3e66a67406447682c59045a0130d884fe1045a6 (diff)
fixed network updating of ink
Diffstat (limited to 'src/client')
-rw-r--r--src/client/views/InkingCanvas.tsx11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/client/views/InkingCanvas.tsx b/src/client/views/InkingCanvas.tsx
index 14a779837..0d87c1239 100644
--- a/src/client/views/InkingCanvas.tsx
+++ b/src/client/views/InkingCanvas.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react";
-import { action } from "mobx";
+import { action, computed } from "mobx";
import { InkingControl } from "./InkingControl";
import React = require("react");
import { Transform } from "../util/Transform";
@@ -11,6 +11,8 @@ import { InkingStroke } from "./InkingStroke";
import "./InkingCanvas.scss"
import { CollectionDockingView } from "./collections/CollectionDockingView";
import { Utils } from "../../Utils";
+import { FieldWaiting } from "../../fields/Field";
+import { getMapLikeKeys } from "mobx/lib/internal";
interface InkCanvasProps {
@@ -28,8 +30,13 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
super(props);
}
+ @computed
get inkData(): StrokeMap {
- return new Map(this.props.Document.GetData(KeyStore.Ink, InkField, new Map));
+ let map = this.props.Document.GetT(KeyStore.Ink, InkField);
+ if (!map || map === FieldWaiting) {
+ return new Map;
+ }
+ return new Map(map.Data);
}
set inkData(value: StrokeMap) {