Skip to content

refactor(Button): 使用Function组件重构 Class组件 #510

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

Merged
merged 1 commit into from
Feb 17, 2023
Merged

refactor(Button): 使用Function组件重构 Class组件 #510

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
4 changes: 2 additions & 2 deletions packages/core/src/Button/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Demo extends Component {
<Spacing/>
<Button disabled>disabled</Button>
<Spacing/>
<Button type="primary">primary</Button>
<Button type="primary" onPress={()=>console.log("The Button")}>primary</Button>
<Spacing/>
<Button type="warning">warning</Button>
<Spacing/>
Expand Down Expand Up @@ -181,7 +181,7 @@ export default Demo

```

### 自定义图标
### 自定义图标

```jsx mdx:preview

Expand Down
221 changes: 110 additions & 111 deletions packages/core/src/Button/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,121 +35,120 @@ export interface ButtonProps extends TouchableOpacityProps {
bordered?: boolean;
}

export default class ButtonView<T> extends React.Component<ButtonProps> {
static defaultProps: ButtonProps = {
activeOpacity: 0.5,
rounded: 5,
bordered: true,
size: 'default',
};
render() {
const {
children,
style,
textStyle: childStyle,
rounded,
bordered,
color: buttonColor,
type,
size,
disabled,
loading,
...restProps
} = this.props;
let backgroundColor, textColor, borderColor, borderWidth, borderRadius;
export default function ButtonView<T>(props: ButtonProps) {
const {
children,
style,
textStyle: childStyle,
rounded,
bordered,
color: buttonColor,
type,
size,
disabled,
loading,
...restProps
} = props;
let backgroundColor, textColor, borderColor, borderWidth, borderRadius;

switch (type) {
case 'warning':
backgroundColor = colors.yellow;
break;
case 'primary':
backgroundColor = colors.blue;
break;
case 'success':
backgroundColor = colors.green;
break;
case 'danger':
backgroundColor = colors.red;
break;
case 'light':
backgroundColor = colors.white;
break;
case 'dark':
backgroundColor = colors.black;
break;
default:
break;
}
if (backgroundColor) {
backgroundColor = color(backgroundColor).rgb().string();
}
if (type) {
textColor = color(backgroundColor).isLight()
? color(colors.black).rgb().string()
: color(colors.white).rgb().string();
}
if (!type) {
borderColor = color(colors.black).alpha(0.32).rgb().string();
borderWidth = 1;
}
if (disabled) {
textColor = color(textColor).alpha(0.3).rgb().string();
}
if (buttonColor) {
backgroundColor = color(buttonColor).rgb().string();
textColor = color(buttonColor).isLight()
? color(buttonColor).darken(0.9).string()
: color(buttonColor).lighten(0.9).string();
}
if (rounded && (typeof rounded === 'number' || typeof rounded === 'boolean')) {
borderRadius = rounded;
}
if (backgroundColor) {
borderColor = color(backgroundColor).darken(0.2).string();
borderWidth = 1;
}
if (!bordered) {
borderWidth = 0;
}
const buttonStyle = {
backgroundColor,
borderColor,
borderWidth,
borderRadius,
};
const textStyle = { color: textColor };
let sizeStyle = {};
if (size && styles[size]) {
sizeStyle = styles[size];
}
let boxStyle = {};
const styleKey = `${size}Box` as keyof typeof styles;
if (size && styles[styleKey]) {
boxStyle = styles[styleKey];
}
if (!children) {
return null;
}
return (
<TouchableOpacity
testID="RNE__Button__wrap"
style={[styles.button, styles.content, buttonStyle, boxStyle, style]}
disabled={disabled}
{...restProps}
>
{loading && <ActivityIndicator size={16} color={textColor} style={styles.icon} />}
{React.Children.toArray(children).map((child: any, idx) => {
return (
<Div testID="RNE__Button__div" key={idx} style={[sizeStyle, styles.label, textStyle, childStyle]}>
{child}
</Div>
);
})}
</TouchableOpacity>
);
switch (type) {
case 'warning':
backgroundColor = colors.yellow;
break;
case 'primary':
backgroundColor = colors.blue;
break;
case 'success':
backgroundColor = colors.green;
break;
case 'danger':
backgroundColor = colors.red;
break;
case 'light':
backgroundColor = colors.white;
break;
case 'dark':
backgroundColor = colors.black;
break;
default:
break;
}
if (backgroundColor) {
backgroundColor = color(backgroundColor).rgb().string();
}
if (type) {
textColor = color(backgroundColor).isLight()
? color(colors.black).rgb().string()
: color(colors.white).rgb().string();
}
if (!type) {
borderColor = color(colors.black).alpha(0.32).rgb().string();
borderWidth = 1;
}
if (disabled) {
textColor = color(textColor).alpha(0.3).rgb().string();
}
if (buttonColor) {
backgroundColor = color(buttonColor).rgb().string();
textColor = color(buttonColor).isLight()
? color(buttonColor).darken(0.9).string()
: color(buttonColor).lighten(0.9).string();
}
if (rounded && (typeof rounded === 'number' || typeof rounded === 'boolean')) {
borderRadius = rounded;
}
if (backgroundColor) {
borderColor = color(backgroundColor).darken(0.2).string();
borderWidth = 1;
}
if (!bordered) {
borderWidth = 0;
}
const buttonStyle = {
backgroundColor,
borderColor,
borderWidth,
borderRadius,
};
const textStyle = { color: textColor };
let sizeStyle = {};
if (size && styles[size]) {
sizeStyle = styles[size];
}
let boxStyle = {};
const styleKey = `${size}Box` as keyof typeof styles;
if (size && styles[styleKey]) {
boxStyle = styles[styleKey];
}
if (!children) {
return null;
}
return (
<TouchableOpacity
testID="RNE__Button__wrap"
style={[styles.button, styles.content, buttonStyle, boxStyle, style]}
disabled={disabled}
{...restProps}
>
{loading && <ActivityIndicator size={16} color={textColor} style={styles.icon} />}
{React.Children.toArray(children).map((child: any, idx) => {
return (
<Div testID="RNE__Button__div" key={idx} style={[sizeStyle, styles.label, textStyle, childStyle]}>
{child}
</Div>
);
})}
</TouchableOpacity>
);
}

ButtonView.defaultProps = {
activeOpacity: 0.5,
rounded: 5,
bordered: true,
size: 'default',
} as ButtonProps;

const styles = StyleSheet.create({
button: {
borderStyle: 'solid',
Expand Down