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

fix(ui): button layout issues #375

Merged
merged 1 commit into from
Apr 29, 2019
Merged

fix(ui): button layout issues #375

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
9 changes: 4 additions & 5 deletions src/framework/ui/button/button.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export class Button extends React.Component<Props> {
const {
textColor,
textFontSize,
textLineHeight,
textFontWeight,
textMarginHorizontal,
iconWidth,
Expand All @@ -100,6 +101,7 @@ export class Button extends React.Component<Props> {
text: {
color: textColor,
fontSize: textFontSize,
lineHeight: textLineHeight,
fontWeight: textFontWeight,
marginHorizontal: textMarginHorizontal,
...derivedTextStyle,
Expand Down Expand Up @@ -165,12 +167,9 @@ export class Button extends React.Component<Props> {

const styles = StyleSheet.create({
container: {
justifyContent: 'space-evenly',
justifyContent: 'center',
alignItems: 'center',
},
text: {
flexGrow: 1,
textAlign: 'center',
},
text: {},
icon: {},
});
16 changes: 7 additions & 9 deletions src/framework/ui/button/button.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`@button: matches snapshot * appearance * empty 1`] = `
"backgroundColor": "#3366FF",
"borderRadius": 8,
"flexDirection": "row",
"justifyContent": "space-evenly",
"justifyContent": "center",
"minHeight": 40,
"minWidth": 40,
"paddingHorizontal": 10,
Expand Down Expand Up @@ -149,7 +149,7 @@ exports[`@button: matches snapshot * appearance * icon 1`] = `
"backgroundColor": "#3366FF",
"borderRadius": 8,
"flexDirection": "row",
"justifyContent": "space-evenly",
"justifyContent": "center",
"minHeight": 40,
"minWidth": 40,
"paddingHorizontal": 10,
Expand Down Expand Up @@ -297,7 +297,7 @@ exports[`@button: matches snapshot * appearance * icon and text 1`] = `
"backgroundColor": "#3366FF",
"borderRadius": 8,
"flexDirection": "row",
"justifyContent": "space-evenly",
"justifyContent": "center",
"minHeight": 40,
"minWidth": 40,
"paddingHorizontal": 10,
Expand Down Expand Up @@ -428,11 +428,10 @@ exports[`@button: matches snapshot * appearance * icon and text 1`] = `
style={
Object {
"color": "#ffffff",
"flexGrow": 1,
"fontSize": 14,
"fontWeight": "800",
"lineHeight": 16,
"marginHorizontal": 10,
"textAlign": "center",
}
}
>
Expand All @@ -458,7 +457,7 @@ exports[`@button: matches snapshot * appearance * text 1`] = `
"backgroundColor": "#3366FF",
"borderRadius": 8,
"flexDirection": "row",
"justifyContent": "space-evenly",
"justifyContent": "center",
"minHeight": 40,
"minWidth": 40,
"paddingHorizontal": 10,
Expand Down Expand Up @@ -574,11 +573,10 @@ exports[`@button: matches snapshot * appearance * text 1`] = `
style={
Object {
"color": "#ffffff",
"flexGrow": 1,
"fontSize": 14,
"fontWeight": "800",
"lineHeight": 16,
"marginHorizontal": 10,
"textAlign": "center",
}
}
>
Expand All @@ -604,7 +602,7 @@ exports[`@button: matches snapshot * interaction * stateless 1`] = `
"backgroundColor": "#3366FF",
"borderRadius": 8,
"flexDirection": "row",
"justifyContent": "space-evenly",
"justifyContent": "center",
"minHeight": 40,
"minWidth": 40,
"paddingHorizontal": 10,
Expand Down
16 changes: 12 additions & 4 deletions src/framework/ui/common/mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,20 @@
"backgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
"textMarginHorizontal": {
"type": "number"
},
"textFontSize": {
"type": "number"
},
"textLineHeight": {
"type": "number"
},
"textFontWeight": {
"type": "string"
},
"textMarginHorizontal": {
"type": "number"
"textColor": {
"type": "string"
},
"iconWidth": {
"type": "number"
Expand Down Expand Up @@ -428,6 +431,7 @@
"paddingHorizontal": 6,
"paddingVertical": 6,
"textFontSize": 10,
"textLineHeight": 12,
"textMarginHorizontal": 6,
"iconWidth": 12,
"iconHeight": 12,
Expand All @@ -439,6 +443,7 @@
"paddingHorizontal": 8,
"paddingVertical": 8,
"textFontSize": 12,
"textLineHeight": 16,
"textMarginHorizontal": 8,
"iconWidth": 16,
"iconHeight": 16,
Expand All @@ -450,6 +455,7 @@
"paddingHorizontal": 10,
"paddingVertical": 12,
"textFontSize": 14,
"textLineHeight": 16,
"textMarginHorizontal": 10,
"iconWidth": 16,
"iconHeight": 16,
Expand All @@ -461,6 +467,7 @@
"paddingHorizontal": 10,
"paddingVertical": 14,
"textFontSize": 16,
"textLineHeight": 20,
"textMarginHorizontal": 10,
"iconWidth": 20,
"iconHeight": 20,
Expand All @@ -472,6 +479,7 @@
"paddingHorizontal": 12,
"paddingVertical": 16,
"textFontSize": 18,
"textLineHeight": 24,
"textMarginHorizontal": 12,
"iconWidth": 24,
"iconHeight": 24,
Expand Down