@salutejs/plasma-new-hope 0.76.1-dev.0 → 0.76.2-canary.1180.8703198104.0
Sign up to get free protection for your applications and to get access to all the features.
- package/cjs/components/Avatar/Avatar.js +15 -1
- package/cjs/components/Avatar/Avatar.js.map +1 -1
- package/es/components/Avatar/Avatar.js +15 -1
- package/es/components/Avatar/Avatar.js.map +1 -1
- package/package.json +2 -2
- package/styled-components/cjs/components/Avatar/Avatar.js +15 -1
- package/styled-components/cjs/examples/plasma_b2c/components/Avatar/Avatar.stories.tsx +1 -0
- package/styled-components/cjs/examples/plasma_b2c/components/AvatarGroup/AvatarGroup.stories.tsx +36 -18
- package/styled-components/es/components/Avatar/Avatar.js +15 -1
- package/styled-components/es/examples/plasma_b2c/components/Avatar/Avatar.stories.tsx +1 -0
- package/styled-components/es/examples/plasma_b2c/components/AvatarGroup/AvatarGroup.stories.tsx +36 -18
- package/types/components/Avatar/Avatar.d.ts.map +1 -1
|
@@ -16,7 +16,7 @@ var base = require('./variations/_size/base.js');
|
|
|
16
16
|
var base$1 = require('./variations/_focused/base.js');
|
|
17
17
|
var getInitialsForName = require('./utils/getInitialsForName.js');
|
|
18
18
|
|
|
19
|
-
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable"];
|
|
19
|
+
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable", "aria-label"];
|
|
20
20
|
var getAvatarContent = function getAvatarContent(_ref) {
|
|
21
21
|
var customText = _ref.customText,
|
|
22
22
|
url = _ref.url,
|
|
@@ -52,6 +52,10 @@ var StyledIndicator = /*#__PURE__*/react.styled(_exp())({
|
|
|
52
52
|
"sgw0czr-0": [/*#__PURE__*/_exp5()]
|
|
53
53
|
}
|
|
54
54
|
});
|
|
55
|
+
var StatusDict = {
|
|
56
|
+
active: 'Статус активен',
|
|
57
|
+
inactive: 'Статус неактивен'
|
|
58
|
+
};
|
|
55
59
|
var avatarRoot = function avatarRoot(Root) {
|
|
56
60
|
return /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
57
61
|
var avatarSize = props.size,
|
|
@@ -63,14 +67,23 @@ var avatarRoot = function avatarRoot(Root) {
|
|
|
63
67
|
_props$focused = props.focused,
|
|
64
68
|
focused = _props$focused === void 0 ? true : _props$focused,
|
|
65
69
|
isScalable = props.isScalable,
|
|
70
|
+
ariaLabelProp = props['aria-label'],
|
|
66
71
|
rest = _rollupPluginBabelHelpers.objectWithoutProperties(props, _excluded);
|
|
67
72
|
var initials = React.useMemo(function () {
|
|
68
73
|
return getInitialsForName.getInitialsForName(name);
|
|
69
74
|
}, [name]);
|
|
75
|
+
var ariaLabel;
|
|
76
|
+
|
|
77
|
+
// INFO: есть a11y и есть изображение, поэтому нужно озвучить что на нем: включаем aria-label
|
|
78
|
+
if ((rest === null || rest === void 0 ? void 0 : rest.role) === 'button' && url) {
|
|
79
|
+
ariaLabel = !ariaLabelProp || ariaLabelProp.trim() === '' ? name : ariaLabelProp;
|
|
80
|
+
ariaLabel = status ? "".concat(ariaLabel, " ").concat(StatusDict[status]) : ariaLabel;
|
|
81
|
+
}
|
|
70
82
|
return /*#__PURE__*/React.createElement(Root, _rollupPluginBabelHelpers.extends({
|
|
71
83
|
ref: ref,
|
|
72
84
|
size: avatarSize,
|
|
73
85
|
className: index.cx(Avatar_tokens.classes.avatarItem, className),
|
|
86
|
+
"aria-label": ariaLabel,
|
|
74
87
|
focused: focused
|
|
75
88
|
}, rest), /*#__PURE__*/React.createElement(Avatar_styles.Wrapper, {
|
|
76
89
|
isScalable: isScalable
|
|
@@ -80,6 +93,7 @@ var avatarRoot = function avatarRoot(Root) {
|
|
|
80
93
|
initials: initials,
|
|
81
94
|
name: name
|
|
82
95
|
})), status && /*#__PURE__*/React.createElement(Avatar_styles.StatusIcon, null, /*#__PURE__*/React.createElement(StyledIndicator, {
|
|
96
|
+
"aria-label": StatusDict[status],
|
|
83
97
|
status: status
|
|
84
98
|
})));
|
|
85
99
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.js","sources":["../../../src/components/Avatar/Avatar.tsx"],"sourcesContent":["import React, { forwardRef, useMemo, ReactElement } from 'react';\nimport { styled } from '@linaria/react';\n\nimport { RootProps, component, mergeConfig } from '../../engines';\nimport { cx } from '../../utils';\nimport { indicatorConfig, indicatorTokens } from '../Indicator';\n\nimport { classes, tokens } from './Avatar.tokens';\nimport { base, Wrapper, Image, StatusIcon, Text } from './Avatar.styles';\nimport { AvatarProps } from './Avatar.types';\nimport { base as viewCSS } from './variations/_size/base';\nimport { base as focusedCSS } from './variations/_focused/base';\nimport { getInitialsForName } from './utils';\n\nconst getAvatarContent = ({\n customText,\n url,\n initials,\n name,\n}: Omit<AvatarProps, 'size'> & { initials?: string }): ReactElement => {\n if (customText) {\n return <Text>{customText}</Text>;\n }\n\n if (url) {\n return <Image src={url} alt={name} />;\n }\n\n return <Text>{initials}</Text>;\n};\n\nconst mergedConfig = mergeConfig(indicatorConfig);\nconst Indicator: React.FunctionComponent<\n React.HTMLAttributes<HTMLDivElement> & { status: AvatarProps['status'] }\n> = component(mergedConfig) as never;\n\nconst StyledIndicator = styled(Indicator)`\n ${indicatorTokens.size}: var(${tokens.statusIconSize});\n ${indicatorTokens.color}: ${({ status }) =>\n status === 'active' ? `var(${tokens.statusOnlineColor})` : `var(${tokens.statusOfflineColor})`}\n`;\n\nexport const avatarRoot = (Root: RootProps<HTMLDivElement, AvatarProps>) => {\n return forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {\n const {\n size: avatarSize,\n name,\n url,\n customText,\n status,\n className,\n focused = true,\n isScalable,\n ...rest\n } = props;\n\n const initials = useMemo(() => getInitialsForName(name), [name]);\n\n return (\n <Root
|
|
1
|
+
{"version":3,"file":"Avatar.js","sources":["../../../src/components/Avatar/Avatar.tsx"],"sourcesContent":["import React, { forwardRef, useMemo, ReactElement } from 'react';\nimport { styled } from '@linaria/react';\n\nimport { RootProps, component, mergeConfig } from '../../engines';\nimport { cx } from '../../utils';\nimport { indicatorConfig, indicatorTokens } from '../Indicator';\n\nimport { classes, tokens } from './Avatar.tokens';\nimport { base, Wrapper, Image, StatusIcon, Text } from './Avatar.styles';\nimport { AvatarProps } from './Avatar.types';\nimport { base as viewCSS } from './variations/_size/base';\nimport { base as focusedCSS } from './variations/_focused/base';\nimport { getInitialsForName } from './utils';\n\nconst getAvatarContent = ({\n customText,\n url,\n initials,\n name,\n}: Omit<AvatarProps, 'size'> & { initials?: string }): ReactElement => {\n if (customText) {\n return <Text>{customText}</Text>;\n }\n\n if (url) {\n return <Image src={url} alt={name} />;\n }\n\n return <Text>{initials}</Text>;\n};\n\nconst mergedConfig = mergeConfig(indicatorConfig);\n\nconst Indicator: React.FunctionComponent<\n React.HTMLAttributes<HTMLDivElement> & { status: AvatarProps['status'] }\n> = component(mergedConfig) as never;\n\nconst StyledIndicator = styled(Indicator)`\n ${indicatorTokens.size}: var(${tokens.statusIconSize});\n ${indicatorTokens.color}: ${({ status }) =>\n status === 'active' ? `var(${tokens.statusOnlineColor})` : `var(${tokens.statusOfflineColor})`}\n`;\n\nconst StatusDict = {\n active: 'Статус активен',\n inactive: 'Статус неактивен',\n};\n\nexport const avatarRoot = (Root: RootProps<HTMLDivElement, AvatarProps>) => {\n return forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {\n const {\n size: avatarSize,\n name,\n url,\n customText,\n status,\n className,\n focused = true,\n isScalable,\n 'aria-label': ariaLabelProp,\n ...rest\n } = props;\n\n const initials = useMemo(() => getInitialsForName(name), [name]);\n let ariaLabel;\n\n // INFO: есть a11y и есть изображение, поэтому нужно озвучить что на нем: включаем aria-label\n if (rest?.role === 'button' && url) {\n ariaLabel = !ariaLabelProp || ariaLabelProp.trim() === '' ? name : ariaLabelProp;\n ariaLabel = status ? `${ariaLabel} ${StatusDict[status]}` : ariaLabel;\n }\n\n return (\n <Root\n ref={ref}\n size={avatarSize}\n className={cx(classes.avatarItem, className)}\n aria-label={ariaLabel}\n focused={focused}\n {...rest}\n >\n <Wrapper isScalable={isScalable}>{getAvatarContent({ customText, url, initials, name })}</Wrapper>\n\n {status && (\n <StatusIcon>\n <StyledIndicator aria-label={StatusDict[status]} status={status} />\n </StatusIcon>\n )}\n </Root>\n );\n });\n};\n\nexport const avatarConfig = {\n name: 'Avatar',\n tag: 'div',\n layout: avatarRoot,\n base,\n variations: {\n size: {\n css: viewCSS,\n },\n focused: {\n css: focusedCSS,\n },\n },\n defaults: {\n size: 'm',\n },\n};\n"],"names":["getAvatarContent","_ref","customText","url","initials","name","React","createElement","Text","Image","src","alt","mergedConfig","mergeConfig","indicatorConfig","Indicator","component","_exp","_exp5","_ref2","status","concat","tokens","statusOnlineColor","statusOfflineColor","StyledIndicator","styled","class","propsAsIs","vars","StatusDict","active","inactive","avatarRoot","Root","forwardRef","props","ref","avatarSize","size","className","_props$focused","focused","isScalable","ariaLabelProp","rest","_excluded","useMemo","getInitialsForName","ariaLabel","role","trim","_extends","cx","classes","avatarItem","Wrapper","StatusIcon","avatarConfig","tag","layout","base","variations","css","viewCSS","focusedCSS","defaults"],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import { base as base$1 } from './variations/_size/base.js';
|
|
|
12
12
|
import { base as base$2 } from './variations/_focused/base.js';
|
|
13
13
|
import { getInitialsForName } from './utils/getInitialsForName.js';
|
|
14
14
|
|
|
15
|
-
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable"];
|
|
15
|
+
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable", "aria-label"];
|
|
16
16
|
var getAvatarContent = function getAvatarContent(_ref) {
|
|
17
17
|
var customText = _ref.customText,
|
|
18
18
|
url = _ref.url,
|
|
@@ -48,6 +48,10 @@ var StyledIndicator = /*#__PURE__*/styled(_exp())({
|
|
|
48
48
|
"sgw0czr-0": [/*#__PURE__*/_exp5()]
|
|
49
49
|
}
|
|
50
50
|
});
|
|
51
|
+
var StatusDict = {
|
|
52
|
+
active: 'Статус активен',
|
|
53
|
+
inactive: 'Статус неактивен'
|
|
54
|
+
};
|
|
51
55
|
var avatarRoot = function avatarRoot(Root) {
|
|
52
56
|
return /*#__PURE__*/forwardRef(function (props, ref) {
|
|
53
57
|
var avatarSize = props.size,
|
|
@@ -59,14 +63,23 @@ var avatarRoot = function avatarRoot(Root) {
|
|
|
59
63
|
_props$focused = props.focused,
|
|
60
64
|
focused = _props$focused === void 0 ? true : _props$focused,
|
|
61
65
|
isScalable = props.isScalable,
|
|
66
|
+
ariaLabelProp = props['aria-label'],
|
|
62
67
|
rest = _objectWithoutProperties(props, _excluded);
|
|
63
68
|
var initials = useMemo(function () {
|
|
64
69
|
return getInitialsForName(name);
|
|
65
70
|
}, [name]);
|
|
71
|
+
var ariaLabel;
|
|
72
|
+
|
|
73
|
+
// INFO: есть a11y и есть изображение, поэтому нужно озвучить что на нем: включаем aria-label
|
|
74
|
+
if ((rest === null || rest === void 0 ? void 0 : rest.role) === 'button' && url) {
|
|
75
|
+
ariaLabel = !ariaLabelProp || ariaLabelProp.trim() === '' ? name : ariaLabelProp;
|
|
76
|
+
ariaLabel = status ? "".concat(ariaLabel, " ").concat(StatusDict[status]) : ariaLabel;
|
|
77
|
+
}
|
|
66
78
|
return /*#__PURE__*/React.createElement(Root, _extends({
|
|
67
79
|
ref: ref,
|
|
68
80
|
size: avatarSize,
|
|
69
81
|
className: cx(classes.avatarItem, className),
|
|
82
|
+
"aria-label": ariaLabel,
|
|
70
83
|
focused: focused
|
|
71
84
|
}, rest), /*#__PURE__*/React.createElement(Wrapper, {
|
|
72
85
|
isScalable: isScalable
|
|
@@ -76,6 +89,7 @@ var avatarRoot = function avatarRoot(Root) {
|
|
|
76
89
|
initials: initials,
|
|
77
90
|
name: name
|
|
78
91
|
})), status && /*#__PURE__*/React.createElement(StatusIcon, null, /*#__PURE__*/React.createElement(StyledIndicator, {
|
|
92
|
+
"aria-label": StatusDict[status],
|
|
79
93
|
status: status
|
|
80
94
|
})));
|
|
81
95
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.js","sources":["../../../src/components/Avatar/Avatar.tsx"],"sourcesContent":["import React, { forwardRef, useMemo, ReactElement } from 'react';\nimport { styled } from '@linaria/react';\n\nimport { RootProps, component, mergeConfig } from '../../engines';\nimport { cx } from '../../utils';\nimport { indicatorConfig, indicatorTokens } from '../Indicator';\n\nimport { classes, tokens } from './Avatar.tokens';\nimport { base, Wrapper, Image, StatusIcon, Text } from './Avatar.styles';\nimport { AvatarProps } from './Avatar.types';\nimport { base as viewCSS } from './variations/_size/base';\nimport { base as focusedCSS } from './variations/_focused/base';\nimport { getInitialsForName } from './utils';\n\nconst getAvatarContent = ({\n customText,\n url,\n initials,\n name,\n}: Omit<AvatarProps, 'size'> & { initials?: string }): ReactElement => {\n if (customText) {\n return <Text>{customText}</Text>;\n }\n\n if (url) {\n return <Image src={url} alt={name} />;\n }\n\n return <Text>{initials}</Text>;\n};\n\nconst mergedConfig = mergeConfig(indicatorConfig);\nconst Indicator: React.FunctionComponent<\n React.HTMLAttributes<HTMLDivElement> & { status: AvatarProps['status'] }\n> = component(mergedConfig) as never;\n\nconst StyledIndicator = styled(Indicator)`\n ${indicatorTokens.size}: var(${tokens.statusIconSize});\n ${indicatorTokens.color}: ${({ status }) =>\n status === 'active' ? `var(${tokens.statusOnlineColor})` : `var(${tokens.statusOfflineColor})`}\n`;\n\nexport const avatarRoot = (Root: RootProps<HTMLDivElement, AvatarProps>) => {\n return forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {\n const {\n size: avatarSize,\n name,\n url,\n customText,\n status,\n className,\n focused = true,\n isScalable,\n ...rest\n } = props;\n\n const initials = useMemo(() => getInitialsForName(name), [name]);\n\n return (\n <Root
|
|
1
|
+
{"version":3,"file":"Avatar.js","sources":["../../../src/components/Avatar/Avatar.tsx"],"sourcesContent":["import React, { forwardRef, useMemo, ReactElement } from 'react';\nimport { styled } from '@linaria/react';\n\nimport { RootProps, component, mergeConfig } from '../../engines';\nimport { cx } from '../../utils';\nimport { indicatorConfig, indicatorTokens } from '../Indicator';\n\nimport { classes, tokens } from './Avatar.tokens';\nimport { base, Wrapper, Image, StatusIcon, Text } from './Avatar.styles';\nimport { AvatarProps } from './Avatar.types';\nimport { base as viewCSS } from './variations/_size/base';\nimport { base as focusedCSS } from './variations/_focused/base';\nimport { getInitialsForName } from './utils';\n\nconst getAvatarContent = ({\n customText,\n url,\n initials,\n name,\n}: Omit<AvatarProps, 'size'> & { initials?: string }): ReactElement => {\n if (customText) {\n return <Text>{customText}</Text>;\n }\n\n if (url) {\n return <Image src={url} alt={name} />;\n }\n\n return <Text>{initials}</Text>;\n};\n\nconst mergedConfig = mergeConfig(indicatorConfig);\n\nconst Indicator: React.FunctionComponent<\n React.HTMLAttributes<HTMLDivElement> & { status: AvatarProps['status'] }\n> = component(mergedConfig) as never;\n\nconst StyledIndicator = styled(Indicator)`\n ${indicatorTokens.size}: var(${tokens.statusIconSize});\n ${indicatorTokens.color}: ${({ status }) =>\n status === 'active' ? `var(${tokens.statusOnlineColor})` : `var(${tokens.statusOfflineColor})`}\n`;\n\nconst StatusDict = {\n active: 'Статус активен',\n inactive: 'Статус неактивен',\n};\n\nexport const avatarRoot = (Root: RootProps<HTMLDivElement, AvatarProps>) => {\n return forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {\n const {\n size: avatarSize,\n name,\n url,\n customText,\n status,\n className,\n focused = true,\n isScalable,\n 'aria-label': ariaLabelProp,\n ...rest\n } = props;\n\n const initials = useMemo(() => getInitialsForName(name), [name]);\n let ariaLabel;\n\n // INFO: есть a11y и есть изображение, поэтому нужно озвучить что на нем: включаем aria-label\n if (rest?.role === 'button' && url) {\n ariaLabel = !ariaLabelProp || ariaLabelProp.trim() === '' ? name : ariaLabelProp;\n ariaLabel = status ? `${ariaLabel} ${StatusDict[status]}` : ariaLabel;\n }\n\n return (\n <Root\n ref={ref}\n size={avatarSize}\n className={cx(classes.avatarItem, className)}\n aria-label={ariaLabel}\n focused={focused}\n {...rest}\n >\n <Wrapper isScalable={isScalable}>{getAvatarContent({ customText, url, initials, name })}</Wrapper>\n\n {status && (\n <StatusIcon>\n <StyledIndicator aria-label={StatusDict[status]} status={status} />\n </StatusIcon>\n )}\n </Root>\n );\n });\n};\n\nexport const avatarConfig = {\n name: 'Avatar',\n tag: 'div',\n layout: avatarRoot,\n base,\n variations: {\n size: {\n css: viewCSS,\n },\n focused: {\n css: focusedCSS,\n },\n },\n defaults: {\n size: 'm',\n },\n};\n"],"names":["getAvatarContent","_ref","customText","url","initials","name","React","createElement","Text","Image","src","alt","mergedConfig","mergeConfig","indicatorConfig","Indicator","component","_exp","_exp5","_ref2","status","concat","tokens","statusOnlineColor","statusOfflineColor","StyledIndicator","styled","class","propsAsIs","vars","StatusDict","active","inactive","avatarRoot","Root","forwardRef","props","ref","avatarSize","size","className","_props$focused","focused","isScalable","ariaLabelProp","rest","_excluded","useMemo","getInitialsForName","ariaLabel","role","trim","_extends","cx","classes","avatarItem","Wrapper","StatusIcon","avatarConfig","tag","layout","base","variations","css","viewCSS","focusedCSS","defaults"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salutejs/plasma-new-hope",
|
|
3
|
-
"version": "0.76.
|
|
3
|
+
"version": "0.76.2-canary.1180.8703198104.0",
|
|
4
4
|
"description": "Salute Design System blueprint",
|
|
5
5
|
"main": "cjs/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
"react-popper": "2.3.0",
|
|
103
103
|
"storeon": "3.1.5"
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "cb051ebf73df6252738c85f8daccafc3c7282495"
|
|
106
106
|
}
|
|
@@ -15,7 +15,7 @@ var _Avatar2 = /*#__PURE__*/require("./Avatar.styles");
|
|
|
15
15
|
var _base = /*#__PURE__*/require("./variations/_size/base");
|
|
16
16
|
var _base2 = /*#__PURE__*/require("./variations/_focused/base");
|
|
17
17
|
var _utils2 = /*#__PURE__*/require("./utils");
|
|
18
|
-
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable"];
|
|
18
|
+
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable", "aria-label"];
|
|
19
19
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
20
20
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
21
21
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
|
|
@@ -46,6 +46,10 @@ var StyledIndicator = /*#__PURE__*/(0, _styledComponents["default"])(Indicator).
|
|
|
46
46
|
var status = _ref2.status;
|
|
47
47
|
return status === 'active' ? "var(".concat(_Avatar.tokens.statusOnlineColor, ")") : "var(".concat(_Avatar.tokens.statusOfflineColor, ")");
|
|
48
48
|
});
|
|
49
|
+
var StatusDict = {
|
|
50
|
+
active: 'Статус активен',
|
|
51
|
+
inactive: 'Статус неактивен'
|
|
52
|
+
};
|
|
49
53
|
var avatarRoot = exports.avatarRoot = function avatarRoot(Root) {
|
|
50
54
|
return /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
51
55
|
var avatarSize = props.size,
|
|
@@ -57,14 +61,23 @@ var avatarRoot = exports.avatarRoot = function avatarRoot(Root) {
|
|
|
57
61
|
_props$focused = props.focused,
|
|
58
62
|
focused = _props$focused === void 0 ? true : _props$focused,
|
|
59
63
|
isScalable = props.isScalable,
|
|
64
|
+
ariaLabelProp = props['aria-label'],
|
|
60
65
|
rest = _objectWithoutProperties(props, _excluded);
|
|
61
66
|
var initials = (0, _react.useMemo)(function () {
|
|
62
67
|
return (0, _utils2.getInitialsForName)(name);
|
|
63
68
|
}, [name]);
|
|
69
|
+
var ariaLabel;
|
|
70
|
+
|
|
71
|
+
// INFO: есть a11y и есть изображение, поэтому нужно озвучить что на нем: включаем aria-label
|
|
72
|
+
if ((rest === null || rest === void 0 ? void 0 : rest.role) === 'button' && url) {
|
|
73
|
+
ariaLabel = !ariaLabelProp || ariaLabelProp.trim() === '' ? name : ariaLabelProp;
|
|
74
|
+
ariaLabel = status ? "".concat(ariaLabel, " ").concat(StatusDict[status]) : ariaLabel;
|
|
75
|
+
}
|
|
64
76
|
return /*#__PURE__*/_react["default"].createElement(Root, _extends({
|
|
65
77
|
ref: ref,
|
|
66
78
|
size: avatarSize,
|
|
67
79
|
className: (0, _utils.cx)(_Avatar.classes.avatarItem, className),
|
|
80
|
+
"aria-label": ariaLabel,
|
|
68
81
|
focused: focused
|
|
69
82
|
}, rest), /*#__PURE__*/_react["default"].createElement(_Avatar2.Wrapper, {
|
|
70
83
|
isScalable: isScalable
|
|
@@ -74,6 +87,7 @@ var avatarRoot = exports.avatarRoot = function avatarRoot(Root) {
|
|
|
74
87
|
initials: initials,
|
|
75
88
|
name: name
|
|
76
89
|
})), status && /*#__PURE__*/_react["default"].createElement(_Avatar2.StatusIcon, null, /*#__PURE__*/_react["default"].createElement(StyledIndicator, {
|
|
90
|
+
"aria-label": StatusDict[status],
|
|
77
91
|
status: status
|
|
78
92
|
})));
|
|
79
93
|
});
|
package/styled-components/cjs/examples/plasma_b2c/components/AvatarGroup/AvatarGroup.stories.tsx
CHANGED
|
@@ -8,6 +8,7 @@ import { Avatar } from '../Avatar/Avatar';
|
|
|
8
8
|
import { AvatarGroup } from './AvatarGroup';
|
|
9
9
|
|
|
10
10
|
type Story = StoryObj<ComponentProps<typeof AvatarGroup>>;
|
|
11
|
+
type Avatar = ComponentProps<typeof Avatar>;
|
|
11
12
|
|
|
12
13
|
const meta: Meta<typeof AvatarGroup> = {
|
|
13
14
|
title: 'plasma_b2c/AvatarGroup',
|
|
@@ -33,40 +34,57 @@ export const Default: Story = {
|
|
|
33
34
|
|
|
34
35
|
export const DynamicSize: Story = {
|
|
35
36
|
args: { totalCount: 10, visibleCount: 3 },
|
|
36
|
-
render: (args: ComponentProps<typeof AvatarGroup>) => {
|
|
37
|
-
const itemLength =
|
|
37
|
+
render: ({ visibleCount, totalCount, ...args }: ComponentProps<typeof AvatarGroup>) => {
|
|
38
|
+
const itemLength = totalCount;
|
|
38
39
|
|
|
39
40
|
return (
|
|
40
41
|
<AvatarGroup {...args}>
|
|
41
|
-
{Array(
|
|
42
|
+
{Array(visibleCount)
|
|
42
43
|
.fill(true)
|
|
43
44
|
.map((_, index) => (
|
|
44
|
-
<Avatar size="xxl" customText={index + 1} />
|
|
45
|
+
<Avatar size="xxl" key={index} customText={index + 1} />
|
|
45
46
|
))}
|
|
46
47
|
|
|
47
|
-
{itemLength >
|
|
48
|
-
<Avatar size="xxl" customText={`+${itemLength - args.visibleCount}`} />
|
|
49
|
-
)}
|
|
48
|
+
{itemLength > visibleCount && <Avatar size="xxl" customText={`+${itemLength - visibleCount}`} />}
|
|
50
49
|
</AvatarGroup>
|
|
51
50
|
);
|
|
52
51
|
},
|
|
53
52
|
};
|
|
54
53
|
|
|
54
|
+
const list: Array<Avatar> = [
|
|
55
|
+
{
|
|
56
|
+
name: 'Илья Муромец',
|
|
57
|
+
status: 'active',
|
|
58
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
name: 'Алеша Попович',
|
|
62
|
+
status: 'active',
|
|
63
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
name: 'Добрыня Никитич',
|
|
67
|
+
status: 'active',
|
|
68
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
name: 'Микула Селянинович',
|
|
72
|
+
status: 'inactive',
|
|
73
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
name: 'Ставр Годинович',
|
|
77
|
+
status: 'inactive',
|
|
78
|
+
},
|
|
79
|
+
];
|
|
80
|
+
|
|
55
81
|
export const Accessibility: Story = {
|
|
56
82
|
render: (args: ComponentProps<typeof AvatarGroup>) => {
|
|
57
83
|
return (
|
|
58
84
|
<AvatarGroup {...args}>
|
|
59
|
-
{
|
|
60
|
-
.
|
|
61
|
-
|
|
62
|
-
<Avatar
|
|
63
|
-
role="button"
|
|
64
|
-
tabIndex={0}
|
|
65
|
-
focused
|
|
66
|
-
size="xxl"
|
|
67
|
-
url="https://avatars.githubusercontent.com/u/1813468?v=4"
|
|
68
|
-
/>
|
|
69
|
-
))}
|
|
85
|
+
{list.map((props) => (
|
|
86
|
+
<Avatar role="button" tabIndex={0} focused key={props.name} size="xxl" {...props} />
|
|
87
|
+
))}
|
|
70
88
|
</AvatarGroup>
|
|
71
89
|
);
|
|
72
90
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable"];
|
|
1
|
+
var _excluded = ["size", "name", "url", "customText", "status", "className", "focused", "isScalable", "aria-label"];
|
|
2
2
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
3
3
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
4
4
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
@@ -36,6 +36,10 @@ var StyledIndicator = /*#__PURE__*/styled(Indicator).withConfig({
|
|
|
36
36
|
var status = _ref2.status;
|
|
37
37
|
return status === 'active' ? "var(".concat(tokens.statusOnlineColor, ")") : "var(".concat(tokens.statusOfflineColor, ")");
|
|
38
38
|
});
|
|
39
|
+
var StatusDict = {
|
|
40
|
+
active: 'Статус активен',
|
|
41
|
+
inactive: 'Статус неактивен'
|
|
42
|
+
};
|
|
39
43
|
export var avatarRoot = function avatarRoot(Root) {
|
|
40
44
|
return /*#__PURE__*/forwardRef(function (props, ref) {
|
|
41
45
|
var avatarSize = props.size,
|
|
@@ -47,14 +51,23 @@ export var avatarRoot = function avatarRoot(Root) {
|
|
|
47
51
|
_props$focused = props.focused,
|
|
48
52
|
focused = _props$focused === void 0 ? true : _props$focused,
|
|
49
53
|
isScalable = props.isScalable,
|
|
54
|
+
ariaLabelProp = props['aria-label'],
|
|
50
55
|
rest = _objectWithoutProperties(props, _excluded);
|
|
51
56
|
var initials = useMemo(function () {
|
|
52
57
|
return getInitialsForName(name);
|
|
53
58
|
}, [name]);
|
|
59
|
+
var ariaLabel;
|
|
60
|
+
|
|
61
|
+
// INFO: есть a11y и есть изображение, поэтому нужно озвучить что на нем: включаем aria-label
|
|
62
|
+
if ((rest === null || rest === void 0 ? void 0 : rest.role) === 'button' && url) {
|
|
63
|
+
ariaLabel = !ariaLabelProp || ariaLabelProp.trim() === '' ? name : ariaLabelProp;
|
|
64
|
+
ariaLabel = status ? "".concat(ariaLabel, " ").concat(StatusDict[status]) : ariaLabel;
|
|
65
|
+
}
|
|
54
66
|
return /*#__PURE__*/React.createElement(Root, _extends({
|
|
55
67
|
ref: ref,
|
|
56
68
|
size: avatarSize,
|
|
57
69
|
className: cx(classes.avatarItem, className),
|
|
70
|
+
"aria-label": ariaLabel,
|
|
58
71
|
focused: focused
|
|
59
72
|
}, rest), /*#__PURE__*/React.createElement(Wrapper, {
|
|
60
73
|
isScalable: isScalable
|
|
@@ -64,6 +77,7 @@ export var avatarRoot = function avatarRoot(Root) {
|
|
|
64
77
|
initials: initials,
|
|
65
78
|
name: name
|
|
66
79
|
})), status && /*#__PURE__*/React.createElement(StatusIcon, null, /*#__PURE__*/React.createElement(StyledIndicator, {
|
|
80
|
+
"aria-label": StatusDict[status],
|
|
67
81
|
status: status
|
|
68
82
|
})));
|
|
69
83
|
});
|
package/styled-components/es/examples/plasma_b2c/components/AvatarGroup/AvatarGroup.stories.tsx
CHANGED
|
@@ -8,6 +8,7 @@ import { Avatar } from '../Avatar/Avatar';
|
|
|
8
8
|
import { AvatarGroup } from './AvatarGroup';
|
|
9
9
|
|
|
10
10
|
type Story = StoryObj<ComponentProps<typeof AvatarGroup>>;
|
|
11
|
+
type Avatar = ComponentProps<typeof Avatar>;
|
|
11
12
|
|
|
12
13
|
const meta: Meta<typeof AvatarGroup> = {
|
|
13
14
|
title: 'plasma_b2c/AvatarGroup',
|
|
@@ -33,40 +34,57 @@ export const Default: Story = {
|
|
|
33
34
|
|
|
34
35
|
export const DynamicSize: Story = {
|
|
35
36
|
args: { totalCount: 10, visibleCount: 3 },
|
|
36
|
-
render: (args: ComponentProps<typeof AvatarGroup>) => {
|
|
37
|
-
const itemLength =
|
|
37
|
+
render: ({ visibleCount, totalCount, ...args }: ComponentProps<typeof AvatarGroup>) => {
|
|
38
|
+
const itemLength = totalCount;
|
|
38
39
|
|
|
39
40
|
return (
|
|
40
41
|
<AvatarGroup {...args}>
|
|
41
|
-
{Array(
|
|
42
|
+
{Array(visibleCount)
|
|
42
43
|
.fill(true)
|
|
43
44
|
.map((_, index) => (
|
|
44
|
-
<Avatar size="xxl" customText={index + 1} />
|
|
45
|
+
<Avatar size="xxl" key={index} customText={index + 1} />
|
|
45
46
|
))}
|
|
46
47
|
|
|
47
|
-
{itemLength >
|
|
48
|
-
<Avatar size="xxl" customText={`+${itemLength - args.visibleCount}`} />
|
|
49
|
-
)}
|
|
48
|
+
{itemLength > visibleCount && <Avatar size="xxl" customText={`+${itemLength - visibleCount}`} />}
|
|
50
49
|
</AvatarGroup>
|
|
51
50
|
);
|
|
52
51
|
},
|
|
53
52
|
};
|
|
54
53
|
|
|
54
|
+
const list: Array<Avatar> = [
|
|
55
|
+
{
|
|
56
|
+
name: 'Илья Муромец',
|
|
57
|
+
status: 'active',
|
|
58
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
name: 'Алеша Попович',
|
|
62
|
+
status: 'active',
|
|
63
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
name: 'Добрыня Никитич',
|
|
67
|
+
status: 'active',
|
|
68
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
name: 'Микула Селянинович',
|
|
72
|
+
status: 'inactive',
|
|
73
|
+
url: 'https://avatars.githubusercontent.com/u/1813468?v=4',
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
name: 'Ставр Годинович',
|
|
77
|
+
status: 'inactive',
|
|
78
|
+
},
|
|
79
|
+
];
|
|
80
|
+
|
|
55
81
|
export const Accessibility: Story = {
|
|
56
82
|
render: (args: ComponentProps<typeof AvatarGroup>) => {
|
|
57
83
|
return (
|
|
58
84
|
<AvatarGroup {...args}>
|
|
59
|
-
{
|
|
60
|
-
.
|
|
61
|
-
|
|
62
|
-
<Avatar
|
|
63
|
-
role="button"
|
|
64
|
-
tabIndex={0}
|
|
65
|
-
focused
|
|
66
|
-
size="xxl"
|
|
67
|
-
url="https://avatars.githubusercontent.com/u/1813468?v=4"
|
|
68
|
-
/>
|
|
69
|
-
))}
|
|
85
|
+
{list.map((props) => (
|
|
86
|
+
<Avatar role="button" tabIndex={0} focused key={props.name} size="xxl" {...props} />
|
|
87
|
+
))}
|
|
70
88
|
</AvatarGroup>
|
|
71
89
|
);
|
|
72
90
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.d.ts","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAC;AAGjE,OAAO,EAAE,SAAS,EAA0B,MAAM,eAAe,CAAC;AAMlE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Avatar.d.ts","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4C,MAAM,OAAO,CAAC;AAGjE,OAAO,EAAE,SAAS,EAA0B,MAAM,eAAe,CAAC;AAMlE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAuC7C,eAAO,MAAM,UAAU,SAAU,UAAU,cAAc,EAAE,WAAW,CAAC;;;;;;;;wCA2CtE,CAAC;AAEF,eAAO,MAAM,YAAY;;;mBA7CQ,UAAU,cAAc,EAAE,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;CA6DtE,CAAC"}
|