New: Add react-select component

- Custom style overrides - single and multi examples and tests - Downgraded sass naming convention errors to warnings until we can do inline/file based rules/exclusions - Added spacing between example components and removed unnecessary `<div>`s - `allowCreate` dependant on JedWatson/react-select#660 - Removed unnecessary box shadow length properties
Adslot · Jan 11, 2016 · 3f1611f · 3f1611f
1 parent 9e5ef63
commit 3f1611f
Show file tree

Hide file tree

Showing 8 changed files with 254 additions and 55 deletions.
diff --git a/.sass-lint.yml b/.sass-lint.yml
@@ -42,7 +42,9 @@ rules:
   force-pseudo-nesting: 2
 
   # Name Formats
-  class-name-format: 2
+  # TODO: When inline linting is supported set as error (https://github.com/sasstools/sass-lint/pull/402) and ignore
+  # in Select.scss
+  class-name-format: 1
   function-name-format: 2
   mixin-name-format: 2
   placeholder-name-format: 2

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   ],
   "author": "Adslot",
   "devDependencies": {
-    "alexandria-adslot": "^0.7.0",
+    "alexandria-adslot": "^0.7.1",
     "autoprefixer-loader": "^3.1.0",
     "babel-core": "^6.4.0",
     "babel-eslint": "^5.0.0-beta6",
@@ -90,6 +90,7 @@
   "dependencies": {
     "lodash": "^3.10.1",
     "react": "^0.14.6",
-    "react-dom": "^0.14.6"
+    "react-dom": "^0.14.6",
+    "react-select": "^1.0.0-beta8"
   }
 }
diff --git a/src/components/Main.js b/src/components/Main.js
@@ -8,21 +8,50 @@ import {
   Tab,
   Radio,
   RadioGroup,
+  Select,
   Toggle,
 } from './distributionEntry';
 
 require('styles/App.scss');
 
+const selectCountriesOptions = [
+  { value: 'au', label: 'Australia' },
+  { value: 'uk', label: 'United Kingdom' },
+  { value: 'us', label: 'United States' },
+  { value: 'lt', label: 'Lesotho', disabled: true },
+];
+
+const selectFlavoursOptions = [
+  { label: 'Chocolate', value: 'chocolate' },
+  { label: 'Vanilla', value: 'vanilla' },
+  { label: 'Strawberry', value: 'strawberry' },
+  { label: 'Caramel', value: 'caramel' },
+  { label: 'Cookies and Cream', value: 'cookiescream' },
+  { label: 'Peppermint', value: 'peppermint' },
+];
+
 class AppComponent extends React.Component {
   constructor(props) {
     super(props);
+    this.setSelectedCountry = this.setSelectedCountry.bind(this);
+    this.setSelectedFlavours = this.setSelectedFlavours.bind(this);
     this.toggleSimpleModal = this.toggleSimpleModal.bind(this);
 
     this.state = {
+      selectedCountry: 'au',
+      selectedFlavours: 'vanilla',
       showSimpleModal: false,
     };
   }
 
+  setSelectedCountry(newValue) {
+    this.setState({ selectedCountry: newValue.value });
+  }
+
+  setSelectedFlavours(newValue) {
+    this.setState({ selectedFlavours: newValue });
+  }
+
   toggleSimpleModal() {
     this.setState({ showSimpleModal: !this.state.showSimpleModal });
   }
@@ -107,52 +136,73 @@ class AppComponent extends React.Component {
           </Modal.Footer>
         </Modal>
 
+
         <h1>Checkboxes</h1>
-        <div className="example-component-panel">
-          <Checkbox label="Unchecked" />
-        </div>
-        <div className="example-component-panel">
-          <Checkbox label="Checked" checked />
-        </div>
-        <div className="example-component-panel">
-          <Checkbox label="Disabled" disabled />
-        </div>
-        <div className="example-component-panel">
-          <Checkbox label="Checked and Disabled" checked disabled />
-        </div>
+        <Checkbox label="Unchecked" />
+        <br />
+        <Checkbox label="Checked" checked />
+        <br />
+        <Checkbox label="Disabled" disabled />
+        <br />
+        <Checkbox label="Checked and Disabled" checked disabled />
+
+
         <h1>Radio Buttons</h1>
-        <div className="example-component-panel">
-          <RadioGroup name="testRadio" value="2">
-            <Radio
-              label="Unchecked"
-              value="1"
-            />
-            <Radio
-              label="Checked"
-              value="2"
-            />
-          </RadioGroup>
-        </div>
-        <div className="example-component-panel">
-          <RadioGroup name="testRadio" value="2">
-            <Radio
-              label="Disabled"
-              value="1"
-              disabled
-            />
-            <Radio
-              label="Checked and Disabled"
-              value="2"
-              disabled
-              checked
-            />
-          </RadioGroup>
-        </div>
+        <RadioGroup name="testRadio" value="2">
+          <Radio
+            label="Unchecked"
+            value="1"
+          />
+          <Radio
+            label="Checked"
+            value="2"
+          />
+        </RadioGroup>
+        <br />
+        <RadioGroup name="testRadio" value="2">
+          <Radio
+            label="Disabled"
+            value="1"
+            disabled
+          />
+          <Radio
+            label="Checked and Disabled"
+            value="2"
+            disabled
+            checked
+          />
+        </RadioGroup>
+
 
         <h1>Toggle</h1>
-        <div className="example-component-panel">
-          <Toggle />
-        </div>
+        <span>Left</span> <Toggle /> <span>Right</span>
+
+
+        <h1>Select</h1>
+        <Select
+          clearable={false}
+          name="countriesSelect"
+          noResultsText="Sorry, couldn't find that country."
+          onChange={this.setSelectedCountry}
+          options={selectCountriesOptions}
+          placeholder="Countries"
+          value={this.state.selectedCountry}
+        />
+
+        <br />
+
+        <Select
+          addLabelText="Add '{label}' flavour?"
+          allowCreate // Not implemented by react-select v1.0.0-beta8 TODO: When supported, check it works.
+          multi
+          name="flavoursSelect"
+          noResultsText="Noooo, no flavours :("
+          onChange={this.setSelectedFlavours}
+          options={selectFlavoursOptions}
+          placeholder="Select your favs."
+          simpleValue
+          value={this.state.selectedFlavours}
+        />
       </div>
     );
   }

