@cdek-it/react-native-ui-kit 1.0.0-beta.2 → 1.0.0-beta.4

package/README.md

@@ -38,8 +38,8 @@ UI kit использует следующие виды шрифтов.
 
 | Тип шрифта  | Используемые начертания                        | Рекомендуемый шрифт | Рекомендуемый аналог |
 | ----------- | ---------------------------------------------- | ------------------- | -------------------- |
-| `primary`   | – regular<br/>– demibold<br/>– demibold italic | TT Fellows          | Noto Sans            |
-| `secondary` | – regular<br/>– medium<br/>– bold              | Noto Sans           | —                    |
+| `primary`   | – regular<br/>– demibold<br/>– demibold italic | TT Fellows          | PT Sans              |
+| `secondary` | – regular<br/>– bold                           | PT Sans             | —                    |
 
 Исходники шрифтов не поставляются вместе с пакетом, их требуется подключать
 отдельно. После подключения шрифтов в проект, необходимо указать их в
@@ -84,11 +84,10 @@ UI kit использует следующие виды шрифтов.
           ],
         },
         {
-          fontFamily: 'Noto Sans',
+          fontFamily: 'PT Sans',
           fontDefinitions: [
-            { path: './assets/NotoSans-Bold.ttf', weight: 700 },
-            { path: './assets/NotoSans-Medium.ttf', weight: 500 },
-            { path: './assets/NotoSans-Regular.ttf', weight: 400 },
+            { path: './assets/fonts/PTSans-Bold.ttf', weight: 700 },
+            { path: './assets/fonts/PTSans-Regular.ttf', weight: 400 },
           ],
         },
       ],
@@ -131,7 +130,7 @@ UI kit использует следующие виды шрифтов.
 
       //подключение шрифтов
       ReactFontManager.getInstance().addCustomFont(this, "TT Fellows", R.font.xml_tt_fellows)
-      ReactFontManager.getInstance().addCustomFont(this, "Noto Sans", R.font.xml_noto_sans)
+      ReactFontManager.getInstance().addCustomFont(this, "PT Sans", R.font.xml_pt_sans)
 
       // остальной код...
     }

package/dist/components/Button/utils/ButtonContainer.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines, max-lines-per-function */
 import { useContext } from 'react';
 import { Pressable } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
