@megafon/ui-core 2.1.0 → 2.1.4

package/dist/lib/components/Paragraph/Paragraph.css

@@ -36,6 +36,7 @@ h5 {
 .mfui-paragraph_color_purple {
   color: #731982;
 }
+.mfui-paragraph_color_base,
 .mfui-paragraph_color_clearWhite {
   color: #FFFFFF;
 }
@@ -48,6 +49,7 @@ h5 {
 .mfui-paragraph_color_spbSky2 {
   color: #D8D8D8;
 }
+.mfui-paragraph_color_content,
 .mfui-paragraph_color_freshAsphalt {
   color: #333333;
 }

package/dist/lib/components/Paragraph/Paragraph.d.ts

@@ -1,5 +1,21 @@
 import * as React from 'react';
 import './Paragraph.less';
+declare const COLORS: {
+    GREEN: string;
+    PURPLE: string;
+    BASE: string;
+    SPB_SKY_0: string;
+    SPB_SKY_1: string;
+    SPB_SKY_2: string;
+    CONTENT: string;
+    FULL_BLACK: string;
+    INHERIT: string;
+    /** @deprecated */
+    CLEAR_WHITE: string;
+    /** @deprecated */
+    FRESH_ASPHALT: string;
+};
+declare type ColorType = typeof COLORS[keyof typeof COLORS];
 export interface IParagraphProps {
     /** Выравнивание по горизонтали */
     align?: 'left' | 'center' | 'right';
@@ -8,7 +24,7 @@ export interface IParagraphProps {
     /** Вертикальный отступ (включен по умолчанию) */
     hasMargin?: boolean;
     /** Цвет текста */
-    color?: 'green' | 'purple' | 'clearWhite' | 'spbSky0' | 'spbSky1' | 'spbSky2' | 'freshAsphalt' | 'fullBlack' | 'inherit';
+    color?: ColorType;
     /** Дополнительный класс корневого элемента */
     className?: string;
 }

package/dist/lib/components/Paragraph/Paragraph.js

@@ -7,6 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+require("core-js/modules/es.array.concat");
+
+require("core-js/modules/es.array.includes");
+
+require("core-js/modules/es.object.values");
+
+require("core-js/modules/es.string.includes");
+
 var React = _interopRequireWildcard(require("react"));
 
 var _uiHelpers = require("@megafon/ui-helpers");
@@ -17,6 +25,23 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var COLORS = {
+  GREEN: 'green',
+  PURPLE: 'purple',
+  BASE: 'base',
+  SPB_SKY_0: 'spbSky0',
+  SPB_SKY_1: 'spbSky1',
+  SPB_SKY_2: 'spbSky2',
+  CONTENT: 'content',
+  FULL_BLACK: 'fullBlack',
+  INHERIT: 'inherit',
+
+  /** @deprecated */
+  CLEAR_WHITE: 'clearWhite',
+
+  /** @deprecated */
+  FRESH_ASPHALT: 'freshAsphalt'
+};
 var cn = (0, _uiHelpers.cnCreate)('mfui-paragraph');
 
 var Paragraph = function Paragraph(_ref) {
@@ -43,7 +68,25 @@ Paragraph.propTypes = {
   align: PropTypes.oneOf(['left', 'center', 'right']),
   size: PropTypes.oneOf(['regular', 'small']),
   hasMargin: PropTypes.bool,
-  color: PropTypes.oneOf(['green', 'purple', 'clearWhite', 'spbSky0', 'spbSky1', 'spbSky2', 'freshAsphalt', 'fullBlack', 'inherit'])
+  color: function color(props, propName, componentName) {
+    var deprecatedBlackValue = COLORS.FRESH_ASPHALT;
+    var deprecatedWhiteValue = COLORS.CLEAR_WHITE;
+    var propValue = props[propName];
+
+    if (propValue && !Object.values(COLORS).includes(propValue)) {
+      return new Error("Failed prop type: Invalid prop '".concat(propName, "' of value '").concat(propValue, "' supplied to '").concat(componentName, "', \n            expected one of [").concat(Object.values(COLORS), "]"));
+    }
+
+    if (propValue && props[propName] === deprecatedBlackValue) {
+      return new Error("Failed prop type: Invalid prop '".concat(propName, "' of value '").concat(propValue, "' supplied to '").concat(componentName, "',\n            value '").concat(deprecatedBlackValue, "' is deprecated, please use value '").concat(COLORS.CONTENT, "'"));
+    }
+
+    if (propValue && props[propName] === deprecatedWhiteValue) {
+      return new Error("Failed prop type: Invalid prop '".concat(propName, "' of value '").concat(propValue, "' supplied to '").concat(componentName, "',\n            value '").concat(deprecatedWhiteValue, "' is deprecated, please use value '").concat(COLORS.BASE, "'"));
+    }
+
+    return null;
+  }
 };
 var _default = Paragraph;
 exports["default"] = _default;

package/dist/lib/components/Tabs/Tabs.css

@@ -254,8 +254,8 @@ h5 {
   border-color: rgba(237, 237, 237, 0.5);
 }
 .mfui-tabs_tab-color_green:not(.mfui-tabs_sticky) .mfui-tabs__tab-inner {
-  color: rgba(255, 255, 255, 0.5);
-  fill: rgba(255, 255, 255, 0.5);
+  color: #FFFFFF80;
+  fill: #FFFFFF80;
 }
 .mfui-tabs_tab-color_green:not(.mfui-tabs_sticky) .mfui-tabs__tab-inner:hover {
   color: #FFFFFF;

package/dist/lib/components/Tabs/Tabs.js

@@ -126,36 +126,41 @@ var Tabs = function Tabs(_ref) {
 
   var _React$useState9 = React.useState(0),
       _React$useState10 = (0, _slicedToArray2["default"])(_React$useState9, 2),
-      underlineWidth = _React$useState10[0],
-      setUnderlineWidth = _React$useState10[1];
+      activeTabWidth = _React$useState10[0],
+      setActiveTabWidth = _React$useState10[1];
 
   var _React$useState11 = React.useState(0),
       _React$useState12 = (0, _slicedToArray2["default"])(_React$useState11, 2),
-      underlineTranslate = _React$useState12[0],
-      setUnderlineTranslate = _React$useState12[1];
+      underlineWidth = _React$useState12[0],
+      setUnderlineWidth = _React$useState12[1];
 
-  var _React$useState13 = React.useState('none'),
+  var _React$useState13 = React.useState(0),
       _React$useState14 = (0, _slicedToArray2["default"])(_React$useState13, 2),
-      underlineTransition = _React$useState14[0],
-      setUnderlineTransition = _React$useState14[1];
+      underlineTranslate = _React$useState14[0],
+      setUnderlineTranslate = _React$useState14[1];
 
-  var _React$useState15 = React.useState('auto'),
+  var _React$useState15 = React.useState('none'),
       _React$useState16 = (0, _slicedToArray2["default"])(_React$useState15, 2),
-      tabListHeight = _React$useState16[0],
-      setTabListHeight = _React$useState16[1];
+      underlineTransition = _React$useState16[0],
+      setUnderlineTransition = _React$useState16[1];
 
-  var _React$useState17 = React.useState(false),
+  var _React$useState17 = React.useState('auto'),
       _React$useState18 = (0, _slicedToArray2["default"])(_React$useState17, 2),
-      isSticky = _React$useState18[0],
-      setSticky = _React$useState18[1];
+      tabListHeight = _React$useState18[0],
+      setTabListHeight = _React$useState18[1];
 
-  var _React$useState19 = React.useState({
+  var _React$useState19 = React.useState(false),
+      _React$useState20 = (0, _slicedToArray2["default"])(_React$useState19, 2),
+      isSticky = _React$useState20[0],
+      setSticky = _React$useState20[1];
+
+  var _React$useState21 = React.useState({
     left: 0,
     right: 0
   }),
-      _React$useState20 = (0, _slicedToArray2["default"])(_React$useState19, 2),
-      stickyOffset = _React$useState20[0],
-      setStickyOffset = _React$useState20[1];
+      _React$useState22 = (0, _slicedToArray2["default"])(_React$useState21, 2),
+      stickyOffset = _React$useState22[0],
+      setStickyOffset = _React$useState22[1];
 
   var setTabRef = React.useCallback(function (tab) {
     tab && tabsRef.current.push(tab);
@@ -165,21 +170,15 @@ var Tabs = function Tabs(_ref) {
       return;
     }
 
-    var tabNodeChild = tabsRef.current[currentIndex].firstElementChild;
-
-    var _ref2 = tabNodeChild || {},
-        _ref2$clientWidth = _ref2.clientWidth,
-        clientWidth = _ref2$clientWidth === void 0 ? 0 : _ref2$clientWidth;
-
     var translate = (0, _toConsumableArray2["default"])(tabsRef.current).splice(0, currentIndex).reduce(function (accWidth, node) {
       var _node$getBoundingClie = node.getBoundingClientRect(),
           width = _node$getBoundingClie.width;
 
       return accWidth + width;
     }, 0);
-    setUnderlineWidth(clientWidth);
+    setUnderlineWidth(activeTabWidth);
     setUnderlineTranslate(translate);
-  }, [currentIndex]);
+  }, [currentIndex, activeTabWidth]);
   var calculateSticky = React.useCallback(function () {
     if (!sticky || !rootRef.current || !tabListRef.current) {
       return;
@@ -276,12 +275,12 @@ var Tabs = function Tabs(_ref) {
   }, []);
   React.useEffect(function () {
     var observer = new IntersectionObserver(function (entries) {
-      entries.forEach(function (_ref3) {
-        var isIntersecting = _ref3.isIntersecting,
-            _ref3$boundingClientR = _ref3.boundingClientRect,
-            top = _ref3$boundingClientR.top,
-            left = _ref3$boundingClientR.left,
-            right = _ref3$boundingClientR.right;
+      entries.forEach(function (_ref2) {
+        var isIntersecting = _ref2.isIntersecting,
+            _ref2$boundingClientR = _ref2.boundingClientRect,
+            top = _ref2$boundingClientR.top,
+            left = _ref2$boundingClientR.left,
+            right = _ref2$boundingClientR.right;
 
         if (!sticky || !rootRef.current || !tabListRef.current) {
           return;
@@ -323,10 +322,20 @@ var Tabs = function Tabs(_ref) {
   }, [calculateSticky]);
   React.useEffect(function () {
     var handleResize = (0, _lodash["default"])(function () {
-      calculateUnderline();
       calculateSticky();
     }, 300);
+    var activeTabNode = tabsRef.current[currentIndex];
+    var resizeObserver = new ResizeObserver(function (entries) {
+      if (!entries.length || !entries[0]) {
+        return;
+      }
+
+      var width = entries[0].contentRect.width;
+      setActiveTabWidth(width);
+      calculateUnderline();
+    });
     calculateUnderline();
+    resizeObserver.observe(activeTabNode);
     window.addEventListener('resize', handleResize);
     return function () {
       window.removeEventListener('resize', handleResize);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@megafon/ui-core",
-  "version": "2.1.0",
+  "version": "2.1.4",
   "files": [
     "dist",
     "styles"
@@ -28,6 +28,7 @@
     "lint": "yarn lint:ts && yarn lint:less",
     "lint:ts": "eslint --ext .js,.jsx,.ts,.tsx src --max-warnings=0",
     "lint:less": "stylelint --syntax less src/**/*.less src/**/**/*.less",
+    "lint:less:fix": "yarn lint:less --fix",
     "test": "yarn test:unit",
     "test:unit": "jest",
     "test:update": "jest --updateSnapshot"
@@ -52,7 +53,7 @@
     "@babel/preset-env": "^7.8.6",
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
-    "@megafon/ui-icons": "^0.1.0",
+    "@megafon/ui-icons": "^0.1.1",
     "@svgr/core": "^2.4.1",
     "@testing-library/react-hooks": "^7.0.1",
     "@types/enzyme": "^3.10.5",
@@ -95,5 +96,5 @@
     "react-popper": "^2.2.3",
     "swiper": "^6.5.6"
   },
-  "gitHead": "42bd6840a217196ba9e80c6c77f92f5951881c12"
+  "gitHead": "88cfe6bca4b341ea19d7cb0b70798250bbbe127a"
 }

package/styles/base.less

@@ -1,47 +1,75 @@
 // Basic Colors
 @green: #00B956;
 @purple: #731982;
-@clearWhite: #FFFFFF;
+@base: #FFFFFF;
 @spbSky0: #F6F6F6;
 @spbSky1: #EDEDED;
 @spbSky2: #D8D8D8;
-@freshAsphalt: #333333;
+@spbSky3: #999999;
+@content: #333333;
 @fullBlack: #000000;
 
 // Secondary Colors
 @warmRedC: #EB5A40;
-@mandarin: #FFA717;
+@Pantone137C: #FFA717;
 @Pantone311C: #5BD9E5;
 @reflexBlue: #444189;
 
 // System Colors
 @fury: #F62434;
-@link: #34AAF2;
+@systemBlue: #34AAF2;
+@background: #FFFFFF;
 @buttonHoverGreen: #10E272;
-@buttonhoverPurple: #A500BF;
+@buttonhoverPurple: #534455;
 @buttonDown: #404D46;
 
+// Gradients
+@basic: linear-gradient(90deg, #01873F 0%, #00B956 74%, #14CD6A 100%);
+@vip: linear-gradient(90deg, #5B1168 0%, #731982 74%, #821E93 100%);
+@exclusive: linear-gradient(90deg, #2A2674 0%, #444189 74%, #504D93 100%);
+
+// Static
+@STCBlack: #333333;
+@STCWhite: #FFFFFF;
+
+// Static Opacity
+
+@STCWhite5: #FFFFFF0D;
+@STCWhite10: #FFFFFF1A;
+@STCWhite20: #FFFFFF33;
+@STCWhite50: #FFFFFF80;
+@STCBlack5: #3333330D;
+@STCBlack10: #3333331A;
+@STCBlack20: #33333333;
+@STCBlack50: #33333380;
+
+// Soft (new)
+@green80: #0CDC78;
+@green20: #DDFFEC;
+@purple80: #AA67C1;
+@purple20: #FFEEFF;
+@warmRedC80: #FF765D;
+@warmRedC20: #FFCFC7;
+@Pantone137C80: #FFB945;
+@Pantone137C20: #FFEDD1;
+@Pantone311C80: #62E3FF;
+@Pantone311C20: #E1FAFF;
+@reflexBlue80: #554FC9;
+@reflexBlue20: #EBEAFF;
+@fury80: #F8505D;
+@fury20: #FFC5C9;
+
 // Notification Colors
-// TODO: будут отрефакторены после доработки палитры со стороны дизайна
-@error: #F1515D;
-@success: rgba(0, 185, 86, 0.1);
-@info: #DEF7FA;
-@warning: #FFEDD1;
-@green20: fade(@green, 20);
-@warmRedC20: fade(@warmRedC, 20);
-@mandarin20: fade(@mandarin, 20);
-@Pantone311C20: fade(@Pantone311C, 20);
+// TODO: будут отрефакторены после обновления дизайном Notification по новой палитре
+@error: #FFC4C9;
 @spbSky160: fade(@spbSky1, 60);
-@clearWhite60: fade(@clearWhite, 60);
-@clearWhite20: fade(@clearWhite, 20);
+@base30: fade(@base, 30);
 
 // Additional Colors Variants
-@clearWhite50: fade(@clearWhite, 50);
-@freshAsphalt25: fade(@freshAsphalt, 25);
-@freshAsphalt50: fade(@freshAsphalt, 50);
+@content25: fade(@content, 25);
 @fullBlack25: fade(@fullBlack, 25);
 @fullBlack50: fade(@fullBlack, 50);
-@freshAsphaltLighten50: lighten(@freshAsphalt, 50);
+@contentLighten50: lighten(@content, 50);
 
 // BREAKPOINTS
 @mobileSmallEnd:      479px;
@@ -199,7 +227,7 @@ h5 {
 }
 
 .link() {
-    color: @link;
+    color: @systemBlue;
     text-decoration: none;
 
     &:hover {