Merge pull request #305 from lad-tech/292-mobydick-20-fonts-popups

292 mobydick 20 fonts popups
lad-tech · Jan 20, 2025 · 68e4b20 · 68e4b20
2 parents 83b41d1 + 176253c
commit 68e4b20
Show file tree

Hide file tree

Showing 20 changed files with 116 additions and 76 deletions.
diff --git a/packages/calendar/src/Calendar/__tests__/__snapshots__/ModalCalendar.test.tsx.snap b/packages/calendar/src/Calendar/__tests__/__snapshots__/ModalCalendar.test.tsx.snap
@@ -3646,6 +3646,7 @@ exports[`ModalCalendar bottomView IButtonView.large 1`] = `
               "color": "#9BA1B0",
               "fontFamily": "Inter-Regular",
               "fontSize": 16,
+              "fontWeight": "400",
               "lineHeight": 20,
               "minHeight": 20,
             },
@@ -3668,6 +3669,7 @@ exports[`ModalCalendar bottomView IButtonView.large 1`] = `
               "color": "#20242D",
               "fontFamily": "Inter-Medium",
               "fontSize": 16,
+              "fontWeight": "500",
               "lineHeight": 20,
               "minHeight": 20,
             },
@@ -7477,6 +7479,7 @@ exports[`ModalCalendar bottomView IButtonView.small onAcceptDateRangeChange 1`]
               "color": "#9BA1B0",
               "fontFamily": "Inter-Regular",
               "fontSize": 16,
+              "fontWeight": "400",
               "lineHeight": 20,
               "minHeight": 20,
             },
@@ -11219,6 +11222,7 @@ exports[`ModalCalendar bottomView IButtonView.small onDateRangeChange 1`] = `
               "color": "#9BA1B0",
               "fontFamily": "Inter-Regular",
               "fontSize": 16,
+              "fontWeight": "400",
               "lineHeight": 20,
               "minHeight": 20,
             },
@@ -14961,6 +14965,7 @@ exports[`ModalCalendar renders correctly 1`] = `
               "color": "#20242D",
               "fontFamily": "Inter-Medium",
               "fontSize": 16,
+              "fontWeight": "500",
               "lineHeight": 20,
               "minHeight": 20,
             },
@@ -18681,6 +18686,7 @@ exports[`ModalCalendar renders correctly initialRange 1`] = `
               "color": "#20242D",
               "fontFamily": "Inter-Medium",
               "fontSize": 16,
+              "fontWeight": "500",
               "lineHeight": 20,
               "minHeight": 20,
             },
@@ -22346,6 +22352,7 @@ exports[`ModalCalendar renders correctly initialRange only fromDate isShowToday
               "color": "#20242D",
               "fontFamily": "Inter-Medium",
               "fontSize": 16,
+              "fontWeight": "500",
               "lineHeight": 20,
               "minHeight": 20,
             },

diff --git a/packages/calendar/src/Calendar/types.ts b/packages/calendar/src/Calendar/types.ts
@@ -1,10 +1,7 @@
 import {MarkingProps} from 'react-native-calendars/src/calendar/day/marking';
 import {CalendarProps} from 'react-native-calendars';
 import {ReactElement} from 'react';
-import {
-  IHorizontalButtonsView,
-  TypographyLegacyProp,
-} from '@lad-tech/mobydick-core';
+import {IHorizontalButtonsView, TypographyProp} from '@lad-tech/mobydick-core';
 
 export interface IMarkedTypes {
   [key: string]: MarkingProps;
@@ -62,9 +59,9 @@ export interface IModalCalendar
   onDateRangeChange?: (dateRange?: IDateRange) => void;
   titlePrefix?: string;
   titleSuffix?: string;
-  titleFont?: TypographyLegacyProp;
+  titleFont?: TypographyProp;
   descriptionText?: string;
-  descriptionFont?: TypographyLegacyProp;
+  descriptionFont?: TypographyProp;
   buttonView?: IButtonView;
   isCounter?: boolean;
   onAcceptDateRangeChange?: (dateRange: IDateRange) => void;

diff --git a/...c/popups/components/ActionSheetBase/__tests__/__snapshots__/ActionSheetBase.test.tsx.snap b/...c/popups/components/ActionSheetBase/__tests__/__snapshots__/ActionSheetBase.test.tsx.snap
@@ -192,6 +192,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly with i
                 "color": "#FFFFFF",
                 "fontFamily": "Inter-Regular",
                 "fontSize": 14,
+                "fontWeight": "400",
                 "lineHeight": 18,
                 "minHeight": 18,
               },

