Skip to content
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

Jump to bottom

[CircularProgress] Accept as string size property #9700

Merged
merged 1 commit into from
Jan 2, 2018
Merged

[CircularProgress] Accept as string size property #9700

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
2 changes: 1 addition & 1 deletion pages/api/circular-progress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ filename: /src/Progress/CircularProgress.js
| max | number | 100 | The max value of progress in determinate mode. |
| min | number | 0 | The min value of progress in determinate mode. |
| mode | enum:&nbsp;'determinate'&nbsp;&#124;<br>&nbsp;'indeterminate'<br> | 'indeterminate' | The mode of show your progress. Indeterminate for when there is no value for progress. Determinate for controlled progress value. |
| size | number | 40 | The size of the circle. |
| size | union:&nbsp;number&nbsp;&#124;<br>&nbsp;string<br> | 40 | The size of the circle. |
| thickness | number | 3.6 | The thickness of the circle. |
| value | number | 0 | The value of progress in determinate mode. |

Expand Down
2 changes: 1 addition & 1 deletion src/Progress/CircularProgress.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface CircularProgressProps
max?: number;
min?: number;
mode?: 'determinate' | 'indeterminate';
size?: number;
size?: number | string;
thickness?: number;
value?: number;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Progress/CircularProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ CircularProgress.propTypes = {
/**
* The size of the circle.
*/
size: PropTypes.number,
size: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
/**
* @ignore
*/
Expand Down