feat(foundation): added typography option to themeFactory

sendbird · Jun 24, 2022 · 28b47d5 · 28b47d5
1 parent 4bfdfde
commit 28b47d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/uikit-react-native-foundation/src/styles/themeFactory.ts b/packages/uikit-react-native-foundation/src/styles/themeFactory.ts
@@ -1,5 +1,5 @@
 import Palette from '../theme/Palette';
-import { createTypography } from '../theme/Typography';
+import { TypographyOverrides, createTypography } from '../theme/Typography';
 import type { UIKitColors, UIKitTheme } from '../types';
 import createAppearanceHelper from './createAppearanceHelper';
 import createScaleFactor from './createScaleFactor';
@@ -9,24 +9,29 @@ type Options = {
   appearance: UIKitTheme['appearance'];
   palette?: UIKitTheme['palette'];
   colors: (palette: UIKitTheme['palette']) => UIKitColors;
+  typography?: TypographyOverrides;
   scaleFactorOption?: {
     scaleFactor: UIKitTheme['scaleFactor'];
     applyToCreateStyleSheet: boolean;
   };
 };
 
-const defaultScaleFactor = createScaleFactor();
-
-export const themeFactory = ({ appearance, scaleFactorOption, palette = Palette, colors }: Options): UIKitTheme => {
+export const themeFactory = ({
+  appearance,
+  scaleFactorOption,
+  palette = Palette,
+  colors,
+  typography = { shared: { fontFamily: 'System' } },
+}: Options): UIKitTheme => {
   if (scaleFactorOption?.applyToCreateStyleSheet) createStyleSheet.updateScaleFactor(scaleFactorOption.scaleFactor);
-  const _scaleFactor = scaleFactorOption?.scaleFactor ?? defaultScaleFactor;
+  const scaleFactor = scaleFactorOption?.scaleFactor ?? createScaleFactor();
 
   return {
     appearance,
     palette,
     select: createAppearanceHelper(appearance),
     colors: colors(palette),
-    scaleFactor: _scaleFactor,
-    typography: createTypography({ shared: { fontFamily: 'System' } }, _scaleFactor),
+    typography: createTypography(typography, scaleFactor),
+    scaleFactor,
   };
 };
diff --git a/packages/uikit-react-native-foundation/src/theme/Typography.ts b/packages/uikit-react-native-foundation/src/theme/Typography.ts
@@ -1,8 +1,9 @@
 import type { FontAttributes, Typography } from '../types';
 
-type TypographyOverrides = Partial<Typography> & {
+export type TypographyOverrides = Partial<Typography> & {
   shared?: Partial<FontAttributes>;
 };
+
 export const createTypography = (
   overrides: TypographyOverrides = {},
   scaleFactor: (dp: number) => number,