From 23869bc33a92daa8637e1c848208690ecff1225d Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Thu, 4 Oct 2018 10:16:20 +0200 Subject: [PATCH] Fixed formatting for some of the files --- .../packages/ui-components/src/Help.js | 14 ++++--- .../ui-components/src/LabelWithHelpIcon.js | 32 ++++++---------- .../src/forms/AddEntryToTableField.js | 8 +++- .../ui-components/src/forms/Checkbox.js | 11 +++--- .../ui-components/src/forms/InputField.js | 37 +++++++++---------- .../ui-components/src/forms/Select.js | 7 +--- .../ui-components/src/forms/Textarea.js | 7 +--- .../packages/ui-components/src/index.js | 3 -- 8 files changed, 54 insertions(+), 65 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/Help.js b/scm-ui-components/packages/ui-components/src/Help.js index 9cd696d3e4..965d16f145 100644 --- a/scm-ui-components/packages/ui-components/src/Help.js +++ b/scm-ui-components/packages/ui-components/src/Help.js @@ -11,7 +11,7 @@ const styles = { float: "left", paddingLeft: "3px", float: "right" -} + } }; type Props = { @@ -24,10 +24,14 @@ class Help extends React.Component { const { message, classes } = this.props; const multiline = message.length > 60 ? "is-tooltip-multiline" : ""; return ( -
- -
+
+ +
); } } diff --git a/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js b/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js index f83f57b519..b5d049e68d 100644 --- a/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js +++ b/scm-ui-components/packages/ui-components/src/LabelWithHelpIcon.js @@ -1,6 +1,6 @@ //@flow import React from "react"; -import {Help} from "./index"; +import { Help } from "./index"; type Props = { label: string, @@ -8,7 +8,6 @@ type Props = { }; class LabelWithHelpIcon extends React.Component { - renderLabel = () => { const label = this.props.label; if (label) { @@ -19,35 +18,28 @@ class LabelWithHelpIcon extends React.Component { renderHelp = () => { const helpText = this.props.helpText; - if(helpText){ + if (helpText) { return (
-
); - } - else - return null; + + ); + } else return null; }; renderLabelWithHelpIcon = () => { - if(this.props.label){ - return( + if (this.props.label) { + return (
-
- {this.renderLabel()} +
{this.renderLabel()}
+ {this.renderHelp()}
- {this.renderHelp()} -
- ) - } - else - return null; + ); + } else return null; }; render() { - return ( - this.renderLabelWithHelpIcon() - ); + return this.renderLabelWithHelpIcon(); } } diff --git a/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js b/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js index 34197fc717..e5c04eb613 100644 --- a/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js +++ b/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js @@ -26,7 +26,13 @@ class AddEntryToTableField extends React.Component { } render() { - const { disabled, buttonLabel, fieldLabel, errorMessage, helpText} = this.props; + const { + disabled, + buttonLabel, + fieldLabel, + errorMessage, + helpText + } = this.props; return (
{ renderHelp = () => { const helpText = this.props.helpText; - if(helpText){ + if (helpText) { return (
-
); - } - else - return null; +
+ ); + } else return null; }; render() { diff --git a/scm-ui-components/packages/ui-components/src/forms/InputField.js b/scm-ui-components/packages/ui-components/src/forms/InputField.js index 4d9208d41f..79b71298f8 100644 --- a/scm-ui-components/packages/ui-components/src/forms/InputField.js +++ b/scm-ui-components/packages/ui-components/src/forms/InputField.js @@ -1,7 +1,7 @@ //@flow import React from "react"; import classNames from "classnames"; -import {LabelWithHelpIcon} from "../index"; +import { LabelWithHelpIcon } from "../index"; type Props = { label?: string, @@ -64,26 +64,23 @@ class InputField extends React.Component { "" ); return ( -
- + +
+ { + this.field = input; + }} + className={classNames("input", errorView)} + type={type} + placeholder={placeholder} + value={value} + onChange={this.handleInput} + onKeyPress={this.handleKeyPress} + disabled={disabled} /> -
- { - this.field = input; - }} - className={classNames("input", errorView)} - type={type} - placeholder={placeholder} - value={value} - onChange={this.handleInput} - onKeyPress={this.handleKeyPress} - disabled={disabled} - /> -
- {helper} +
+ {helper}
); } diff --git a/scm-ui-components/packages/ui-components/src/forms/Select.js b/scm-ui-components/packages/ui-components/src/forms/Select.js index 902d9c36dd..dd63872b19 100644 --- a/scm-ui-components/packages/ui-components/src/forms/Select.js +++ b/scm-ui-components/packages/ui-components/src/forms/Select.js @@ -1,6 +1,6 @@ //@flow import React from "react"; -import {LabelWithHelpIcon} from "../index"; +import { LabelWithHelpIcon } from "../index"; export type SelectItem = { value: string, @@ -35,10 +35,7 @@ class Select extends React.Component { return (
- +