@alfalab/core-components 21.3.0-beta.2 → 21.3.3

package/button/index.css

@@ -11,16 +11,13 @@
     /* Hard up */
 }
 :root {
-    --gap-2xs: 4px;
     --gap-xs: 8px;
-    --gap-s: 12px;
     --gap-m: 16px;
-    --gap-l: 20px;
     --gap-xl: 24px;
     --gap-2xl: 32px;
 }
 :root {
-    --border-radius-m: 8px;
+    --border-radius-s: 4px;
 }
 :root {
     --focus-color: var(--color-light-border-link);
@@ -35,11 +32,11 @@
 }
 :root {
     /* misc */
-    --button-border-radius: var(--border-radius-m);
+    --button-border-radius: var(--border-radius-s);
     --button-active-transform: none;
     --button-font-weight: 500;
 }
-.button__component_amy1g {
+.button__component_azo26 {
     position: relative;
     display: inline-flex;
     vertical-align: middle;
@@ -67,125 +64,79 @@
     box-sizing: border-box;
     will-change: transform
 }
-.button__component_amy1g:active {
+.button__component_azo26:active {
         transform: var(--button-active-transform);
     }
-.button__focused_amy1g {
+.button__focused_azo26 {
     outline: 2px solid var(--focus-color);
     outline-offset: 2px;
 }
-.button__loading_amy1g .button__text_amy1g,
-.button__loading_amy1g .button__addons_amy1g {
+.button__loading_azo26 .button__text_azo26,
+.button__loading_azo26 .button__addons_azo26 {
     opacity: 0;
 }
-.button__stretchText_amy1g {
+.button__stretchText_azo26 {
     flex-grow: 1;
 }
-a.button__loading_amy1g {
+a.button__loading_azo26 {
     pointer-events: none;
 }
-.button__loader_amy1g {
+.button__loader_azo26 {
     position: absolute;
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
 }
 /* Size */
-.button__xxs_amy1g {
+.button__xs_azo26 {
     min-width: 80px;
     min-height: var(--size-xs-height);
     padding: 0 var(--gap-m);
     font-size: 14px
 }
-.button__xxs_amy1g.button__iconOnly_amy1g {
+.button__xs_azo26.button__iconOnly_azo26 {
         min-width: var(--size-xs-height);
     }
-.button__xs_amy1g {
-    min-width: 88px;
-    min-height: 40px;
-    padding: 0 var(--gap-l);
-    font-size: 14px
-}
-.button__xs_amy1g.button__iconOnly_amy1g {
-        min-width: 40px;
-    }
-.button__s_amy1g {
+.button__s_azo26 {
     min-width: 104px;
     min-height: var(--size-s-height);
     font-size: 16px
 }
-.button__s_amy1g.button__iconOnly_amy1g {
+.button__s_azo26.button__iconOnly_azo26 {
         min-width: var(--size-s-height);
     }
-.button__m_amy1g {
+.button__m_azo26 {
     min-width: 128px;
     min-height: var(--size-m-height);
-    padding: 0 28px;
     font-size: 16px
 }
-.button__m_amy1g.button__iconOnly_amy1g {
+.button__m_azo26.button__iconOnly_azo26 {
         min-width: var(--size-m-height);
     }
-.button__l_amy1g {
+.button__l_azo26 {
     min-width: 160px;
     min-height: var(--size-l-height);
     padding: 0 var(--gap-2xl);
     font-size: 18px;
     line-height: 24px
 }
-.button__l_amy1g.button__iconOnly_amy1g {
+.button__l_azo26.button__iconOnly_azo26 {
         min-width: var(--size-l-height);
     }
-.button__xl_amy1g {
-    min-width: 168px;
+.button__xl_azo26 {
+    min-width: 160px;
     min-height: var(--size-xl-height);
-    padding: 0 36px;
+    padding: 0 var(--gap-2xl);
     font-size: 18px;
     line-height: 24px
 }
-.button__xl_amy1g.button__iconOnly_amy1g {
+.button__xl_azo26.button__iconOnly_azo26 {
         min-width: var(--size-xl-height);
     }
-.button__withRightAddons_amy1g.button__xxs_amy1g {
-        padding-right: var(--gap-s);
-    }
-.button__withRightAddons_amy1g.button__xs_amy1g {
-        padding-right: var(--gap-m);
-    }
-.button__withRightAddons_amy1g.button__s_amy1g {
-        padding-right: var(--gap-l);
-    }
-.button__withRightAddons_amy1g.button__m_amy1g {
-        padding-right: var(--gap-xl);
-    }
-.button__withRightAddons_amy1g.button__l_amy1g {
-        padding-right: 28px;
-    }
-.button__withRightAddons_amy1g.button__xl_amy1g {
-        padding-right: var(--gap-2xl);
-    }
-.button__withLeftAddons_amy1g.button__xxs_amy1g {
-        padding-left: var(--gap-s);
-    }
-.button__withLeftAddons_amy1g.button__xs_amy1g {
-        padding-left: var(--gap-m);
-    }
-.button__withLeftAddons_amy1g.button__s_amy1g {
-        padding-left: var(--gap-l);
-    }
-.button__withLeftAddons_amy1g.button__m_amy1g {
-        padding-left: var(--gap-xl);
-    }
-.button__withLeftAddons_amy1g.button__l_amy1g {
-        padding-left: 28px;
-    }
-.button__withLeftAddons_amy1g.button__xl_amy1g {
-        padding-left: var(--gap-2xl);
-    }
-.button__link_amy1g {
+.button__link_azo26 {
     min-width: 0;
 }
-.button__ghost_amy1g {
+.button__ghost_azo26 {
     min-width: 0;
     min-height: 0;
     padding: 0;
@@ -193,62 +144,43 @@ a.button__loading_amy1g {
     -webkit-appearance: none;
             appearance: none
 }
-.button__ghost_amy1g.button__iconOnly_amy1g {
+.button__ghost_azo26.button__iconOnly_azo26 {
         min-width: 0;
     }
 /* Disabled */
-.button__component_amy1g:disabled {
+.button__component_azo26:disabled {
     cursor: var(--disabled-cursor);
 }
 /* Addons */
-.button__addons_amy1g {
+.button__addons_azo26 {
     display: flex;
     flex-shrink: 0;
     align-items: center;
-    margin: 0
 }
-.button__addons_amy1g:first-child {
-        margin-right: var(--gap-2xs);
-    }
-.button__addons_amy1g:last-child {
-        margin-left: var(--gap-2xs);
-    }
-.button__addons_amy1g:only-child {
-        margin: 0;
-    }
-.button__s_amy1g .button__addons_amy1g:first-child, .button__m_amy1g .button__addons_amy1g:first-child {
-        margin-right: var(--gap-xs);
-    }
-.button__s_amy1g .button__addons_amy1g:last-child, .button__m_amy1g .button__addons_amy1g:last-child {
-        margin-left: var(--gap-xs);
-    }
-.button__s_amy1g .button__addons_amy1g:only-child, .button__m_amy1g .button__addons_amy1g:only-child {
-        margin: 0;
-    }
-.button__l_amy1g .button__addons_amy1g:first-child, .button__xl_amy1g .button__addons_amy1g:first-child {
-        margin-right: var(--gap-s);
-    }
-.button__l_amy1g .button__addons_amy1g:last-child, .button__xl_amy1g .button__addons_amy1g:last-child {
-        margin-left: var(--gap-s);
-    }
-.button__l_amy1g .button__addons_amy1g:only-child, .button__xl_amy1g .button__addons_amy1g:only-child {
-        margin: 0;
-    }
-.button__iconOnly_amy1g {
+.button__addons_azo26:first-child {
+    margin: 0 var(--gap-xs) 0 0;
+}
+.button__addons_azo26:last-child {
+    margin: 0 0 0 var(--gap-xs);
+}
+.button__addons_azo26:only-child {
+    margin: 0;
+}
+.button__iconOnly_azo26 {
     padding: 0;
 }
 /* Block */
-.button__block_amy1g {
+.button__block_azo26 {
     display: flex;
     width: 100%;
 }
 /* Nowrap */
-.button__nowrap_amy1g {
+.button__nowrap_azo26 {
     white-space: nowrap;
 }
 /* IE min-height fix */
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .button__component_amy1g:after {
+    .button__component_azo26:after {
         min-height: inherit;
         font-size: 0;
         content: '';

package/button/inverted.css

@@ -34,16 +34,6 @@
     --button-inverted-secondary-color: var(--color-dark-text-primary);
     --button-inverted-secondary-disabled-color: rgba(255, 255, 255, 0.3);
 
-    /* tertiary */
-    --button-inverted-tertiary-base-bg-color: transparent;
-    --button-inverted-tertiary-hover-bg-color: rgba(255, 255, 255, 0.15);
-    --button-inverted-tertiary-active-bg-color: rgba(0, 0, 0, 0.15);
-    --button-inverted-tertiary-disabled-bg-color: transparent;
-    --button-inverted-tertiary-base-border-color: var(--color-light-border-tertiary-inverted);
-    --button-inverted-tertiary-disabled-border-color: rgba(35, 53, 73, 0.3);
-    --button-inverted-tertiary-color: var(--color-dark-text-primary);
-    --button-inverted-tertiary-disabled-color: rgba(255, 255, 255, 0.3);
-
     /* outlined */
     --button-inverted-outlined-base-bg-color: transparent;
     --button-inverted-outlined-hover-bg-color: rgba(255, 255, 255, 0.15);
@@ -60,153 +50,133 @@
     --button-inverted-ghost-active-color: rgb(128, 128, 128);
     --button-inverted-ghost-disabled-color: rgba(255, 255, 255, 0.3);
 }
-.button__primary_18njg {
+.button__primary_rzxwb {
     color: var(--button-inverted-primary-color);
     background-color: var(--button-inverted-primary-base-bg-color)
 }
-.button__primary_18njg:hover {
+.button__primary_rzxwb:hover {
         background-color: var(--button-inverted-primary-hover-bg-color);
     }
-.button__primary_18njg:active {
+.button__primary_rzxwb:active {
         background-color: var(--button-inverted-primary-active-bg-color);
     }
-.button__secondary_18njg {
+.button__secondary_rzxwb {
     color: var(--button-inverted-secondary-color);
     background-color: var(--button-inverted-secondary-base-bg-color);
     border: 1px solid var(--button-inverted-secondary-base-border-color)
 }
-.button__secondary_18njg:hover {
+.button__secondary_rzxwb:hover {
         background-color: var(--button-inverted-secondary-hover-bg-color);
     }
-.button__secondary_18njg:active {
+.button__secondary_rzxwb:active {
         background-color: var(--button-inverted-secondary-active-bg-color);
     }
-.button__outlined_18njg {
+.button__outlined_rzxwb {
     color: var(--button-inverted-outlined-color);
     background-color: var(--button-inverted-outlined-base-bg-color);
     border: 1px solid var(--button-inverted-outlined-base-border-color)
 }
-.button__outlined_18njg:hover {
+.button__outlined_rzxwb:hover {
         background-color: var(--button-inverted-outlined-hover-bg-color);
     }
-.button__outlined_18njg:active {
+.button__outlined_rzxwb:active {
         background-color: var(--button-inverted-outlined-active-bg-color);
     }
-.button__tertiary_18njg {
-    color: var(--button-inverted-tertiary-color);
-    background-color: var(--button-inverted-tertiary-base-bg-color);
-    border: 1px solid var(--button-inverted-tertiary-base-border-color)
-}
-.button__tertiary_18njg:hover {
-        background-color: var(--button-inverted-tertiary-hover-bg-color);
-    }
-.button__tertiary_18njg:active {
-        background-color: var(--button-inverted-tertiary-active-bg-color);
-    }
-.button__filled_18njg {
+.button__filled_rzxwb {
     color: var(--color-dark-text-primary);
     background-color: var(--color-dark-bg-neutral)
 }
-.button__filled_18njg:hover {
+.button__filled_rzxwb:hover {
         background-color: rgb(99, 112, 126);
     }
-.button__filled_18njg:active {
+.button__filled_rzxwb:active {
         background-color: rgb(61, 74, 88);
     }
-.button__transparent_18njg {
+.button__transparent_rzxwb {
     color: var(--color-light-text-primary-inverted);
     background-color: rgba(255, 255, 255, 0.1)
 }
-.button__transparent_18njg:hover {
+.button__transparent_rzxwb:hover {
         background-color: rgba(255, 255, 255, 0.2);
     }
-.button__transparent_18njg:active {
+.button__transparent_rzxwb:active {
         /* TODO: какой цвет? */
         background-color: rgba(255, 255, 255, 0.05);
     }
-.button__link_18njg {
+.button__link_rzxwb {
     color: var(--color-light-text-primary-inverted);
     background-color: transparent
 }
-.button__link_18njg:hover {
+.button__link_rzxwb:hover {
         background-color: var(--color-light-specialbg-component-inverted);
     }
-.button__link_18njg:active {
+.button__link_rzxwb:active {
         /* TODO: какой цвет? */
         background-color: rgba(179, 179, 179, 0.15);
     }
-.button__ghost_18njg {
+.button__ghost_rzxwb {
     color: var(--button-inverted-ghost-base-color)
 }
-.button__ghost_18njg:hover {
+.button__ghost_rzxwb:hover {
         color: var(--button-inverted-ghost-hover-color);
     }
-.button__ghost_18njg:active {
+.button__ghost_rzxwb:active {
         color: var(--button-inverted-ghost-active-color);
     }
-.button__component_18njg:disabled.button__primary_18njg {
+.button__component_rzxwb:disabled.button__primary_rzxwb {
         color: var(--button-inverted-primary-disabled-color);
         background-color: var(--button-inverted-primary-disabled-bg-color)
     }
-.button__component_18njg:disabled.button__primary_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__primary_rzxwb.button__loading_rzxwb {
             background-color: var(--button-inverted-primary-base-bg-color);
         }
-.button__component_18njg:disabled.button__secondary_18njg {
+.button__component_rzxwb:disabled.button__secondary_rzxwb {
         color: var(--button-inverted-secondary-disabled-color);
         background-color: var(--button-inverted-secondary-disabled-bg-color);
         border-color: var(--button-inverted-secondary-disabled-border-color)
     }
-.button__component_18njg:disabled.button__secondary_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__secondary_rzxwb.button__loading_rzxwb {
             color: var(--button-inverted-secondary-color);
             background-color: var(--button-inverted-secondary-base-bg-color);
             border-color: var(--button-inverted-secondary-base-border-color);
         }
-.button__component_18njg:disabled.button__outlined_18njg {
+.button__component_rzxwb:disabled.button__outlined_rzxwb {
         color: var(--button-inverted-outlined-disabled-color);
         background-color: var(--button-inverted-outlined-disabled-bg-color);
         border-color: var(--button-inverted-outlined-disabled-border-color)
     }
-.button__component_18njg:disabled.button__outlined_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__outlined_rzxwb.button__loading_rzxwb {
             color: var(--button-inverted-outlined-color);
             border-color: var(--button-inverted-outlined-border-color);
         }
-.button__component_18njg:disabled.button__tertiary_18njg {
-        color: var(--button-inverted-tertiary-disabled-color);
-        background-color: var(--button-inverted-tertiary-disabled-bg-color);
-        border-color: var(--button-inverted-tertiary-disabled-border-color)
-    }
-.button__component_18njg:disabled.button__tertiary_18njg.button__loading_18njg {
-            color: var(--button-inverted-tertiary-color);
-            border-color: var(--button-inverted-tertiary-border-color);
-        }
-.button__component_18njg:disabled.button__filled_18njg {
+.button__component_rzxwb:disabled.button__filled_rzxwb {
         color: rgba(255, 255, 255, 0.3);
         background-color: rgba(72, 87, 103, 0.3);
         border-color: transparent
     }
-.button__component_18njg:disabled.button__filled_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__filled_rzxwb.button__loading_rzxwb {
             color: var(--color-dark-text-primary);
             background-color: var(--color-dark-bg-neutral);
             border-color: transparent;
         }
-.button__component_18njg:disabled.button__transparent_18njg {
+.button__component_rzxwb:disabled.button__transparent_rzxwb {
         color: rgba(255, 255, 255, 0.3);
         background-color: rgba(255, 255, 255, 0.03)
     }
-.button__component_18njg:disabled.button__transparent_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__transparent_rzxwb.button__loading_rzxwb {
             color: var(--color-light-text-primary-inverted);
             background-color: rgba(255, 255, 255, 0.1);
         }
-.button__component_18njg:disabled.button__link_18njg {
+.button__component_rzxwb:disabled.button__link_rzxwb {
         color: rgba(255, 255, 255, 0.3);
         background-color: transparent
     }
-.button__component_18njg:disabled.button__link_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__link_rzxwb.button__loading_rzxwb {
             color: var(--color-light-text-primary-inverted);
         }
-.button__component_18njg:disabled.button__ghost_18njg {
+.button__component_rzxwb:disabled.button__ghost_rzxwb {
         color: var(--button-inverted-ghost-disabled-color)
     }
-.button__component_18njg:disabled.button__ghost_18njg.button__loading_18njg {
+.button__component_rzxwb:disabled.button__ghost_rzxwb.button__loading_rzxwb {
             color: var(--button-inverted-ghost-base-color);
         }

package/button/modern/Component.d.ts

@@ -5,7 +5,7 @@ type ComponentProps = {
     /**
      * Тип кнопки
      */
-    view?: 'primary' | 'secondary' | 'tertiary' | 'outlined' | 'filled' | 'transparent' | 'link' | 'ghost';
+    view?: 'primary' | 'secondary' | 'outlined' | 'filled' | 'transparent' | 'link' | 'ghost';
     /**
      * Слот слева
      */
@@ -17,7 +17,7 @@ type ComponentProps = {
     /**
      * Размер компонента
      */
-    size?: 'xxs' | 'xs' | 's' | 'm' | 'l' | 'xl';
+    size?: 'xs' | 's' | 'm' | 'l' | 'xl';
     /**
      * Растягивает компонент на ширину контейнера
      */

package/button/modern/Component.js

@@ -4,13 +4,13 @@ import mergeRefs from 'react-merge-refs';
 import { useFocus } from '@alfalab/hooks';
 import { Loader } from '../../loader/modern';
 
-var styles = {"component":"button__component_amy1g","focused":"button__focused_amy1g","loading":"button__loading_amy1g","text":"button__text_amy1g","addons":"button__addons_amy1g","stretchText":"button__stretchText_amy1g","loader":"button__loader_amy1g","xxs":"button__xxs_amy1g","iconOnly":"button__iconOnly_amy1g","xs":"button__xs_amy1g","s":"button__s_amy1g","m":"button__m_amy1g","l":"button__l_amy1g","xl":"button__xl_amy1g","withRightAddons":"button__withRightAddons_amy1g","withLeftAddons":"button__withLeftAddons_amy1g","link":"button__link_amy1g","ghost":"button__ghost_amy1g","block":"button__block_amy1g","nowrap":"button__nowrap_amy1g"};
+var styles = {"component":"button__component_azo26","focused":"button__focused_azo26","loading":"button__loading_azo26","text":"button__text_azo26","addons":"button__addons_azo26","stretchText":"button__stretchText_azo26","loader":"button__loader_azo26","xs":"button__xs_azo26","iconOnly":"button__iconOnly_azo26","s":"button__s_azo26","m":"button__m_azo26","l":"button__l_azo26","xl":"button__xl_azo26","link":"button__link_azo26","ghost":"button__ghost_azo26","block":"button__block_azo26","nowrap":"button__nowrap_azo26"};
 require('./index.css');
 
-var defaultColors = {"primary":"button__primary_1jxky","secondary":"button__secondary_1jxky","outlined":"button__outlined_1jxky","tertiary":"button__tertiary_1jxky","filled":"button__filled_1jxky","transparent":"button__transparent_1jxky","link":"button__link_1jxky","ghost":"button__ghost_1jxky","component":"button__component_1jxky","loading":"button__loading_1jxky"};
+var defaultColors = {"primary":"button__primary_c21ga","secondary":"button__secondary_c21ga","outlined":"button__outlined_c21ga","filled":"button__filled_c21ga","transparent":"button__transparent_c21ga","link":"button__link_c21ga","ghost":"button__ghost_c21ga","component":"button__component_c21ga","loading":"button__loading_c21ga"};
 require('./default.css');
 
-var invertedColors = {"primary":"button__primary_18njg","secondary":"button__secondary_18njg","outlined":"button__outlined_18njg","tertiary":"button__tertiary_18njg","filled":"button__filled_18njg","transparent":"button__transparent_18njg","link":"button__link_18njg","ghost":"button__ghost_18njg","component":"button__component_18njg","loading":"button__loading_18njg"};
+var invertedColors = {"primary":"button__primary_rzxwb","secondary":"button__secondary_rzxwb","outlined":"button__outlined_rzxwb","filled":"button__filled_rzxwb","transparent":"button__transparent_rzxwb","link":"button__link_rzxwb","ghost":"button__ghost_rzxwb","component":"button__component_rzxwb","loading":"button__loading_rzxwb"};
 require('./inverted.css');
 
 const colorStyles = {
@@ -22,38 +22,19 @@ const colorStyles = {
  * чтобы при быстрых ответах от сервера кнопка не «моргала».
  */
 const LOADER_MIN_DISPLAY_INTERVAL = 500;
-const logWarning = (view) => {
-    const viewsMap = {
-        filled: 'secondary',
-        transparent: 'secondary',
-        outlined: 'tertiary',
-    };
-    // eslint-disable-next-line no-console
-    console.warn(
-    // eslint-disable-next-line prefer-template
-    `@alfalab/core-components/button: view='${view}' будет удален в следующих мажорных версиях. ` +
-        `Используйте view='${viewsMap[view]}'. Чтобы поменять все кнопки на проекте разом, можно воспользоваться codemode: ` +
-        'npx core-components-codemod --components=ButtonViews src/**/*.tsx');
-};
 const Button = React.forwardRef(({ children, view = 'secondary', leftAddons, rightAddons, size = 'm', block = false, className, dataTestId, href, loading = false, nowrap = false, colors = 'default', Component = href ? 'a' : 'button', ...restProps }, ref) => {
-    if (['outlined', 'filled', 'transparent'].includes(view)) {
-        logWarning(view);
-    }
     const buttonRef = useRef(null);
     const [focused] = useFocus(buttonRef, 'keyboard');
     const [loaderTimePassed, setLoaderTimePassed] = useState(true);
     const timerId = useRef(0);
     const showLoader = loading || !loaderTimePassed;
-    const iconOnly = !children;
     const componentProps = {
         className: cn(styles.component, styles[view], styles[size], colorStyles[colors].component, colorStyles[colors][view], {
             [styles.focused]: focused,
             [styles.block]: block,
-            [styles.iconOnly]: iconOnly,
+            [styles.iconOnly]: !children,
             [styles.nowrap]: nowrap,
             [styles.loading]: showLoader,
-            [styles.withRightAddons]: Boolean(rightAddons) && !iconOnly,
-            [styles.withLeftAddons]: Boolean(leftAddons) && !iconOnly,
             [colorStyles[colors].loading]: showLoader,
         }, className),
         'data-test-id': dataTestId || null,