@alfalab/core-components-typography 3.0.4 → 3.0.6

package/modern/index.js

@@ -1,9 +1,9 @@
 import 'react';
 import 'classnames';
-import './colors.module-08772334.js';
+import './colors.module-cc6915f1.js';
 import './text/component.js';
 import './title/component.js';
-import './common.module-2f6fae5e.js';
+import './common.module-00b1ccc7.js';
 import './title/index.js';
 import './title-mobile/component.js';
 import './title-responsive/component.js';

package/modern/text/component.d.ts

@@ -2,10 +2,11 @@
 import React from 'react';
 import { HTMLAttributes } from "react";
 import { Color } from "../colors";
+import { TextElementType } from "../types";
 type NativeProps = HTMLAttributes<HTMLSpanElement>;
-type TextProps = Omit<NativeProps, 'color'> & {
+type TextBaseProps = {
     /**
-     * [Вариант начертания](https://alfa-laboratory.github.io/core-components/master/?path=/docs/гайдлайны-типографика--page)
+     * [Вариант начертания](https://core-ds.github.io/core-components/master/?path=/docs/инструкции-типографика--page)
      */
     view?: 'primary-large' | 'primary-medium' | 'primary-small' | 'secondary-large' | 'secondary-medium' | 'secondary-small' | 'component' | 'caps';
     /**
@@ -23,7 +24,7 @@ type TextProps = Omit<NativeProps, 'color'> & {
     /**
      * HTML тег
      */
-    tag?: 'p' | 'span' | 'div';
+    tag?: 'span' | 'div';
     /**
      * Css-класс для стилизации (native prop)
      */
@@ -36,40 +37,15 @@ type TextProps = Omit<NativeProps, 'color'> & {
      * Контент (native prop)
      */
     children?: React.ReactNode;
-};
-type TextElementType = HTMLParagraphElement | HTMLSpanElement | HTMLDivElement;
-declare const Text: React.ForwardRefExoticComponent<Omit<NativeProps, "color"> & {
-    /**
-     * [Вариант начертания](https://alfa-laboratory.github.io/core-components/master/?path=/docs/гайдлайны-типографика--page)
-     */
-    view?: "primary-large" | "primary-medium" | "primary-small" | "secondary-large" | "secondary-medium" | "secondary-small" | "component" | "caps" | undefined;
     /**
-     * Цвет текста
-     */
-    color?: "tertiary" | "disabled" | "accent" | "primary" | "attention" | "positive" | "secondary" | "tertiary-inverted" | "primary-inverted" | "secondary-inverted" | "link" | "negative" | undefined;
-    /**
-     * Толщина шрифта
-     */
-    weight?: "regular" | "medium" | "bold" | undefined;
-    /**
-     * Делает цифры моноширинными
-     */
-    monospaceNumbers?: boolean | undefined;
-    /**
-     * HTML тег
+     * Добавляет отступы к тэгу 'p'
      */
-    tag?: "p" | "span" | "div" | undefined;
-    /**
-     * Css-класс для стилизации (native prop)
-     */
-    className?: string | undefined;
-    /**
-     * Id компонента для тестов
-     */
-    dataTestId?: string | undefined;
-    /**
-     * Контент (native prop)
-     */
-    children?: React.ReactNode;
-} & React.RefAttributes<TextElementType>>;
+    defaultMargins?: never;
+};
+type TextPTagProps = Omit<TextBaseProps, 'tag' | 'defaultMargins'> & {
+    tag?: 'p';
+    defaultMargins?: boolean;
+};
+type TextProps = Omit<NativeProps, 'color'> & (TextBaseProps | TextPTagProps);
+declare const Text: React.ForwardRefExoticComponent<TextProps & React.RefAttributes<TextElementType>>;
 export { TextProps, Text };

package/modern/text/component.js

@@ -1,10 +1,14 @@
 import React, { forwardRef } from 'react';
 import cn from 'classnames';
-import { c as colors } from '../colors.module-08772334.js';
+import { c as colors } from '../colors.module-cc6915f1.js';
 
-var styles = {"paragraph":"typography__paragraph_2x4ms","primary-large":"typography__primary-large_2x4ms","primary-medium":"typography__primary-medium_2x4ms","primary-small":"typography__primary-small_2x4ms","secondary-large":"typography__secondary-large_2x4ms","secondary-medium":"typography__secondary-medium_2x4ms","secondary-small":"typography__secondary-small_2x4ms","component":"typography__component_2x4ms","caps":"typography__caps_2x4ms","bold":"typography__bold_2x4ms","medium":"typography__medium_2x4ms","regular":"typography__regular_2x4ms","monospace":"typography__monospace_2x4ms"};
+var styles = {"paragraph":"typography__paragraph_1osp9","paragraphWithMargins":"typography__paragraphWithMargins_1osp9","primary-large":"typography__primary-large_1osp9","primary-medium":"typography__primary-medium_1osp9","primary-small":"typography__primary-small_1osp9","secondary-large":"typography__secondary-large_1osp9","secondary-medium":"typography__secondary-medium_1osp9","secondary-small":"typography__secondary-small_1osp9","component":"typography__component_1osp9","caps":"typography__caps_1osp9","bold":"typography__bold_1osp9","medium":"typography__medium_1osp9","regular":"typography__regular_1osp9","monospace":"typography__monospace_1osp9"};
 require('./index.css')
 
-const Text = forwardRef(({ view = 'primary-medium', tag: Component = 'span', weight, monospaceNumbers = false, color, className, dataTestId, children, ...restProps }, ref) => (React.createElement(Component, { className: cn({ [styles.paragraph]: Component === 'p', [styles.monospace]: monospaceNumbers }, className, color && colors[color], styles[view], weight && styles[weight]), "data-test-id": dataTestId, ref: ref, ...restProps }, children)));
+const Text = forwardRef(({ view = 'primary-medium', tag: Component = 'span', weight, monospaceNumbers = false, defaultMargins = true, color, className, dataTestId, children, ...restProps }, ref) => (React.createElement(Component, { className: cn({
+        [styles.paragraph]: Component === 'p' && !defaultMargins,
+        [styles.paragraphWithMargins]: Component === 'p' && defaultMargins,
+        [styles.monospace]: monospaceNumbers,
+    }, className, color && colors[color], styles[view], weight && styles[weight]), "data-test-id": dataTestId, ref: ref, ...restProps }, children)));
 
 export { Text };

package/modern/text/index.css

@@ -1,4 +1,4 @@
-/* hash: 10nkn */
+/* hash: 1tcrl */
 :root {
 
     /* Hard */
@@ -13,62 +13,66 @@
 :root {
     --text-paragraph-margin-bottom: 0 0 var(--gap-s);
 }
-.typography__paragraph_2x4ms {
-    margin: var(--text-paragraph-margin-bottom);
+.typography__paragraph_1osp9 {
+    margin: 0;
+    padding: 0;
+}
+.typography__paragraphWithMargins_1osp9 {
     padding: 0;
+    margin: var(--text-paragraph-margin-bottom);
 }
-.typography__primary-large_2x4ms {
+.typography__primary-large_1osp9 {
     font-size: 18px;
     line-height: 24px;
     font-weight: 400;
 }
-.typography__primary-medium_2x4ms {
+.typography__primary-medium_1osp9 {
     font-size: 16px;
     line-height: 24px;
     font-weight: 400;
 }
-.typography__primary-small_2x4ms {
+.typography__primary-small_1osp9 {
     font-size: 14px;
     line-height: 20px;
     font-weight: 400;
 }
-.typography__secondary-large_2x4ms {
+.typography__secondary-large_1osp9 {
     font-size: 13px;
     line-height: 16px;
     font-weight: 400;
 }
-.typography__secondary-medium_2x4ms {
+.typography__secondary-medium_1osp9 {
     font-size: 12px;
     line-height: 16px;
     font-weight: 400;
 }
-.typography__secondary-small_2x4ms {
+.typography__secondary-small_1osp9 {
     font-size: 11px;
     line-height: 16px;
     font-weight: 400;
 }
-.typography__component_2x4ms {
+.typography__component_1osp9 {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
 }
-.typography__caps_2x4ms {
+.typography__caps_1osp9 {
     font-size: 12px;
     line-height: 16px;
     font-weight: 500;
     letter-spacing: 1.25px;
     text-transform: uppercase;
 }
-.typography__bold_2x4ms {
+.typography__bold_1osp9 {
     font-weight: bold;
 }
-.typography__medium_2x4ms {
+.typography__medium_1osp9 {
     font-weight: 500;
 }
-.typography__regular_2x4ms {
+.typography__regular_1osp9 {
     font-weight: normal;
 }
-.typography__monospace_2x4ms {
+.typography__monospace_1osp9 {
     font-feature-settings: "tnum";
     font-variant-numeric: tabular-nums;
 }

package/modern/text/index.js

@@ -1,4 +1,4 @@
 import 'react';
 import 'classnames';
-import '../colors.module-08772334.js';
+import '../colors.module-cc6915f1.js';
 export { Text } from './component.js';

package/modern/title/common.css

@@ -1,17 +1,17 @@
-/* hash: 1ijuk */
-.typography__component_2u43o {
+/* hash: punmg */
+.typography__component_13ul2 {
     margin: 0;
     padding: 0;
 }
 
-.typography__bold_2u43o {
+.typography__bold_13ul2 {
     font-weight: bold;
 }
 
-.typography__medium_2u43o {
+.typography__medium_13ul2 {
     font-weight: 500;
 }
 
-.typography__regular_2u43o {
+.typography__regular_13ul2 {
     font-weight: normal;
 }

package/modern/title/component.d.ts

@@ -9,7 +9,7 @@ type TitleProps = Omit<NativeProps, 'color'> & {
      */
     tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'div';
     /**
-     * [Вариант начертания](https://alfa-laboratory.github.io/core-components/master/?path=/docs/гайдлайны-типографика--page)
+     * [Вариант начертания](https://core-ds.github.io/core-components/master/?path=/docs/инструкции-типографика--page)
      */
     view?: 'xlarge' | 'large' | 'medium' | 'small' | 'xsmall';
     /**
@@ -53,7 +53,7 @@ declare const Title: React.ForwardRefExoticComponent<Omit<NativeProps, "color">
      */
     tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'div';
     /**
-     * [Вариант начертания](https://alfa-laboratory.github.io/core-components/master/?path=/docs/гайдлайны-типографика--page)
+     * [Вариант начертания](https://core-ds.github.io/core-components/master/?path=/docs/инструкции-типографика--page)
      */
     view?: "medium" | "small" | "xlarge" | "large" | "xsmall" | undefined;
     /**

package/modern/title/component.js

@@ -1,6 +1,6 @@
 import React, { forwardRef } from 'react';
 import cn from 'classnames';
-import { c as colors } from '../colors.module-08772334.js';
+import { c as colors } from '../colors.module-cc6915f1.js';
 
 const Title = forwardRef(({ tag: Component = 'div', view = 'medium', font = 'styrene', weight = font === 'styrene' ? 'medium' : 'bold', defaultMargins = false, color, className, dataTestId, children, styles, ...restProps }, ref) => (React.createElement(Component, { className: cn(styles.component, className, styles[`${font}-${view}`], defaultMargins && styles[`margins-${view}`], styles[weight], color && colors[color]), "data-test-id": dataTestId, ref: ref, ...restProps }, children)));
 

package/modern/title/index.css

@@ -1,4 +1,4 @@
-/* hash: k7jos */
+/* hash: k67ng */
 :root {
 
     /* Hard */
@@ -17,87 +17,87 @@
     --font-family-styrene: 'Styrene UI', system-ui, -apple-system, 'Segoe UI', Roboto,
         'Helvetica Neue', Helvetica, sans-serif;
 }
-.typography__styrene-xlarge_vlaw6 {
+.typography__styrene-xlarge_1fpnk {
     font-size: 48px;
     line-height: 64px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-large_vlaw6 {
+.typography__styrene-large_1fpnk {
     font-size: 40px;
     line-height: 48px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-medium_vlaw6 {
+.typography__styrene-medium_1fpnk {
     font-size: 32px;
     line-height: 40px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-small_vlaw6 {
+.typography__styrene-small_1fpnk {
     font-size: 24px;
     line-height: 32px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-xsmall_vlaw6 {
+.typography__styrene-xsmall_1fpnk {
     font-size: 20px;
     line-height: 24px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__system-xlarge_vlaw6 {
+.typography__system-xlarge_1fpnk {
     font-size: 48px;
     line-height: 52px;
     font-weight: 700;
 }
-.typography__system-large_vlaw6 {
+.typography__system-large_1fpnk {
     font-size: 40px;
     line-height: 48px;
     font-weight: 700;
 }
-.typography__system-medium_vlaw6 {
+.typography__system-medium_1fpnk {
     font-size: 30px;
     line-height: 36px;
     font-weight: 700;
 }
-.typography__system-small_vlaw6 {
+.typography__system-small_1fpnk {
     font-size: 22px;
     line-height: 26px;
     font-weight: 700;
 }
-.typography__system-xsmall_vlaw6 {
+.typography__system-xsmall_1fpnk {
     font-size: 18px;
     line-height: 22px;
     font-weight: 700;
 }
-.typography__margins-xlarge_vlaw6 {
+.typography__margins-xlarge_1fpnk {
     margin: 0 0 var(--gap-xl);
 }
-.typography__margins-large_vlaw6 {
+.typography__margins-large_1fpnk {
     margin: var(--gap-4xl) 0 var(--gap-xl);
 }
-.typography__margins-medium_vlaw6 {
+.typography__margins-medium_1fpnk {
     margin: var(--gap-4xl) 0 var(--gap-xl);
 }
-.typography__margins-small_vlaw6 {
+.typography__margins-small_1fpnk {
     margin: var(--gap-3xl) 0 var(--gap-m);
 }
-.typography__margins-xsmall_vlaw6 {
+.typography__margins-xsmall_1fpnk {
     margin: var(--gap-3xl) 0 var(--gap-m);
 }
-.typography__bold_vlaw6 {
+.typography__bold_1fpnk {
     font-weight: bold;
 }
-.typography__medium_vlaw6 {
+.typography__medium_1fpnk {
     font-weight: 500;
 }
-.typography__regular_vlaw6 {
+.typography__regular_1fpnk {
     font-weight: normal;
 }

package/modern/title/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import 'classnames';
-import '../colors.module-08772334.js';
+import '../colors.module-cc6915f1.js';
 import { Title as Title$1 } from './component.js';
-import { c as commonStyles } from '../common.module-2f6fae5e.js';
+import { c as commonStyles } from '../common.module-00b1ccc7.js';
 
-var styles = {"styrene-xlarge":"typography__styrene-xlarge_vlaw6","styrene-large":"typography__styrene-large_vlaw6","styrene-medium":"typography__styrene-medium_vlaw6","styrene-small":"typography__styrene-small_vlaw6","styrene-xsmall":"typography__styrene-xsmall_vlaw6","system-xlarge":"typography__system-xlarge_vlaw6","system-large":"typography__system-large_vlaw6","system-medium":"typography__system-medium_vlaw6","system-small":"typography__system-small_vlaw6","system-xsmall":"typography__system-xsmall_vlaw6","margins-xlarge":"typography__margins-xlarge_vlaw6","margins-large":"typography__margins-large_vlaw6","margins-medium":"typography__margins-medium_vlaw6","margins-small":"typography__margins-small_vlaw6","margins-xsmall":"typography__margins-xsmall_vlaw6","bold":"typography__bold_vlaw6","medium":"typography__medium_vlaw6","regular":"typography__regular_vlaw6"};
+var styles = {"styrene-xlarge":"typography__styrene-xlarge_1fpnk","styrene-large":"typography__styrene-large_1fpnk","styrene-medium":"typography__styrene-medium_1fpnk","styrene-small":"typography__styrene-small_1fpnk","styrene-xsmall":"typography__styrene-xsmall_1fpnk","system-xlarge":"typography__system-xlarge_1fpnk","system-large":"typography__system-large_1fpnk","system-medium":"typography__system-medium_1fpnk","system-small":"typography__system-small_1fpnk","system-xsmall":"typography__system-xsmall_1fpnk","margins-xlarge":"typography__margins-xlarge_1fpnk","margins-large":"typography__margins-large_1fpnk","margins-medium":"typography__margins-medium_1fpnk","margins-small":"typography__margins-small_1fpnk","margins-xsmall":"typography__margins-xsmall_1fpnk","bold":"typography__bold_1fpnk","medium":"typography__medium_1fpnk","regular":"typography__regular_1fpnk"};
 require('./index.css')
 
 const Title = (props) => (

package/modern/title-mobile/component.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import 'classnames';
-import '../colors.module-08772334.js';
+import '../colors.module-cc6915f1.js';
 import { Title } from '../title/component.js';
-import { c as commonStyles } from '../common.module-2f6fae5e.js';
+import { c as commonStyles } from '../common.module-00b1ccc7.js';
 
-var styles = {"styrene-xlarge":"typography__styrene-xlarge_14e9g","styrene-large":"typography__styrene-large_14e9g","styrene-medium":"typography__styrene-medium_14e9g","styrene-small":"typography__styrene-small_14e9g","styrene-xsmall":"typography__styrene-xsmall_14e9g","system-xlarge":"typography__system-xlarge_14e9g","system-large":"typography__system-large_14e9g","system-medium":"typography__system-medium_14e9g","system-small":"typography__system-small_14e9g","system-xsmall":"typography__system-xsmall_14e9g","bold":"typography__bold_14e9g","medium":"typography__medium_14e9g","regular":"typography__regular_14e9g"};
+var styles = {"styrene-xlarge":"typography__styrene-xlarge_1h27x","styrene-large":"typography__styrene-large_1h27x","styrene-medium":"typography__styrene-medium_1h27x","styrene-small":"typography__styrene-small_1h27x","styrene-xsmall":"typography__styrene-xsmall_1h27x","system-xlarge":"typography__system-xlarge_1h27x","system-large":"typography__system-large_1h27x","system-medium":"typography__system-medium_1h27x","system-small":"typography__system-small_1h27x","system-xsmall":"typography__system-xsmall_1h27x","bold":"typography__bold_1h27x","medium":"typography__medium_1h27x","regular":"typography__regular_1h27x"};
 require('./index.css')
 
 const TitleMobile = (props) => (

package/modern/title-mobile/index.css

@@ -1,4 +1,4 @@
-/* hash: t4o7q */
+/* hash: ihzlt */
 :root {
 
     /* Hard */
@@ -11,72 +11,72 @@
     --font-family-styrene: 'Styrene UI', system-ui, -apple-system, 'Segoe UI', Roboto,
         'Helvetica Neue', Helvetica, sans-serif;
 }
-.typography__styrene-xlarge_14e9g {
+.typography__styrene-xlarge_1h27x {
     font-size: 34px;
     line-height: 40px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-large_14e9g {
+.typography__styrene-large_1h27x {
     font-size: 30px;
     line-height: 36px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-medium_14e9g {
+.typography__styrene-medium_1h27x {
     font-size: 26px;
     line-height: 32px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-small_14e9g {
+.typography__styrene-small_1h27x {
     font-size: 20px;
     line-height: 28px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__styrene-xsmall_14e9g {
+.typography__styrene-xsmall_1h27x {
     font-size: 16px;
     line-height: 20px;
     font-weight: 500;
     font-feature-settings: 'ss01';
     font-family: var(--font-family-styrene);
 }
-.typography__system-xlarge_14e9g {
+.typography__system-xlarge_1h27x {
     font-size: 34px;
     line-height: 40px;
     font-weight: 600;
 }
-.typography__system-large_14e9g {
+.typography__system-large_1h27x {
     font-size: 30px;
     line-height: 36px;
     font-weight: 600;
 }
-.typography__system-medium_14e9g {
+.typography__system-medium_1h27x {
     font-size: 26px;
     line-height: 32px;
     font-weight: 600;
 }
-.typography__system-small_14e9g {
+.typography__system-small_1h27x {
     font-size: 20px;
     line-height: 28px;
     font-weight: 600;
 }
-.typography__system-xsmall_14e9g {
+.typography__system-xsmall_1h27x {
     font-size: 16px;
     line-height: 20px;
     font-weight: 600;
 }
-.typography__bold_14e9g {
+.typography__bold_1h27x {
     font-weight: bold;
 }
-.typography__medium_14e9g {
+.typography__medium_1h27x {
     font-weight: 500;
 }
-.typography__regular_14e9g {
+.typography__regular_1h27x {
     font-weight: normal;
 }

package/modern/title-mobile/index.js

@@ -1,6 +1,6 @@
 import 'react';
 import 'classnames';
-import '../colors.module-08772334.js';
+import '../colors.module-cc6915f1.js';
 import '../title/component.js';
-import '../common.module-2f6fae5e.js';
+import '../common.module-00b1ccc7.js';
 export { TitleMobile } from './component.js';

package/modern/title-responsive/component.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import 'classnames';
-import '../colors.module-08772334.js';
+import '../colors.module-cc6915f1.js';
 import { Title } from '../title/component.js';
-import { c as commonStyles } from '../common.module-2f6fae5e.js';
+import { c as commonStyles } from '../common.module-00b1ccc7.js';
 
-var styles = {"styrene-xlarge":"typography__styrene-xlarge_1vad3","styrene-large":"typography__styrene-large_1vad3","styrene-medium":"typography__styrene-medium_1vad3","styrene-small":"typography__styrene-small_1vad3","styrene-xsmall":"typography__styrene-xsmall_1vad3","system-xlarge":"typography__system-xlarge_1vad3","system-large":"typography__system-large_1vad3","system-medium":"typography__system-medium_1vad3","system-small":"typography__system-small_1vad3","system-xsmall":"typography__system-xsmall_1vad3","margins-xlarge":"typography__margins-xlarge_1vad3","margins-large":"typography__margins-large_1vad3","margins-medium":"typography__margins-medium_1vad3","margins-small":"typography__margins-small_1vad3","margins-xsmall":"typography__margins-xsmall_1vad3"};
+var styles = {"styrene-xlarge":"typography__styrene-xlarge_1u216","styrene-large":"typography__styrene-large_1u216","styrene-medium":"typography__styrene-medium_1u216","styrene-small":"typography__styrene-small_1u216","styrene-xsmall":"typography__styrene-xsmall_1u216","system-xlarge":"typography__system-xlarge_1u216","system-large":"typography__system-large_1u216","system-medium":"typography__system-medium_1u216","system-small":"typography__system-small_1u216","system-xsmall":"typography__system-xsmall_1u216","margins-xlarge":"typography__margins-xlarge_1u216","margins-large":"typography__margins-large_1u216","margins-medium":"typography__margins-medium_1u216","margins-small":"typography__margins-small_1u216","margins-xsmall":"typography__margins-xsmall_1u216"};
 require('./index.css')
 
 const TitleResponsive = (props) => (