@alfalab/core-components-circular-progress-bar 3.6.7 → 3.7.0

package/@alfalab/core-components-shared/package.json

@@ -0,0 +1,26 @@
+{
+    "name": "@alfalab/core-components-shared",
+    "version": "0.14.1",
+    "description": "Shared package for core-components",
+    "keywords": [],
+    "license": "MIT",
+    "main": "index.js",
+    "module": "./esm/index.js",
+    "publishConfig": {
+        "access": "public",
+        "directory": "dist"
+    },
+    "sideEffects": false,
+    "peerDependencies": {
+        "react": ">=16.8.0"
+    },
+    "dependencies": {
+        "@alfalab/hooks": "^1.13.1",
+        "tslib": "^2.4.0"
+    },
+    "devDependencies": {
+        "@maskito/core": "^1.7.0"
+    },
+    "themesVersion": "13.6.0",
+    "varsVersion": "9.16.0"
+}

package/Component.d.ts

@@ -1,12 +1,27 @@
 /// <reference types="react" />
 import React from 'react';
 import { ElementType, ReactNode } from "react";
-type TypographyColor = 'primary' | 'secondary' | 'tertiary' | 'positive' | 'negative';
+import { ComponentSize } from "./types/component-size";
+import { TypographyColor } from "./types/typography-color";
 type CircularProgressBarProps = {
     /**
      * Уровень прогресса, %
      */
-    value: number;
+    value: number | {
+        /**
+         * Время таймера в секундах
+         * Минимальное значение 0
+         * Максимальное значение 3600
+         */
+        timer: number;
+        /**
+         * Направлние отсчета таймера
+         * forward: считаем от 0 до указанного значения
+         * backward: считаем от указанного значения до 0
+         * @default backward
+         */
+        counting?: 'forward' | 'backward';
+    };
     /**
      * Дополнительный класс
      */
@@ -19,6 +34,16 @@ type CircularProgressBarProps = {
      * Цвет контента
      */
     contentColor?: TypographyColor | string;
+    /**
+     * Цвет заголовка
+     * Приоритет выше чем у `contentColor`
+     */
+    titleColor?: TypographyColor | string;
+    /**
+     * Цвет подзаголовка
+     * Приоритет выше чем у `contentColor`
+     */
+    subtitleColor?: TypographyColor | string;
     /**
      * Дополнительный текст
      */
@@ -37,9 +62,10 @@ type CircularProgressBarProps = {
     view?: 'positive' | 'negative';
     /**
      * Размер (xxl — 144×144px, xl — 128×128px, l — 80×80px, m — 64×64px, s — 48×48px, xs — 24×24px)
-     * @description xs, s, m, l, xl, xxl deprecated, используйте вместо них 24, 48, 64 , 80, 128, 144 соответственно
+     * @description xs, s, m, l, xl, xxl deprecated, используйте вместо них 24, 48, 64, 80, 128, 144 соответственно
+     * @default 64
      */
-    size?: 'xxl' | 'xl' | 'l' | 'm' | 's' | 'xs' | 24 | 48 | 64 | 80 | 128 | 144;
+    size?: ComponentSize;
     /**
      * Наличие желоба
      */
@@ -103,9 +129,14 @@ type CircularProgressBarProps = {
      * Цвет желоба
      */
     strokeColor?: string;
+    /**
+     * Направление заполнения круга
+     * @default desc
+     */
+    directionType?: 'asc' | 'desc';
 };
 /**
  * Компонент круглого прогресс бара.
  */
 declare const CircularProgressBar: React.FC<CircularProgressBarProps>;
-export { TypographyColor, CircularProgressBarProps, CircularProgressBar };
+export { CircularProgressBarProps, CircularProgressBar };

package/Component.js

@@ -5,15 +5,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
+var coreComponentsShared = require('@alfalab/core-components-shared');
 var coreComponentsTypography = require('@alfalab/core-components-typography');
+var utils_isTypographyColor = require('./utils/is-typography-color.js');
 var consts = require('./consts.js');
+var useTimer = require('./use-timer.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"component":"circular-progress-bar__component_5bj3o","bg-positive":"circular-progress-bar__bg-positive_5bj3o","bg-negative":"circular-progress-bar__bg-negative_5bj3o","svg":"circular-progress-bar__svg_5bj3o","title":"circular-progress-bar__title_5bj3o","subtitle":"circular-progress-bar__subtitle_5bj3o","labelWrapper":"circular-progress-bar__labelWrapper_5bj3o","label":"circular-progress-bar__label_5bj3o","typography":"circular-progress-bar__typography_5bj3o","size-144":"circular-progress-bar__size-144_5bj3o","size-128":"circular-progress-bar__size-128_5bj3o","size-80":"circular-progress-bar__size-80_5bj3o","size-64":"circular-progress-bar__size-64_5bj3o","size-48":"circular-progress-bar__size-48_5bj3o","size-24":"circular-progress-bar__size-24_5bj3o","backgroundCircle":"circular-progress-bar__backgroundCircle_5bj3o","progressCircle":"circular-progress-bar__progressCircle_5bj3o","positive":"circular-progress-bar__positive_5bj3o","negative":"circular-progress-bar__negative_5bj3o","stroke":"circular-progress-bar__stroke_5bj3o","iconWrapper":"circular-progress-bar__iconWrapper_5bj3o","icon-tertiary":"circular-progress-bar__icon-tertiary_5bj3o","icon-positive":"circular-progress-bar__icon-positive_5bj3o","icon-negative":"circular-progress-bar__icon-negative_5bj3o","icon-primary-inverted":"circular-progress-bar__icon-primary-inverted_5bj3o","icon-primary":"circular-progress-bar__icon-primary_5bj3o","icon-secondary":"circular-progress-bar__icon-secondary_5bj3o","icon":"circular-progress-bar__icon_5bj3o"};
+var styles = {"component":"circular-progress-bar__component_1cf8i","bg-positive":"circular-progress-bar__bg-positive_1cf8i","bg-negative":"circular-progress-bar__bg-negative_1cf8i","svg":"circular-progress-bar__svg_1cf8i","title":"circular-progress-bar__title_1cf8i","subtitle":"circular-progress-bar__subtitle_1cf8i","labelWrapper":"circular-progress-bar__labelWrapper_1cf8i","label":"circular-progress-bar__label_1cf8i","typography":"circular-progress-bar__typography_1cf8i","size-144":"circular-progress-bar__size-144_1cf8i","size-128":"circular-progress-bar__size-128_1cf8i","size-96":"circular-progress-bar__size-96_1cf8i","size-80":"circular-progress-bar__size-80_1cf8i","size-64":"circular-progress-bar__size-64_1cf8i","size-48":"circular-progress-bar__size-48_1cf8i","size-24":"circular-progress-bar__size-24_1cf8i","backgroundCircle":"circular-progress-bar__backgroundCircle_1cf8i","progressCircle":"circular-progress-bar__progressCircle_1cf8i","positive":"circular-progress-bar__positive_1cf8i","negative":"circular-progress-bar__negative_1cf8i","stroke":"circular-progress-bar__stroke_1cf8i","iconWrapper":"circular-progress-bar__iconWrapper_1cf8i","icon-tertiary":"circular-progress-bar__icon-tertiary_1cf8i","icon-positive":"circular-progress-bar__icon-positive_1cf8i","icon-negative":"circular-progress-bar__icon-negative_1cf8i","icon-primary-inverted":"circular-progress-bar__icon-primary-inverted_1cf8i","icon-primary":"circular-progress-bar__icon-primary_1cf8i","icon-secondary":"circular-progress-bar__icon-secondary_1cf8i","icon":"circular-progress-bar__icon_1cf8i"};
 require('./index.css')
 
 /**
@@ -21,7 +24,21 @@ require('./index.css')
  */
 var CircularProgressBar = function (_a) {
     var _b, _c, _d;
-    var value = _a.value, _e = _a.view, view = _e === void 0 ? 'positive' : _e, _f = _a.size, size = _f === void 0 ? 64 : _f, className = _a.className, dataTestId = _a.dataTestId, _g = _a.title, title = _g === void 0 ? value ? value.toString() : '0' : _g, titleComplete = _a.titleComplete, subtitle = _a.subtitle, _h = _a.contentColor, contentColor = _h === void 0 ? 'secondary' : _h, subtitleComplete = _a.subtitleComplete, _j = _a.stroke, stroke = _j === void 0 ? true : _j, fillComplete = _a.fillComplete, Icon = _a.icon, IconComplete = _a.iconComplete, completeTextColor = _a.completeTextColor, _k = _a.completeIconColor, completeIconColor = _k === void 0 ? 'tertiary' : _k, _l = _a.direction, direction = _l === void 0 ? 'clockwise' : _l, height = _a.height, children = _a.children, progressStrokeColor = _a.progressStrokeColor, circleColor = _a.circleColor, strokeColor = _a.strokeColor;
+    var _e;
+    var valueFromProps = _a.value, _f = _a.view, view = _f === void 0 ? 'positive' : _f, _g = _a.size, size = _g === void 0 ? 64 : _g, className = _a.className, dataTestId = _a.dataTestId, _h = _a.title, titleFromProps = _h === void 0 ? coreComponentsShared.isObject(valueFromProps) ? null : "".concat(valueFromProps) : _h, titleComplete = _a.titleComplete, subtitle = _a.subtitle, _j = _a.contentColor, contentColor = _j === void 0 ? 'secondary' : _j, subtitleComplete = _a.subtitleComplete, _k = _a.stroke, stroke = _k === void 0 ? true : _k, fillComplete = _a.fillComplete, Icon = _a.icon, IconComplete = _a.iconComplete, completeTextColor = _a.completeTextColor, _l = _a.completeIconColor, completeIconColor = _l === void 0 ? 'tertiary' : _l, _m = _a.direction, direction = _m === void 0 ? 'clockwise' : _m, height = _a.height, children = _a.children, progressStrokeColor = _a.progressStrokeColor, circleColor = _a.circleColor, strokeColor = _a.strokeColor, _o = _a.directionType, directionType = _o === void 0 ? 'asc' : _o, titleColor = _a.titleColor, subtitleColor = _a.subtitleColor;
+    var isTimer = coreComponentsShared.isObject(valueFromProps);
+    var _p = useTimer.useTimer(isTimer ? Math.min(Math.max(valueFromProps.timer, consts.MIN_TIMER_VALUE), consts.MAX_TIMER_VALUE) : -1, isTimer, isTimer ? (_e = valueFromProps.counting) !== null && _e !== void 0 ? _e : 'backward' : 'backward'), timerValue = _p[0], timerTitle = _p[1];
+    var value;
+    var title;
+    if (isTimer) {
+        value = timerValue;
+        title = timerTitle;
+    }
+    else {
+        value = valueFromProps;
+        title = titleFromProps;
+    }
+    value = directionType === 'desc' ? consts.MAX_PROGRESS_VALUE - value : value;
     var memorized = React.useMemo(function () {
         var strokeWidth = consts.STROKE[size];
         var maxProgress = 100;
@@ -42,7 +59,7 @@ var CircularProgressBar = function (_a) {
             strokeDasharray: strokeDasharray,
             strokeDashoffset: strokeDashoffset,
         };
-    }, [value, size]);
+    }, [size, value]);
     var isComplete = value === 100;
     var isCompleteTextColor = isComplete && completeTextColor;
     var titleContent = titleComplete && isComplete ? titleComplete : title;
@@ -51,12 +68,30 @@ var CircularProgressBar = function (_a) {
     var typographyContentColor = consts.TYPOGRAPHY_COLOR.includes(contentColor)
         ? contentColor
         : undefined;
+    var getTextColor = function (color) {
+        if (isCompleteTextColor) {
+            return completeTextColor;
+        }
+        if (color) {
+            return utils_isTypographyColor.isTypographyColor(color) ? color : undefined;
+        }
+        return typographyContentColor;
+    };
+    var getTextStyleColor = function (color) {
+        if (color) {
+            if (!utils_isTypographyColor.isTypographyColor(color)) {
+                return { color: color };
+            }
+            return {};
+        }
+        return tslib.__assign({}, (!typographyContentColor && { color: contentColor }));
+    };
     var renderTitleString = function () {
-        return consts.SIZES[size] > 64 ? (React__default.default.createElement(coreComponentsTypography.TitleMobile, { className: cn__default.default(styles.typography, styles.title), color: isCompleteTextColor ? completeTextColor : typographyContentColor, tag: 'div', font: 'system', view: consts.VIEW_TITLE[size], style: tslib.__assign({}, (!typographyContentColor && { color: contentColor })) }, titleContent)) : (React__default.default.createElement(coreComponentsTypography.Text, { className: styles.title, color: isCompleteTextColor ? completeTextColor : typographyContentColor, tag: 'div', weight: 'bold', view: consts.VIEW_TEXT[size], style: tslib.__assign({}, (!typographyContentColor && { color: contentColor })) }, titleContent));
+        return consts.SIZES[size] > 64 ? (React__default.default.createElement(coreComponentsTypography.TitleMobile, { className: cn__default.default(styles.typography, styles.title), color: getTextColor(titleColor), tag: 'div', font: 'system', view: consts.VIEW_TITLE[size], style: tslib.__assign({}, getTextStyleColor(titleColor)), dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'title') }, titleContent)) : (React__default.default.createElement(coreComponentsTypography.Text, { className: styles.title, color: getTextColor(titleColor), tag: 'div', weight: 'bold', view: consts.VIEW_TEXT[size], style: tslib.__assign({}, getTextStyleColor(titleColor)), dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'title') }, titleContent));
     };
     var renderTitle = function () { return (typeof title === 'string' ? renderTitleString() : titleContent); };
     var renderSubTitle = function () {
-        return typeof subtitle === 'string' ? (React__default.default.createElement(coreComponentsTypography.Text, { tag: 'div', className: styles.subtitle, color: isCompleteTextColor ? completeTextColor : typographyContentColor, view: 'primary-small', style: tslib.__assign({}, (!typographyContentColor && { color: contentColor })) }, subtitleContent)) : (subtitleContent);
+        return typeof subtitle === 'string' ? (React__default.default.createElement(coreComponentsTypography.Text, { tag: 'div', className: styles.subtitle, color: getTextColor(subtitleColor), view: 'primary-small', dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'subtitle'), style: tslib.__assign({}, getTextStyleColor(subtitleColor)) }, subtitleContent)) : (subtitleContent);
     };
     var renderIcon = function () {
         var _a;
@@ -75,10 +110,10 @@ var CircularProgressBar = function (_a) {
         React__default.default.createElement("svg", { viewBox: "0 0 ".concat(memorized.widthSVG, " ").concat(memorized.heightSVG), className: styles.svg, xmlns: 'http://www.w3.org/2000/svg' },
             React__default.default.createElement("circle", { className: cn__default.default(styles.backgroundCircle, styles[consts.SIZE_TO_CLASSNAME_MAP[size]], (_c = {},
                     _c[styles.stroke] = !stroke,
-                    _c)), style: tslib.__assign({}, (strokeColor && stroke && { stroke: strokeColor })), cx: memorized.center, cy: memorized.center, r: memorized.radius, strokeWidth: consts.STROKE[size] }),
+                    _c)), style: tslib.__assign({}, (strokeColor && stroke && { stroke: strokeColor })), cx: memorized.center, cy: memorized.center, r: memorized.radius, strokeWidth: consts.STROKE[size], "data-test-id": coreComponentsShared.getDataTestId(dataTestId, 'circle-progress-bar') }),
             React__default.default.createElement("circle", { className: cn__default.default(styles.progressCircle, styles[view], styles[consts.SIZE_TO_CLASSNAME_MAP[size]]), style: tslib.__assign({}, (progressStrokeColor && { stroke: progressStrokeColor })), cx: memorized.center, cy: memorized.center, r: memorized.radius, strokeWidth: consts.STROKE[size], strokeDasharray: memorized.strokeDasharray, strokeDashoffset: direction === 'counter-clockwise'
                     ? -memorized.strokeDashoffset
-                    : memorized.strokeDashoffset, transform: "rotate(".concat(-90, " ").concat(memorized.center, " ").concat(memorized.center, ")") })),
+                    : memorized.strokeDashoffset, transform: "rotate(".concat(-90, " ").concat(memorized.center, " ").concat(memorized.center, ")"), "data-test-id": coreComponentsShared.getDataTestId(dataTestId, 'circle-progress-value') })),
         React__default.default.createElement("div", { className: cn__default.default(styles.labelWrapper, (_d = {},
                 _d[styles.label] = Icon || IconComplete,
                 _d)) }, children || renderContent())));

