Merge pull request #814 from gympass/DS-838

[DS-838] - Font-Weight typing
gympass · May 27, 2024 · 4ff9153 · 4ff9153
2 parents 23ecccc + 512ae21
commit 4ff9153
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/packages/system/src/fontWeight.android.js → ...tem/src/font-weight/fontWeight.android.ts b/packages/system/src/fontWeight.android.js → ...tem/src/font-weight/fontWeight.android.ts
@@ -1,4 +1,4 @@
-import { getFontWeight, generator } from './theme';
+import { getFontWeight, generator } from '../theme';
 
 export const fontWeight = props =>
   generator({

diff --git a/packages/system/src/fontWeight.js → ...ages/system/src/font-weight/fontWeight.ts b/packages/system/src/fontWeight.js → ...ages/system/src/font-weight/fontWeight.ts
@@ -1,4 +1,4 @@
-import { getFontWeight, generator } from './theme';
+import { getFontWeight, generator } from '../theme';
 
 export const fontWeight = props =>
   generator({

diff --git a/packages/system/src/font-weight/index.ts b/packages/system/src/font-weight/index.ts
@@ -0,0 +1,2 @@
+export * from './fontWeight';
+export type { FontWeights } from './types';
diff --git a/packages/system/src/font-weight/types.ts b/packages/system/src/font-weight/types.ts
@@ -0,0 +1,8 @@
+import { fontWeights } from '@gympass/yoga-tokens';
+
+type FontWeightsValues = typeof fontWeights | string | number;
+
+export type FontWeights = {
+  fontWeight?: FontWeightsValues;
+  fw?: FontWeightsValues;
+};
diff --git a/packages/system/src/typography.js b/packages/system/src/typography.js
@@ -7,7 +7,7 @@ import {
   compose,
 } from './theme';
 
-import { fontWeight } from './fontWeight';
+import { fontWeight } from './font-weight';
 
 const color = props =>
   generator({

diff --git a/packages/system/src/typography.test.js b/packages/system/src/typography.test.js
@@ -9,7 +9,7 @@ import {
   textTransform,
 } from './typography';
 
-import { fontWeight as fontWeightAndroid } from './fontWeight.android';
+import { fontWeight as fontWeightAndroid } from './font-weight/fontWeight.android';
 
 const fontSizes = [10, 20, 40];