refactoring

scm-ui-components/packages/ui-components/src/forms/Select.js

@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import {Help} from "../index";
+import {LabelWithHelpIcon} from "../index";
 
 export type SelectItem = {
   value: string,
@@ -30,33 +30,15 @@ class Select extends React.Component<Props> {
     this.props.onChange(event.target.value);
   };
 
-  renderLabel = () => {
-    const label = this.props.label;
-    if (label) {
-      return <label className="label">{label}</label>;
-    }
-    return "";
-  };
-
-  renderHelp = () => {
-    const helpText = this.props.helpText;
-    if(helpText){
-      return (
-        <div className="control columns is-vcentered">
-          <Help message={helpText} />
-        </div>);
-    }
-    else
-      return null;
-  };
-
   render() {
-    const { options, value } = this.props;
+    const { options, value, label, helpText } = this.props;
 
     return (
       <div className="field">
-        {this.renderLabel()}
-        <div className="field is-grouped">
+        <LabelWithHelpIcon
+          label={label}
+          helpText={helpText}
+        />
         <div className="control select">
           <select
             ref={input => {
@@ -74,8 +56,6 @@ class Select extends React.Component<Props> {
             })}
           </select>
         </div>
-          {this.renderHelp()}
-        </div>
       </div>
     );
   }