diff --git a/packages/yoga/src/Text/native/Text.jsx b/packages/yoga/src/Text/native/Text.jsx index 602a1b1c03..2cb0ace307 100644 --- 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 index 351dec9507..ae115b4f9e 100644 --- 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 b/packages/yoga/src/Text/textStyle.ios.jsx similarity index 100% rename from packages/yoga/src/Text/textStyle.native.jsx rename to packages/yoga/src/Text/textStyle.ios.jsx