Merge remote-tracking branch 'upstream/develop' into develop

1 files changed, 64 insertions, 14 deletions

diff --git a/ui/app/components/text-field/text-field.component.js b/ui/app/components/text-field/text-field.component.js
index 6fd3b82b4..2c72d8124 100644
--- a/ui/app/components/text-field/text-field.component.js
+++ b/ui/app/components/text-field/text-field.component.js
@@ -1,45 +1,92 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { withStyles } from 'material-ui/styles'
-import { default as MaterialTextField } from 'material-ui/TextField'
+import { withStyles } from '@material-ui/core/styles'
+import { default as MaterialTextField } from '@material-ui/core/TextField'
+
+const inputLabelBase = {
+  transform: 'none',
+  transition: 'none',
+  position: 'initial',
+  color: '#5b5b5b',
+}
 
 const styles = {
-  cssLabel: {
-    '&$cssFocused': {
+  materialLabel: {
+    '&$materialFocused': {
       color: '#aeaeae',
     },
-    '&$cssError': {
+    '&$materialError': {
       color: '#aeaeae',
     },
     fontWeight: '400',
     color: '#aeaeae',
   },
-  cssFocused: {},
-  cssUnderline: {
+  materialFocused: {},
+  materialUnderline: {
     '&:after': {
-      backgroundColor: '#f7861c',
+      borderBottom: '2px solid #f7861c',
+    },
+  },
+  materialError: {},
+  // Non-material styles
+  formLabel: {
+    '&$formLabelFocused': {
+      color: '#5b5b5b',
+    },
+    '&$materialError': {
+      color: '#5b5b5b',
     },
   },
-  cssError: {},
+  formLabelFocused: {},
+  inputFocused: {},
+  inputRoot: {
+    'label + &': {
+      marginTop: '8px',
+    },
+    border: '1px solid #d2d8dd',
+    height: '48px',
+    borderRadius: '4px',
+    padding: '0 16px',
+    display: 'flex',
+    alignItems: 'center',
+    '&$inputFocused': {
+      border: '1px solid #2f9ae0',
+    },
+  },
+  largeInputLabel: {
+    ...inputLabelBase,
+    fontSize: '1rem',
+  },
+  inputLabel: {
+    ...inputLabelBase,
+    fontSize: '.75rem',
+  },
 }
 
 const TextField = props => {
-  const { error, classes, ...textFieldProps } = props
+  const { error, classes, material, startAdornment, largeLabel, ...textFieldProps } = props
 
   return (
     <MaterialTextField
       error={Boolean(error)}
       helperText={error}
       InputLabelProps={{
+        shrink: material ? undefined : true,
+        className: material ? '' : (largeLabel ? classes.largeInputLabel : classes.inputLabel),
         FormLabelClasses: {
-          root: classes.cssLabel,
-          focused: classes.cssFocused,
-          error: classes.cssError,
+          root: material ? classes.materialLabel : classes.formLabel,
+          focused: material ? classes.materialFocused : classes.formLabelFocused,
+          error: classes.materialError,
         },
       }}
       InputProps={{
+        startAdornment: startAdornment || undefined,
+        disableUnderline: !material,
         classes: {
-          underline: classes.cssUnderline,
+          root: material ? '' : classes.inputRoot,
+          input: material ? '' : classes.input,
+          underline: material ? classes.materialUnderline : '',
+          focused: material ? '' : classes.inputFocused,
         },
       }}
       {...textFieldProps}
@@ -54,6 +101,9 @@ TextField.defaultProps = {
 TextField.propTypes = {
   error: PropTypes.string,
   classes: PropTypes.object,
+  material: PropTypes.bool,
+  startAdornment: PropTypes.element,
+  largeLabel: PropTypes.bool,
 }
 
 export default withStyles(styles)(TextField)