Skip to content

Fix empty ref and adding auto refresh #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duynguyenhoang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix empty ref and adding auto refresh #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// .babelrc
{
"presets": ["es2015"],
"plugins": ["transform-react-jsx", "babel-plugin-add-module-exports"]
}
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@

## Usage

Accepted props:

`refreshTimeout`: The milisecond you want to refresh your progress, it will stop and start again.

`className`: Your custom class name

Include `react-progress-2/main.css` to your project. With [SystemJS CSS plugin](https://github.com/systemjs/plugin-css) you simply need to write this line:
```js
import "react-progress-2/main.css!"
Expand Down
4 changes: 2 additions & 2 deletions dev/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import Progress from '../src/main'
class Application extends React.Component {
render() {
return (
<div className='application'>
<Progress.Component />
<div className="application">
<Progress.Component refreshTimeout={3000} className="my-progress" />
<button onClick={this.showProgress}>Show progress</button>
<button onClick={this.hideProgress}>Hide progress</button>
</div>
Expand Down
48 changes: 23 additions & 25 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,46 @@
'use strict';

Object.defineProperty(exports, '__esModule', {
Object.defineProperty(exports, "__esModule", {
value: true
});

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

var _react = require('react');

var _react2 = _interopRequireDefault(_react);

var Component = _react2['default'].createClass({
displayName: 'Component',
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var Component = _react2.default.createClass({
count: 0,
runningTimerId: null,
refreshTimerId: null,
hidingTimerId: null,

getInitialState: function getInitialState() {
return {
state: 'hidden'
};
},

getDefaultProps: function getDefaultProps() {
return {
cls: ''
className: '',
refreshTimeout: 0
};
},

render: function render() {
var cls = 'loader-60devs ' + this.props.cls;
var className = 'loader-60devs ' + this.props.className;

return _react2['default'].createElement(
return _react2.default.createElement(
'div',
{ className: cls, 'data-state': this.state.state, ref: 'element' },
_react2['default'].createElement('div', { className: 'loader-60devs-progress' })
{ className: className, 'data-state': this.state.state, ref: 'element' },
_react2.default.createElement('div', { className: 'loader-60devs-progress' })
);
},

show: function show() {
if (++this.count > 1) return;

clearTimeout(this.hidingTimerId);

clearTimeout(this.refreshTimerId);
var element = this.refs.element;

var progressEl = element.querySelector('.loader-60devs-progress');
Expand All @@ -55,38 +52,39 @@ var Component = _react2['default'].createClass({
element.setAttribute('data-state', '');
element.offsetHeight;
element.setAttribute('data-state', 'running');
var that = this;
if (this.props.refreshTimeout > 0) {
this.refreshTimerId = setTimeout(function () {
that.hide();
that.show();
}, this.props.refreshTimeout);
}
},

hide: function hide() {
if (--this.count > 0) return;

clearTimeout(this.refreshTimerId);
this.refs.element.setAttribute('data-state', 'finishing');
this.hidingTimerId = setTimeout(this.toHiddenState, 500);
},

hideAll: function hideAll() {
this.count = 1;
this.hide();
},

toHiddenState: function toHiddenState() {
this.refs.element.setAttribute('data-state', 'hidden');
this.refs.element && this.refs.element.setAttribute('data-state', 'hidden');
},

componentWillMount: function componentWillMount() {
Component.instance = this;
},

componentWillUnmount: function componentWillUnmount() {
delete Component.instance;
},

isVisible: function isVisible() {
return this.refs.element.getAttribute('data-state') != 'hidden';
return this.refs.element && this.refs.element.getAttribute('data-state') != 'hidden';
}
});

exports['default'] = {
exports.default = {
Component: Component,
show: function show() {
Component.instance.show();
Expand All @@ -101,4 +99,4 @@ exports['default'] = {
return Component.instance.isVisible();
}
};
module.exports = exports['default'];
module.exports = exports['default'];
9 changes: 8 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@
"version": "4.2.1",
"description": "React progress 2",
"scripts": {
"build": "babel src -d lib --ignore __tests__",
"test": "echo \"Error: no test specified\" && exit 1"
},
"main": "lib/main.js",
"dependencies": {},
"devDependencies": {},
"devDependencies": {
"babel-cli": "^6.18.0",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-latest": "^6.16.0",
"babel-register": "^6.18.0",
"babel-plugin-transform-react-jsx": "^6.18.0"
},
"repository": {
"type": "git",
"url": "git+https://github.com/milworm/react-progress-2.git"
Expand Down
23 changes: 16 additions & 7 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React from 'react'
let Component = React.createClass({
count: 0,
runningTimerId: null,
refreshTimerId: null,
hidingTimerId: null,

getInitialState() {
Expand All @@ -13,15 +14,16 @@ let Component = React.createClass({

getDefaultProps() {
return {
cls: ''
className: '',
refreshTimeout: 0,
}
},

render() {
let cls = `loader-60devs ${this.props.cls}`
let className = `loader-60devs ${this.props.className}`

return (
<div className={cls} data-state={this.state.state} ref="element">
<div className={className} data-state={this.state.state} ref="element">
<div className="loader-60devs-progress"></div>
</div>
)
Expand All @@ -32,7 +34,7 @@ let Component = React.createClass({
return

clearTimeout(this.hidingTimerId)

clearTimeout(this.refreshTimerId)
var {element} = this.refs
let progressEl = element.querySelector('.loader-60devs-progress')

Expand All @@ -43,12 +45,19 @@ let Component = React.createClass({
element.setAttribute('data-state', '')
element.offsetHeight
element.setAttribute('data-state', 'running')
var that = this;
if (this.props.refreshTimeout > 0) {
this.refreshTimerId = setTimeout(function() {
that.hide();
that.show();
}, this.props.refreshTimeout);
}
},

hide() {
if(-- this.count > 0)
return

clearTimeout(this.refreshTimerId)
this.refs.element.setAttribute('data-state', 'finishing')
this.hidingTimerId = setTimeout(this.toHiddenState, 500)
},
Expand All @@ -59,7 +68,7 @@ let Component = React.createClass({
},

toHiddenState() {
this.refs.element.setAttribute('data-state', 'hidden')
this.refs.element && this.refs.element.setAttribute('data-state', 'hidden')
},

componentWillMount() {
Expand All @@ -71,7 +80,7 @@ let Component = React.createClass({
},

isVisible() {
return this.refs.element.getAttribute('data-state') != 'hidden'
return this.refs.element && this.refs.element.getAttribute('data-state') != 'hidden'
}
})

Expand Down