Migrate ProgressBar to themr

react-toolbox · May 22, 2016 · 38cb1b0 · 38cb1b0
1 parent e5ef5e2
commit 38cb1b0
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 19 deletions.
diff --git a/components/progress_bar/ProgressBar.js b/components/progress_bar/ProgressBar.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import ClassNames from 'classnames';
-import style from './style';
+import classnames from 'classnames';
+import { themr } from 'react-css-themr';
 import prefixer from '../utils/prefixer';
 
 class ProgressBar extends React.Component {
@@ -9,8 +9,18 @@ class ProgressBar extends React.Component {
     className: React.PropTypes.string,
     max: React.PropTypes.number,
     min: React.PropTypes.number,
-    mode: React.PropTypes.string,
+    mode: React.PropTypes.oneOf(['determinate', 'indeterminate']),
     multicolor: React.PropTypes.bool,
+    theme: React.PropTypes.shape({
+      buffer: React.PropTypes.string.isRequired,
+      circle: React.PropTypes.string.isRequired,
+      circular: React.PropTypes.string.isRequired,
+      indeterminate: React.PropTypes.string.isRequired,
+      linear: React.PropTypes.string.isRequired,
+      multicolor: React.PropTypes.string.isRequired,
+      path: React.PropTypes.string.isRequired,
+      value: React.PropTypes.string.isRequired
+    }),
     type: React.PropTypes.oneOf(['linear', 'circular']),
     value: React.PropTypes.number
   };
@@ -51,8 +61,8 @@ class ProgressBar extends React.Component {
 
   renderCircular () {
     return (
-      <svg className={style.circle}>
-        <circle className={style.path} style={this.circularStyle()} cx='30' cy='30' r='25' />
+      <svg className={this.props.theme.circle}>
+        <circle className={this.props.theme.path} style={this.circularStyle()} cx='30' cy='30' r='25' />
       </svg>
     );
   }
@@ -61,30 +71,31 @@ class ProgressBar extends React.Component {
     const {buffer, value} = this.linearStyle();
     return (
       <div>
-        <span ref='buffer' data-ref='buffer' className={style.buffer} style={buffer}></span>
-        <span ref='value' data-ref='value' className={style.value} style={value}></span>
+        <span ref='buffer' data-ref='buffer' className={this.props.theme.buffer} style={buffer}></span>
+        <span ref='value' data-ref='value' className={this.props.theme.value} style={value}></span>
       </div>
     );
   }
 
   render () {
-    const className = ClassNames(style[this.props.type], {
-      [style[this.props.mode]]: this.props.mode,
-      [style.multicolor]: this.props.multicolor
-    }, this.props.className);
+    const { className, max, min, mode, multicolor, type, theme, value } = this.props;
+    const _className = classnames(theme[type], {
+      [theme[mode]]: mode,
+      [theme.multicolor]: multicolor
+    }, className);
 
     return (
       <div
         data-react-toolbox='progress-bar'
-        aria-valuenow={this.props.value}
-        aria-valuemin={this.props.min}
-        aria-valuemax={this.props.max}
-        className={className}
+        aria-valuenow={value}
+        aria-valuemin={min}
+        aria-valuemax={max}
+        className={_className}
       >
-        {this.props.type === 'circular' ? this.renderCircular() : this.renderLinear()}
+        {type === 'circular' ? this.renderCircular() : this.renderLinear()}
       </div>
     );
   }
 }
 
-export default ProgressBar;
+export default themr('ToolboxProgress')(ProgressBar);
diff --git a/components/progress_bar/readme.md b/components/progress_bar/readme.md
@@ -5,11 +5,12 @@ Minimize visual changes that occur while your app loads content by representing
 <!-- example -->
 ```jsx
 import ProgressBar from 'react-toolbox/lib/progress_bar';
+import theme from 'react-toolbox/lib/progress_bar/theme';
 
 const ProgressTest = () => (
   <div>
-    <ProgressBar type="circular" mode="indeterminate" />
-    <ProgressBar type="linear" mode="determinate" value={83} buffer={90}/>
+    <ProgressBar type="circular" mode="indeterminate" theme={theme} />
+    <ProgressBar type="linear" mode="determinate" value={83} buffer={90} theme={theme} />
   </div>
 );
 ```
@@ -27,3 +28,17 @@ const ProgressTest = () => (
 | `type`        | `String`    | `linear`        | Type of the progress bar, it can be `circular` or `linear`.|
 | `value`       | `Number`    | `0`             | Value of the current progress.|
 
+## Theming
+
+You can take a look to the `_config.scss` variables. The themed key for this component is `ToolboxProgress`, it should implement the following interface:
+
+| Name     | Description|
+|:---------|:-----------|
+| `buffer` | Used to style the buffer element in the linear progress.|
+| `circle` | Used for the circle element in the circular progress.|
+| `circular` | Used for the root element when the type is circular.|
+| `indeterminate` | Added to the root element if mode is indeterminate.|
+| `linear` | Used for the root element when the type is linear.|
+| `multicolor` | Added to the root if the component is multicolor (circular).|
+| `path` | Used for the inner path in the circular progress.|
+| `value` | Used to style the value element in the linear progress.|
diff --git a/components/progress_bar/style.scss → components/progress_bar/theme.scss b/components/progress_bar/style.scss → components/progress_bar/theme.scss
diff --git a/spec/theme.js b/spec/theme.js
@@ -17,6 +17,7 @@ import ToolboxList from '../components/list/theme.scss';
 import ToolboxMenu from '../components/menu/theme.scss';
 import ToolboxNavigation from '../components/navigation/theme.scss';
 import ToolboxOverlay from '../components/overlay/theme.scss';
+import ToolboxProgress from '../components/progress_bar/theme.scss';
 import ToolboxRipple from '../components/ripple/theme.scss';
 import ToolboxTimePicker from '../components/time_picker/theme.scss';
 
@@ -39,6 +40,7 @@ export default defineTheme({
   ToolboxMenu,
   ToolboxNavigation,
   ToolboxOverlay,
+  ToolboxProgress,
   ToolboxRipple,
   ToolboxTimePicker
 });