diff --git a/src/components/distributionEntry.js b/src/components/distributionEntry.js
@@ -2,6 +2,7 @@
 
 require('styles/_bootstrap-custom.scss');
 require('styles/_icheck-custom.scss');
+require('styles/_react-select-custom.scss');
 require('styles/_react-toggle-custom.scss');
 
 import Button from 'react-bootstrap/lib/Button';
@@ -24,6 +25,8 @@ import {
   Totals,
 } from 'alexandria-adslot';
 
+import Select from 'react-select';
+
 module.exports = {
   Alert,
   Breadcrumb,
@@ -37,6 +40,7 @@ module.exports = {
   Radio,
   RadioGroup,
   Search,
+  Select,
   Slicey,
   Tab,
   Tabs,

diff --git a/src/styles/App.scss b/src/styles/App.scss
@@ -23,4 +23,8 @@ body {
   > .btn-panel + .btn-panel {
     margin-top: $spacing-etalon;
   }
+
+  > br {
+    line-height: $spacing-etalon;
+  }
 }
diff --git a/src/styles/_react-select-custom.scss b/src/styles/_react-select-custom.scss
@@ -0,0 +1,83 @@
+@import 'variable';
+
+// control options
+$select-input-border-color: $color-border-lighter;
+$select-input-border-radius: $border-radius-base;
+$select-input-border-focus: $select-input-border-color;
+$select-input-height: 30px;
+$select-padding-vertical: 4px;
+$select-padding-horizontal: 7px;
+$select-text-color: $color-text;
+
+// menu options
+$select-option-color: $color-text-light;
+$select-option-focused-color: $select-option-color;
+$select-option-focused-bg: $color-gray-white;
+
+// clear "x" button
+$select-clear-color: $color-text-light;
+$select-clear-hover-color: $color-negative;
+
+// arrow indicator
+$select-arrow-color: $color-text-light;
+$select-arrow-color-hover: $color-text;
+
+// multi-select item
+$select-item-gutter: 4px;
+$select-item-color: $color-text-inverse;
+$select-item-hover-color: $color-text-light;
+$select-item-bg: $color-gray-darker;
+$select-item-hover-bg: $select-item-bg;
+$select-item-font-size: 11px;
+$select-item-padding-vertical: 0;
+$select-item-padding-horizontal: 5px;
+$select-item-border-radius: 0;
+
+
+@import '../../node_modules/react-select/scss/default';
+
+
+.Select {
+  &:not(.is-disabled) {
+    .Select-control {
+      box-shadow: 0 1px $color-border-light;
+
+      &:hover,
+      &:focus {
+        box-shadow: 0 2px $color-border-light;
+      }
+    }
+
+    &.is-open,
+    &.is-focused {
+      &:not(.is-open) {
+        > .Select-control {
+          border-color: $color-border-lighter;
+        }
+      }
+    }
+  }
+
+  &--multi {
+    $multi-select-value-height: $select-input-height - ($select-item-padding-horizontal * 2);
+
+    .Select-value {
+      border: 0;
+      height: $multi-select-value-height;
+
+      &-icon,
+      &-label {
+        line-height: 1;
+        margin-top: 3px;
+      }
+
+      &-icon {
+        border: 0;
+        float: right;
+        font-size: $font-size-subheader;
+        text-align: left;
+        width: 13px;
+      }
+    }
+  }
+}
diff --git a/src/styles/bootstrapOverrides/Button.scss b/src/styles/bootstrapOverrides/Button.scss
@@ -67,7 +67,7 @@
 }
 
 .btn {
-  box-shadow: 0 1px 0 $color-border-light;
+  box-shadow: 0 1px $color-border-light;
   margin-right: 5px;
 
   // Make border the same colour as the fill.
@@ -86,7 +86,7 @@
 
   &:hover,
   &:focus {
-    box-shadow: 0 2px 0 $color-border-light;
+    box-shadow: 0 2px $color-border-light;
     transform: translateY(-1px);
   }