Skip to content

Commit

Permalink
Merge pull request #5591 from GeekyAnts/release/3.4.25
Browse files Browse the repository at this point in the history
Release/3.4.25
  • Loading branch information
surajahmed committed Dec 5, 2022
2 parents bc96a3f + 2289e76 commit 18052a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prettier --write"
]
},
"version": "3.4.24",
"version": "3.4.25",
"license": "MIT",
"private": false,
"main": "lib/commonjs/index",
Expand Down
4 changes: 2 additions & 2 deletions src/components/primitives/Text/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ const Text = ({ children, ...props }: ITextProps, ref: any) => {
if (resolvedFontFamily) {
fontFamily = resolvedFontFamily;
}

// Need to apply fontWeight & fontStyle on web
if (Platform.OS === 'web') {
if (resolvedFontFamily) {
fontFamily = resolvedFontFamily;
fontFamily = resolvedFontFamily.fontFamily;
}

resolvedFontFamily = {
fontFamily,
fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400),
Expand Down

1 comment on commit 18052a1

@vercel
Copy link

@vercel vercel bot commented on 18052a1 Dec 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.