Add option for defaultTheme under Typograhy (bug-1072)

data-for-change · Mar 16, 2024 · 4487b78 · 4487b78
1 parent a45d88f
commit 4487b78
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/components/atoms/Typography.tsx b/src/components/atoms/Typography.tsx
@@ -3,18 +3,20 @@ import MaterialTypography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import { Variant } from '@material-ui/core/styles/createTypography';
 
-interface IBold {
+interface IProps {
   bold?: boolean;
+  defaultTheme?: boolean;
 }
 
 interface IText {
-  [property: string]: FC<IBold>;
+  [property: string]: FC<IProps>;
 }
 
 interface ITypographyBase {
   bold?: boolean;
   variant: Variant;
   component: ElementType;
+  defaultTheme?: boolean;
 }
 
 const useStyles = makeStyles(() => ({
@@ -28,8 +30,8 @@ const useBold = (bold = false) => {
   return bold ? classes.bold : '';
 };
 
-const TypographyBase: FC<ITypographyBase> = ({ bold, variant, component, children }) => (
-  <MaterialTypography  className={useBold(bold)} variant={variant} component={component}>
+const TypographyBase: FC<ITypographyBase> = ({ bold, defaultTheme, variant, component, children }) => (
+  <MaterialTypography  className={useBold(bold)} variant={variant} component={component} color={defaultTheme ? "textPrimary" : undefined}>
     {children}
   </MaterialTypography>
 );

diff --git a/src/components/molecules/NewsFlashFilterPanel.tsx b/src/components/molecules/NewsFlashFilterPanel.tsx
@@ -80,7 +80,7 @@ const NewsFlashFilterPanel: FC<IProps> = () => {
             key={filter}
           >
             {filter === SourceFilterEnum.all ? (
-              <Typography.Title2>{t('filterPanel.all')}</Typography.Title2>
+              <Typography.Title2 defaultTheme>{t('filterPanel.all')}</Typography.Title2>
             ) : (
               <img className={classes.image} src={logo} alt={filter} />
             )}