package/consts.d.ts

@@ -9,6 +9,7 @@ declare const SIZES: {
     48: number;
     64: number;
     80: number;
+    96: number;
     128: number;
     144: number;
 };
@@ -23,6 +24,7 @@ declare const STROKE: {
     48: number;
     64: number;
     80: number;
+    96: number;
     128: number;
     144: number;
 };
@@ -37,6 +39,7 @@ declare const VIEW_TITLE: {
     readonly 48: "small";
     readonly 64: "small";
     readonly 80: "xsmall";
+    readonly 96: "xsmall";
     readonly 128: "medium";
     readonly 144: "medium";
 };
@@ -51,6 +54,7 @@ declare const VIEW_TEXT: {
     readonly 48: "secondary-small";
     readonly 64: "secondary-large";
     readonly 80: "secondary-large";
+    readonly 96: "secondary-large";
     readonly 128: "secondary-large";
     readonly 144: "secondary-large";
 };
@@ -66,7 +70,11 @@ declare const SIZE_TO_CLASSNAME_MAP: {
     48: string;
     64: string;
     80: string;
+    96: string;
     128: string;
     144: string;
 };
-export { SIZES, STROKE, VIEW_TITLE, VIEW_TEXT, TYPOGRAPHY_COLOR, SIZE_TO_CLASSNAME_MAP };
+declare const MAX_PROGRESS_VALUE = 100;
+declare const MIN_TIMER_VALUE = 0;
+declare const MAX_TIMER_VALUE = 3599;
+export { SIZES, STROKE, VIEW_TITLE, VIEW_TEXT, TYPOGRAPHY_COLOR, SIZE_TO_CLASSNAME_MAP, MAX_PROGRESS_VALUE, MIN_TIMER_VALUE, MAX_TIMER_VALUE };

