From 55c9549ec507d6bf3343803f9181b44d6cd32c25 Mon Sep 17 00:00:00 2001 From: chgibb Date: Tue, 10 Sep 2019 18:53:54 -0400 Subject: [PATCH] lint --- .../circularGenomeBuilderView.tsx | 4 +- .../containers/genomeBuilderOverlays.tsx | 19 +++--- .../containers/overlays/editContigOverlay.tsx | 68 ++++++++++--------- .../editCache/changeContigBodyColour.ts | 48 +++++++------ .../editCache/changeContigText.ts | 44 ++++++------ 5 files changed, 101 insertions(+), 82 deletions(-) diff --git a/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx b/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx index 693b1c368..5c701b1e3 100644 --- a/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx +++ b/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx @@ -12,8 +12,8 @@ import {GenomeBuilderAppBar} from "./containers/genomeBuilderAppBar"; import {GenomeBuilderOverlays} from "./containers/genomeBuilderOverlays"; import {CircularGenomeEditCache, CircularGenomeEditOpts, CircularGenomeEditAction} from "./editCache/cirularGenomeEditCache"; import {changeName} from "./editCache/changeName"; -import { changeContigText } from './editCache/changeContigText'; -import { changeContigBodyColour } from './editCache/changeContigBodyColour'; +import {changeContigText} from "./editCache/changeContigText"; +import {changeContigBodyColour} from "./editCache/changeContigBodyColour"; export interface CircularGenomeBuilderViewState { figureSelectOvelayOpen: boolean; diff --git a/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx b/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx index 4db711b3b..27722cc37 100644 --- a/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx +++ b/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx @@ -35,19 +35,20 @@ export function GenomeBuilderOverlays(this: CircularGenomeBuilderView, props: { { + onSave={(opts) => + { if(figure) { - if(opts.newName) - { - this.changeContigText(figure,opts.contigUuid,opts.newName); - } + if(opts.newName) + { + this.changeContigText(figure,opts.contigUuid,opts.newName); + } - if(opts.newBodyColour) - { - this.changeContigBodyColour(figure,opts.contigUuid,opts.newBodyColour); + if(opts.newBodyColour) + { + this.changeContigBodyColour(figure,opts.contigUuid,opts.newBodyColour); + } } - } }} onClose={() => { diff --git a/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx b/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx index 90c544e89..e4ba349dd 100644 --- a/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx +++ b/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx @@ -1,15 +1,15 @@ import * as React from "react"; -import { SketchPicker, ColorResult, RGBColor } from "react-color"; +import {SketchPicker, ColorResult, RGBColor} from "react-color"; -import { CircularFigure, Contig } from "../../../../circularFigure/circularFigure"; -import { GridWrapper } from "../../../../containers/gridWrapper"; -import { Grid } from "../../../../components/grid"; -import { IconButton } from "../../../../components/iconButton"; -import { blue } from "../../../../styles/colours"; -import { ChevronLeft } from "../../../../components/icons/chevronLeft"; -import { OutlinedInput } from "../../../../components/outlinedInput"; -import { Button } from '../../../../components/button'; -import { Typography } from '../../../../components/typography'; +import {CircularFigure, Contig} from "../../../../circularFigure/circularFigure"; +import {GridWrapper} from "../../../../containers/gridWrapper"; +import {Grid} from "../../../../components/grid"; +import {IconButton} from "../../../../components/iconButton"; +import {blue} from "../../../../styles/colours"; +import {ChevronLeft} from "../../../../components/icons/chevronLeft"; +import {OutlinedInput} from "../../../../components/outlinedInput"; +import {Button} from "../../../../components/button"; +import {Typography} from "../../../../components/typography"; export interface EditContigOverlayProps { onClose: () => void; @@ -28,19 +28,20 @@ export interface EditContigOverlayState { } -export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element { +export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element +{ let endteredName = ""; let enteredTextColour: ColorResult | undefined; let enteredBodyColour: ColorResult | undefined; return (
-
+
@@ -48,13 +49,13 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element {
-
+
Name in reference:
-
+
{props.contig.name} @@ -62,19 +63,20 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element {
-
+
Name to display:
-
+
{ + onChange: (event) => + { endteredName = event.target.value; } }} @@ -83,25 +85,26 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element {
-
+
Text opacity:
-
+
{ + onChange: (event) => + { if(event.target.value) { console.log(parseFloat(event.target.value)); if(parseFloat(event.target.value) == NaN) { - alert(`Opacity must be a number`); + alert("Opacity must be a number"); } } } @@ -111,18 +114,19 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element {
-
+
Text colour:
-
+
{ + onChange={(color: ColorResult) => + { enteredTextColour = color; }} /> @@ -130,18 +134,19 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element {
-
+
Body colour:
-
+
{ + onChange={(color: ColorResult) => + { enteredBodyColour = color; }} /> @@ -150,7 +155,7 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element {
-
+