@megafon/ui-shared 5.14.0 → 5.16.0

package/dist/lib/components/ImageBanner/ImageBanner.css

@@ -7,26 +7,28 @@ h5 {
 }
 .mfui-image-banner {
   position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
   overflow: hidden;
 }
 @media screen and (min-width: 1024px) {
   .mfui-image-banner {
-    height: 420px;
-    padding: 0 80px;
-  }
-}
-@media screen and (min-width: 1024px) {
-  .mfui-image-banner__wrapper {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+        -ms-flex-direction: row;
+            flex-direction: row;
     -webkit-box-align: center;
         -ms-flex-align: center;
             align-items: center;
-    -webkit-box-pack: justify;
-        -ms-flex-pack: justify;
-            justify-content: space-between;
-    height: 100%;
+    height: 420px;
   }
 }
 .mfui-image-banner__picture {
@@ -38,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;
@@ -65,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: 250px;
+  max-height: 150px;
 }
 @media screen and (min-width: 768px) and (max-width: 1023px) {
-  .mfui-image-banner__background-image {
-    max-height: 280px;
+  .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;
@@ -84,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 {
@@ -95,9 +96,10 @@ h5 {
     text-align: center;
   }
 }
-@media screen and (max-width: 1023px) {
-  .mfui-image-banner_bottom-offset .mfui-image-banner__content {
-    padding-bottom: 72px;
+@media screen and (min-width: 1024px) {
+  .mfui-image-banner__content {
+    width: 50%;
+    padding: 0 80px;
   }
 }
 .mfui-image-banner__description {
@@ -192,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) {
@@ -201,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;
@@ -210,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/lib/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,22 +37,26 @@ export interface IImageBannerProps {
     classes?: {
         root?: string;
         image?: string;
+        imageSource?: string;
         title?: string;
         description?: string;
         cost?: string;
         badgesContainer?: string;
         badges?: string;
-        badge?: string;
         adBlock?: string;
     };
     /** Ссылка на корневой элемент */
     rootRef?: Ref<HTMLDivElement>;
     /** Заголовок */
-    title: string | React.ReactNode | React.ReactNode[];
+    title?: string | React.ReactNode | React.ReactNode[];
     /** Текст-описание */
     description?: string | React.ReactNode | React.ReactNode[];
     /** Строка со стоимостью услуги */
     cost?: string;
+    /** Тег заголовка на разрешении экрана 0-767 */
+    headerLevelMobile?: 'h1' | 'h2';
+    /** Тег заголовка на разрешении экрана 768+ */
+    headerLevel?: 'h1' | 'h2';
     /** Фоновый цвет */
     backgroundColor?: BackgroundColorType;
     /** Радиус границы */
@@ -79,12 +77,10 @@ export interface IImageBannerProps {
     autoHeight?: boolean;
     /** Изображение растягивается на всю ширину или вписывается в фиксированный фрейм (по умолчанию фрейм) */
     isImageFullWidth?: boolean;
-    /** Данные для блока с бейджами */
-    badges?: PriceBadgePropsType[];
-    /** Дополнительный отступ снизу при использовании в баннере */
-    hasBottomOffset?: boolean;
+    /** Бейджи */
+    badges?: JSX.Element[] | JSX.Element;
     /** Элемент блока с рекламой */
-    adBlock?: JSX.Element;
+    adBlock?: JSX.Element | null;
 }
 declare const ImageBanner: React.FC<IImageBannerProps>;
 export default ImageBanner;

package/dist/lib/components/ImageBanner/ImageBanner.js

@@ -9,12 +9,12 @@ exports["default"] = exports.ImageVerticalAlign = exports.NavTheme = exports.Rad
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 require("core-js/modules/es.symbol.js");
 
 require("core-js/modules/es.symbol.description.js");
 
-require("core-js/modules/es.array.map.js");
-
 require("core-js/modules/es.array.concat.js");
 
 require("core-js/modules/es.object.values.js");
@@ -105,33 +105,47 @@ var ImageBanner = function ImageBanner(_ref2) {
       title = _ref2.title,
       description = _ref2.description,
       cost = _ref2.cost,
+      _ref2$headerLevelMobi = _ref2.headerLevelMobile,
+      headerLevelMobile = _ref2$headerLevelMobi === void 0 ? 'h1' : _ref2$headerLevelMobi,
+      _ref2$headerLevel = _ref2.headerLevel,
+      headerLevel = _ref2$headerLevel === void 0 ? 'h1' : _ref2$headerLevel,
       _ref2$backgroundColor = _ref2.backgroundColor,
       backgroundColor = _ref2$backgroundColor === void 0 ? BackgroundColor.TRANSPARENT : _ref2$backgroundColor,
       _ref2$radius = _ref2.radius,
       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,
-      hasBottomOffset = _ref2.hasBottomOffset,
+      badges = _ref2.badges,
       adBlock = _ref2.adBlock,
       _ref2$children = _ref2.children,
       children = _ref2$children === void 0 ? [] : _ref2$children;
+
+  var _React$useState = _react["default"].useState(false),
+      _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
+      isMobile = _React$useState2[0],
+      setIsMobile = _React$useState2[1];
+
+  _react["default"].useEffect(function () {
+    var mediaQuery = window.matchMedia("(max-width: ".concat(_uiHelpers.breakpoints.MOBILE_MIDDLE_END, "px)"));
+
+    var handleMediaChange = function handleMediaChange(_ref3) {
+      var matches = _ref3.matches;
+      setIsMobile(matches);
+    };
+
+    setIsMobile(mediaQuery.matches);
+    mediaQuery.addEventListener('change', handleMediaChange);
+    return function () {
+      mediaQuery.removeEventListener('change', handleMediaChange);
+    };
+  }, []);
+
   var navTheme = getTheme(backgroundColor);
   var hasImage = !!(imageMobile || imageMobile2x || imageDesktop || imageDesktop2x);
 
-  var renderBadges = !!badges.length && /*#__PURE__*/_react["default"].createElement("div", {
+  var renderBadges = !!badges && /*#__PURE__*/_react["default"].createElement("div", {
     className: cn('badges', [classes.badges])
-  }, badges.map(function (_ref3) {
-    var text = _ref3.text,
-        iconType = _ref3.iconType;
-    return /*#__PURE__*/_react["default"].createElement(_uiCore.PriceBadge, {
-      className: classes.badge,
-      theme: navTheme,
-      iconType: iconType,
-      key: text
-    }, text);
-  }));
+  }, badges);
 
   var renderAdBlock = !!adBlock && /*#__PURE__*/_react["default"].createElement("div", {
     className: cn('ad-block', [classes.adBlock])
@@ -143,7 +157,8 @@ var ImageBanner = function ImageBanner(_ref2) {
     className: cn('badges-container', [classes.badgesContainer])
   }, renderBadges, renderAdBlock), !!title && /*#__PURE__*/_react["default"].createElement(_uiCore.Header, {
     className: cn('title', [classes.title]),
-    color: "inherit"
+    color: "inherit",
+    as: isMobile ? headerLevelMobile : headerLevel
   }, typeof title === 'string' ? (0, _uiHelpers.convert)(title, _uiHelpers.titleConvertConfig) : title), !!description && /*#__PURE__*/_react["default"].createElement(_uiCore.Header, {
     className: cn('description', [classes.description]),
     as: "h5",
@@ -159,10 +174,11 @@ var ImageBanner = function ImageBanner(_ref2) {
       'v-align': imageVerticalAlign
     })
   }, /*#__PURE__*/_react["default"].createElement("source", {
+    className: classes.imageSource,
     media: "(min-width: ".concat(_uiHelpers.breakpoints.DESKTOP_SMALL_START, "px)"),
     srcSet: "".concat(imageDesktop, ", ").concat(imageDesktop2x, " 2x")
   }), /*#__PURE__*/_react["default"].createElement("img", (0, _extends2["default"])({}, (0, _uiHelpers.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
@@ -175,13 +191,10 @@ var ImageBanner = function ImageBanner(_ref2) {
       'has-image': hasImage,
       'auto-height': autoHeight,
       'full-width': isImageFullWidth,
-      'bottom-offset': hasBottomOffset && !hasImage,
       radius: radius
     }, [className, classes.root]),
     ref: rootRef
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: cn('wrapper')
-  }, renderContent, hasImage && renderImage));
+  }), renderContent, hasImage && renderImage);
 };
 
 ImageBanner.propTypes = {
@@ -193,6 +206,7 @@ ImageBanner.propTypes = {
   classes: PropTypes.shape({
     root: PropTypes.string,
     image: PropTypes.string,
+    imageSource: PropTypes.string,
     title: PropTypes.string,
     description: PropTypes.string,
     cost: PropTypes.string,
@@ -204,9 +218,11 @@ ImageBanner.propTypes = {
   rootRef: PropTypes.oneOfType([PropTypes.func, PropTypes.oneOfType([PropTypes.shape({
     current: PropTypes.elementType
   }), PropTypes.any])]),
-  title: PropTypes.oneOfType([PropTypes.string, PropTypes.node, PropTypes.arrayOf(PropTypes.node)]).isRequired,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
   description: PropTypes.oneOfType([PropTypes.string, PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
   cost: PropTypes.string,
+  headerLevelMobile: PropTypes.oneOf(['h1', 'h2']),
+  headerLevel: PropTypes.oneOf(['h1', 'h2']),
   backgroundColor: PropTypes.oneOf(Object.values(BackgroundColor)),
   radius: PropTypes.oneOf(Object.values(Radius)),
   imageMobile: PropTypes.string,
@@ -217,11 +233,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),
-  hasBottomOffset: PropTypes.bool,
+  badges: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.element.isRequired), PropTypes.element]),
   adBlock: PropTypes.element
 };
 var _default = ImageBanner;

package/dist/lib/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/lib/helpers/getColumnConfig.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@megafon/ui-shared",
-  "version": "5.14.0",
+  "version": "5.16.0",
   "files": [
     "dist"
   ],
@@ -48,7 +48,7 @@
     "@babel/preset-env": "^7.8.6",
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
-    "@megafon/ui-icons": "^2.25.0",
+    "@megafon/ui-icons": "^2.26.0",
     "@svgr/core": "^2.4.1",
     "@testing-library/jest-dom": "5.16.2",
     "@testing-library/react": "12.1.2",
@@ -82,7 +82,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.8.4",
-    "@megafon/ui-core": "^5.16.0",
+    "@megafon/ui-core": "^5.18.0",
     "@megafon/ui-helpers": "^2.6.0",
     "core-js": "^3.6.4",
     "htmr": "^0.9.2",
@@ -90,5 +90,5 @@
     "prop-types": "^15.7.2",
     "swiper": "^6.5.6"
   },
-  "gitHead": "0d4f96ecbc805db6a1b2200dd9adbb707349d474"
+  "gitHead": "083ea89de7d915f3d2d74aff90e4ec8213a235f5"
 }