Merge branch 'master' into sophie-ai-images

1 files changed, 19 insertions, 15 deletions

diff --git a/src/client/views/TouchScrollableMenu.tsx b/src/client/views/TouchScrollableMenu.tsx
index 969605be9..530c693a7 100644
--- a/src/client/views/TouchScrollableMenu.tsx
+++ b/src/client/views/TouchScrollableMenu.tsx
@@ -1,6 +1,6 @@
-import React = require("react");
-import { computed } from "mobx";
-import { observer } from "mobx-react";
+import * as React from 'react';
+import { computed } from 'mobx';
+import { observer } from 'mobx-react';
 
 export interface TouchScrollableMenuProps {
     options: JSX.Element[];
@@ -24,31 +24,35 @@ export interface TouchScrollableMenuItemProps {
 
 @observer
 export default class TouchScrollableMenu extends React.Component<TouchScrollableMenuProps> {
-
     @computed
-    private get possibilities() { return this.props.options; }
+    private get possibilities() {
+        return this.props.options;
+    }
 
     @computed
-    private get selectedIndex() { return this.props.selectedIndex; }
+    private get selectedIndex() {
+        return this.props.selectedIndex;
+    }
 
     render() {
         return (
-            <div className="inkToTextDoc-cont" style={{
-                transform: `translate(${this.props.x}px, ${this.props.y}px)`,
-                width: 300,
-                height: this.possibilities.length * 25
-            }}>
+            <div
+                className="inkToTextDoc-cont"
+                style={{
+                    transform: `translate(${this.props.x}px, ${this.props.y}px)`,
+                    width: 300,
+                    height: this.possibilities.length * 25,
+                }}>
                 <div className="inkToTextDoc-scroller" style={{ transform: `translate(0, ${-this.selectedIndex * 25}px)` }}>
                     {this.possibilities}
                 </div>
-                <div className="shadow" style={{ height: `calc(100% - 25px - ${this.selectedIndex * 25}px)` }}>
-                </div>
+                <div className="shadow" style={{ height: `calc(100% - 25px - ${this.selectedIndex * 25}px)` }}></div>
             </div>
         );
     }
 }
 
-export class TouchScrollableMenuItem extends React.Component<TouchScrollableMenuItemProps>{
+export class TouchScrollableMenuItem extends React.Component<TouchScrollableMenuItemProps> {
     render() {
         return (
             <div className="menuItem-cont" onClick={this.props.onClick}>
@@ -56,4 +60,4 @@ export class TouchScrollableMenuItem extends React.Component<TouchScrollableMenu
             </div>
         );
     }
-}
\ No newline at end of file
+}