diff --git a/...ges/core/src/popups/components/ActionSheetBase/__tests__/__snapshots__/Item.test.tsx.snap b/...ges/core/src/popups/components/ActionSheetBase/__tests__/__snapshots__/Item.test.tsx.snap
@@ -68,6 +68,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly Item 1
             "color": "#2B78EE",
             "fontFamily": "Inter-Medium",
             "fontSize": 16,
+            "fontWeight": "500",
             "lineHeight": 20,
             "minHeight": 20,
           },
@@ -151,6 +152,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly Item w
             "color": "#FFFFFF",
             "fontFamily": "Inter-Regular",
             "fontSize": 14,
+            "fontWeight": "400",
             "lineHeight": 18,
             "minHeight": 18,
           },
@@ -237,6 +239,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly Item w
             "color": "#FFFFFF",
             "fontFamily": "Inter-Regular",
             "fontSize": 14,
+            "fontWeight": "400",
             "lineHeight": 18,
             "minHeight": 18,
           },
@@ -408,6 +411,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly Item w
             "color": "#9BA1B0",
             "fontFamily": "Inter-Medium",
             "fontSize": 16,
+            "fontWeight": "500",
             "lineHeight": 20,
             "minHeight": 20,
           },
@@ -511,6 +515,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly Item w
             "color": "#2B78EE",
             "fontFamily": "Inter-Medium",
             "fontSize": 16,
+            "fontWeight": "500",
             "lineHeight": 20,
             "minHeight": 20,
           },
@@ -594,6 +599,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly Item w
             "color": "#20242D",
             "fontFamily": "Inter-Regular",
             "fontSize": 16,
+            "fontWeight": "400",
             "lineHeight": 20,
             "minHeight": 20,
           },
