feat(ui): add font-family for each component that has text

akveo · Sep 26, 2019 · aa11e1c · aa11e1c
1 parent 5468776
commit aa11e1c
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 2 deletions.
diff --git a/src/framework/ui/bottomNavigation/bottomNavigationTab.component.tsx b/src/framework/ui/bottomNavigation/bottomNavigationTab.component.tsx
@@ -143,6 +143,7 @@ export class BottomNavigationTabComponent extends React.Component<BottomNavigati
       iconMarginVertical,
       iconTintColor,
       textMarginVertical,
+      textFontFamily,
       textFontSize,
       textLineHeight,
       textFontWeight,
@@ -154,6 +155,7 @@ export class BottomNavigationTabComponent extends React.Component<BottomNavigati
       container: containerParameters,
       text: {
         marginVertical: textMarginVertical,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         lineHeight: textLineHeight,
         fontWeight: textFontWeight,

diff --git a/src/framework/ui/button/button.component.tsx b/src/framework/ui/button/button.component.tsx
@@ -188,6 +188,7 @@ export class ButtonComponent extends React.Component<ButtonProps> {
   private getComponentStyle = (source: StyleType): StyleType => {
     const {
       textColor,
+      textFontFamily,
       textFontSize,
       textLineHeight,
       textFontWeight,
@@ -203,6 +204,7 @@ export class ButtonComponent extends React.Component<ButtonProps> {
       container: containerParameters,
       text: {
         color: textColor,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         lineHeight: textLineHeight,
         fontWeight: textFontWeight,

diff --git a/src/framework/ui/checkbox/checkbox.component.tsx b/src/framework/ui/checkbox/checkbox.component.tsx
@@ -314,10 +314,11 @@ class CheckBoxComponent extends React.Component<CheckBoxProps> {
   private getComponentStyle = (source: StyleType): StyleType => {
     const {
       textMarginHorizontal,
-      textColor,
+      textFontFamily,
       textFontSize,
       textFontWeight,
       textLineHeight,
+      textColor,
       iconWidth,
       iconHeight,
       iconBorderRadius,
@@ -335,10 +336,11 @@ class CheckBoxComponent extends React.Component<CheckBoxProps> {
       selectContainer: containerParameters,
       text: {
         marginHorizontal: textMarginHorizontal,
-        color: textColor,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         fontWeight: textFontWeight,
         lineHeight: textLineHeight,
+        color: textColor,
       },
       icon: {
         width: iconWidth,

diff --git a/src/framework/ui/input/input.component.tsx b/src/framework/ui/input/input.component.tsx
@@ -370,6 +370,7 @@ export class InputComponent extends React.Component<InputProps> {
 
     const {
       textMarginHorizontal,
+      textFontFamily,
       textFontSize,
       textLineHeight,
       textFontWeight,
@@ -407,6 +408,7 @@ export class InputComponent extends React.Component<InputProps> {
       },
       text: {
         marginHorizontal: textMarginHorizontal,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         // FIXME: RN issue (https://github.com/facebook/react-native/issues/7823)
         // lineHeight: textLineHeight,

diff --git a/src/framework/ui/list/listItem.component.tsx b/src/framework/ui/list/listItem.component.tsx
@@ -218,10 +218,12 @@ export class ListItemComponent extends React.Component<ListItemProps> {
       iconMarginHorizontal,
       iconTintColor,
       titleMarginHorizontal,
+      titleFontFamily,
       titleFontSize,
       titleLineHeight,
       titleFontWeight,
       titleColor,
+      descriptionFontFamily,
       descriptionFontSize,
       descriptionFontWeight,
       descriptionLineHeight,
@@ -242,13 +244,15 @@ export class ListItemComponent extends React.Component<ListItemProps> {
       },
       title: {
         marginHorizontal: titleMarginHorizontal,
+        fontFamily: titleFontFamily,
         fontSize: titleFontSize,
         lineHeight: titleLineHeight,
         fontWeight: titleFontWeight,
         color: titleColor,
       },
       description: {
         color: descriptionColor,
+        fontFamily: descriptionFontFamily,
         fontSize: descriptionFontSize,
         fontWeight: descriptionFontWeight,
         lineHeight: descriptionLineHeight,

diff --git a/src/framework/ui/menu/menuItem.component.tsx b/src/framework/ui/menu/menuItem.component.tsx
@@ -128,6 +128,7 @@ class MenuItemComponent extends React.Component<MenuItemProps> {
       },
       title: {
         marginHorizontal: titleStyles.titleMarginHorizontal,
+        fontFamily: titleStyles.titleFontFamily,
         fontSize: titleStyles.titleFontSize,
         fontWeight: titleStyles.titleFontWeight,
         lineHeight: titleStyles.titleLineHeight,

diff --git a/src/framework/ui/radio/radio.component.tsx b/src/framework/ui/radio/radio.component.tsx
@@ -197,6 +197,7 @@ export class RadioComponent extends React.Component<RadioProps> {
   private getComponentStyle = (source: StyleType): StyleType => {
     const {
       textMarginHorizontal,
+      textFontFamily,
       textFontSize,
       textFontWeight,
       textLineHeight,
@@ -218,6 +219,7 @@ export class RadioComponent extends React.Component<RadioProps> {
       selectContainer: containerParameters,
       text: {
         marginHorizontal: textMarginHorizontal,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         lineHeight: textLineHeight,
         fontWeight: textFontWeight,

diff --git a/src/framework/ui/select/select.component.tsx b/src/framework/ui/select/select.component.tsx
@@ -579,13 +579,15 @@ class SelectComponent extends React.Component<SelectProps, State> {
       },
       text: {
         color: textStyles.textColor,
+        fontFamily: textStyles.textFontFamily,
         fontSize: textStyles.textFontSize,
         fontWeight: textStyles.textFontWeight,
         lineHeight: textStyles.textLineHeight,
         marginHorizontal: textStyles.textMarginHorizontal,
       },
       placeholder: {
         color: placeholderStyles.placeholderColor,
+        fontFamily: placeholderStyles.placeholderFontFamily,
         fontSize: placeholderStyles.placeholderFontSize,
         fontWeight: placeholderStyles.placeholderFontWeight,
         lineHeight: placeholderStyles.placeholderLineHeight,

diff --git a/src/framework/ui/select/selectOption.component.tsx b/src/framework/ui/select/selectOption.component.tsx
@@ -88,6 +88,7 @@ class SelectOptionComponent extends React.Component<SelectOptionProps> {
   private getComponentStyle = (source: StyleType): StyleType => {
     const {
       textColor,
+      textFontFamily,
       textFontSize,
       textFontWeight,
       textLineHeight,
@@ -105,13 +106,15 @@ class SelectOptionComponent extends React.Component<SelectOptionProps> {
       },
       text: {
         color: textColor,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         fontWeight: textFontWeight,
         lineHeight: textLineHeight,
         marginHorizontal: textMarginHorizontal,
       },
       multiSelectText: {
         color: multiSelectTextColor,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         fontWeight: textFontWeight,
         lineHeight: textLineHeight,

diff --git a/src/framework/ui/tab/tab.component.tsx b/src/framework/ui/tab/tab.component.tsx
@@ -147,6 +147,7 @@ export class TabComponent extends React.Component<TabProps> {
   private getComponentStyle = (source: StyleType): StyleType => {
     const {
       textMarginVertical,
+      textFontFamily,
       textFontSize,
       textLineHeight,
       textFontWeight,
@@ -168,6 +169,7 @@ export class TabComponent extends React.Component<TabProps> {
       },
       title: {
         marginVertical: textMarginVertical,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         lineHeight: textLineHeight,
         fontWeight: textFontWeight,

diff --git a/src/framework/ui/tooltip/tooltip.component.tsx b/src/framework/ui/tooltip/tooltip.component.tsx
@@ -235,6 +235,7 @@ export class TooltipComponent extends React.Component<TooltipProps> {
       iconTintColor,
       textMarginHorizontal,
       textFontSize,
+      textFontFamily,
       textLineHeight,
       textColor,
       ...containerParameters
@@ -254,6 +255,7 @@ export class TooltipComponent extends React.Component<TooltipProps> {
       },
       text: {
         marginHorizontal: textMarginHorizontal,
+        fontFamily: textFontFamily,
         fontSize: textFontSize,
         lineHeight: textLineHeight,
         color: textColor,

diff --git a/src/framework/ui/topNavigation/topNavigation.component.tsx b/src/framework/ui/topNavigation/topNavigation.component.tsx
@@ -189,11 +189,13 @@ export class TopNavigationComponent extends React.Component<TopNavigationProps>
   private getComponentStyle = (source: StyleType): StyleType => {
     const {
       titleTextAlign,
+      titleFontFamily,
       titleFontSize,
       titleLineHeight,
       titleFontWeight,
       titleColor,
       subtitleTextAlign,
+      subtitleFontFamily,
       subtitleFontSize,
       subtitleLineHeight,
       subtitleFontWeight,
@@ -207,13 +209,15 @@ export class TopNavigationComponent extends React.Component<TopNavigationProps>
       titleContainer: {},
       title: {
         textAlign: titleTextAlign,
+        fontFamily: titleFontFamily,
         fontSize: titleFontSize,
         lineHeight: titleLineHeight,
         fontWeight: titleFontWeight,
         color: titleColor,
       },
       subtitle: {
         textAlign: subtitleTextAlign,
+        fontFamily: subtitleFontFamily,
         fontSize: subtitleFontSize,
         color: subtitleColor,
         fontWeight: subtitleFontWeight,