Merge pull request #824 from gympass/DS-843

[DS-843] - Typography typing
gympass · Jun 4, 2024 · c9af458 · c9af458
2 parents 50b7688 + 26289d4
commit c9af458
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/packages/system/src/typography/index.ts b/packages/system/src/typography/index.ts
@@ -0,0 +1,2 @@
+export * from './typography';
+export type { Typography } from './types';
diff --git a/packages/system/src/typography/types.ts b/packages/system/src/typography/types.ts
@@ -0,0 +1,28 @@
+import { colors, fontSizes, lineHeights } from '@gympass/yoga-tokens';
+
+type ColorsValues = typeof colors | string;
+type FontSizesValues = typeof fontSizes | string | number;
+type LineHeightsValues = typeof lineHeights | string | number;
+type TextAlignValues = string;
+
+type Color = {
+  color?: ColorsValues;
+  c?: ColorsValues;
+};
+
+type FontSize = {
+  fontSize?: FontSizesValues;
+  fs?: FontSizesValues;
+};
+
+type LineHeight = {
+  lineHeight?: LineHeightsValues;
+  lh?: LineHeightsValues;
+};
+
+type TextAlign = {
+  textAlign?: TextAlignValues;
+  ta?: TextAlignValues;
+};
+
+export type Typography = Color & FontSize & LineHeight & TextAlign;
diff --git a/packages/system/src/typography.test.js → .../system/src/typography/typography.test.js b/packages/system/src/typography.test.js → .../system/src/typography/typography.test.js
@@ -9,7 +9,7 @@ import {
   textTransform,
 } from './typography';
 
-import { fontWeight as fontWeightAndroid } from './font-weight/fontWeight.android';
+import { fontWeight as fontWeightAndroid } from '../font-weight/fontWeight.android';
 
 const fontSizes = [10, 20, 40];
 

diff --git a/packages/system/src/typography.js → packages/system/src/typography/typography.ts b/packages/system/src/typography.js → packages/system/src/typography/typography.ts
@@ -1,13 +1,13 @@
-import { toPx } from './unit';
+import { toPx } from '../unit';
 import {
   getFontSize,
   getColor,
   getLineHeight,
   generator,
   compose,
-} from './theme';
+} from '../theme';
 
-import { fontWeight } from './font-weight';
+import { fontWeight } from '../font-weight';
 
 const color = props =>
   generator({
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './typography';
		export type { Typography } from './types';