Skip to content

ProgressBar custom borderRadius #3884

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
MIchaelZablianov wants to merge 1 commit into
base: master
Choose a base branch
from
+54 −25
Open

ProgressBar custom borderRadius #3884

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
33 changes: 32 additions & 1 deletion demo/src/screens/componentScreens/ProgressBarScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import {StyleSheet, ScrollView} from 'react-native';
import {View, Text, ProgressBar, Colors, Spacings} from 'react-native-ui-lib';//eslint-disable-line
import {View, Text, ProgressBar, Colors, Spacings, BorderRadiuses} from 'react-native-ui-lib';//eslint-disable-line


export default class ProgressBarScreen extends Component {
Expand Down Expand Up @@ -82,6 +82,37 @@ export default class ProgressBarScreen extends Component {
style={styles.progressBar}
customElement={this.customElement}
/>

<Text $textDefault text70 style={styles.text}>
Custom Border Radius 0
</Text>
<ProgressBar
progress={progresses[3]}
style={styles.progressBar}
borderRadius={BorderRadiuses.br0}
progressColor={Colors.blue50}
/>

<Text $textDefault text70 style={styles.text}>
Custom Border Radius 10
</Text>
<ProgressBar
progress={progresses[3]}
style={styles.progressBar}
borderRadius={BorderRadiuses.br10}
progressColor={Colors.red20}
/>

<Text $textDefault text70 style={styles.text}>
Custom Border Radius 0 for FullWidth
</Text>
<ProgressBar
progress={progresses[3]}
style={styles.fullWidthProgressBar}
borderRadius={BorderRadiuses.br0}
progressColor={Colors.blue50}
fullWidth
/>
</View>
</ScrollView>
);
Expand Down
40 changes: 16 additions & 24 deletions packages/react-native-ui-lib/src/components/progressBar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ interface Props {
* Custom element to render on top of the animated progress
*/
customElement?: JSX.Element;
/**
* Custom border radius for the progress bar
*/
borderRadius?: number;
testID?: string;
}
export type ProgressBarProps = Props;
Expand All @@ -49,7 +53,8 @@ class ProgressBar extends PureComponent<Props, State> {
static displayName = 'ProgressBar';

static defaultProps: Partial<Props> = {
progress: 0
progress: 0,
borderRadius: BorderRadiuses.br100
};

progressAnimation: Animated.Value;
Expand Down Expand Up @@ -100,29 +105,27 @@ class ProgressBar extends PureComponent<Props, State> {
}

getContainerStyle() {
const {fullWidth} = this.props;
const {fullWidth, borderRadius} = this.props;
const containerHeight = fullWidth ? FULL_WIDTH_CONTAINER_HEIGHT : CONTAINER_HEIGHT;
const tabletContainerHeight = fullWidth ? TABLET_FULL_WIDTH_CONTAINER_HEIGHT : TABLET_CONTAINER_HEIGHT;
const inlineStyle = fullWidth ? null : styles.inlineContainer;

return {
...inlineStyle,
height: Constants.isTablet ? tabletContainerHeight : containerHeight
height: Constants.isTablet ? tabletContainerHeight : containerHeight,
borderRadius
};
}

getProgressStyle() {
const {fullWidth, progressColor} = this.props;
const borderRadius = fullWidth ? styles.fullWidthProgressBorderRadius : styles.inlineBorderRadius;
const {fullWidth, progressColor, borderRadius} = this.props;
const progressStyle = {
right: Constants.isRTL ? undefined : this.state.containerWidth,
backgroundColor: progressColor || DEFAULT_COLOR
backgroundColor: progressColor || DEFAULT_COLOR,
borderRadius: fullWidth ? undefined : borderRadius,
borderBottomRightRadius: fullWidth ? borderRadius : undefined,
borderTopRightRadius: fullWidth ? borderRadius : undefined
};

return {
...borderRadius,
...progressStyle
};
return progressStyle;
}

renderCustomElement() {
Expand Down Expand Up @@ -167,11 +170,7 @@ export default asBaseComponent<ProgressBarProps, typeof ProgressBar>(ProgressBar
const styles = StyleSheet.create({
container: {
backgroundColor: Colors.$backgroundNeutralMedium,
overflow: 'hidden',
borderRadius: BorderRadiuses.br100
},
inlineContainer: {
borderRadius: BorderRadiuses.br100
overflow: 'hidden'
},
progress: {
position: 'absolute',
Expand All @@ -184,12 +183,5 @@ const styles = StyleSheet.create({
customElement: {
height: '100%',
width: '100%'
},
inlineBorderRadius: {
borderRadius: BorderRadiuses.br100
},
fullWidthProgressBorderRadius: {
borderBottomRightRadius: BorderRadiuses.br100,
borderTopRightRadius: BorderRadiuses.br100
}
});
6 changes: 6 additions & 0 deletions packages/react-native-ui-lib/src/components/progressBar/progressBar.api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
"name": "customElement",
"type": "JSX.Element",
"description": "Custom element to render on top of the animated progress"
},
{
"name": "borderRadius",
"type": "number",
"description": "Custom border radius for the progress bar",
"default": "BorderRadiuses.br100"
}
],
"snippet": [
Expand Down