fix(fix-typography-extend): [DefaultTheme] fix typography type extension

packages/juno-core/src/foundation/theme/DefaultTheme.ts

@@ -0,0 +1,2 @@
+/** that theme provide user to custom with */
+export interface DefaultTheme {}

packages/juno-core/src/foundation/theme/index.ts

@@ -7,3 +7,4 @@ export * from './paletteProp.type';
 export * from './theme.type';
 export * from './typography.type';
 export * from './useThemeProps';
+export * from './DefaultTheme';

packages/juno-core/src/foundation/theme/theme.type.ts

@@ -170,9 +170,7 @@ import radius from './assets/radius.json';
 import shape from './assets/shape.json';
 import zIndex from './assets/zIndex.json';
 import { RcTypographyType } from './typography.type';
-
-/** that theme provide user to custom with */
-export interface DefaultTheme {}
+import { DefaultTheme } from './DefaultTheme';
 
 /** inner for make `(DefaultTheme & ForExtendTheme)['palette']` work with ts */
 type ForExtendTheme = { palette: {} };

packages/juno-core/src/foundation/theme/typography.type.ts

@@ -1,6 +1,7 @@
 import { Theme as MuiTheme } from '@material-ui/core/styles';
 
 import typography from './assets/typography.json';
+import { DefaultTheme } from './DefaultTheme';
 
 type RcTypographyPickFields =
   | 'fontFamily'
@@ -27,22 +28,25 @@ export type RcTypographyKeys =
   | 'body1'
   | 'caption2'
   | 'caption1'
-  | 'inherit';
+  | 'inherit'
+  | keyof ExtensionTypography;
 
 export type RcTypographyAddition = Pick<
   typeof typography,
   RcTypographyPickFields
 >;
 
-export type RcTypographies = Record<
-  RcTypographyKeys,
-  {
-    fontSize: string | number;
-    fontWeight: number | number;
-    lineHeight: string | number;
-  }
->;
+export type RcTypographyDetail = {
+  fontSize: string | number;
+  fontWeight: number;
+  lineHeight: string | number;
+};
+
+export type RcTypographies = Record<RcTypographyKeys, RcTypographyDetail>;
+
+type ExtensionTypography = (DefaultTheme & { typography: {} })['typography'];
 
 export type RcTypographyType = RcTypographyAddition &
+  ExtensionTypography &
   RcTypographies &
   MuiTheme['typography'];

sync-github.json

@@ -1,3 +1,3 @@
 {
-  "latestCommitSHA": "58bdb5c97105f25bda64d9af3a92c58cc5f29b86"
+  "latestCommitSHA": "b5e53517b7e548cf7e84f72da4189ab459ab9ca2"
 }