@@ -771,6 +777,7 @@ exports[`@lad-tech/mobydick-core/ActionSheetBase should renders correctly inner
             "color": "#FFFFFF",
             "fontFamily": "Inter-Regular",
             "fontSize": 14,
+            "fontWeight": "400",
             "lineHeight": 18,
             "minHeight": 18,
           },

diff --git a/packages/core/src/popups/components/ActionSheetBase/content/Contents.tsx b/packages/core/src/popups/components/ActionSheetBase/content/Contents.tsx
@@ -2,7 +2,7 @@ import {IItemType, IPropsContents} from '../types';
 import stylesCreate from '../stylesCreate';
 import useStyles from '../../../../styles/hooks/useStyles';
 import View from '../../../../basic/components/View/View';
-import {TypographyLegacy} from '../../../../typography';
+import {Typography} from '../../../../typography';
 import CheckBox from '../../../../controls/CheckBox/CheckBox';
 import Radio from '../../../../controls/Radio/Radio';
 
@@ -32,9 +32,9 @@ const Contents = (props: IPropsContents) => {
     <>
       <View style={styles.leftIconView}>
         {leftIcon && <View style={styles.leftIcon}>{leftIcon}</View>}
-        <TypographyLegacy style={styles.textSelected} font={selectFont()}>
+        <Typography style={styles.textSelected} font={selectFont()}>
           {title}
-        </TypographyLegacy>
+        </Typography>
       </View>
 
       {checkboxList && (

diff --git a/packages/core/src/popups/components/ActionSheetBase/types.ts b/packages/core/src/popups/components/ActionSheetBase/types.ts
@@ -1,12 +1,12 @@
 import {StyleProp, ViewStyle} from 'react-native';
 import {PropsWithChildren, ReactElement} from 'react';
 
-import {TypographyLegacyProp} from '../../../typography/types';
+import {TypographyProp} from '../../../typography/types';
 import {IPopup} from '../../types';
 
 export interface IPropsContents {
   title: string;
-  textFont?: TypographyLegacyProp;
+  textFont?: TypographyProp;
   leftIcon?: ReactElement | undefined;
   onPress?(): void;
   radio?: string;

diff --git a/packages/core/src/popups/components/ModalBase/AlertContent.tsx b/packages/core/src/popups/components/ModalBase/AlertContent.tsx
@@ -28,7 +28,7 @@ const AlertContent: FC<IProps> = props => {
       <SimpleIcon
         name={name || 'icon-check'}
         size={size || px(36)}
-        color={color || colors.IconBase}
+        color={color || colors.IconAccent}
       />
     </View>
   );

diff --git a/packages/core/src/popups/components/ModalBase/TextContent.tsx b/packages/core/src/popups/components/ModalBase/TextContent.tsx
@@ -3,7 +3,7 @@ import {FC} from 'react';
 import {ITextContentProps} from '../PopupBase';
 import useStyles from '../../../styles/hooks/useStyles';
 import View from '../../../basic/components/View/View';
-import {TypographyLegacy} from '../../../typography/components/TypographyLegacy/TypographyLegacy';
+import {Typography} from '../../../typography';
 
 import stylesCreate from './stylesCreate';
 
@@ -21,18 +21,18 @@ const TextContent: FC<ITextContentProps> = props => {
   return (
     <View style={styles.textContent}>
       {Boolean(title) && (
-        <TypographyLegacy
+        <Typography
           style={[styles.title, titleStyles]}
           font={titleFont ? titleFont : 'SemiBold-Primary-L'}>
           {title}
-        </TypographyLegacy>
+        </Typography>
       )}
       {Boolean(descriptionText) && (
-        <TypographyLegacy
+        <Typography
           style={[styles.description, descriptionStyles]}
-          font={descriptionFont ? descriptionFont : 'Regular-Tertiary-XS'}>
+          font={descriptionFont ? descriptionFont : 'Regular-Tertiary-S'}>
           {descriptionText}
-        </TypographyLegacy>
+        </Typography>
       )}
     </View>
   );

diff --git a/...es/core/src/popups/components/ModalBase/__tests__/__snapshots__/TextContent.text.tsx.snap b/...es/core/src/popups/components/ModalBase/__tests__/__snapshots__/TextContent.text.tsx.snap
@@ -17,6 +17,7 @@ exports[`@lad-tech/mobydick-core/Title should renders correctly with description
           "color": "#353A45",
           "fontFamily": "Inter-Medium",
           "fontSize": 16,
+          "fontWeight": "500",
           "lineHeight": 20,
           "minHeight": 20,
         },
