From 87c3090f47f2ee86d7ac6c120307a7d461823e76 Mon Sep 17 00:00:00 2001
From: Matt Shwery <mshwery@gmail.com>
Date: Fri, 20 Jul 2018 12:29:43 -0500
Subject: [PATCH] Bug/select icon margin (#237)

* add padding for icon on Select, add SelectField, add docs

* wip. include in docs

* wip
---
 docs/src/componentRoutes.js                   |   4 +
 docs/src/utils/getComponent.js                |   3 +-
 src/select/docs/examples/Select-basic.example |   4 +
 src/select/docs/index.js                      |  66 +++++++++
 src/select/index.js                           |   1 +
 src/select/src/Select.js                      |   7 +-
 src/select/src/SelectField.js                 | 125 ++++++++++++++++++
 src/text-input/src/TextInputField.js          |   9 +-
 8 files changed, 210 insertions(+), 9 deletions(-)
 create mode 100644 src/select/docs/examples/Select-basic.example
 create mode 100644 src/select/docs/index.js
 create mode 100644 src/select/src/SelectField.js

diff --git a/docs/src/componentRoutes.js b/docs/src/componentRoutes.js
index c846e8fc2..0a30a0a40 100644
--- a/docs/src/componentRoutes.js
+++ b/docs/src/componentRoutes.js
@@ -48,6 +48,10 @@ module.exports = [
     name: 'Colors',
     path: '/components/colors'
   },
+  {
+    name: 'Select',
+    path: '/components/select'
+  },
   {
     name: 'Select Menu',
     path: '/components/select-menu'
diff --git a/docs/src/utils/getComponent.js b/docs/src/utils/getComponent.js
index 273c42a00..57d4938df 100644
--- a/docs/src/utils/getComponent.js
+++ b/docs/src/utils/getComponent.js
@@ -7,7 +7,6 @@ import buttonsDocs from '../../../src/buttons/docs'
 import autocompleteDocs from '../../../src/autocomplete/docs/'
 import comboboxDocs from '../../../src/combobox/docs/'
 // import badgesDocs from '../../src/badges/docs/'
-// import selectDocs from '../../src/select/docs/'
 import popoverDocs from '../../../src/popover/docs/'
 // import portalDocs from '../../src/portal/docs/'
 import textInputDocs from '../../../src/text-input/docs/'
@@ -29,6 +28,7 @@ import cornerDialogDocs from '../../../src/corner-dialog/docs/'
 import alertDocs from '../../../src/alert/docs/'
 import toasterDocs from '../../../src/toaster/docs/'
 import selectMenuDocs from '../../../src/select-menu/docs/'
+import selectDocs from '../../../src/select/docs/'
 
 const map = {
   radio: radioDocs,
@@ -41,6 +41,7 @@ const map = {
   layers: layersDocs,
   typography: typographyDocs,
   colors: colorsDocs,
+  select: selectDocs,
   'select menu': selectMenuDocs,
   'text input': textInputDocs,
   'search input': searchInputDocs,
diff --git a/src/select/docs/examples/Select-basic.example b/src/select/docs/examples/Select-basic.example
new file mode 100644
index 000000000..c8bc704ef
--- /dev/null
+++ b/src/select/docs/examples/Select-basic.example
@@ -0,0 +1,4 @@
+<Select onChange={(event) => alert(event.target.value)}>
+  <option value="foo" checked>Foo</option>
+  <option value="bar">Bar</option>
+</Select>
\ No newline at end of file
diff --git a/src/select/docs/index.js b/src/select/docs/index.js
new file mode 100644
index 000000000..d09e6be85
--- /dev/null
+++ b/src/select/docs/index.js
@@ -0,0 +1,66 @@
+import React from 'react'
+import Box from 'ui-box'
+import Component from '@reactions/component'
+import Select from '../src/Select'
+
+/* eslint-disable import/no-unresolved, import/no-webpack-loader-syntax */
+import sourceSelect from '!raw-loader!../src/Select'
+/* eslint-enable import/no-unresolved, import/no-webpack-loader-syntax */
+
+/**
+ * Code examples
+ */
+import exampleSelectBasic from './examples/Select-basic.example'
+
+const title = 'Select'
+const subTitle = 'A styled native <select> for choosing items from a list.'
+
+const introduction = (
+  <div>
+    <p>
+      The <code>Select</code> component is a styled wrapper around a native{' '}
+      <code>select</code> element, which allows selection of one item from a
+      dropdown list. Anytime you would reach for a native select, use this.
+    </p>
+  </div>
+)
+
+const appearanceOptions = null
+
+const scope = {
+  Box,
+  Select,
+  Component
+}
+
+const components = [
+  {
+    name: 'Select',
+    source: sourceSelect,
+    description: (
+      <p>
+        The <code>Select</code> component.
+      </p>
+    ),
+    examples: [
+      {
+        title: 'Basic Select Example',
+        description: (
+          <div>
+            <p>This example shows basic usage with a selected item.</p>
+          </div>
+        ),
+        codeText: exampleSelectBasic,
+        scope
+      }
+    ]
+  }
+]
+
+export default {
+  title,
+  subTitle,
+  introduction,
+  appearanceOptions,
+  components
+}
diff --git a/src/select/index.js b/src/select/index.js
index da47c1e96..aecb6ec4d 100644
--- a/src/select/index.js
+++ b/src/select/index.js
@@ -1 +1,2 @@
 export Select from './src/Select'
+export SelectField from './src/SelectField'
diff --git a/src/select/src/Select.js b/src/select/src/Select.js
index f3be8dc6f..91c195713 100644
--- a/src/select/src/Select.js
+++ b/src/select/src/Select.js
@@ -105,13 +105,14 @@ class Select extends PureComponent {
     const textSize = theme.getTextSizeForControlHeight(height)
     const borderRadius = theme.getBorderRadiusForControlHeight(height)
     const iconSize = theme.getIconSizeForSelect(height)
+    const iconMargin = height >= 36 ? 12 : 8
 
     return (
       <Box
         display="inline-flex"
         flex={1}
         position="relative"
-        width={200}
+        width="auto"
         height={height}
         {...props}
       >
@@ -130,6 +131,8 @@ class Select extends PureComponent {
           borderRadius={borderRadius}
           textTransform="default"
           paddingLeft={Math.round(height / 3.2)}
+          // Provide enough space for auto-sizing select including the icon
+          paddingRight={iconMargin * 2 + iconSize}
         >
           {children}
         </Text>
@@ -140,7 +143,7 @@ class Select extends PureComponent {
           position="absolute"
           top="50%"
           marginTop={-iconSize / 2}
-          right={height >= 36 ? 12 : 8}
+          right={iconMargin}
           pointerEvents="none"
         />
       </Box>
diff --git a/src/select/src/SelectField.js b/src/select/src/SelectField.js
new file mode 100644
index 000000000..3ceb129a1
--- /dev/null
+++ b/src/select/src/SelectField.js
@@ -0,0 +1,125 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import { splitBoxProps } from 'ui-box'
+import { FormField } from '../../form-field'
+import Select from './Select'
+
+let idCounter = 0
+
+export default class TextInputField extends PureComponent {
+  static propTypes = {
+    /**
+     * Composes the Select component as the base.
+     */
+    ...Select.propTypes,
+    ...FormField.propTypes,
+
+    /**
+     * The label used above the input element.
+     */
+    label: PropTypes.node.isRequired,
+
+    /**
+     * Passed on the label as a htmlFor prop.
+     */
+    labelFor: PropTypes.string,
+
+    /**
+     * Wether or not show a asterix after the label.
+     */
+    isRequired: PropTypes.bool,
+
+    /**
+     * A optional description of the field under the label, above the input element.
+     */
+    description: PropTypes.node,
+
+    /**
+     * A optional hint under the input element.
+     */
+    hint: PropTypes.node,
+
+    /**
+     * If a validation message is passed it is shown under the input element
+     * and above the hint.
+     */
+    validationMessage: PropTypes.node,
+
+    /**
+     * The height of the input element.
+     */
+    inputHeight: PropTypes.number,
+
+    /**
+     * The width of the input width.
+     */
+    inputWidth: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+  }
+
+  static defaultProps = {
+    /**
+     * The input width should be as wide as the form field.
+     */
+    inputWidth: '100%',
+    inputHeight: 32
+  }
+
+  state = {
+    id: (this.props.id || idCounter++).toString()
+  }
+
+  render() {
+    const {
+      // We are using the id from the state
+      id: unusedId,
+
+      // FormField props
+      hint,
+      label,
+      description,
+      validationMessage,
+
+      // TextInput props
+      inputHeight,
+      inputWidth,
+      disabled,
+      required,
+      isInvalid,
+      appearance,
+
+      // Rest props are spread on the FormField
+      ...props
+    } = this.props
+
+    const id = `SelectField-${this.state.id}`
+
+    /**
+     * Split the wrapper props from the input props.
+     */
+    const { matchedProps, remainingProps } = splitBoxProps(props)
+
+    return (
+      <FormField
+        marginBottom={24}
+        label={label}
+        isRequired={required}
+        hint={hint}
+        description={description}
+        validationMessage={validationMessage}
+        labelFor={id}
+        {...matchedProps}
+      >
+        <Select
+          id={id}
+          width={inputWidth}
+          height={inputHeight}
+          disabled={disabled}
+          required={required}
+          isInvalid={isInvalid}
+          appearance={appearance}
+          {...remainingProps}
+        />
+      </FormField>
+    )
+  }
+}
diff --git a/src/text-input/src/TextInputField.js b/src/text-input/src/TextInputField.js
index 12edd23d0..e90e26b70 100644
--- a/src/text-input/src/TextInputField.js
+++ b/src/text-input/src/TextInputField.js
@@ -64,11 +64,8 @@ export default class TextInputField extends PureComponent {
     inputHeight: 32
   }
 
-  constructor(props) {
-    super(props)
-    this.state = {
-      id: (props.id || idCounter++).toString()
-    }
+  state = {
+    id: (this.props.id || idCounter++).toString()
   }
 
   render() {
@@ -96,7 +93,7 @@ export default class TextInputField extends PureComponent {
       ...props
     } = this.props
 
-    const { id } = this.state
+    const id = `TextInputField-${this.state.id}`
 
     /**
      * Split the wrapper props from the input props.