@megafon/ui-shared 5.15.0 → 5.16.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.16.0](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/compare/@megafon/ui-shared@5.15.0...@megafon/ui-shared@5.16.0) (2024-07-08)
+
+
+### Bug Fixes
+
+* **imagebanner:** fix size for mobile ([45e6e67](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/45e6e67a914d27f9b91c81a1216917cf399d4973))
+* **imagebanner:** review fixes ([1522d02](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/1522d0292428c7d04636d73b04ed679b81a1771c))
+
+
+### Features
+
+* **card:** add new props: markerList, badge; add new value hover-shadow to prop view; ([c73c54b](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/c73c54b158e4b6e38a77e569e874763feaa593b4))
+* **container:** add border-radius to root element ([419ec1f](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/419ec1fb16fffe138c772438768eab04e43f3589))
+* **imagebanner:** update badges for ImageBanner ([554e1ad](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/554e1ada1dc9dc7b7e7f9214056cdb83e4af9ba0))
+* **imagebanner:** update classes props for ImageBanner ([8ec0df4](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/8ec0df4ce74e1e4f00fc5edab52357f9f6aa9ede))
+* **imagebanner:** update image size for ImageBanner ([cd0242e](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/cd0242e24085bc2e1e8f0339ae8c7f0781c3fb39))
+* **textwithicon:** add border for icon ([1af5774](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/commit/1af57741ebc67abe503c842ee181f0d36f04db26))
+
+
+
+
+
 # [5.15.0](https://hq-gitlab.megafon.ru/site-portal/services/megafon-ui/compare/@megafon/ui-shared@5.14.0...@megafon/ui-shared@5.15.0) (2024-07-01)
 
 

package/dist/es/components/Card/Card.css