package/consts.js

@@ -13,6 +13,7 @@ var SIZES = {
     48: 48,
     64: 64,
     80: 80,
+    96: 96,
     128: 128,
     144: 144,
 };
@@ -27,6 +28,7 @@ var STROKE = {
     48: 4,
     64: 6,
     80: 8,
+    96: 8,
     128: 10,
     144: 12,
 };
@@ -41,6 +43,7 @@ var VIEW_TITLE = {
     48: 'small',
     64: 'small',
     80: 'xsmall',
+    96: 'xsmall',
     128: 'medium',
     144: 'medium',
 };
@@ -55,6 +58,7 @@ var VIEW_TEXT = {
     48: 'secondary-small',
     64: 'secondary-large',
     80: 'secondary-large',
+    96: 'secondary-large',
     128: 'secondary-large',
     144: 'secondary-large',
 };
@@ -70,10 +74,17 @@ var SIZE_TO_CLASSNAME_MAP = {
     48: 'size-48',
     64: 'size-64',
     80: 'size-80',
+    96: 'size-96',
     128: 'size-128',
     144: 'size-144',
 };
+var MAX_PROGRESS_VALUE = 100;
+var MIN_TIMER_VALUE = 0;
+var MAX_TIMER_VALUE = 3599;
 
+exports.MAX_PROGRESS_VALUE = MAX_PROGRESS_VALUE;
+exports.MAX_TIMER_VALUE = MAX_TIMER_VALUE;
+exports.MIN_TIMER_VALUE = MIN_TIMER_VALUE;
 exports.SIZES = SIZES;
 exports.SIZE_TO_CLASSNAME_MAP = SIZE_TO_CLASSNAME_MAP;
 exports.STROKE = STROKE;

