Skip to content

Commit

Permalink
fix: useFonts default map
Browse files Browse the repository at this point in the history
  • Loading branch information
vpicone committed Jul 28, 2020
1 parent 5a4f620 commit fff3e91
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion packages/components-react-native/src/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const styles = StyleSheet.create({
paddingRight: 64,
},
title: {
fontFamily: 'IBMPlexSans_Regular',
fontFamily: 'IBMPlexSans',
color: theme.text04,
fontSize: Platform.select({
android: 16,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Text: React.FC<TextProps> = ({ children, kind = 'p1', ...rest }) => {

const styles = StyleSheet.create({
text: {
fontFamily: 'IBMPlexSans-Regular',
fontFamily: 'IBMPlexSans',
},
h1: {
fontSize: 14,
Expand Down
12 changes: 6 additions & 6 deletions packages/components-react-native/src/util/useFonts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { useEffect, useState } from 'react';
import { loadAsync } from 'expo-font';

import { default as IBMPlexSans_Light } from '@vpicone/components-react-native/assets/plex/IBMPlexSans-Light.ttf';
import { default as IBMPlexMono_Regular } from '@vpicone/components-react-native/assets/plex/IBMPlexMono-Regular.ttf';
import { default as IBMPlexSans_Regular } from '@vpicone/components-react-native/assets/plex/IBMPlexSans-Regular.ttf';
import { default as IBMPlexMono } from '@vpicone/components-react-native/assets/plex/IBMPlexMono-Regular.ttf';
import { default as IBMPlexSans } from '@vpicone/components-react-native/assets/plex/IBMPlexSans-Regular.ttf';
import { default as IBMPlexSans_SemiBold } from '@vpicone/components-react-native/assets/plex/IBMPlexSans-SemiBold.ttf';

export const defaultMap = {
IBMPlexSans_Light,
IBMPlexMono: IBMPlexMono_Regular,
IBMPlexSans: IBMPlexSans_Regular,
IBMPlexSans_SemiBold,
IBMPlexMono,
IBMPlexSans,
'IBMPlexSans-Light': IBMPlexSans_Light,
'IBMPlexSans-SemiBold': IBMPlexSans_SemiBold,
'CarbonIcons-Core': require('@vpicone/icons-react-native/assets/icons/CarbonIcons-Core.ttf'),
};

Expand Down

0 comments on commit fff3e91

Please sign in to comment.