@@ -42,6 +42,7 @@ h5 {
   -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
           box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
+.mfui-card_link.mfui-card_view_hover-shadow:hover,
 .mfui-card_link.mfui-card_view_shadow:hover {
   -webkit-box-shadow: 0 8px 28px 0 rgba(0, 0, 0, 0.1);
           box-shadow: 0 8px 28px 0 rgba(0, 0, 0, 0.1);
@@ -60,6 +61,18 @@ h5 {
     padding: 32px;
   }
 }
+.mfui-card__header {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  gap: 12px;
+  -webkit-box-align: start;
+      -ms-flex-align: start;
+          align-items: start;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+}
 .mfui-card__icon {
   width: 40px;
   height: 40px;
@@ -67,23 +80,24 @@ h5 {
 }
 .mfui-card__img-box {
   position: relative;
-  margin-bottom: 24px;
   padding-bottom: 56.25%;
   border-radius: 12px;
   overflow: hidden;
 }
+.mfui-card__img-box_position_top {
+  margin: -6px -6px 24px -6px;
+}
 @media screen and (min-width: 1280px) {
-  .mfui-card__img-box {
-    margin-bottom: 32px;
+  .mfui-card__img-box_position_top {
+    margin: -12px -12px 32px -12px;
   }
 }
 .mfui-card__img-box_position_bottom {
-  margin-top: 24px;
-  margin-bottom: 0;
+  margin: 24px -6px 0 -6px;
 }
 @media screen and (min-width: 1280px) {
   .mfui-card__img-box_position_bottom {
-    margin-top: 32px;
+    margin: 32px -12px 0 -12px;
   }
 }
 .mfui-card__img {
@@ -101,6 +115,35 @@ h5 {
   -webkit-transform: scale(1.2);
           transform: scale(1.2);
 }
+.mfui-card__marker-list {
+  margin: 16px 0 0 0;
+  padding: 0;
+  list-style-type: none;
+}
+.mfui-card__marker-item {
+  position: relative;
+  padding-left: 20px;
+}
+.mfui-card__marker-item:not(:last-child) {
+  margin-bottom: 12px;
+}
+.mfui-card__marker-item:before {
+  content: '';
+  position: absolute;
+  top: 7px;
+  left: 0;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background-color: var(--stcBlack20);
+  opacity: 0.8;
+}
+.mfui-card__marker-note {
+  display: block;
+  margin: 4px 0 0 0;
+  padding: 0;
+  font-weight: 500;
+}
 .mfui-card__texts {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -117,6 +160,9 @@ h5 {
   margin: 0;
   padding-left: 24px;
 }
+.mfui-card__texts ul {
+  list-style-type: disc;
+}
 .mfui-card__texts-title {
   font-weight: 500;
 }

package/dist/es/components/Card/Card.d.ts

@@ -1,6 +1,6 @@
-import React, { Ref } from 'react';
+import React, { ReactElement, Ref } from 'react';
 import './Card.less';
-import { ButtonType, FeaturesList, IconsList, Image, Link, Price, TextsList, Title } from './types';
+import { ButtonType, FeaturesList, IconsList, Image, Link, MarkerList, Price, TextsList, Title } from './types';
 export interface ICard {
     /** Дополнительные data атрибуты к внутренним элементам */
     dataAttrs?: {
@@ -22,7 +22,7 @@ export interface ICard {
     rootRef?: Ref<HTMLDivElement | HTMLAnchorElement>;
     isFullHeight?: boolean;
     /** Вид */
-    view?: 'shadow' | 'background';
+    view?: 'shadow' | 'hover-shadow' | 'background';
     /** Ссылка для карточки */
     link?: Link;
     /** Изображение */
@@ -31,6 +31,8 @@ export interface ICard {
     icon?: React.ReactNode;
     /** Заголовок */
     title: Title;
+    /** Маркированный список */
+    markerList?: MarkerList;
     /** Список текстов */
     textsList?: TextsList;
     /** Список характеристик */
@@ -43,6 +45,8 @@ export interface ICard {
     button?: ButtonType;
     /** Дополнительная кнопка */
     extraButton?: ButtonType;
+    /** Бейдж */
+    badge?: ReactElement;
     /** Обработчик клика по карточке */
     onClick?: () => void;
 }

package/dist/es/components/Card/Card.js

@@ -47,14 +47,16 @@ var Card = function Card(_ref5) {
       image = _ref5.image,
       icon = _ref5.icon,
       title = _ref5.title,
+      markerList = _ref5.markerList,
       textsList = _ref5.textsList,
       featuresList = _ref5.featuresList,
       iconsList = _ref5.iconsList,
       price = _ref5.price,
       button = _ref5.button,
       extraButton = _ref5.extraButton,
+      badge = _ref5.badge,
       onClick = _ref5.onClick;
-  var isOnlyTitle = !image && !icon && !textsList && !featuresList && !iconsList && !price && !button && !extraButton;
+  var isOnlyTitle = !image && !icon && !markerList && !textsList && !featuresList && !iconsList && !price && !button && !extraButton;
   var isLink = (link === null || link === void 0 ? void 0 : link.href) && !button && !extraButton;
   var isBottomImage = (image === null || image === void 0 ? void 0 : image.position) === 'bottom';
   var ElementType = isLink ? 'a' : 'div';
@@ -64,14 +66,18 @@ var Card = function Card(_ref5) {
       return null;
     }
 
+    var _image$position = image.position,
+        position = _image$position === void 0 ? 'top' : _image$position,
+        src = image.src,
+        alt = image.alt;
     return /*#__PURE__*/React.createElement("div", _extends({}, filterDataAttrs(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.imgBox), {
       className: cn('img-box', {
-        position: image.position
+        position: position
       })
     }), /*#__PURE__*/React.createElement("img", {
       className: cn('img'),
-      src: image.src,
-      alt: image.alt
+      src: src,
+      alt: alt
     }));
   };
 
@@ -86,6 +92,19 @@ var Card = function Card(_ref5) {
   };
 
   var renderContent = function renderContent() {
+    if (markerList) {
+      return /*#__PURE__*/React.createElement("ul", {
+        className: cn('marker-list')
+      }, markerList.map(function (item, i) {
+        return /*#__PURE__*/React.createElement("li", {
+          className: cn('marker-item'),
+          key: i
+        }, convert(item.title, {}), !!item.note && /*#__PURE__*/React.createElement("span", {
+          className: cn('marker-note')
+        }, convert(item.note, {})));
+      }));
+    }
+
     if (textsList) {
       return /*#__PURE__*/React.createElement("div", {
         className: cn('texts')
@@ -210,11 +229,13 @@ var Card = function Card(_ref5) {
     target: isLink ? link === null || link === void 0 ? void 0 : link.target : undefined,
     onClick: isLink ? onClick : undefined,
     ref: rootRef
-  }), renderIcon(), !isBottomImage && renderImage(), /*#__PURE__*/React.createElement(Header, {
+  }), renderIcon(), !isBottomImage && renderImage(), /*#__PURE__*/React.createElement("div", {
+    className: cn('header')
+  }, /*#__PURE__*/React.createElement(Header, {
     className: cn('title'),
     as: "h3",
     align: title.align
-  }, title.text), renderContent(), renderFooter());
+  }, title.text), badge), renderContent(), renderFooter());
 };
 
 Card.propTypes = {

package/dist/es/components/Card/types.d.ts

@@ -20,6 +20,12 @@ export declare type Title = {
     /** Выравнивание */
     align?: 'left' | 'center';
 };
+export declare type MarkerList = {
+    /** Заголовок */
+    title: string;
+    /** Примечание */
+    note?: string;
+}[];
 export declare type TextsList = {
     /** Заголовок */
     title?: string;

package/dist/es/components/Container/Container.css

@@ -8,9 +8,10 @@ h5 {
 .mfui-container {
   position: relative;
   padding-bottom: 96px;
+  border-radius: 24px;
 }
 .mfui-container_bg-color_default {
-  background-color: var(--base);
+  background-color: var(--background);
 }
 .mfui-container_bg-color_light-gray {
   background-color: var(--spbSky0);
@@ -105,6 +106,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_light-gray:has( + .mfui-container_bg-color_light-gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_light-gray + .mfui-container_bg-color_light-gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_light-gray + .mfui-container_bg-color_gray {
   padding-top: 96px;
 }
@@ -118,6 +127,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_light-gray:has( + .mfui-container_bg-color_gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_light-gray + .mfui-container_bg-color_gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_light-gray + .mfui-container_bg-color_green {
   padding-top: 96px;
 }
@@ -131,6 +148,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_light-gray:has( + .mfui-container_bg-color_green) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_light-gray + .mfui-container_bg-color_green {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_light-gray + .mfui-container_bg-color_purple {
   padding-top: 96px;
 }
@@ -144,6 +169,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_light-gray:has( + .mfui-container_bg-color_purple) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_light-gray + .mfui-container_bg-color_purple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_gray + .mfui-container_bg-color_default {
   padding-top: 96px;
 }
@@ -170,6 +203,22 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_gray:has( + .mfui-container_bg-color_light-gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_gray + .mfui-container_bg-color_light-gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+.mfui-container_bg-color_gray:has( + .mfui-container_bg-color_gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_gray + .mfui-container_bg-color_gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_gray + .mfui-container_bg-color_green {
   padding-top: 96px;
 }
@@ -183,6 +232,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_gray:has( + .mfui-container_bg-color_green) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_gray + .mfui-container_bg-color_green {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_gray + .mfui-container_bg-color_purple {
   padding-top: 96px;
 }
@@ -196,6 +253,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_gray:has( + .mfui-container_bg-color_purple) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_gray + .mfui-container_bg-color_purple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_green + .mfui-container_bg-color_default {
   padding-top: 96px;
 }
@@ -222,6 +287,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_green:has( + .mfui-container_bg-color_light-gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_green + .mfui-container_bg-color_light-gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_green + .mfui-container_bg-color_gray {
   padding-top: 96px;
 }
@@ -235,6 +308,22 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_green:has( + .mfui-container_bg-color_gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_green + .mfui-container_bg-color_gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+.mfui-container_bg-color_green:has( + .mfui-container_bg-color_green) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_green + .mfui-container_bg-color_green {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_green + .mfui-container_bg-color_purple {
   padding-top: 96px;
 }
@@ -248,6 +337,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_green:has( + .mfui-container_bg-color_purple) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_green + .mfui-container_bg-color_purple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_purple + .mfui-container_bg-color_default {
   padding-top: 96px;
 }
@@ -274,6 +371,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_purple:has( + .mfui-container_bg-color_light-gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_purple + .mfui-container_bg-color_light-gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_purple + .mfui-container_bg-color_gray {
   padding-top: 96px;
 }
@@ -287,6 +392,14 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_purple:has( + .mfui-container_bg-color_gray) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_purple + .mfui-container_bg-color_gray {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container_bg-color_purple + .mfui-container_bg-color_green {
   padding-top: 96px;
 }
@@ -300,6 +413,22 @@ h5 {
     padding-top: 48px;
   }
 }
+.mfui-container_bg-color_purple:has( + .mfui-container_bg-color_green) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_purple + .mfui-container_bg-color_green {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+.mfui-container_bg-color_purple:has( + .mfui-container_bg-color_purple) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.mfui-container_bg-color_purple + .mfui-container_bg-color_purple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
 .mfui-container .mfui-title-description-box + .mfui-benefits-icons {
   margin-top: 56px;
 }

package/dist/es/components/ImageBanner/ImageBanner.css

@@ -29,7 +29,6 @@ h5 {
         -ms-flex-align: center;
             align-items: center;
     height: 420px;
-    padding: 0 80px;
   }
 }
 .mfui-image-banner__picture {
@@ -41,18 +40,14 @@ h5 {
   -webkit-box-pack: center;
       -ms-flex-pack: center;
           justify-content: center;
+  max-width: 672px;
 }
 @media screen and (min-width: 1024px) {
   .mfui-image-banner__picture {
-    width: 356px;
+    width: 50%;
     height: 100%;
   }
 }
-@media screen and (min-width: 1280px) {
-  .mfui-image-banner__picture {
-    width: 408px;
-  }
-}
 .mfui-image-banner__picture_v-align_top {
   -webkit-box-align: start;
       -ms-flex-align: start;
@@ -68,18 +63,18 @@ h5 {
       -ms-flex-align: end;
           align-items: flex-end;
 }
-.mfui-image-banner__background-image {
+.mfui-image-banner__image {
   display: block;
   max-width: 100%;
   max-height: 150px;
 }
 @media screen and (min-width: 768px) and (max-width: 1023px) {
-  .mfui-image-banner__background-image {
+  .mfui-image-banner__image {
     max-height: 230px;
   }
 }
 @media screen and (min-width: 1024px) {
-  .mfui-image-banner__background-image {
+  .mfui-image-banner__image {
     max-height: 100%;
     -o-object-fit: contain;
        object-fit: contain;
@@ -87,6 +82,9 @@ h5 {
 }
 .mfui-image-banner__content {
   z-index: 1;
+  -webkit-box-flex: 1;
+      -ms-flex-positive: 1;
+          flex-grow: 1;
 }
 @media screen and (max-width: 1023px) {
   .mfui-image-banner__content {
@@ -98,6 +96,12 @@ h5 {
     text-align: center;
   }
 }
+@media screen and (min-width: 1024px) {
+  .mfui-image-banner__content {
+    width: 50%;
+    padding: 0 80px;
+  }
+}
 .mfui-image-banner__description {
   margin-top: 16px;
   white-space: pre-wrap;
@@ -190,7 +194,7 @@ h5 {
 }
 @media screen and (min-width: 1024px) {
   .mfui-image-banner_auto-height .mfui-image-banner__content {
-    padding: 48px 0;
+    padding: 48px 80px;
   }
 }
 @media screen and (min-width: 1024px) {
@@ -199,7 +203,12 @@ h5 {
   }
 }
 @media screen and (min-width: 1024px) {
-  .mfui-image-banner_full-width .mfui-image-banner__background-image {
+  .mfui-image-banner_has-image .mfui-image-banner__content {
+    padding-right: 0;
+  }
+}
+@media screen and (min-width: 1024px) {
+  .mfui-image-banner_full-width .mfui-image-banner__image {
     position: absolute;
     right: 0;
     bottom: 0;
@@ -208,7 +217,7 @@ h5 {
   }
 }
 @media screen and (min-width: 1024px) {
-  .mfui-image-banner_full-width.mfui-image-banner_auto-height .mfui-image-banner__background-image {
+  .mfui-image-banner_full-width.mfui-image-banner_auto-height .mfui-image-banner__image {
     width: 100%;
     height: 100%;
     -o-object-fit: cover;

package/dist/es/components/ImageBanner/ImageBanner.d.ts

@@ -1,5 +1,4 @@
 import React, { Ref } from 'react';
-import { PriceBadge } from '@megafon/ui-core';
 import './ImageBanner.less';
 export declare const BackgroundColor: {
     readonly TRANSPARENT: "transparent";
@@ -26,11 +25,6 @@ export declare const ImageVerticalAlign: {
     readonly BOTTOM: "bottom";
 };
 export declare type ImageVerticalAlignType = typeof ImageVerticalAlign[keyof typeof ImageVerticalAlign];
-declare type PriceBadgeTypes = React.ComponentProps<typeof PriceBadge>;
-export declare type PriceBadgePropsType = Pick<PriceBadgeTypes, 'iconType'> & {
-    /** Текст бейджа */
-    text: string;
-};
 export interface IImageBannerProps {
     /** Дополнительные data атрибуты к внутренним элементам */
     dataAttrs?: {
@@ -43,12 +37,12 @@ export interface IImageBannerProps {
     classes?: {
         root?: string;
         image?: string;
+        imageSource?: string;
         title?: string;
         description?: string;
         cost?: string;
         badgesContainer?: string;
         badges?: string;
-        badge?: string;
         adBlock?: string;
     };
     /** Ссылка на корневой элемент */
@@ -83,8 +77,8 @@ export interface IImageBannerProps {
     autoHeight?: boolean;
     /** Изображение растягивается на всю ширину или вписывается в фиксированный фрейм (по умолчанию фрейм) */
     isImageFullWidth?: boolean;
-    /** Данные для блока с бейджами */
-    badges?: PriceBadgePropsType[];
+    /** Бейджи */
+    badges?: JSX.Element[] | JSX.Element;
     /** Элемент блока с рекламой */
     adBlock?: JSX.Element | null;
 }