package/cssm/Component.d.ts

@@ -1,12 +1,27 @@
 /// <reference types="react" />
 import React from 'react';
 import { ElementType, ReactNode } from "react";
-type TypographyColor = 'primary' | 'secondary' | 'tertiary' | 'positive' | 'negative';
+import { ComponentSize } from "./types/component-size";
+import { TypographyColor } from "./types/typography-color";
 type CircularProgressBarProps = {
     /**
      * Уровень прогресса, %
      */
-    value: number;
+    value: number | {
+        /**
+         * Время таймера в секундах
+         * Минимальное значение 0
+         * Максимальное значение 3600
+         */
+        timer: number;
+        /**
+         * Направлние отсчета таймера
+         * forward: считаем от 0 до указанного значения
+         * backward: считаем от указанного значения до 0
+         * @default backward
+         */
+        counting?: 'forward' | 'backward';
+    };
     /**
      * Дополнительный класс
      */
@@ -19,6 +34,16 @@ type CircularProgressBarProps = {
      * Цвет контента
      */
     contentColor?: TypographyColor | string;
+    /**
+     * Цвет заголовка
+     * Приоритет выше чем у `contentColor`
+     */
+    titleColor?: TypographyColor | string;
+    /**
+     * Цвет подзаголовка
+     * Приоритет выше чем у `contentColor`
+     */
+    subtitleColor?: TypographyColor | string;
     /**
      * Дополнительный текст
      */
@@ -37,9 +62,10 @@ type CircularProgressBarProps = {
     view?: 'positive' | 'negative';
     /**
      * Размер (xxl — 144×144px, xl — 128×128px, l — 80×80px, m — 64×64px, s — 48×48px, xs — 24×24px)
-     * @description xs, s, m, l, xl, xxl deprecated, используйте вместо них 24, 48, 64 , 80, 128, 144 соответственно
+     * @description xs, s, m, l, xl, xxl deprecated, используйте вместо них 24, 48, 64, 80, 128, 144 соответственно
+     * @default 64
      */
-    size?: 'xxl' | 'xl' | 'l' | 'm' | 's' | 'xs' | 24 | 48 | 64 | 80 | 128 | 144;
+    size?: ComponentSize;
     /**
      * Наличие желоба
      */
@@ -103,9 +129,14 @@ type CircularProgressBarProps = {
      * Цвет желоба
      */
     strokeColor?: string;
+    /**
+     * Направление заполнения круга
+     * @default desc
+     */
+    directionType?: 'asc' | 'desc';
 };
 /**
  * Компонент круглого прогресс бара.
  */
 declare const CircularProgressBar: React.FC<CircularProgressBarProps>;
-export { TypographyColor, CircularProgressBarProps, CircularProgressBar };
+export { CircularProgressBarProps, CircularProgressBar };

package/cssm/Component.js

@@ -5,8 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var cn = require('classnames');
+var coreComponentsShared = require('@alfalab/core-components-shared/cssm');
 var coreComponentsTypography = require('@alfalab/core-components-typography/cssm');
+var utils_isTypographyColor = require('./utils/is-typography-color.js');
 var consts = require('./consts.js');
+var useTimer = require('./use-timer.js');
 var styles = require('./index.module.css');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -20,7 +23,21 @@ var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
  */
 var CircularProgressBar = function (_a) {
     var _b, _c, _d;
-    var value = _a.value, _e = _a.view, view = _e === void 0 ? 'positive' : _e, _f = _a.size, size = _f === void 0 ? 64 : _f, className = _a.className, dataTestId = _a.dataTestId, _g = _a.title, title = _g === void 0 ? value ? value.toString() : '0' : _g, titleComplete = _a.titleComplete, subtitle = _a.subtitle, _h = _a.contentColor, contentColor = _h === void 0 ? 'secondary' : _h, subtitleComplete = _a.subtitleComplete, _j = _a.stroke, stroke = _j === void 0 ? true : _j, fillComplete = _a.fillComplete, Icon = _a.icon, IconComplete = _a.iconComplete, completeTextColor = _a.completeTextColor, _k = _a.completeIconColor, completeIconColor = _k === void 0 ? 'tertiary' : _k, _l = _a.direction, direction = _l === void 0 ? 'clockwise' : _l, height = _a.height, children = _a.children, progressStrokeColor = _a.progressStrokeColor, circleColor = _a.circleColor, strokeColor = _a.strokeColor;
+    var _e;
+    var valueFromProps = _a.value, _f = _a.view, view = _f === void 0 ? 'positive' : _f, _g = _a.size, size = _g === void 0 ? 64 : _g, className = _a.className, dataTestId = _a.dataTestId, _h = _a.title, titleFromProps = _h === void 0 ? coreComponentsShared.isObject(valueFromProps) ? null : "".concat(valueFromProps) : _h, titleComplete = _a.titleComplete, subtitle = _a.subtitle, _j = _a.contentColor, contentColor = _j === void 0 ? 'secondary' : _j, subtitleComplete = _a.subtitleComplete, _k = _a.stroke, stroke = _k === void 0 ? true : _k, fillComplete = _a.fillComplete, Icon = _a.icon, IconComplete = _a.iconComplete, completeTextColor = _a.completeTextColor, _l = _a.completeIconColor, completeIconColor = _l === void 0 ? 'tertiary' : _l, _m = _a.direction, direction = _m === void 0 ? 'clockwise' : _m, height = _a.height, children = _a.children, progressStrokeColor = _a.progressStrokeColor, circleColor = _a.circleColor, strokeColor = _a.strokeColor, _o = _a.directionType, directionType = _o === void 0 ? 'asc' : _o, titleColor = _a.titleColor, subtitleColor = _a.subtitleColor;
+    var isTimer = coreComponentsShared.isObject(valueFromProps);
+    var _p = useTimer.useTimer(isTimer ? Math.min(Math.max(valueFromProps.timer, consts.MIN_TIMER_VALUE), consts.MAX_TIMER_VALUE) : -1, isTimer, isTimer ? (_e = valueFromProps.counting) !== null && _e !== void 0 ? _e : 'backward' : 'backward'), timerValue = _p[0], timerTitle = _p[1];
+    var value;
+    var title;
+    if (isTimer) {
+        value = timerValue;
+        title = timerTitle;
+    }
+    else {
+        value = valueFromProps;
+        title = titleFromProps;
+    }
+    value = directionType === 'desc' ? consts.MAX_PROGRESS_VALUE - value : value;
     var memorized = React.useMemo(function () {
         var strokeWidth = consts.STROKE[size];
         var maxProgress = 100;
@@ -41,7 +58,7 @@ var CircularProgressBar = function (_a) {
             strokeDasharray: strokeDasharray,
             strokeDashoffset: strokeDashoffset,
         };
-    }, [value, size]);
+    }, [size, value]);
     var isComplete = value === 100;
     var isCompleteTextColor = isComplete && completeTextColor;
     var titleContent = titleComplete && isComplete ? titleComplete : title;
@@ -50,12 +67,30 @@ var CircularProgressBar = function (_a) {
     var typographyContentColor = consts.TYPOGRAPHY_COLOR.includes(contentColor)
         ? contentColor
         : undefined;
+    var getTextColor = function (color) {
+        if (isCompleteTextColor) {
+            return completeTextColor;
+        }
+        if (color) {
+            return utils_isTypographyColor.isTypographyColor(color) ? color : undefined;
+        }
+        return typographyContentColor;
+    };
+    var getTextStyleColor = function (color) {
+        if (color) {
+            if (!utils_isTypographyColor.isTypographyColor(color)) {
+                return { color: color };
+            }
+            return {};
+        }
+        return tslib.__assign({}, (!typographyContentColor && { color: contentColor }));
+    };
     var renderTitleString = function () {
-        return consts.SIZES[size] > 64 ? (React__default.default.createElement(coreComponentsTypography.TitleMobile, { className: cn__default.default(styles__default.default.typography, styles__default.default.title), color: isCompleteTextColor ? completeTextColor : typographyContentColor, tag: 'div', font: 'system', view: consts.VIEW_TITLE[size], style: tslib.__assign({}, (!typographyContentColor && { color: contentColor })) }, titleContent)) : (React__default.default.createElement(coreComponentsTypography.Text, { className: styles__default.default.title, color: isCompleteTextColor ? completeTextColor : typographyContentColor, tag: 'div', weight: 'bold', view: consts.VIEW_TEXT[size], style: tslib.__assign({}, (!typographyContentColor && { color: contentColor })) }, titleContent));
+        return consts.SIZES[size] > 64 ? (React__default.default.createElement(coreComponentsTypography.TitleMobile, { className: cn__default.default(styles__default.default.typography, styles__default.default.title), color: getTextColor(titleColor), tag: 'div', font: 'system', view: consts.VIEW_TITLE[size], style: tslib.__assign({}, getTextStyleColor(titleColor)), dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'title') }, titleContent)) : (React__default.default.createElement(coreComponentsTypography.Text, { className: styles__default.default.title, color: getTextColor(titleColor), tag: 'div', weight: 'bold', view: consts.VIEW_TEXT[size], style: tslib.__assign({}, getTextStyleColor(titleColor)), dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'title') }, titleContent));
     };
     var renderTitle = function () { return (typeof title === 'string' ? renderTitleString() : titleContent); };
     var renderSubTitle = function () {
-        return typeof subtitle === 'string' ? (React__default.default.createElement(coreComponentsTypography.Text, { tag: 'div', className: styles__default.default.subtitle, color: isCompleteTextColor ? completeTextColor : typographyContentColor, view: 'primary-small', style: tslib.__assign({}, (!typographyContentColor && { color: contentColor })) }, subtitleContent)) : (subtitleContent);
+        return typeof subtitle === 'string' ? (React__default.default.createElement(coreComponentsTypography.Text, { tag: 'div', className: styles__default.default.subtitle, color: getTextColor(subtitleColor), view: 'primary-small', dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'subtitle'), style: tslib.__assign({}, getTextStyleColor(subtitleColor)) }, subtitleContent)) : (subtitleContent);
     };
     var renderIcon = function () {
         var _a;
@@ -74,10 +109,10 @@ var CircularProgressBar = function (_a) {
         React__default.default.createElement("svg", { viewBox: "0 0 ".concat(memorized.widthSVG, " ").concat(memorized.heightSVG), className: styles__default.default.svg, xmlns: 'http://www.w3.org/2000/svg' },
             React__default.default.createElement("circle", { className: cn__default.default(styles__default.default.backgroundCircle, styles__default.default[consts.SIZE_TO_CLASSNAME_MAP[size]], (_c = {},
                     _c[styles__default.default.stroke] = !stroke,
-                    _c)), style: tslib.__assign({}, (strokeColor && stroke && { stroke: strokeColor })), cx: memorized.center, cy: memorized.center, r: memorized.radius, strokeWidth: consts.STROKE[size] }),
+                    _c)), style: tslib.__assign({}, (strokeColor && stroke && { stroke: strokeColor })), cx: memorized.center, cy: memorized.center, r: memorized.radius, strokeWidth: consts.STROKE[size], "data-test-id": coreComponentsShared.getDataTestId(dataTestId, 'circle-progress-bar') }),
             React__default.default.createElement("circle", { className: cn__default.default(styles__default.default.progressCircle, styles__default.default[view], styles__default.default[consts.SIZE_TO_CLASSNAME_MAP[size]]), style: tslib.__assign({}, (progressStrokeColor && { stroke: progressStrokeColor })), cx: memorized.center, cy: memorized.center, r: memorized.radius, strokeWidth: consts.STROKE[size], strokeDasharray: memorized.strokeDasharray, strokeDashoffset: direction === 'counter-clockwise'
                     ? -memorized.strokeDashoffset
-                    : memorized.strokeDashoffset, transform: "rotate(".concat(-90, " ").concat(memorized.center, " ").concat(memorized.center, ")") })),
+                    : memorized.strokeDashoffset, transform: "rotate(".concat(-90, " ").concat(memorized.center, " ").concat(memorized.center, ")"), "data-test-id": coreComponentsShared.getDataTestId(dataTestId, 'circle-progress-value') })),
         React__default.default.createElement("div", { className: cn__default.default(styles__default.default.labelWrapper, (_d = {},
                 _d[styles__default.default.label] = Icon || IconComplete,
                 _d)) }, children || renderContent())));