@@ -160,6 +161,14 @@ const buttonContainerStyles = StyleSheet.create(({ theme, border, spacing, sizin
                     backgroundColor: theme.Button.Text.textButtonHoverBg,
                 },
             },
+            {
+                variant: 'link',
+                disabled: 'true',
+                styles: {
+                    borderColor: theme.Button.Brand.buttonBorderColor,
+                    backgroundColor: theme.Button.Text.textButtonBg,
+                },
+            },
             // severity container (override placeholder variant styles)
             {
                 variant: 'basic',

package/dist/components/Typography/Anchor.js

@@ -49,7 +49,7 @@ const styles = StyleSheet.create(({ spacing, typography, fonts }) => ({
     container: { flexDirection: 'row', alignItems: 'center' },
     text: {
         flexShrink: 1,
-        fontSize: typography.Size['text-xs'],
+        fontSize: typography.Size['text-sm'],
         includeFontPadding: false,
         verticalAlign: 'middle',
         color: typography.Color.Service['text-info'],

package/dist/components/Typography/Body.js

@@ -13,7 +13,7 @@ export const Body = ({ base, color = 'default', disabled, paragraph, weight = 'r
 };
 const styles = StyleSheet.create(({ theme, typography, fonts }) => ({
     text: {
-        fontSize: typography.Size['text-base'],
+        fontSize: typography.Size['text-lg'],
         includeFontPadding: false,
         verticalAlign: 'middle',
         fontFamily: fonts.secondary,
@@ -24,8 +24,8 @@ const styles = StyleSheet.create(({ theme, typography, fonts }) => ({
     default: { color: theme.General.textColor },
     primary: { color: theme.General.primaryColor },
     secondary: { color: theme.General.textSecondaryColor },
-    base: { fontSize: typography.Size['text-sm'] },
-    paragraph: { lineHeight: 24 },
-    paragraphBase: { lineHeight: 21 },
+    base: { fontSize: typography.Size['text-base'] },
+    paragraph: { fontSize: typography.Size['text-lg'] },
+    paragraphBase: { fontSize: typography.Size['text-base'] },
     disabled: { opacity: 0.6 },
 }));

package/dist/components/Typography/Caption.js

@@ -26,7 +26,7 @@ export const Caption = ({ color = 'default', disabled, style, Icon, ...other })
 const CaptionTestId = { text: 'CaptionText', icon: 'CaptionIcon' };
 const styles = StyleSheet.create(({ theme, spacing, typography, fonts }) => ({
     text: {
-        fontSize: typography.Size['text-xs'],
+        fontSize: typography.Size['text-sm'],
         includeFontPadding: false,
         verticalAlign: 'middle',
         fontFamily: fonts.primary,

package/dist/components/Typography/Subtitle.js

@@ -9,7 +9,7 @@ export const Subtitle = memo(({ base = false, color = 'default', style, ...other
 const styles = StyleSheet.create(({ theme, typography, fonts }) => ({
     text: {
         fontSize: typography.Size['text-sm'],
-        fontWeight: 500,
+        fontWeight: 700,
         textTransform: 'uppercase',
         fontFamily: fonts.primary,
     },

package/dist/components/Typography/Title.js

@@ -3,19 +3,19 @@ import { StyleSheet } from 'react-native-unistyles';
 export const Title = ({ level, style, ...other }) => (<Text style={[styles.text, styles[level], style]} testID='Title' {...other}/>);
 const styles = StyleSheet.create(({ theme, typography, fonts }) => ({
     text: {
-        color: theme.General.secondaryColor,
+        color: theme.General.textColor,
         fontFamily: fonts.primary,
         fontWeight: 700,
         includeFontPadding: false,
         verticalAlign: 'middle',
     },
-    d1: { fontSize: typography.Size['text-5xl'] },
-    d2: { fontSize: typography.Size['text-4xl'] },
-    d3: { fontSize: typography.Size['text-3xl'] },
-    h1: { fontSize: typography.Size['text-2xl'] },
-    h2: { fontSize: typography.Size['text-xl'] },
-    h3: { fontSize: typography.Size['text-lg'] },
-    h4: { fontSize: typography.Size['text-base'] },
-    h5: { fontSize: typography.Size['text-sm'] },
-    h6: { fontSize: typography.Size['text-xs'], lineHeight: 12 },
+    d1: { fontSize: typography.Size['text-6xl'] },
+    d2: { fontSize: typography.Size['text-5xl'] },
+    d3: { fontSize: typography.Size['text-4xl'] },
+    h1: { fontSize: typography.Size['text-3xl'] },
+    h2: { fontSize: typography.Size['text-2xl'] },
+    h3: { fontSize: typography.Size['text-xl'] },
+    h4: { fontSize: typography.Size['text-lg'] },
+    h5: { fontSize: typography.Size['text-base'] },
+    h6: { fontSize: typography.Size['text-sm'] },
 }));

package/dist/theme/darkTheme.js

@@ -6,5 +6,5 @@ import { commonTheme } from './commonTheme';
 export const darkTheme = {
     theme: { ...darkThemeAssets, InputSize, ModalSize, custom: customDark },
     ...commonTheme,
-    fonts: { primary: 'TT Fellows', secondary: 'Noto Sans' },
+    fonts: { primary: 'TT Fellows', secondary: 'PT Sans' },
 };

package/dist/theme/lightTheme.js

@@ -6,5 +6,5 @@ import { commonTheme } from './commonTheme';
 export const lightTheme = {
     theme: { ...lightThemeAssets, InputSize, ModalSize, custom: customLight },
     ...commonTheme,
-    fonts: { primary: 'TT Fellows', secondary: 'Noto Sans' },
+    fonts: { primary: 'TT Fellows', secondary: 'PT Sans' },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdek-it/react-native-ui-kit",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "UI kit на основе Prime Faces, Prime Flex для React Native",
   "license": "MIT",
   "homepage": "https://developer.cdek.ru/design-system",