@@ -54,6 +55,7 @@ exports[`@lad-tech/mobydick-core/Title should renders correctly with titleFont 1
           "color": "#353A45",
           "fontFamily": "Inter-Medium",
           "fontSize": 16,
+          "fontWeight": "500",
           "lineHeight": 20,
           "minHeight": 20,
         },
@@ -77,9 +79,10 @@ exports[`@lad-tech/mobydick-core/Title should renders correctly with titleFont 1
         {
           "color": "#5E6678",
           "fontFamily": "Inter-Regular",
-          "fontSize": 12,
-          "lineHeight": 16,
-          "minHeight": 16,
+          "fontSize": 14,
+          "fontWeight": "400",
+          "lineHeight": 18,
+          "minHeight": 18,
         },
         [
           {
@@ -115,6 +118,7 @@ exports[`@lad-tech/mobydick-core/Title should renders correctly without descript
           "color": "#20242D",
           "fontFamily": "Inter-SemiBold",
           "fontSize": 18,
+          "fontWeight": "600",
           "lineHeight": 22,
           "minHeight": 22,
         },
@@ -138,9 +142,10 @@ exports[`@lad-tech/mobydick-core/Title should renders correctly without descript
         {
           "color": "#5E6678",
           "fontFamily": "Inter-Regular",
-          "fontSize": 12,
-          "lineHeight": 16,
-          "minHeight": 16,
+          "fontSize": 14,
+          "fontWeight": "400",
+          "lineHeight": 18,
+          "minHeight": 18,
         },
         [
           {
@@ -176,6 +181,7 @@ exports[`@lad-tech/mobydick-core/Title should renders correctly without titleFon
           "color": "#20242D",
           "fontFamily": "Inter-SemiBold",
           "fontSize": 18,
+          "fontWeight": "600",
           "lineHeight": 22,
           "minHeight": 22,
         },

diff --git a/packages/core/src/popups/components/Modals/__tests__/__snapshots__/ModalAsk.test.tsx.snap b/packages/core/src/popups/components/Modals/__tests__/__snapshots__/ModalAsk.test.tsx.snap
@@ -115,6 +115,7 @@ exports[`@lad-tech/mobydick-core/modalAsk should renders correctly 1`] = `
               "color": "#20242D",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 18,
+              "fontWeight": "600",
               "lineHeight": 22,
               "minHeight": 22,
             },
@@ -136,9 +137,10 @@ exports[`@lad-tech/mobydick-core/modalAsk should renders correctly 1`] = `
             {
               "color": "#5E6678",
               "fontFamily": "Inter-Regular",
-              "fontSize": 12,
-              "lineHeight": 16,
-              "minHeight": 16,
+              "fontSize": 14,
+              "fontWeight": "400",
+              "lineHeight": 18,
+              "minHeight": 18,
             },
             [
               {
@@ -415,6 +417,7 @@ exports[`@lad-tech/mobydick-core/modalAsk should renders correctly with optional
               "color": "#20242D",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 18,
+              "fontWeight": "600",
               "lineHeight": 22,
               "minHeight": 22,
             },
@@ -436,9 +439,10 @@ exports[`@lad-tech/mobydick-core/modalAsk should renders correctly with optional
             {
               "color": "#5E6678",
               "fontFamily": "Inter-Regular",
-              "fontSize": 12,
-              "lineHeight": 16,
-              "minHeight": 16,
+              "fontSize": 14,
+              "fontWeight": "400",
+              "lineHeight": 18,
+              "minHeight": 18,
             },
             [
               {

diff --git a/packages/core/src/popups/components/Modals/__tests__/__snapshots__/ModalError.test.tsx.snap b/packages/core/src/popups/components/Modals/__tests__/__snapshots__/ModalError.test.tsx.snap
@@ -115,6 +115,7 @@ exports[`@lad-tech/mobydick-core/modalError should renders correctly 1`] = `
               "color": "#20242D",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 18,
+              "fontWeight": "600",
               "lineHeight": 22,
               "minHeight": 22,
             },
@@ -136,9 +137,10 @@ exports[`@lad-tech/mobydick-core/modalError should renders correctly 1`] = `
             {
               "color": "#5E6678",
               "fontFamily": "Inter-Regular",
-              "fontSize": 12,
-              "lineHeight": 16,
-              "minHeight": 16,
+              "fontSize": 14,
+              "fontWeight": "400",
+              "lineHeight": 18,
+              "minHeight": 18,
             },
             [
               {
@@ -347,6 +349,7 @@ exports[`@lad-tech/mobydick-core/modalError should renders correctly with option
               "color": "#20242D",
               "fontFamily": "Inter-SemiBold",
               "fontSize": 18,
+              "fontWeight": "600",
               "lineHeight": 22,
               "minHeight": 22,
             },
@@ -368,9 +371,10 @@ exports[`@lad-tech/mobydick-core/modalError should renders correctly with option
             {
               "color": "#5E6678",
               "fontFamily": "Inter-Regular",
-              "fontSize": 12,
-              "lineHeight": 16,
-              "minHeight": 16,
+              "fontSize": 14,
+              "fontWeight": "400",
+              "lineHeight": 18,
+              "minHeight": 18,
             },
             [
               {