package/cssm/consts.d.ts

@@ -9,6 +9,7 @@ declare const SIZES: {
     48: number;
     64: number;
     80: number;
+    96: number;
     128: number;
     144: number;
 };
@@ -23,6 +24,7 @@ declare const STROKE: {
     48: number;
     64: number;
     80: number;
+    96: number;
     128: number;
     144: number;
 };
@@ -37,6 +39,7 @@ declare const VIEW_TITLE: {
     readonly 48: "small";
     readonly 64: "small";
     readonly 80: "xsmall";
+    readonly 96: "xsmall";
     readonly 128: "medium";
     readonly 144: "medium";
 };
@@ -51,6 +54,7 @@ declare const VIEW_TEXT: {
     readonly 48: "secondary-small";
     readonly 64: "secondary-large";
     readonly 80: "secondary-large";
+    readonly 96: "secondary-large";
     readonly 128: "secondary-large";
     readonly 144: "secondary-large";
 };
@@ -66,7 +70,11 @@ declare const SIZE_TO_CLASSNAME_MAP: {
     48: string;
     64: string;
     80: string;
+    96: string;
     128: string;
     144: string;
 };
-export { SIZES, STROKE, VIEW_TITLE, VIEW_TEXT, TYPOGRAPHY_COLOR, SIZE_TO_CLASSNAME_MAP };
+declare const MAX_PROGRESS_VALUE = 100;
+declare const MIN_TIMER_VALUE = 0;
+declare const MAX_TIMER_VALUE = 3599;
+export { SIZES, STROKE, VIEW_TITLE, VIEW_TEXT, TYPOGRAPHY_COLOR, SIZE_TO_CLASSNAME_MAP, MAX_PROGRESS_VALUE, MIN_TIMER_VALUE, MAX_TIMER_VALUE };

