Skip to content

Commit

Permalink
Merge branch 'main' into vvtimofeev-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
vvtimofeev authored Dec 19, 2024
2 parents c26e472 + 92e53a0 commit e34df71
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/components/Progress/ProgressInnerText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import {progressBlock} from './constants';

export interface ProgressInnerTextProps {
text?: string;
text?: React.ReactNode;
offset?: number;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Progress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ LANDING_BLOCK-->
| size | Sets the progress bar size. The progress bar text can only be displayed in `"m"` size. | `string` | `"m"` |
| stack | Configuration of composite progress bar. Not required if a `value` is provided. | `Array<Stack>` | |
| stackClassName | HTML `class` attribute of stack | `string` | |
| text | Text inside the progress bar | `string` | |
| text | Text inside the progress bar | `ReactNode` | |
| theme | Sets progress color | `string` | `"default"` |
| value | Current progress value. The available range is from 0 to 100. Using the `stack` property value is optional and is used as maxValue. | `number` | |

Expand Down
2 changes: 1 addition & 1 deletion src/components/Progress/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface ProgressGeneralProps extends QAProps {

export interface ProgressDefaultProps {
/** Text inside progress bar */
text: string;
text: React.ReactNode;
/** Theme */
theme: ProgressTheme;
/** Size. Text of progress bar is displayed in `m` size only. */
Expand Down

0 comments on commit e34df71

Please sign in to comment.