refactor(ui): button - apply mappings

akveo · Apr 8, 2019 · c6b253f · c6b253f
1 parent ef61e17
commit c6b253f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/src/framework/ui/button/button.component.tsx b/src/framework/ui/button/button.component.tsx
@@ -75,7 +75,6 @@ export class Button extends React.Component<Props> {
     const {
       textColor,
       textFontSize,
-      textLineHeight,
       textFontWeight,
       textMarginHorizontal,
       iconWidth,
@@ -97,16 +96,17 @@ export class Button extends React.Component<Props> {
       text: {
         color: textColor,
         fontSize: textFontSize,
-        lineHeight: textLineHeight,
         fontWeight: textFontWeight,
         marginHorizontal: textMarginHorizontal,
         ...derivedTextStyle,
+        ...styles.text,
       },
       icon: {
         width: iconWidth,
         height: iconHeight,
         tintColor: iconTintColor,
         marginHorizontal: iconMarginHorizontal,
+        ...styles.icon,
       },
     };
   };
@@ -116,7 +116,7 @@ export class Button extends React.Component<Props> {
 
     return (
       <Text
-        style={[style, styles.text]}
+        style={style}
         key={1}>
         {text}
       </Text>

diff --git a/src/framework/ui/button/button.spec.tsx.snap b/src/framework/ui/button/button.spec.tsx.snap
@@ -423,16 +423,12 @@ exports[`@button: matches snapshot * appearance * icon and text 1`] = `
   />
   <ForwardRef(WrappingElement)
     style={
-      Array [
-        Object {
-          "color": "#ffffff",
-          "fontSize": 14,
-          "fontWeight": "800",
-          "lineHeight": 16,
-          "marginHorizontal": 10,
-        },
-        Object {},
-      ]
+      Object {
+        "color": "#ffffff",
+        "fontSize": 14,
+        "fontWeight": "800",
+        "marginHorizontal": 10,
+      }
     }
   >
     BUTTON
@@ -570,16 +566,12 @@ exports[`@button: matches snapshot * appearance * text 1`] = `
 >
   <ForwardRef(WrappingElement)
     style={
-      Array [
-        Object {
-          "color": "#ffffff",
-          "fontSize": 14,
-          "fontWeight": "800",
-          "lineHeight": 16,
-          "marginHorizontal": 10,
-        },
-        Object {},
-      ]
+      Object {
+        "color": "#ffffff",
+        "fontSize": 14,
+        "fontWeight": "800",
+        "marginHorizontal": 10,
+      }
     }
   >
     BUTTON

diff --git a/src/framework/ui/common/mapping.json b/src/framework/ui/common/mapping.json
@@ -227,9 +227,6 @@
           "textFontSize": {
             "type": "number"
           },
-          "textLineHeight": {
-            "type": "number"
-          },
           "textFontWeight": {
             "type": "string"
           },
@@ -400,8 +397,9 @@
               "tiny": {
                 "minWidth": 24,
                 "minHeight": 24,
+                "paddingHorizontal": 6,
+                "paddingVertical": 6,
                 "textFontSize": 10,
-                "textLineHeight": 12,
                 "textMarginHorizontal": 6,
                 "iconWidth": 12,
                 "iconHeight": 12,
@@ -413,7 +411,6 @@
                 "paddingHorizontal": 8,
                 "paddingVertical": 8,
                 "textFontSize": 12,
-                "textLineHeight": 16,
                 "textMarginHorizontal": 8,
                 "iconWidth": 16,
                 "iconHeight": 16,
@@ -425,7 +422,6 @@
                 "paddingHorizontal": 10,
                 "paddingVertical": 12,
                 "textFontSize": 14,
-                "textLineHeight": 16,
                 "textMarginHorizontal": 10,
                 "iconWidth": 16,
                 "iconHeight": 16,
@@ -437,7 +433,6 @@
                 "paddingHorizontal": 10,
                 "paddingVertical": 14,
                 "textFontSize": 16,
-                "textLineHeight": 20,
                 "textMarginHorizontal": 10,
                 "iconWidth": 20,
                 "iconHeight": 20,
@@ -449,7 +444,6 @@
                 "paddingHorizontal": 12,
                 "paddingVertical": 16,
                 "textFontSize": 18,
-                "textLineHeight": 24,
                 "textMarginHorizontal": 12,
                 "iconWidth": 24,
                 "iconHeight": 24,