package/cssm/consts.js

@@ -13,6 +13,7 @@ var SIZES = {
     48: 48,
     64: 64,
     80: 80,
+    96: 96,
     128: 128,
     144: 144,
 };
@@ -27,6 +28,7 @@ var STROKE = {
     48: 4,
     64: 6,
     80: 8,
+    96: 8,
     128: 10,
     144: 12,
 };
@@ -41,6 +43,7 @@ var VIEW_TITLE = {
     48: 'small',
     64: 'small',
     80: 'xsmall',
+    96: 'xsmall',
     128: 'medium',
     144: 'medium',
 };
@@ -55,6 +58,7 @@ var VIEW_TEXT = {
     48: 'secondary-small',
     64: 'secondary-large',
     80: 'secondary-large',
+    96: 'secondary-large',
     128: 'secondary-large',
     144: 'secondary-large',
 };
@@ -70,10 +74,17 @@ var SIZE_TO_CLASSNAME_MAP = {
     48: 'size-48',
     64: 'size-64',
     80: 'size-80',
+    96: 'size-96',
     128: 'size-128',
     144: 'size-144',
 };
+var MAX_PROGRESS_VALUE = 100;
+var MIN_TIMER_VALUE = 0;
+var MAX_TIMER_VALUE = 3599;
 
