Skip to content

Set progress text properly and runs the animation when the default progress is given #134

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set progress text properly and runs the animation when the default progress is given #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c55dc61
Runs the animation when the default progress is given
Nov 22, 2018
9d89f6a
Set progress text properly when given progress value is greater than 0
Dec 11, 2018
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
3 changes: 3 additions & 0 deletions Circle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ export class ProgressCircle extends Component {
super(props, context);

this.progressValue = 0;
if (props.animated) {
this.progressValue = props.progress._value;
}
}

componentWillMount() {
Expand Down
7 changes: 6 additions & 1 deletion withAnimation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function withAnimation(WrappedComponent, indeterminateProgress) {
constructor(props) {
super(props);

this.progressValue = Math.min(Math.max(props.progress, 0), 1);
this.progressValue = 0;
this.rotationValue = 0;
this.state = {
progress: new Animated.Value(this.progressValue),
Expand All @@ -33,6 +33,7 @@ export default function withAnimation(WrappedComponent, indeterminateProgress) {
}

componentDidMount() {
this.updateProgress(this.props);
this.state.progress.addListener(event => {
this.progressValue = event.value;
});
Expand Down Expand Up @@ -68,6 +69,10 @@ export default function withAnimation(WrappedComponent, indeterminateProgress) {
});
}
}
this.updateProgress(props)
}

updateProgress(props) {
const progress = props.indeterminate
? indeterminateProgress || 0
: Math.min(Math.max(props.progress, 0), 1);
Expand Down