aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/InkingControl.tsx
diff options
context:
space:
mode:
authorAbdullah Ahmed <abdullah_ahmed@brown.edu>2019-08-13 11:02:45 -0400
committerAbdullah Ahmed <abdullah_ahmed@brown.edu>2019-08-13 11:02:45 -0400
commit6c8b7a4e74068178b0f6ca9e491441bf982b4622 (patch)
treecc52f43409819694359d5fcd07f6f01cbd39dea1 /src/client/views/InkingControl.tsx
parentb38e808dc7790cc8698824329ae63b3af210996c (diff)
parent9dd2a31b72e5e527e2dae3b68f856ab8da879e93 (diff)
Merge branch 'recommender_system' of https://github.com/browngraphicslab/Dash-Web into recommender_system
Diffstat (limited to 'src/client/views/InkingControl.tsx')
-rw-r--r--src/client/views/InkingControl.tsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/InkingControl.tsx b/src/client/views/InkingControl.tsx
index 58c83915b..3f40642b5 100644
--- a/src/client/views/InkingControl.tsx
+++ b/src/client/views/InkingControl.tsx
@@ -1,5 +1,5 @@
import { observable, action, computed, runInAction } from "mobx";
-import { ColorState } from 'react-color';
+import { ColorResult } from 'react-color';
import React = require("react");
import { observer } from "mobx-react";
import "./InkingControl.scss";
@@ -41,7 +41,7 @@ export class InkingControl extends React.Component {
}
@undoBatch
- switchColor = action((color: ColorState): void => {
+ switchColor = action((color: ColorResult): void => {
this._selectedColor = color.hex + (color.rgb.a !== undefined ? this.decimalToHexString(Math.round(color.rgb.a * 255)) : "ff");
if (InkingControl.Instance.selectedTool === InkTool.None) {
if (MainOverlayTextBox.Instance.SetColor(color.hex)) return;