New: SpinnerButtonComponent

.sass-lint.yml

@@ -61,7 +61,7 @@ rules:
   indentation: 2
   leading-zero: 2
   nesting-depth: [2, max-depth: 4]
-  property-sort-order: 2
+  property-sort-order: 0
   property-units: [2, global: ['px', 's']]
   quotes: 2
   shorthand-values: 2

package.json

@@ -36,7 +36,7 @@
   ],
   "author": "Adslot",
   "devDependencies": {
-    "alexandria-adslot": "^4.0.0",
+    "alexandria-adslot": "^4.0.2",
     "autoprefixer": "^6.5.3",
     "babel-core": "^6.18.2",
     "babel-eslint": "^6.1.2",

scripts/git-hooks/pre-commit

@@ -12,8 +12,8 @@ then
     echo "👾  Installing node modules."
     npm install
     echo "📑  Compiling distribution files for release."
-    npm run -s dist && git add dist/*
-    exit 0
+    npm run -s dist && git add dist/* && exit 0
+    exit 1
   fi
 fi
 

src/components/Main.jsx

@@ -9,6 +9,7 @@ import moment from 'moment';
 import {
   Accordion,
   Button,
+  SpinnerButton,
   Checkbox,
   ConfirmModal,
   DatePicker,
@@ -327,6 +328,27 @@ class AppComponent extends React.Component {
           <div className="btn btn-inverse btn-success">Div</div>
         </div>
 
+        <h3>Spinner Buttons</h3>
+        <div className="btn-panel">
+          <SpinnerButton isLoading className="btn-borderless" bsSize="sm">
+            Small Borderless
+          </SpinnerButton>
+          <SpinnerButton isLoading bsStyle="success" bsSize="large">
+            Big Success
+          </SpinnerButton>
+          <SpinnerButton
+            isLoading
+            bsStyle="primary"
+          >
+            Primary
+          </SpinnerButton>
+          <SpinnerButton disabled>
+            Disabled
+          </SpinnerButton>
+          <SpinnerButton bsStyle="primary">
+            Not spinning
+          </SpinnerButton>
+        </div>
 
         <h1>Tabs</h1>
         <div className="btn-panel">

src/components/adslotUi/SpinnerButtonComponent.jsx

@@ -0,0 +1,43 @@
+import _ from 'lodash';
+import React, { PropTypes } from 'react';
+import classNames from 'classnames';
+
+import Button from 'react-bootstrap/lib/Button';
+import { Spinner } from 'alexandria-adslot';
+import 'styles/adslotUi/SpinnerButton.scss';
+import expandDts from '../../helpers/expandDtsHelper';
+
+const SpinnerButton = (props) => {
+  const {
+    isLoading,
+    children,
+    dts,
+  } = props;
+
+  return (
+    <Button
+      disabled={isLoading || props.disabled}
+      {..._.pick(props, _.keys(Button.propTypes))}
+      className={classNames('spinner-button-component', props.className)}
+      {...expandDts(dts)}
+    >
+      {isLoading ?
+        <div className="spinner-container">
+          <Spinner size={_.includes(['lg', 'large'], props.bsSize) ? 'medium' : 'small'} />
+        </div>
+      : null }
+      <div className={isLoading ? 'spinner-button-component-children-container' : null}>{children}</div>
+    </Button>
+  );
+};
+
+SpinnerButton.propTypes = _.assign({
+  isLoading: PropTypes.bool,
+  dts: PropTypes.string,
+}, Button.propTypes);
+
+SpinnerButton.defaultProps = {
+  isLoading: false,
+};
+
+export default SpinnerButton;

src/components/distributionEntry.js

@@ -1,6 +1,5 @@
 // Export the consumable components.
 import Accordion from 'components/adslotUi/AccordionComponent';
-import Button from 'react-bootstrap/lib/Button';
 import SearchBar from 'components/adslotUi/SearchBarComponent';
 import Checkbox from 'react-icheck/lib/Checkbox';
 import ConfirmModal from 'components/adslotUi/ConfirmModalComponent';
@@ -23,6 +22,8 @@ import SplitPane from 'components/adslotUi/SplitPaneComponent';
 import Tab from 'react-bootstrap/lib/Tab';
 import Tabs from 'react-bootstrap/lib/Tabs';
 import Toggle from 'react-toggle';
+import SpinnerButton from 'components/adslotUi/SpinnerButtonComponent';
+import Button from 'react-bootstrap/lib/Button';
 import TreePickerGrid from 'components/adslotUi/TreePickerGridComponent';
 import TreePickerNav from 'components/adslotUi/TreePickerNavComponent';
 import TreePickerNode from 'components/adslotUi/TreePickerNodeComponent';
@@ -50,19 +51,20 @@ import {
   Totals,
 } from 'alexandria-adslot';
 
-require('styles/_bootstrap-custom.scss');
-require('styles/_icheck-custom.scss');
-require('styles/_react-select-custom.scss');
-require('styles/_react-toggle-custom.scss');
-require('styles/_react-datepicker-custom.scss');
+import 'styles/_bootstrap-custom.scss';
+import 'styles/_icheck-custom.scss';
+import 'styles/_react-select-custom.scss';
+import 'styles/_react-toggle-custom.scss';
+import 'styles/_react-datepicker-custom.scss';
 
-module.exports = {
+export {
   Accordion,
   Alert,
   Avatar,
   BorderedWell,
   Breadcrumb,
   Button,
+  SpinnerButton,
   Card,
   Checkbox,
   ConfirmModal,
@@ -88,7 +90,7 @@ module.exports = {
   Radio,
   RadioGroup,
   SearchBar,
-  SearchField: Search,
+  Search as SearchField,
   Select,
   Slicey,
   SplitPane,

src/examples/exampleEntry.js

@@ -1,7 +1,7 @@
 import ExampleForm from './components/forms';
 import ExampleSelect from './components/selects';
 
-module.exports = {
+export {
   ExampleForm,
   ExampleSelect,
 };

src/styles/adslotUi/SpinnerButton.scss

@@ -0,0 +1,26 @@
+.spinner-button-component {
+  &-children-container {
+    visibility: hidden; // preserves width and height of button
+  }
+
+  .spinner-container {
+    position: absolute;
+    right: 0;
+    left: 0;
+    margin-right: auto;
+    margin-left: auto;
+
+    // workaround for vertical centering
+    .spinner-component {
+      .spinner {
+        &-small {
+          margin-top: 1px;
+        }
+
+        &-medium {
+          margin-top: -3px;
+        }
+      }
+    }
+  }
+}

test/components/adslotUi/SpinnerButtonComponentTest.jsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import SpinnerButton from 'components/adslotUi/SpinnerButtonComponent';
+import { Spinner } from 'alexandria-adslot';
+import { shallow } from 'enzyme';
+
+describe('SpinnerButtonComponent', () => {
+  it('should render with defaults', () => {
+    const element = shallow(<SpinnerButton>Test</SpinnerButton>);
+    expect(element.find(Spinner)).to.have.length(0);
+    const buttonElement = element.find('Button');
+    console.log(buttonElement.prop('disabled'));
+    expect(buttonElement.prop('disabled')).to.equal(false);
+    expect(buttonElement.prop('isLoading')).to.equal(undefined);
+    expect(element.children().last().text()).to.equal('Test');
+  });
+
+  it('should pass props to button', () => {
+    const element = shallow(
+      <SpinnerButton dts="test" bsStyle="primary" bsSize="lg" isLoading>Test</SpinnerButton>
+    );
+    expect(element.find(Spinner)).to.have.length(1);
+
+    const buttonElement = element.find('Button[data-test-selector="test"]');
+    expect(buttonElement.prop('bsStyle')).to.equal('primary');
+    expect(buttonElement.prop('bsSize')).to.equal('lg');
+    expect(buttonElement.prop('isLoading')).to.equal(undefined);
+  });
+
+  it('should be disabled in loading mode', () => {
+    const element = shallow(
+      <SpinnerButton isLoading>Test</SpinnerButton>
+    );
+    const buttonElement = element.find('Button');
+    console.log(buttonElement.prop('disabled'));
+    expect(buttonElement.prop('disabled')).to.equal(true);
+  });
+
+  it('should preserve disabled state even when not loading', () => {
+    const element = shallow(
+      <SpinnerButton disabled>Test</SpinnerButton>
+    );
+
+    const buttonElement = element.find('Button');
+    expect(buttonElement.prop('isLoading')).to.equal(undefined);
+    expect(buttonElement.prop('disabled')).to.equal(true);
+  });
+});