react-native-shared-components 0.3.4 → 0.3.5

package/lib/module/assets/theme.js

@@ -55,25 +55,25 @@ export const typographyDefault = {
     lineHeight: 'lineHeights/lh16',
     fontSize: 'fontSizes/fs12'
   },
-  'tex14/normal': {
+  'text14/normal': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/regular',
     lineHeight: 'lineHeights/lh20',
     fontSize: 'fontSizes/fs14'
   },
-  'tex14/medium': {
+  'text14/medium': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/medium',
     lineHeight: 'lineHeights/lh20',
     fontSize: 'fontSizes/fs14'
   },
-  'tex14/semiBold': {
+  'text14/semiBold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/semiBold',
     lineHeight: 'lineHeights/lh20',
     fontSize: 'fontSizes/fs14'
   },
-  'tex14/bold': {
+  'text14/bold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/bold',
     lineHeight: 'lineHeights/lh20',
@@ -205,19 +205,19 @@ export const typographyDefault = {
     lineHeight: 'lineHeights/lh44',
     fontSize: 'fontSizes/fs36'
   },
-  'tex36/medium': {
+  'text36/medium': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/medium',
     lineHeight: 'lineHeights/lh44',
     fontSize: 'fontSizes/fs36'
   },
-  'tex36/semiBold': {
+  'text36/semiBold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/semiBold',
     lineHeight: 'lineHeights/lh44',
     fontSize: 'fontSizes/fs36'
   },
-  'tex36/bold': {
+  'text36/bold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/bold',
     lineHeight: 'lineHeights/lh44',

package/lib/module/assets/theme.js.map

@@ -1 +1 @@
-{"version":3,"names":["typographyDefault","fontFamily","fontWeight","lineHeight","fontSize"],"sourceRoot":"../../../src","sources":["assets/theme.ts"],"mappings":";;AAAA,OAAO,MAAMA,iBAAiB,GAAG;EAC/B,0BAA0B,EAAE,SAAS;EAErC,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,gBAAgB,EAAE,EAAE;EAEpB,qBAAqB,EAAE,KAAK;EAE5B,oBAAoB,EAAE,KAAK;EAE3B,sBAAsB,EAAE,KAAK;EAE7B,kBAAkB,EAAE,KAAK;EAEzB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,kBAAkB,EAAE,EAAE;EAEtB,eAAe,EAAE;IACfC,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,iBAAiB,EAAE;IACjBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,aAAa,EAAE;IACbH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,cAAc,EAAE;IACdH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,cAAc,EAAE;IACdH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,gBAAgB,EAAE;IAChBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,YAAY,EAAE;IACZH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,iBAAiB,EAAE;IACjBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,aAAa,EAAE;IACbH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,iBAAiB,EAAE;IACjBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,aAAa,EAAE;IACbH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,iBAAiB,EAAE;IACjBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,aAAa,EAAE;IACbH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,iBAAiB,EAAE;IACjBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,aAAa,EAAE;IACbH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,eAAe,EAAE;IACfH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCE,QAAQ,EAAE,gBAAgB;IAC1BD,UAAU,EAAE;EACd,CAAC;EAED,eAAe,EAAE;IACfF,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,iBAAiB,EAAE;IACjBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,aAAa,EAAE;IACbH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,cAAc,EAAE;IACdH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,qBAAqB;IACjCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,cAAc,EAAE;IACdH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,oBAAoB;IAChCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,gBAAgB,EAAE;IAChBH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,sBAAsB;IAClCC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ,CAAC;EAED,YAAY,EAAE;IACZH,UAAU,EAAE,0BAA0B;IACtCC,UAAU,EAAE,kBAAkB;IAC9BC,UAAU,EAAE,kBAAkB;IAC9BC,QAAQ,EAAE;EACZ;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["typographyDefault","fontFamily","fontWeight","lineHeight","fontSize"],"sourceRoot":"../../../src","sources":["assets/theme.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/BaseButton/index.js

@@ -1,9 +1,9 @@
 "use strict";
 
 import React from 'react';
-import { TouchableOpacity, ActivityIndicator, StyleSheet } from 'react-native';
+import { TouchableOpacity, ActivityIndicator, StyleSheet, Text } from 'react-native';
 import { Colors } from "../../constants/Colors.js";
-import { BaseText } from "../BaseText/index.js";
+import { useTheme } from "../../core/index.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export const BaseButton = ({
   type = 'common',
@@ -21,16 +21,19 @@ export const BaseButton = ({
   const sizeStyle = styles[`size_${size}`];
   const variantStyle = disabled ? styles.variant_disabled : styles[`variant_${variant}`];
   const textVariantStyle = disabled ? styles.text_disabled : styles[`text_variant_${variant}`];
-  const getTextType = () => {
+  const {
+    typography
+  } = useTheme();
+  const getFontSize = () => {
     switch (size) {
-      case 'small':
-        return 'tex14/medium';
-      case 'regular':
-        return 'text16/semiBold';
       case 'large':
-        return 'text20/semiBold';
+        return typography['fontSize/fs16'];
+      case 'regular':
+        return typography['fontSize/fs14'];
+      case 'small':
+        return typography['fontSize/fs12'];
       default:
-        return 'text16/semiBold';
+        return typography['fontSize/fs14'];
     }
   };
   if (type === 'icon') {
@@ -56,9 +59,10 @@ export const BaseButton = ({
       size: "small",
       color: disabled ? Colors.text_disabled_tertiary_light : variant === 'primary' || variant === 'red' ? Colors.text_inverse_primary_light : Colors.text_brand_primary
     }) : /*#__PURE__*/_jsxs(_Fragment, {
-      children: [icon && iconPosition === 'left' && icon, label && /*#__PURE__*/_jsx(BaseText, {
-        type: getTextType(),
-        style: [textVariantStyle, textStyle],
+      children: [icon && iconPosition === 'left' && icon, label && /*#__PURE__*/_jsx(Text, {
+        style: [textVariantStyle, textStyle, {
+          fontSize: getFontSize()
+        }],
         children: label
       }), icon && iconPosition === 'right' && icon]
     })

package/lib/module/components/BaseButton/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","TouchableOpacity","ActivityIndicator","StyleSheet","Colors","BaseText","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","BaseButton","type","variant","size","label","icon","iconPosition","loading","disabled","style","textStyle","props","sizeStyle","styles","variantStyle","variant_disabled","textVariantStyle","text_disabled","getTextType","activeOpacity","baseButton","iconButton","children","color","text_disabled_tertiary_light","text_inverse_primary_light","text_brand_primary","create","flexDirection","alignItems","justifyContent","borderWidth","aspectRatio","height","paddingHorizontal","paddingVertical","borderRadius","gap","backgroundColor","bg_brand_primary","bg_red_primary","borderColor","border_brand_primary","bg_brand_tertiary","bg_disabled_primary_light"],"sourceRoot":"../../../../src","sources":["components/BaseButton/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","TouchableOpacity","ActivityIndicator","StyleSheet","Text","Colors","useTheme","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","BaseButton","type","variant","size","label","icon","iconPosition","loading","disabled","style","textStyle","props","sizeStyle","styles","variantStyle","variant_disabled","textVariantStyle","text_disabled","typography","getFontSize","activeOpacity","baseButton","iconButton","children","color","text_disabled_tertiary_light","text_inverse_primary_light","text_brand_primary","fontSize","create","flexDirection","alignItems","justifyContent","borderWidth","aspectRatio","height","paddingHorizontal","paddingVertical","borderRadius","gap","backgroundColor","bg_brand_primary","bg_red_primary","borderColor","border_brand_primary","bg_brand_tertiary","bg_disabled_primary_light"],"sourceRoot":"../../../../src","sources":["components/BaseButton/index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/BaseText/index.js

@@ -9,10 +9,10 @@ export const BaseTextTypes = {
   'text12/medium': 'text12/medium',
   'text12/semiBold': 'text12/semiBold',
   'text12/bold': 'text12/bold',
-  'tex14/normal': 'tex14/normal',
-  'tex14/medium': 'tex14/medium',
-  'tex14/semiBold': 'tex14/semiBold',
-  'tex14/bold': 'tex14/bold',
+  'text14/normal': 'text14/normal',
+  'text14/medium': 'text14/medium',
+  'text14/semiBold': 'text14/semiBold',
+  'text14/bold': 'text14/bold',
   'text16/normal': 'text16/normal',
   'text16/medium': 'text16/medium',
   'text16/semiBold': 'text16/semiBold',
@@ -33,10 +33,10 @@ export const BaseTextTypes = {
   'text30/medium': 'text30/medium',
   'text30/semiBold': 'text30/semiBold',
   'text30/bold': 'text30/bold',
-  'tex36/normal': 'tex36/normal',
-  'tex36/medium': 'tex36/medium',
-  'tex36/semiBold': 'tex36/semiBold',
-  'tex36/bold': 'tex36/bold'
+  'text36/normal': 'text36/normal',
+  'text36/medium': 'text36/medium',
+  'text36/semiBold': 'text36/semiBold',
+  'text36/bold': 'text36/bold'
 };
 export const BaseText = ({
   children,

package/lib/module/components/BaseText/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Text","useMemo","useTheme","jsx","_jsx","BaseTextTypes","BaseText","children","type","styleText","props","typography","textStyle","fontSize","fontWeight","fontFamily","style"],"sourceRoot":"../../../../src","sources":["components/BaseText/index.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAwC,cAAc;AACnE,SAASC,OAAO,QAAwB,OAAO;AAC/C,SAASC,QAAQ,QAAQ,qBAAY;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtC,OAAO,MAAMC,aAAa,GAAG;EAC3B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,cAAc,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC9B,gBAAgB,EAAE,gBAAgB;EAClC,YAAY,EAAE,YAAY;EAC1B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,cAAc,EAAE,cAAc;EAC9B,cAAc,EAAE,cAAc;EAC9B,gBAAgB,EAAE,gBAAgB;EAClC,YAAY,EAAE;AAChB,CAAC;AAOD,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EACvBC,QAAQ;EACRC,IAAI;EACJC,SAAS;EACT,GAAGC;AACM,CAAC,KAAK;EACf,MAAM;IAAEC;EAAW,CAAC,GAAGT,QAAQ,CAAC,CAAC;EACjC,MAAMU,SAAS,GAAGX,OAAO,CAAC,MAAM;IAC9B,OAAO;MACLY,QAAQ,EAAEF,UAAU,CAACA,UAAU,CAACH,IAAI,CAAC,CAACK,QAAQ,CAAC;MAC/CC,UAAU,EAAEH,UAAU,CAACA,UAAU,CAACH,IAAI,CAAC,CAACM,UAAU,CAAC;MACnDC,UAAU,EAAEJ,UAAU,CAACA,UAAU,CAACH,IAAI,CAAC,CAACO,UAAU;IACpD,CAAC;EACH,CAAC,EAAE,CAACP,IAAI,EAAEG,UAAU,CAAC,CAAC;EAEtB,oBACEP,IAAA,CAACJ,IAAI;IAACgB,KAAK,EAAE;MAAE,GAAGJ,SAAS;MAAE,GAAGH;IAAU,CAAE;IAAA,GAAKC,KAAK;IAAAH,QAAA,EACnDA;EAAQ,CACL,CAAC;AAEX,CAAC","ignoreList":[]}
+{"version":3,"names":["Text","useMemo","useTheme","jsx","_jsx","BaseTextTypes","BaseText","children","type","styleText","props","typography","textStyle","fontSize","fontWeight","fontFamily","style"],"sourceRoot":"../../../../src","sources":["components/BaseText/index.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAwC,cAAc;AACnE,SAASC,OAAO,QAAwB,OAAO;AAC/C,SAASC,QAAQ,QAAQ,qBAAY;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEtC,OAAO,MAAMC,aAAa,GAAG;EAC3B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE,aAAa;EAC5B,eAAe,EAAE,eAAe;EAChC,eAAe,EAAE,eAAe;EAChC,iBAAiB,EAAE,iBAAiB;EACpC,aAAa,EAAE;AACjB,CAAC;AAOD,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EACvBC,QAAQ;EACRC,IAAI;EACJC,SAAS;EACT,GAAGC;AACM,CAAC,KAAK;EACf,MAAM;IAAEC;EAAW,CAAC,GAAGT,QAAQ,CAAC,CAAC;EACjC,MAAMU,SAAS,GAAGX,OAAO,CAAC,MAAM;IAC9B,OAAO;MACLY,QAAQ,EAAEF,UAAU,CAACA,UAAU,CAACH,IAAI,CAAC,CAACK,QAAQ,CAAC;MAC/CC,UAAU,EAAEH,UAAU,CAACA,UAAU,CAACH,IAAI,CAAC,CAACM,UAAU,CAAC;MACnDC,UAAU,EAAEJ,UAAU,CAACA,UAAU,CAACH,IAAI,CAAC,CAACO,UAAU;IACpD,CAAC;EACH,CAAC,EAAE,CAACP,IAAI,EAAEG,UAAU,CAAC,CAAC;EAEtB,oBACEP,IAAA,CAACJ,IAAI;IAACgB,KAAK,EAAE;MAAE,GAAGJ,SAAS;MAAE,GAAGH;IAAU,CAAE;IAAA,GAAKC,KAAK;IAAAH,QAAA,EACnDA;EAAQ,CACL,CAAC;AAEX,CAAC","ignoreList":[]}

package/lib/typescript/src/assets/theme.d.ts

@@ -53,25 +53,25 @@ export declare const typographyDefault: {
         lineHeight: string;
         fontSize: string;
     };
-    'tex14/normal': {
+    'text14/normal': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;
         fontSize: string;
     };
-    'tex14/medium': {
+    'text14/medium': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;
         fontSize: string;
     };
-    'tex14/semiBold': {
+    'text14/semiBold': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;
         fontSize: string;
     };
-    'tex14/bold': {
+    'text14/bold': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;
@@ -203,19 +203,19 @@ export declare const typographyDefault: {
         lineHeight: string;
         fontSize: string;
     };
-    'tex36/medium': {
+    'text36/medium': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;
         fontSize: string;
     };
-    'tex36/semiBold': {
+    'text36/semiBold': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;
         fontSize: string;
     };
-    'tex36/bold': {
+    'text36/bold': {
         fontFamily: string;
         fontWeight: string;
         lineHeight: string;

package/lib/typescript/src/components/BaseButton/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/BaseButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,qBAAqB,EAC3B,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,aAAa,GAAG,KAAK,GAAG,cAAc,CAAC;AAC/E,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC;IAC3E,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAqGhD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/BaseButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,qBAAqB,EAE3B,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,aAAa,GAAG,KAAK,GAAG,cAAc,CAAC;AAC/E,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC;IAC3E,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAqGhD,CAAC"}

package/lib/typescript/src/components/BaseText/index.d.ts

@@ -5,10 +5,10 @@ export declare const BaseTextTypes: {
     'text12/medium': string;
     'text12/semiBold': string;
     'text12/bold': string;
-    'tex14/normal': string;
-    'tex14/medium': string;
-    'tex14/semiBold': string;
-    'tex14/bold': string;
+    'text14/normal': string;
+    'text14/medium': string;
+    'text14/semiBold': string;
+    'text14/bold': string;
     'text16/normal': string;
     'text16/medium': string;
     'text16/semiBold': string;
@@ -29,10 +29,10 @@ export declare const BaseTextTypes: {
     'text30/medium': string;
     'text30/semiBold': string;
     'text30/bold': string;
-    'tex36/normal': string;
-    'tex36/medium': string;
-    'tex36/semiBold': string;
-    'tex36/bold': string;
+    'text36/normal': string;
+    'text36/medium': string;
+    'text36/semiBold': string;
+    'text36/bold': string;
 };
 export type EBaseTextType = keyof typeof BaseTextTypes;
 interface IBaseText extends TextProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-shared-components",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "shared-components",
   "source": "./src/index.tsx",
   "main": "./src/index.tsx",

package/src/assets/theme.ts

@@ -87,28 +87,28 @@ export const typographyDefault = {
     fontSize: 'fontSizes/fs12',
   },
 
-  'tex14/normal': {
+  'text14/normal': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/regular',
     lineHeight: 'lineHeights/lh20',
     fontSize: 'fontSizes/fs14',
   },
 
-  'tex14/medium': {
+  'text14/medium': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/medium',
     lineHeight: 'lineHeights/lh20',
     fontSize: 'fontSizes/fs14',
   },
 
-  'tex14/semiBold': {
+  'text14/semiBold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/semiBold',
     lineHeight: 'lineHeights/lh20',
     fontSize: 'fontSizes/fs14',
   },
 
-  'tex14/bold': {
+  'text14/bold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/bold',
     lineHeight: 'lineHeights/lh20',
@@ -262,21 +262,21 @@ export const typographyDefault = {
     fontSize: 'fontSizes/fs36',
   },
 
-  'tex36/medium': {
+  'text36/medium': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/medium',
     lineHeight: 'lineHeights/lh44',
     fontSize: 'fontSizes/fs36',
   },
 
-  'tex36/semiBold': {
+  'text36/semiBold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/semiBold',
     lineHeight: 'lineHeights/lh44',
     fontSize: 'fontSizes/fs36',
   },
 
-  'tex36/bold': {
+  'text36/bold': {
     fontFamily: 'fontFamilies/productFont',
     fontWeight: 'fontWeights/bold',
     lineHeight: 'lineHeights/lh44',

package/src/components/BaseButton/index.tsx

@@ -6,9 +6,10 @@ import {
   type ViewStyle,
   type TextStyle,
   type TouchableOpacityProps,
+  Text,
 } from 'react-native';
 import { Colors } from '../../constants/Colors';
-import { BaseText, type EBaseTextType } from '../BaseText';
+import { useTheme } from '../../core';
 
 export type ButtonVariant = 'primary' | 'link-subtle' | 'red' | 'brand-subtle';
 export type ButtonSize = 'small' | 'regular' | 'large';
@@ -46,17 +47,18 @@ export const BaseButton: React.FC<BaseButtonProps> = ({
   const textVariantStyle = disabled
     ? styles.text_disabled
     : styles[`text_variant_${variant}`];
+  const { typography } = useTheme();
 
-  const getTextType = (): EBaseTextType => {
+  const getFontSize = () => {
     switch (size) {
-      case 'small':
-        return 'tex14/medium';
-      case 'regular':
-        return 'text16/semiBold';
       case 'large':
-        return 'text20/semiBold';
+        return typography['fontSize/fs16'];
+      case 'regular':
+        return typography['fontSize/fs14'];
+      case 'small':
+        return typography['fontSize/fs12'];
       default:
-        return 'text16/semiBold';
+        return typography['fontSize/fs14'];
     }
   };
 
@@ -115,12 +117,11 @@ export const BaseButton: React.FC<BaseButtonProps> = ({
         <>
           {icon && iconPosition === 'left' && icon}
           {label && (
-            <BaseText
-              type={getTextType()}
-              style={[textVariantStyle, textStyle]}
+            <Text
+              style={[textVariantStyle, textStyle, { fontSize: getFontSize() }]}
             >
               {label}
-            </BaseText>
+            </Text>
           )}
           {icon && iconPosition === 'right' && icon}
         </>

package/src/components/BaseText/index.tsx

@@ -7,10 +7,10 @@ export const BaseTextTypes = {
   'text12/medium': 'text12/medium',
   'text12/semiBold': 'text12/semiBold',
   'text12/bold': 'text12/bold',
-  'tex14/normal': 'tex14/normal',
-  'tex14/medium': 'tex14/medium',
-  'tex14/semiBold': 'tex14/semiBold',
-  'tex14/bold': 'tex14/bold',
+  'text14/normal': 'text14/normal',
+  'text14/medium': 'text14/medium',
+  'text14/semiBold': 'text14/semiBold',
+  'text14/bold': 'text14/bold',
   'text16/normal': 'text16/normal',
   'text16/medium': 'text16/medium',
   'text16/semiBold': 'text16/semiBold',
@@ -31,10 +31,10 @@ export const BaseTextTypes = {
   'text30/medium': 'text30/medium',
   'text30/semiBold': 'text30/semiBold',
   'text30/bold': 'text30/bold',
-  'tex36/normal': 'tex36/normal',
-  'tex36/medium': 'tex36/medium',
-  'tex36/semiBold': 'tex36/semiBold',
-  'tex36/bold': 'tex36/bold',
+  'text36/normal': 'text36/normal',
+  'text36/medium': 'text36/medium',
+  'text36/semiBold': 'text36/semiBold',
+  'text36/bold': 'text36/bold',
 };
 export type EBaseTextType = keyof typeof BaseTextTypes;
 interface IBaseText extends TextProps {