Merge pull request #275 from Gympass/ENJ-127

Fix Android font weight issue
gympass · Jun 23, 2021 · 4c8ffa2 · 4c8ffa2
2 parents 8ea4d82 + a7ce28b
commit 4c8ffa2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/yoga/src/Text/native/Text.jsx b/packages/yoga/src/Text/native/Text.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { oneOf, bool } from 'prop-types';
-import textStyle from '../sharedTextStyle';
+import textStyle from '../textStyle';
 
 const styledText = type => styled.Text`
   ${textStyle(type)}

diff --git a/packages/yoga/src/Text/textStyle.android.jsx b/packages/yoga/src/Text/textStyle.android.jsx
@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import defaultStyle from './textStyle';
+import defaultStyle from './sharedTextStyle';
 
 const textStyle = type => () => css`
   ${defaultStyle(type)};
@@ -17,8 +17,11 @@ const textStyle = type => () => css`
       },
     },
   }) => `
-    ${fontWeight !== 400 ? `-${fontWeight}` : ''};
-    ${light ? `font-family: ${baseFont.family}-${fontWeights.light};` : ''}
+  font-family: ${
+    fontWeight === 400 ? baseFont.family : `${baseFont.family}-${fontWeight}`
+  };
+    
+  ${light ? `font-family: ${baseFont.family}-${fontWeights.light};` : ''}
   `}
 `;
 

diff --git a/packages/yoga/src/Text/textStyle.native.jsx → packages/yoga/src/Text/textStyle.ios.jsx b/packages/yoga/src/Text/textStyle.native.jsx → packages/yoga/src/Text/textStyle.ios.jsx