native: Fix font family suffixes

jxom · Sep 4, 2021 · ae127a8 · ae127a8
1 parent 6e45785
commit ae127a8
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 28 deletions.
diff --git a/native-playground/src/App.js b/native-playground/src/App.js
@@ -30,51 +30,51 @@ import ToastPage from './routes/components/Toast';
 
 const weights = {
   normal: {
-    fontFamilySuffix: 'Regular',
+    fontFamilySuffix: '-Regular',
     fontWeight: 'normal',
   },
   semibold: {
-    fontFamilySuffix: 'SemiBold',
+    fontFamilySuffix: '-SemiBold',
     fontWeight: 'normal',
   },
   bold: {
-    fontFamilySuffix: 'Bold',
+    fontFamilySuffix: '-Bold',
     fontWeight: 'normal',
   },
   100: {
-    fontFamilySuffix: 'Thin',
+    fontFamilySuffix: '-Thin',
     fontWeight: 'normal',
   },
   200: {
-    fontFamilySuffix: 'ExtraLight',
+    fontFamilySuffix: '-ExtraLight',
     fontWeight: 'normal',
   },
   300: {
-    fontFamilySuffix: 'Light',
+    fontFamilySuffix: '-Light',
     fontWeight: 'normal',
   },
   400: {
-    fontFamilySuffix: 'Regular',
+    fontFamilySuffix: '-Regular',
     fontWeight: 'normal',
   },
   500: {
-    fontFamilySuffix: 'Medium',
+    fontFamilySuffix: '-Medium',
     fontWeight: 'normal',
   },
   600: {
-    fontFamilySuffix: 'SemiBold',
+    fontFamilySuffix: '-SemiBold',
     fontWeight: 'normal',
   },
   700: {
-    fontFamilySuffix: 'Bold',
+    fontFamilySuffix: '-Bold',
     fontWeight: 'normal',
   },
   800: {
-    fontFamilySuffix: 'ExtraBold',
+    fontFamilySuffix: '-ExtraBold',
     fontWeight: 'normal',
   },
   900: {
-    fontFamilySuffix: 'Black',
+    fontFamilySuffix: '-Black',
     fontWeight: 'normal',
   },
 };

diff --git a/packages/bumbag-addon-highlighted-code/.gitignore b/packages/bumbag-addon-highlighted-code/.gitignore
@@ -2,5 +2,5 @@
 /lib
 /dist
 /es
-/ts
+/ts/bumbag-addon-highlighted-code/src
 /HighlightedCode
diff --git a/packages/bumbag-addon-markdown/.gitignore b/packages/bumbag-addon-markdown/.gitignore
@@ -2,5 +2,5 @@
 /lib
 /dist
 /es
-/ts
+/ts/bumbag-addon-markdown/src
 /Markdown
diff --git a/packages/bumbag-native-bottom-sheet/.gitignore b/packages/bumbag-native-bottom-sheet/.gitignore
@@ -1,5 +1,5 @@
 # Automatically generated by ../../scripts/build/utils.js
 /lib
 /es
-/ts
+/ts/bumbag-native-bottom-sheet/src
 /BottomSheet
diff --git a/packages/bumbag-native-picker/.gitignore b/packages/bumbag-native-picker/.gitignore
@@ -1,6 +1,6 @@
 # Automatically generated by ../../scripts/build/utils.js
 /lib
 /es
-/ts
+/ts/bumbag-native-picker/src
 /PickerIOS
 /Picker
diff --git a/packages/bumbag-native-toast/.gitignore b/packages/bumbag-native-toast/.gitignore
@@ -1,5 +1,5 @@
 # Automatically generated by ../../scripts/build/utils.js
 /lib
 /es
-/ts
+/ts/bumbag-native-toast/src
 /Toast
diff --git a/packages/bumbag-native/.gitignore b/packages/bumbag-native/.gitignore
@@ -2,7 +2,7 @@
 /lib
 /dist
 /es
-/ts
+/ts/bumbag-native/src
 /utils
 /types
 /theme

diff --git a/packages/bumbag-native/src/theme/fontWeights.ts b/packages/bumbag-native/src/theme/fontWeights.ts
@@ -6,47 +6,47 @@ export const defaultAndroidFontWeights = {
     fontWeight: 'normal',
   },
   semibold: {
-    fontFamilySuffix: 'light',
+    fontFamilySuffix: '-light',
     fontWeight: 'bold',
   },
   bold: {
     fontFamilySuffix: '',
     fontWeight: 'bold',
   },
   100: {
-    fontFamilySuffix: 'thin',
+    fontFamilySuffix: '-thin',
     fontWeight: 'normal',
   },
   200: {
-    fontFamilySuffix: 'light',
+    fontFamilySuffix: '-light',
     fontWeight: 'normal',
   },
   300: {
-    fontFamilySuffix: 'light',
+    fontFamilySuffix: '-light',
     fontWeight: 'normal',
   },
   400: {
     fontFamilySuffix: '',
     fontWeight: 'normal',
   },
   500: {
-    fontFamilySuffix: 'light',
+    fontFamilySuffix: '-light',
     fontWeight: 'bold',
   },
   600: {
-    fontFamilySuffix: 'medium',
+    fontFamilySuffix: '-medium',
     fontWeight: 'normal',
   },
   700: {
     fontFamilySuffix: '',
     fontWeight: 'bold',
   },
   800: {
-    fontFamilySuffix: 'medium',
+    fontFamilySuffix: '-medium',
     fontWeight: 'bold',
   },
   900: {
-    fontFamilySuffix: 'black',
+    fontFamilySuffix: '-black',
     fontWeight: 'normal',
   },
 };

diff --git a/packages/bumbag-native/src/utils/getCSSFromStyleObject.ts b/packages/bumbag-native/src/utils/getCSSFromStyleObject.ts
@@ -320,7 +320,7 @@ export function getCSSFromStyleObject(
           const fontFamily = font(fontFamilyKey)({ theme });
           if (typeof newValue === 'object') {
             newStyle = `
-              font-family: ${fontFamily}${newValue.fontFamilySuffix ? `-${newValue.fontFamilySuffix}` : ''};
+              font-family: ${fontFamily}${newValue.fontFamilySuffix ? `${newValue.fontFamilySuffix}` : ''};
             `;
             newValue = newValue.fontWeight;
           } else if (fontFamily) {

diff --git a/packages/bumbag-native/src/utils/getFontStyles.ts b/packages/bumbag-native/src/utils/getFontStyles.ts
@@ -5,7 +5,7 @@ export function getFontAttributes({ fontFamilyThemeKey, fontWeight: _fontWeight,
   let fontFamily = font(fontFamilyThemeKey)({ theme });
 
   if (typeof fontWeight === 'object') {
-    fontFamily = `${fontFamily}${fontWeight.fontFamilySuffix ? `-${fontWeight.fontFamilySuffix}` : ''}`;
+    fontFamily = `${fontFamily}${fontWeight.fontFamilySuffix ? `${fontWeight.fontFamilySuffix}` : ''}`;
     fontWeight = fontWeight.fontWeight || 'normal';
   }