+exports.MAX_PROGRESS_VALUE = MAX_PROGRESS_VALUE;
+exports.MAX_TIMER_VALUE = MAX_TIMER_VALUE;
+exports.MIN_TIMER_VALUE = MIN_TIMER_VALUE;
 exports.SIZES = SIZES;
 exports.SIZE_TO_CLASSNAME_MAP = SIZE_TO_CLASSNAME_MAP;
 exports.STROKE = STROKE;

package/cssm/index.d.ts

@@ -1 +1,2 @@
 export * from "./Component";
+export * from "./types/typography-color";

package/cssm/index.module.css

@@ -23,7 +23,10 @@
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 
     /* новые значения, используйте их */
-    --gap-0: 0;
+
+    /* no-unit может приводить к проблемам в calc (#1559) */
+    /* stylelint-disable-next-line length-zero-no-unit */
+    --gap-0: 0px;
 } :root {
     --font-family-system: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Helvetica,
         sans-serif;
@@ -92,6 +95,13 @@
         max-width: 108px;
     } .size-128 .title {
         max-height: 32px;
+    } .size-96 {
+    width: 96px;
+    height: 96px
+} .size-96 .labelWrapper {
+        max-width: 64px;
+    } .size-96 .title {
+        max-height: 20px;
     } .size-80 {
     width: 80px;
     height: 80px
@@ -145,6 +155,9 @@
     } .iconWrapper.size-128 {
         max-width: 64px;
         max-height: 64px;
+    } .iconWrapper.size-96 {
+        max-width: 48px;
+        max-height: 48px;
     } .iconWrapper.size-80 {
         max-width: 48px;
         max-height: 48px;

package/cssm/shared/index.d.ts

@@ -0,0 +1 @@
+export { getCircularProgressBarTestIds } from "../utils/get-circular-progress-bar-test-ids";

package/cssm/shared/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils_getCircularProgressBarTestIds = require('../utils/get-circular-progress-bar-test-ids.js');
+
+
+
+exports.getCircularProgressBarTestIds = utils_getCircularProgressBarTestIds.getCircularProgressBarTestIds;

package/cssm/types/component-size.d.ts

@@ -0,0 +1,2 @@
+type ComponentSize = 'xxl' | 'xl' | 'l' | 'm' | 's' | 'xs' | 24 | 48 | 64 | 80 | 128 | 144;
+export { ComponentSize };

package/cssm/types/component-size.js

@@ -0,0 +1,2 @@
+'use strict';
+

package/cssm/types/typography-color.d.ts

@@ -0,0 +1,2 @@
+type TypographyColor = 'primary' | 'secondary' | 'tertiary' | 'positive' | 'negative';
+export { TypographyColor };

package/cssm/types/typography-color.js

@@ -0,0 +1,2 @@
+'use strict';
+

package/cssm/use-timer.d.ts

@@ -0,0 +1,2 @@
+declare function useTimer(time: number, active: boolean | undefined, counting: 'forward' | 'backward', interval?: number, step?: number): [value: number, title: string];
+export { useTimer };