Skip to content

Commit f8eda2a

Browse files
author
Minh Tran
committed
Merge pull request #6 from mydearfriend/master
Add showSpinner prop
2 parents c3ff8a8 + 13491df commit f8eda2a

File tree

4 files changed

+51
-16
lines changed

4 files changed

+51
-16
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Example [here](http://codepen.io/vn38minhtran/pen/QjaZrm)
6262
| onTop | bool | false | Progress bar will ontop & height 100% |
6363
| autoIncrement | bool | false | if `true` percent will auto increment `Math.random() + 1 - Math.random()`% in `intervalTime` ms. |
6464
| intervalTime | number | 200 | Interval time for auto increment. |
65+
| showSpinner | bool | true | Pass `false` to hide spinner icon. |
6566

6667
## Example
6768

dist/react-progress-bar-plus.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/ProgressBar.js

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
'use strict';
22

3+
var _reactTransformHmr2 = require('react-transform-hmr');
4+
5+
var _reactTransformHmr3 = _interopRequireDefault(_reactTransformHmr2);
6+
7+
var _react = require('react');
8+
39
Object.defineProperty(exports, '__esModule', {
410
value: true
511
});
@@ -8,29 +14,46 @@ var _createClass = (function () { function defineProperties(target, props) { for
814

915
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1016

11-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
12-
1317
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
1418

1519
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
1620

17-
var _react = require('react');
18-
1921
var _react2 = _interopRequireDefault(_react);
2022

2123
var _classnames = require('classnames');
2224

2325
var _classnames2 = _interopRequireDefault(_classnames);
2426

27+
var _components = {
28+
_$ProgressBar: {
29+
displayName: 'ProgressBar'
30+
}
31+
};
32+
33+
var _reactComponentWrapper = (0, _reactTransformHmr3['default'])({
34+
filename: '/home/dmitry/projects/react-progress-bar-plus/src/ProgressBar.js',
35+
components: _components,
36+
locals: [module],
37+
imports: [_react]
38+
});
39+
40+
function _wrapComponent(uniqueId) {
41+
return function (ReactClass) {
42+
return _reactComponentWrapper(ReactClass, uniqueId);
43+
};
44+
}
45+
46+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
47+
2548
var ProgressBar = (function (_React$Component) {
2649
_inherits(ProgressBar, _React$Component);
2750

2851
function ProgressBar() {
2952
var _this = this;
3053

31-
_classCallCheck(this, ProgressBar);
54+
_classCallCheck(this, _ProgressBar);
3255

33-
_get(Object.getPrototypeOf(ProgressBar.prototype), 'constructor', this).apply(this, arguments);
56+
_get(Object.getPrototypeOf(_ProgressBar.prototype), 'constructor', this).apply(this, arguments);
3457

3558
this.state = {
3659
percent: this.props.percent
@@ -103,11 +126,11 @@ var ProgressBar = (function (_React$Component) {
103126
'div',
104127
{ className: className },
105128
_react2['default'].createElement('div', { className: 'react-progress-bar-percent', style: style }),
106-
_react2['default'].createElement(
129+
this.props.showSpinner ? _react2['default'].createElement(
107130
'div',
108131
{ className: 'react-progress-bar-spinner' },
109132
_react2['default'].createElement('div', { className: 'react-progress-bar-spinner-icon' })
110-
)
133+
) : null
111134
);
112135
}
113136
}], [{
@@ -116,7 +139,8 @@ var ProgressBar = (function (_React$Component) {
116139
percent: _react2['default'].PropTypes.number.isRequired,
117140
onTop: _react2['default'].PropTypes.bool,
118141
autoIncrement: _react2['default'].PropTypes.bool,
119-
intervalTime: _react2['default'].PropTypes.number
142+
intervalTime: _react2['default'].PropTypes.number,
143+
showSpinner: _react2['default'].PropTypes.bool
120144
},
121145
enumerable: true
122146
}, {
@@ -125,11 +149,14 @@ var ProgressBar = (function (_React$Component) {
125149
percent: -1,
126150
onTop: false,
127151
autoIncrement: false,
128-
intervalTime: 200
152+
intervalTime: 200,
153+
showSpinner: true
129154
},
130155
enumerable: true
131156
}]);
132157

158+
var _ProgressBar = ProgressBar;
159+
ProgressBar = _wrapComponent('_$ProgressBar')(ProgressBar) || ProgressBar;
133160
return ProgressBar;
134161
})(_react2['default'].Component);
135162

src/ProgressBar.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ class ProgressBar extends React.Component {
66
percent: React.PropTypes.number.isRequired,
77
onTop: React.PropTypes.bool,
88
autoIncrement: React.PropTypes.bool,
9-
intervalTime: React.PropTypes.number
9+
intervalTime: React.PropTypes.number,
10+
showSpinner: React.PropTypes.bool
1011
};
1112

1213
static defaultProps = {
1314
percent: -1,
1415
onTop: false,
1516
autoIncrement: false,
16-
intervalTime: 200
17+
intervalTime: 200,
18+
showSpinner: true
1719
};
1820

1921
state = {
@@ -83,9 +85,13 @@ class ProgressBar extends React.Component {
8385
return (
8486
<div className={className}>
8587
<div className="react-progress-bar-percent" style={style}/>
86-
<div className="react-progress-bar-spinner">
87-
<div className="react-progress-bar-spinner-icon"/>
88-
</div>
88+
{
89+
this.props.showSpinner ?
90+
<div className="react-progress-bar-spinner">
91+
<div className="react-progress-bar-spinner-icon"/>
92+
</div>
93+
: null
94+
}
8995
</div>
9096
);
9197
}

0 commit comments

Comments
 (0)