@megafon/ui-shared 5.15.0 → 5.17.0

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,13 +37,14 @@ export interface IImageBannerProps {
     classes?: {
         root?: string;
         image?: string;
+        imageSource?: string;
         title?: string;
         description?: string;
         cost?: string;
         badgesContainer?: string;
         badges?: string;
-        badge?: string;
         adBlock?: string;
+        children?: string;
     };
     /** Ссылка на корневой элемент */
     rootRef?: Ref<HTMLDivElement>;
@@ -83,8 +78,8 @@ export interface IImageBannerProps {
     autoHeight?: boolean;
     /** Изображение растягивается на всю ширину или вписывается в фиксированный фрейм (по умолчанию фрейм) */
     isImageFullWidth?: boolean;
-    /** Данные для блока с бейджами */
-    badges?: PriceBadgePropsType[];
+    /** Бейджи */
+    badges?: JSX.Element[] | JSX.Element;
     /** Элемент блока с рекламой */
     adBlock?: JSX.Element | null;
 }

package/dist/es/components/ImageBanner/ImageBanner.js

@@ -2,11 +2,10 @@ import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
-import "core-js/modules/es.array.map.js";
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.values.js";
 import React from 'react';
-import { Header, PriceBadge } from '@megafon/ui-core';
+import { Header } from '@megafon/ui-core';
 import { breakpoints, cnCreate, filterDataAttrs, convert, titleConvertConfig } from '@megafon/ui-helpers';
 import * as PropTypes from 'prop-types';
 import "./ImageBanner.css";
@@ -88,8 +87,7 @@ var ImageBanner = function ImageBanner(_ref2) {
       radius = _ref2$radius === void 0 ? Radius.CORNERS : _ref2$radius,
       autoHeight = _ref2.autoHeight,
       isImageFullWidth = _ref2.isImageFullWidth,
-      _ref2$badges = _ref2.badges,
-      badges = _ref2$badges === void 0 ? [] : _ref2$badges,
+      badges = _ref2.badges,
       adBlock = _ref2.adBlock,
       _ref2$children = _ref2.children,
       children = _ref2$children === void 0 ? [] : _ref2$children;
@@ -115,18 +113,9 @@ var ImageBanner = function ImageBanner(_ref2) {
   }, []);
   var navTheme = getTheme(backgroundColor);
   var hasImage = !!(imageMobile || imageMobile2x || imageDesktop || imageDesktop2x);
-  var renderBadges = !!badges.length && /*#__PURE__*/React.createElement("div", {
+  var renderBadges = !!badges && /*#__PURE__*/React.createElement("div", {
     className: cn('badges', [classes.badges])
-  }, badges.map(function (_ref4) {
-    var text = _ref4.text,
-        iconType = _ref4.iconType;
-    return /*#__PURE__*/React.createElement(PriceBadge, {
-      className: classes.badge,
-      theme: navTheme,
-      iconType: iconType,
-      key: text
-    }, text);
-  }));
+  }, badges);
   var renderAdBlock = !!adBlock && /*#__PURE__*/React.createElement("div", {
     className: cn('ad-block', [classes.adBlock])
   }, adBlock);
@@ -145,17 +134,18 @@ var ImageBanner = function ImageBanner(_ref2) {
   }, typeof description === 'string' ? convert(description, titleConvertConfig) : description), !!cost && /*#__PURE__*/React.createElement("div", {
     className: cn('cost', [classes.cost])
   }, convert(cost, typographyConfig)), !!children && !!React.Children.count(children) && /*#__PURE__*/React.createElement("div", {
-    className: cn('children')
+    className: cn('children', [classes.children])
   }, children));
   var renderImage = /*#__PURE__*/React.createElement("picture", {
     className: cn('picture', {
       'v-align': imageVerticalAlign
     })
   }, /*#__PURE__*/React.createElement("source", {
+    className: classes.imageSource,
     media: "(min-width: ".concat(breakpoints.DESKTOP_SMALL_START, "px)"),
     srcSet: "".concat(imageDesktop, ", ").concat(imageDesktop2x, " 2x")
   }), /*#__PURE__*/React.createElement("img", _extends({}, filterDataAttrs(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.image), {
-    className: cn('background-image', [classes.image]),
+    className: cn('image', [classes.image]),
     src: imageMobile || imageMobile2x,
     srcSet: imageMobile2x ? "".concat(imageMobile2x, " 2x") : undefined,
     alt: imageAlt
@@ -182,13 +172,15 @@ ImageBanner.propTypes = {
   classes: PropTypes.shape({
     root: PropTypes.string,
     image: PropTypes.string,
+    imageSource: PropTypes.string,
     title: PropTypes.string,
     description: PropTypes.string,
     cost: PropTypes.string,
     badgesContainer: PropTypes.string,
     badges: PropTypes.string,
     badge: PropTypes.string,
-    adBlock: PropTypes.string
+    adBlock: PropTypes.string,
+    children: PropTypes.string
   }),
   rootRef: PropTypes.oneOfType([PropTypes.func, PropTypes.oneOfType([PropTypes.shape({
     current: PropTypes.elementType
@@ -208,10 +200,7 @@ ImageBanner.propTypes = {
   imageVerticalAlign: PropTypes.oneOf(Object.values(ImageVerticalAlign)),
   autoHeight: PropTypes.bool,
   isImageFullWidth: PropTypes.bool,
-  badges: PropTypes.arrayOf(PropTypes.shape({
-    iconType: PropTypes.oneOf(['timer', 'price', 'check', 'attention', 'info', 'profile']).isRequired,
-    text: PropTypes.string.isRequired
-  }).isRequired),
+  badges: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.element.isRequired), PropTypes.element]),
   adBlock: PropTypes.element
 };
 export default ImageBanner;

package/dist/es/components/TextWithIcon/TextWithIconItem.css

@@ -14,18 +14,16 @@ h5 {
           align-items: center;
 }
 .mfui-text-with-icon-item:not(:first-of-type) {
-  margin-top: 16px;
-}
-@media screen and (max-width: 767px) {
-  .mfui-text-with-icon-item:not(:first-of-type) {
-    margin-top: 24px;
-  }
+  margin-top: 12px;
 }
 .mfui-text-with-icon-item__svg-icon {
-  width: 40px;
-  min-width: 40px;
-  height: 40px;
-  min-height: 40px;
+  width: 44px;
+  min-width: 44px;
+  height: 44px;
+  min-height: 44px;
   margin-right: 16px;
+  padding: 6px;
+  border: 1px solid var(--spbSky2);
+  border-radius: 50%;
   overflow: hidden;
 }

package/dist/es/helpers/getColumnConfig.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const getColumnConfig: (isFullWidth: boolean) => Pick<React.PropsWithChildren<import("@megafon/ui-core/dist/lib/components/Grid/GridColumn").IGridColumn>, "all" | "wide" | "mobile" | "desktop" | "tablet">;
+export declare const getColumnConfig: (isFullWidth: boolean) => Pick<React.PropsWithChildren<import("../../../ui-core/dist/lib/components/Grid/GridColumn").IGridColumn>, "all" | "wide" | "mobile" | "desktop" | "tablet">;

package/dist/lib/components/Card/Card.css

@@ -18,7 +18,7 @@ h5 {
       -ms-flex-direction: column;
           flex-direction: column;
   padding: 16px 16px 24px;
-  border-radius: 12px;
+  border-radius: 24px;
   color: var(--content);
   text-decoration: none !important;
   background-color: var(--base);
@@ -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;
+  border-radius: 24px;
   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/lib/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/lib/components/Card/Card.js

@@ -62,14 +62,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';
@@ -79,14 +81,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["default"].createElement("div", (0, _extends2["default"])({}, (0, _uiHelpers.filterDataAttrs)(dataAttrs === null || dataAttrs === void 0 ? void 0 : dataAttrs.imgBox), {
       className: cn('img-box', {
-        position: image.position
+        position: position
       })
     }), /*#__PURE__*/_react["default"].createElement("img", {
       className: cn('img'),
-      src: image.src,
-      alt: image.alt
+      src: src,
+      alt: alt
     }));
   };
 
@@ -101,6 +107,19 @@ var Card = function Card(_ref5) {
   };
 
   var renderContent = function renderContent() {
+    if (markerList) {
+      return /*#__PURE__*/_react["default"].createElement("ul", {
+        className: cn('marker-list')
+      }, markerList.map(function (item, i) {
+        return /*#__PURE__*/_react["default"].createElement("li", {
+          className: cn('marker-item'),
+          key: i
+        }, (0, _uiHelpers.convert)(item.title, {}), !!item.note && /*#__PURE__*/_react["default"].createElement("span", {
+          className: cn('marker-note')
+        }, (0, _uiHelpers.convert)(item.note, {})));
+      }));
+    }
+
     if (textsList) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: cn('texts')
@@ -225,11 +244,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["default"].createElement(_uiCore.Header, {
+  }), renderIcon(), !isBottomImage && renderImage(), /*#__PURE__*/_react["default"].createElement("div", {
+    className: cn('header')
+  }, /*#__PURE__*/_react["default"].createElement(_uiCore.Header, {
     className: cn('title'),
     as: "h3",
     align: title.align
-  }, title.text), renderContent(), renderFooter());
+  }, title.text), badge), renderContent(), renderFooter());
 };
 
 Card.propTypes = {

package/dist/lib/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;