@atlaskit/avatar-group 8.5.9 → 8.5.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @atlaskit/avatar-group
2
2
 
3
+ ## 8.5.12
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 8.5.11
10
+
11
+ ### Patch Changes
12
+
13
+ - [`b2f8af359cf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b2f8af359cf) - Rewrite dynamic styles to be static to aid compiled migration.
14
+ - [`62edf20ab1e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/62edf20ab1e) - Migrates all usage of brand tokens to either selected or information tokens. This change is purely for semantic reasons, there are no visual or behavioural changes.
15
+ - Updated dependencies
16
+
17
+ ## 8.5.10
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies
22
+
3
23
  ## 8.5.9
4
24
 
5
25
  ### Patch Changes
@@ -1,23 +1,37 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
3
  Object.defineProperty(exports, "__esModule", {
6
4
  value: true
7
5
  });
8
6
  exports.default = void 0;
9
7
 
10
- var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
11
-
12
8
  var _react = require("react");
13
9
 
14
10
  var _core = require("@emotion/core");
15
11
 
16
12
  var _constants = require("@atlaskit/theme/constants");
17
13
 
18
- var _templateObject;
19
-
20
- var gutter = (0, _constants.gridSize)() / 2;
14
+ /** @jsx jsx */
15
+ var gridSize = (0, _constants.gridSize)();
16
+ var gutter = gridSize / 2;
17
+ var listStyles = (0, _core.css)({
18
+ // removes default ul styles. Needs !important to override contextual styles in product.
19
+ display: 'flex',
20
+ margin: 0,
21
+ marginRight: -gutter,
22
+ marginLeft: -gutter,
23
+ padding: 0,
24
+ justifyContent: 'flex-start',
25
+ flexWrap: 'wrap',
26
+ lineHeight: 1,
27
+ listStyleType: 'none !important'
28
+ });
29
+ var listItemStyles = (0, _core.css)({
30
+ margin: 0,
31
+ marginBottom: gridSize,
32
+ paddingRight: gutter,
33
+ paddingLeft: gutter
34
+ });
21
35
 
22
36
  var Grid = function Grid(_ref) {
23
37
  var children = _ref.children,
@@ -25,11 +39,12 @@ var Grid = function Grid(_ref) {
25
39
  label = _ref['aria-label'];
26
40
  return (0, _core.jsx)("ul", {
27
41
  "data-testid": testId,
28
- "aria-label": label // eslint-disable-next-line @repo/internal/react/no-css-string-literals
29
- ,
30
- css: (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n // removes default ul styles. Needs !important to override contextual styles in product.\n list-style-type: none !important;\n margin: 0;\n padding: 0;\n\n > li {\n margin: 0;\n margin-bottom: ", "px;\n padding-left: ", "px;\n padding-right: ", "px;\n }\n\n display: flex;\n flex-wrap: wrap;\n justify-content: flex-start;\n line-height: 1;\n margin-left: -", "px;\n margin-right: -", "px;\n "])), (0, _constants.gridSize)(), gutter, gutter, gutter, gutter)
42
+ "aria-label": label,
43
+ css: listStyles
31
44
  }, _react.Children.map(children, function (child) {
32
- return child && (0, _core.jsx)("li", null, child);
45
+ return child && (0, _core.jsx)("li", {
46
+ css: listItemStyles
47
+ }, child);
33
48
  }));
34
49
  }; // eslint-disable-next-line @repo/internal/react/require-jsdoc
35
50
 
@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
13
13
 
14
14
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
15
15
 
16
- var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
17
-
18
16
  var _react = require("react");
19
17
 
20
18
  var _core = require("@emotion/core");
@@ -25,48 +23,69 @@ var _colors = require("@atlaskit/theme/colors");
25
23
 
26
24
  var _excluded = ["testId", "className", "ref"];
27
25
 
28
- var _templateObject, _templateObject2;
29
-
30
26
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
31
27
 
32
28
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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; }
33
29
 
34
30
  var FONT_SIZE = {
35
- xsmall: 10,
36
- small: 10,
37
- medium: 11,
38
- large: 12,
39
- xlarge: 16,
40
- xxlarge: 16
41
- };
42
-
43
- var getButtonStyles = function getButtonStyles(css, _ref) {
44
- var size = _ref.size,
45
- isActive = _ref.isActive;
46
- // eslint-disable-next-line @repo/internal/react/no-css-string-literals
47
- var activeStyles = css(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n background-color: ", ";\n transform: scale(", ");\n box-shadow: 0 0 0 ", "px ", ";\n color: ", ";\n "])), "var(--ds-background-brand, ".concat(_colors.B50, ")"), _avatar.ACTIVE_SCALE_FACTOR, _avatar.BORDER_WIDTH, "var(--ds-text-brand, ".concat(_colors.B300, ")"), "var(--ds-text-brand, ".concat(_colors.B400, ")")); // eslint-disable-next-line @repo/internal/react/no-css-string-literals
48
-
49
- return css(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n background-color: ", ";\n font-size: ", "px;\n font-family: inherit;\n font-weight: 500;\n\n &:hover {\n background-color: ", ";\n color: ", ";\n &:after {\n background-color: ", ";\n opacity: 1;\n }\n }\n\n &:active {\n background-color: ", ";\n color: ", ";\n &:after {\n background-color: transparent;\n }\n }\n\n ", "\n "])), "var(--ds-text, ".concat(_colors.N500, ")"), "var(--ds-background-neutral, ".concat(_colors.N20, ")"), FONT_SIZE[size], "var(--ds-background-neutral-hovered, ".concat(_colors.N30, ")"), "var(--ds-text, ".concat(_colors.N500, ")"), "var(--ds-background-neutral-hovered, ".concat(_colors.N30A, ")"), "var(--ds-background-neutral-pressed, ".concat(_colors.B50, ")"), "var(--ds-text, ".concat(_colors.B400, ")"), isActive && activeStyles);
31
+ xsmall: '10px',
32
+ small: '10px',
33
+ medium: '11px',
34
+ large: '12px',
35
+ xlarge: '16px',
36
+ xxlarge: '16px'
50
37
  };
51
-
38
+ var buttonActiveStyles = (0, _core.css)({
39
+ // eslint-disable-next-line @repo/internal/styles/no-nested-styles
40
+ '&&': {
41
+ backgroundColor: "var(--ds-background-selected, ".concat(_colors.B50, ")"),
42
+ boxShadow: "0 0 0 ".concat(_avatar.BORDER_WIDTH, "px ").concat("var(--ds-text-selected, ".concat(_colors.B300, ")")),
43
+ color: "var(--ds-text-selected, ".concat(_colors.B400, ")"),
44
+ transform: "scale(".concat(_avatar.ACTIVE_SCALE_FACTOR, ")")
45
+ }
46
+ });
47
+ var buttonStyles = (0, _core.css)({
48
+ // eslint-disable-next-line @repo/internal/styles/no-nested-styles
49
+ '&&': {
50
+ backgroundColor: "var(--ds-background-neutral, ".concat(_colors.N20, ")"),
51
+ color: "var(--ds-text, ".concat(_colors.N500, ")"),
52
+ fontFamily: 'inherit',
53
+ fontWeight: 500,
54
+ '&:hover': {
55
+ backgroundColor: "var(--ds-background-neutral-hovered, ".concat(_colors.N30, ")"),
56
+ color: "var(--ds-text, ".concat(_colors.N500, ")"),
57
+ '&:after': {
58
+ backgroundColor: "var(--ds-background-neutral-hovered, ".concat(_colors.N30A, ")"),
59
+ opacity: 1
60
+ }
61
+ },
62
+ '&:active': {
63
+ backgroundColor: "var(--ds-background-neutral-pressed, ".concat(_colors.B50, ")"),
64
+ color: "var(--ds-text, ".concat(_colors.B400, ")"),
65
+ '&:after': {
66
+ backgroundColor: 'transparent'
67
+ }
68
+ }
69
+ }
70
+ });
52
71
  var MAX_DISPLAY_COUNT = 99;
53
- var MoreIndicator = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
54
- var _ref2$appearance = _ref2.appearance,
55
- appearance = _ref2$appearance === void 0 ? 'circle' : _ref2$appearance,
56
- _ref2$borderColor = _ref2.borderColor,
57
- borderColor = _ref2$borderColor === void 0 ? "var(--ds-surface-overlay, ".concat((0, _colors.background)(), ")") : _ref2$borderColor,
58
- _ref2$size = _ref2.size,
59
- size = _ref2$size === void 0 ? 'medium' : _ref2$size,
60
- _ref2$count = _ref2.count,
61
- count = _ref2$count === void 0 ? 0 : _ref2$count,
62
- testId = _ref2.testId,
63
- onClick = _ref2.onClick,
64
- ariaControls = _ref2['aria-controls'],
65
- ariaExpanded = _ref2['aria-expanded'],
66
- ariaHaspopup = _ref2['aria-haspopup'],
67
- _ref2$buttonProps = _ref2.buttonProps,
68
- buttonProps = _ref2$buttonProps === void 0 ? {} : _ref2$buttonProps,
69
- isActive = _ref2.isActive;
72
+ var MoreIndicator = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
73
+ var _ref$appearance = _ref.appearance,
74
+ appearance = _ref$appearance === void 0 ? 'circle' : _ref$appearance,
75
+ _ref$borderColor = _ref.borderColor,
76
+ borderColor = _ref$borderColor === void 0 ? "var(--ds-surface-overlay, ".concat((0, _colors.background)(), ")") : _ref$borderColor,
77
+ _ref$size = _ref.size,
78
+ size = _ref$size === void 0 ? 'medium' : _ref$size,
79
+ _ref$count = _ref.count,
80
+ count = _ref$count === void 0 ? 0 : _ref$count,
81
+ testId = _ref.testId,
82
+ onClick = _ref.onClick,
83
+ ariaControls = _ref['aria-controls'],
84
+ ariaExpanded = _ref['aria-expanded'],
85
+ ariaHaspopup = _ref['aria-haspopup'],
86
+ _ref$buttonProps = _ref.buttonProps,
87
+ buttonProps = _ref$buttonProps === void 0 ? {} : _ref$buttonProps,
88
+ isActive = _ref.isActive;
70
89
  var onClickHander = (0, _react.useCallback)(function (event, analyticsEvent) {
71
90
  if (buttonProps.onClick) {
72
91
  buttonProps.onClick(event);
@@ -81,28 +100,25 @@ var MoreIndicator = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
81
100
  borderColor: borderColor,
82
101
  ref: ref,
83
102
  onClick: onClickHander
84
- }, function (_ref3) {
85
- var _ = _ref3.testId,
86
- className = _ref3.className,
87
- ref = _ref3.ref,
88
- props = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
89
- return (0, _core.jsx)(_core.ClassNames, null, function (_ref4) {
90
- var css = _ref4.css,
91
- cx = _ref4.cx;
92
- return (0, _core.jsx)("button", (0, _extends2.default)({
93
- type: "submit"
94
- }, buttonProps, props, {
95
- ref: ref,
96
- "data-testid": testId,
97
- "aria-controls": ariaControls,
98
- "aria-expanded": ariaExpanded,
99
- "aria-haspopup": ariaHaspopup,
100
- className: cx(className, getButtonStyles(css, {
101
- size: size,
102
- isActive: isActive
103
- }))
104
- }), "+", count > MAX_DISPLAY_COUNT ? MAX_DISPLAY_COUNT : count);
105
- });
103
+ }, function (_ref2) {
104
+ var _ = _ref2.testId,
105
+ className = _ref2.className,
106
+ ref = _ref2.ref,
107
+ props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
108
+ return (0, _core.jsx)("button", (0, _extends2.default)({
109
+ type: "submit"
110
+ }, buttonProps, props, {
111
+ ref: ref,
112
+ "data-testid": testId,
113
+ "aria-controls": ariaControls,
114
+ "aria-expanded": ariaExpanded,
115
+ "aria-haspopup": ariaHaspopup,
116
+ style: {
117
+ fontSize: FONT_SIZE[size]
118
+ },
119
+ css: [buttonStyles, isActive && buttonActiveStyles],
120
+ className: className
121
+ }), "+", count > MAX_DISPLAY_COUNT ? MAX_DISPLAY_COUNT : count);
106
122
  });
107
123
  });
108
124
  MoreIndicator.displayName = 'MoreIndicator'; // eslint-disable-next-line @repo/internal/react/require-jsdoc
@@ -1,14 +1,10 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
3
  Object.defineProperty(exports, "__esModule", {
6
4
  value: true
7
5
  });
8
6
  exports.default = void 0;
9
7
 
10
- var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
11
-
12
8
  var _react = require("react");
13
9
 
14
10
  var _core = require("@emotion/core");
@@ -17,9 +13,20 @@ var _avatar = require("@atlaskit/avatar");
17
13
 
18
14
  var _constants = require("@atlaskit/theme/constants");
19
15
 
20
- var _templateObject;
21
-
16
+ /** @jsx jsx */
22
17
  var gutter = _avatar.BORDER_WIDTH * 2 + (0, _constants.gridSize)() / 2;
18
+ var listStyles = (0, _core.css)({
19
+ display: 'flex',
20
+ margin: 0,
21
+ marginRight: gutter,
22
+ padding: 0,
23
+ lineHeight: 1,
24
+ listStyleType: 'none !important'
25
+ });
26
+ var listItemStyles = (0, _core.css)({
27
+ margin: 0,
28
+ marginRight: -gutter
29
+ });
23
30
 
24
31
  var Stack = function Stack(_ref) {
25
32
  var children = _ref.children,
@@ -27,11 +34,12 @@ var Stack = function Stack(_ref) {
27
34
  label = _ref['aria-label'];
28
35
  return (0, _core.jsx)("ul", {
29
36
  "data-testid": testId,
30
- "aria-label": label // eslint-disable-next-line @repo/internal/react/no-css-string-literals
31
- ,
32
- css: (0, _core.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n // removes default ul styles\n list-style-type: none !important;\n margin: 0;\n padding: 0;\n\n > li {\n margin: 0;\n margin-right: -", "px;\n }\n\n display: flex;\n line-height: 1;\n margin-right: ", "px;\n "])), gutter, gutter)
37
+ "aria-label": label,
38
+ css: listStyles
33
39
  }, _react.Children.map(children, function (child) {
34
- return child && (0, _core.jsx)("li", null, child);
40
+ return child && (0, _core.jsx)("li", {
41
+ css: listItemStyles
42
+ }, child);
35
43
  }));
36
44
  }; // eslint-disable-next-line @repo/internal/react/require-jsdoc
37
45
 
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/avatar-group",
3
- "version": "8.5.9",
3
+ "version": "8.5.12",
4
4
  "sideEffects": false
5
5
  }
@@ -1,8 +1,27 @@
1
1
  /** @jsx jsx */
2
2
  import { Children } from 'react';
3
3
  import { css, jsx } from '@emotion/core';
4
- import { gridSize } from '@atlaskit/theme/constants';
5
- const gutter = gridSize() / 2;
4
+ import { gridSize as getGridSize } from '@atlaskit/theme/constants';
5
+ const gridSize = getGridSize();
6
+ const gutter = gridSize / 2;
7
+ const listStyles = css({
8
+ // removes default ul styles. Needs !important to override contextual styles in product.
9
+ display: 'flex',
10
+ margin: 0,
11
+ marginRight: -gutter,
12
+ marginLeft: -gutter,
13
+ padding: 0,
14
+ justifyContent: 'flex-start',
15
+ flexWrap: 'wrap',
16
+ lineHeight: 1,
17
+ listStyleType: 'none !important'
18
+ });
19
+ const listItemStyles = css({
20
+ margin: 0,
21
+ marginBottom: gridSize,
22
+ paddingRight: gutter,
23
+ paddingLeft: gutter
24
+ });
6
25
 
7
26
  const Grid = ({
8
27
  children,
@@ -10,29 +29,11 @@ const Grid = ({
10
29
  'aria-label': label
11
30
  }) => jsx("ul", {
12
31
  "data-testid": testId,
13
- "aria-label": label // eslint-disable-next-line @repo/internal/react/no-css-string-literals
14
- ,
15
- css: css`
16
- // removes default ul styles. Needs !important to override contextual styles in product.
17
- list-style-type: none !important;
18
- margin: 0;
19
- padding: 0;
20
-
21
- > li {
22
- margin: 0;
23
- margin-bottom: ${gridSize()}px;
24
- padding-left: ${gutter}px;
25
- padding-right: ${gutter}px;
26
- }
27
-
28
- display: flex;
29
- flex-wrap: wrap;
30
- justify-content: flex-start;
31
- line-height: 1;
32
- margin-left: -${gutter}px;
33
- margin-right: -${gutter}px;
34
- `
35
- }, Children.map(children, child => child && jsx("li", null, child))); // eslint-disable-next-line @repo/internal/react/require-jsdoc
32
+ "aria-label": label,
33
+ css: listStyles
34
+ }, Children.map(children, child => child && jsx("li", {
35
+ css: listItemStyles
36
+ }, child))); // eslint-disable-next-line @repo/internal/react/require-jsdoc
36
37
 
37
38
 
38
39
  export default Grid;
@@ -2,58 +2,50 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
 
3
3
  /** @jsx jsx */
4
4
  import { forwardRef, useCallback } from 'react';
5
- import { ClassNames, jsx } from '@emotion/core';
5
+ import { css, jsx } from '@emotion/core';
6
6
  import Avatar, { ACTIVE_SCALE_FACTOR, BORDER_WIDTH } from '@atlaskit/avatar';
7
7
  import { B300, B400, B50, background, N20, N30, N30A, N500 } from '@atlaskit/theme/colors';
8
8
  const FONT_SIZE = {
9
- xsmall: 10,
10
- small: 10,
11
- medium: 11,
12
- large: 12,
13
- xlarge: 16,
14
- xxlarge: 16
9
+ xsmall: '10px',
10
+ small: '10px',
11
+ medium: '11px',
12
+ large: '12px',
13
+ xlarge: '16px',
14
+ xxlarge: '16px'
15
15
  };
16
-
17
- const getButtonStyles = (css, {
18
- size,
19
- isActive
20
- }) => {
21
- // eslint-disable-next-line @repo/internal/react/no-css-string-literals
22
- const activeStyles = css`
23
- background-color: ${`var(--ds-background-brand, ${B50})`};
24
- transform: scale(${ACTIVE_SCALE_FACTOR});
25
- box-shadow: 0 0 0 ${BORDER_WIDTH}px ${`var(--ds-text-brand, ${B300})`};
26
- color: ${`var(--ds-text-brand, ${B400})`};
27
- `; // eslint-disable-next-line @repo/internal/react/no-css-string-literals
28
-
29
- return css`
30
- color: ${`var(--ds-text, ${N500})`};
31
- background-color: ${`var(--ds-background-neutral, ${N20})`};
32
- font-size: ${FONT_SIZE[size]}px;
33
- font-family: inherit;
34
- font-weight: 500;
35
-
36
- &:hover {
37
- background-color: ${`var(--ds-background-neutral-hovered, ${N30})`};
38
- color: ${`var(--ds-text, ${N500})`};
39
- &:after {
40
- background-color: ${`var(--ds-background-neutral-hovered, ${N30A})`};
41
- opacity: 1;
16
+ const buttonActiveStyles = css({
17
+ // eslint-disable-next-line @repo/internal/styles/no-nested-styles
18
+ '&&': {
19
+ backgroundColor: `var(--ds-background-selected, ${B50})`,
20
+ boxShadow: `0 0 0 ${BORDER_WIDTH}px ${`var(--ds-text-selected, ${B300})`}`,
21
+ color: `var(--ds-text-selected, ${B400})`,
22
+ transform: `scale(${ACTIVE_SCALE_FACTOR})`
23
+ }
24
+ });
25
+ const buttonStyles = css({
26
+ // eslint-disable-next-line @repo/internal/styles/no-nested-styles
27
+ '&&': {
28
+ backgroundColor: `var(--ds-background-neutral, ${N20})`,
29
+ color: `var(--ds-text, ${N500})`,
30
+ fontFamily: 'inherit',
31
+ fontWeight: 500,
32
+ '&:hover': {
33
+ backgroundColor: `var(--ds-background-neutral-hovered, ${N30})`,
34
+ color: `var(--ds-text, ${N500})`,
35
+ '&:after': {
36
+ backgroundColor: `var(--ds-background-neutral-hovered, ${N30A})`,
37
+ opacity: 1
42
38
  }
43
- }
44
-
45
- &:active {
46
- background-color: ${`var(--ds-background-neutral-pressed, ${B50})`};
47
- color: ${`var(--ds-text, ${B400})`};
48
- &:after {
49
- background-color: transparent;
39
+ },
40
+ '&:active': {
41
+ backgroundColor: `var(--ds-background-neutral-pressed, ${B50})`,
42
+ color: `var(--ds-text, ${B400})`,
43
+ '&:after': {
44
+ backgroundColor: 'transparent'
50
45
  }
51
46
  }
52
-
53
- ${isActive && activeStyles}
54
- `;
55
- };
56
-
47
+ }
48
+ });
57
49
  const MAX_DISPLAY_COUNT = 99;
58
50
  const MoreIndicator = /*#__PURE__*/forwardRef(({
59
51
  appearance = 'circle',
@@ -87,9 +79,6 @@ const MoreIndicator = /*#__PURE__*/forwardRef(({
87
79
  className,
88
80
  ref,
89
81
  ...props
90
- }) => jsx(ClassNames, null, ({
91
- css,
92
- cx
93
82
  }) => jsx("button", _extends({
94
83
  type: "submit"
95
84
  }, buttonProps, props, {
@@ -98,11 +87,12 @@ const MoreIndicator = /*#__PURE__*/forwardRef(({
98
87
  "aria-controls": ariaControls,
99
88
  "aria-expanded": ariaExpanded,
100
89
  "aria-haspopup": ariaHaspopup,
101
- className: cx(className, getButtonStyles(css, {
102
- size,
103
- isActive
104
- }))
105
- }), "+", count > MAX_DISPLAY_COUNT ? MAX_DISPLAY_COUNT : count)));
90
+ style: {
91
+ fontSize: FONT_SIZE[size]
92
+ },
93
+ css: [buttonStyles, isActive && buttonActiveStyles],
94
+ className: className
95
+ }), "+", count > MAX_DISPLAY_COUNT ? MAX_DISPLAY_COUNT : count));
106
96
  });
107
97
  MoreIndicator.displayName = 'MoreIndicator'; // eslint-disable-next-line @repo/internal/react/require-jsdoc
108
98
 
@@ -4,6 +4,18 @@ import { css, jsx } from '@emotion/core';
4
4
  import { BORDER_WIDTH } from '@atlaskit/avatar';
5
5
  import { gridSize } from '@atlaskit/theme/constants';
6
6
  const gutter = BORDER_WIDTH * 2 + gridSize() / 2;
7
+ const listStyles = css({
8
+ display: 'flex',
9
+ margin: 0,
10
+ marginRight: gutter,
11
+ padding: 0,
12
+ lineHeight: 1,
13
+ listStyleType: 'none !important'
14
+ });
15
+ const listItemStyles = css({
16
+ margin: 0,
17
+ marginRight: -gutter
18
+ });
7
19
 
8
20
  const Stack = ({
9
21
  children,
@@ -11,24 +23,11 @@ const Stack = ({
11
23
  'aria-label': label
12
24
  }) => jsx("ul", {
13
25
  "data-testid": testId,
14
- "aria-label": label // eslint-disable-next-line @repo/internal/react/no-css-string-literals
15
- ,
16
- css: css`
17
- // removes default ul styles
18
- list-style-type: none !important;
19
- margin: 0;
20
- padding: 0;
21
-
22
- > li {
23
- margin: 0;
24
- margin-right: -${gutter}px;
25
- }
26
-
27
- display: flex;
28
- line-height: 1;
29
- margin-right: ${gutter}px;
30
- `
31
- }, Children.map(children, child => child && jsx("li", null, child))); // eslint-disable-next-line @repo/internal/react/require-jsdoc
26
+ "aria-label": label,
27
+ css: listStyles
28
+ }, Children.map(children, child => child && jsx("li", {
29
+ css: listItemStyles
30
+ }, child))); // eslint-disable-next-line @repo/internal/react/require-jsdoc
32
31
 
33
32
 
34
33
  export default Stack;
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/avatar-group",
3
- "version": "8.5.9",
3
+ "version": "8.5.12",
4
4
  "sideEffects": false
5
5
  }
@@ -1,12 +1,27 @@
1
- import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
2
-
3
- var _templateObject;
4
-
5
1
  /** @jsx jsx */
6
2
  import { Children } from 'react';
7
3
  import { css, jsx } from '@emotion/core';
8
- import { gridSize } from '@atlaskit/theme/constants';
9
- var gutter = gridSize() / 2;
4
+ import { gridSize as getGridSize } from '@atlaskit/theme/constants';
5
+ var gridSize = getGridSize();
6
+ var gutter = gridSize / 2;
7
+ var listStyles = css({
8
+ // removes default ul styles. Needs !important to override contextual styles in product.
9
+ display: 'flex',
10
+ margin: 0,
11
+ marginRight: -gutter,
12
+ marginLeft: -gutter,
13
+ padding: 0,
14
+ justifyContent: 'flex-start',
15
+ flexWrap: 'wrap',
16
+ lineHeight: 1,
17
+ listStyleType: 'none !important'
18
+ });
19
+ var listItemStyles = css({
20
+ margin: 0,
21
+ marginBottom: gridSize,
22
+ paddingRight: gutter,
23
+ paddingLeft: gutter
24
+ });
10
25
 
11
26
  var Grid = function Grid(_ref) {
12
27
  var children = _ref.children,
@@ -14,11 +29,12 @@ var Grid = function Grid(_ref) {
14
29
  label = _ref['aria-label'];
15
30
  return jsx("ul", {
16
31
  "data-testid": testId,
17
- "aria-label": label // eslint-disable-next-line @repo/internal/react/no-css-string-literals
18
- ,
19
- css: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n // removes default ul styles. Needs !important to override contextual styles in product.\n list-style-type: none !important;\n margin: 0;\n padding: 0;\n\n > li {\n margin: 0;\n margin-bottom: ", "px;\n padding-left: ", "px;\n padding-right: ", "px;\n }\n\n display: flex;\n flex-wrap: wrap;\n justify-content: flex-start;\n line-height: 1;\n margin-left: -", "px;\n margin-right: -", "px;\n "])), gridSize(), gutter, gutter, gutter, gutter)
32
+ "aria-label": label,
33
+ css: listStyles
20
34
  }, Children.map(children, function (child) {
21
- return child && jsx("li", null, child);
35
+ return child && jsx("li", {
36
+ css: listItemStyles
37
+ }, child);
22
38
  }));
23
39
  }; // eslint-disable-next-line @repo/internal/react/require-jsdoc
24
40
 
@@ -1,51 +1,71 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
- import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
4
3
  var _excluded = ["testId", "className", "ref"];
5
4
 
6
- var _templateObject, _templateObject2;
7
-
8
5
  /** @jsx jsx */
9
6
  import { forwardRef, useCallback } from 'react';
10
- import { ClassNames, jsx } from '@emotion/core';
7
+ import { css, jsx } from '@emotion/core';
11
8
  import Avatar, { ACTIVE_SCALE_FACTOR, BORDER_WIDTH } from '@atlaskit/avatar';
12
9
  import { B300, B400, B50, background, N20, N30, N30A, N500 } from '@atlaskit/theme/colors';
13
10
  var FONT_SIZE = {
14
- xsmall: 10,
15
- small: 10,
16
- medium: 11,
17
- large: 12,
18
- xlarge: 16,
19
- xxlarge: 16
20
- };
21
-
22
- var getButtonStyles = function getButtonStyles(css, _ref) {
23
- var size = _ref.size,
24
- isActive = _ref.isActive;
25
- // eslint-disable-next-line @repo/internal/react/no-css-string-literals
26
- var activeStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n background-color: ", ";\n transform: scale(", ");\n box-shadow: 0 0 0 ", "px ", ";\n color: ", ";\n "])), "var(--ds-background-brand, ".concat(B50, ")"), ACTIVE_SCALE_FACTOR, BORDER_WIDTH, "var(--ds-text-brand, ".concat(B300, ")"), "var(--ds-text-brand, ".concat(B400, ")")); // eslint-disable-next-line @repo/internal/react/no-css-string-literals
27
-
28
- return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n color: ", ";\n background-color: ", ";\n font-size: ", "px;\n font-family: inherit;\n font-weight: 500;\n\n &:hover {\n background-color: ", ";\n color: ", ";\n &:after {\n background-color: ", ";\n opacity: 1;\n }\n }\n\n &:active {\n background-color: ", ";\n color: ", ";\n &:after {\n background-color: transparent;\n }\n }\n\n ", "\n "])), "var(--ds-text, ".concat(N500, ")"), "var(--ds-background-neutral, ".concat(N20, ")"), FONT_SIZE[size], "var(--ds-background-neutral-hovered, ".concat(N30, ")"), "var(--ds-text, ".concat(N500, ")"), "var(--ds-background-neutral-hovered, ".concat(N30A, ")"), "var(--ds-background-neutral-pressed, ".concat(B50, ")"), "var(--ds-text, ".concat(B400, ")"), isActive && activeStyles);
11
+ xsmall: '10px',
12
+ small: '10px',
13
+ medium: '11px',
14
+ large: '12px',
15
+ xlarge: '16px',
16
+ xxlarge: '16px'
29
17
  };
30
-
18
+ var buttonActiveStyles = css({
19
+ // eslint-disable-next-line @repo/internal/styles/no-nested-styles
20
+ '&&': {
21
+ backgroundColor: "var(--ds-background-selected, ".concat(B50, ")"),
22
+ boxShadow: "0 0 0 ".concat(BORDER_WIDTH, "px ").concat("var(--ds-text-selected, ".concat(B300, ")")),
23
+ color: "var(--ds-text-selected, ".concat(B400, ")"),
24
+ transform: "scale(".concat(ACTIVE_SCALE_FACTOR, ")")
25
+ }
26
+ });
27
+ var buttonStyles = css({
28
+ // eslint-disable-next-line @repo/internal/styles/no-nested-styles
29
+ '&&': {
30
+ backgroundColor: "var(--ds-background-neutral, ".concat(N20, ")"),
31
+ color: "var(--ds-text, ".concat(N500, ")"),
32
+ fontFamily: 'inherit',
33
+ fontWeight: 500,
34
+ '&:hover': {
35
+ backgroundColor: "var(--ds-background-neutral-hovered, ".concat(N30, ")"),
36
+ color: "var(--ds-text, ".concat(N500, ")"),
37
+ '&:after': {
38
+ backgroundColor: "var(--ds-background-neutral-hovered, ".concat(N30A, ")"),
39
+ opacity: 1
40
+ }
41
+ },
42
+ '&:active': {
43
+ backgroundColor: "var(--ds-background-neutral-pressed, ".concat(B50, ")"),
44
+ color: "var(--ds-text, ".concat(B400, ")"),
45
+ '&:after': {
46
+ backgroundColor: 'transparent'
47
+ }
48
+ }
49
+ }
50
+ });
31
51
  var MAX_DISPLAY_COUNT = 99;
32
- var MoreIndicator = /*#__PURE__*/forwardRef(function (_ref2, ref) {
33
- var _ref2$appearance = _ref2.appearance,
34
- appearance = _ref2$appearance === void 0 ? 'circle' : _ref2$appearance,
35
- _ref2$borderColor = _ref2.borderColor,
36
- borderColor = _ref2$borderColor === void 0 ? "var(--ds-surface-overlay, ".concat(background(), ")") : _ref2$borderColor,
37
- _ref2$size = _ref2.size,
38
- size = _ref2$size === void 0 ? 'medium' : _ref2$size,
39
- _ref2$count = _ref2.count,
40
- count = _ref2$count === void 0 ? 0 : _ref2$count,
41
- testId = _ref2.testId,
42
- onClick = _ref2.onClick,
43
- ariaControls = _ref2['aria-controls'],
44
- ariaExpanded = _ref2['aria-expanded'],
45
- ariaHaspopup = _ref2['aria-haspopup'],
46
- _ref2$buttonProps = _ref2.buttonProps,
47
- buttonProps = _ref2$buttonProps === void 0 ? {} : _ref2$buttonProps,
48
- isActive = _ref2.isActive;
52
+ var MoreIndicator = /*#__PURE__*/forwardRef(function (_ref, ref) {
53
+ var _ref$appearance = _ref.appearance,
54
+ appearance = _ref$appearance === void 0 ? 'circle' : _ref$appearance,
55
+ _ref$borderColor = _ref.borderColor,
56
+ borderColor = _ref$borderColor === void 0 ? "var(--ds-surface-overlay, ".concat(background(), ")") : _ref$borderColor,
57
+ _ref$size = _ref.size,
58
+ size = _ref$size === void 0 ? 'medium' : _ref$size,
59
+ _ref$count = _ref.count,
60
+ count = _ref$count === void 0 ? 0 : _ref$count,
61
+ testId = _ref.testId,
62
+ onClick = _ref.onClick,
63
+ ariaControls = _ref['aria-controls'],
64
+ ariaExpanded = _ref['aria-expanded'],
65
+ ariaHaspopup = _ref['aria-haspopup'],
66
+ _ref$buttonProps = _ref.buttonProps,
67
+ buttonProps = _ref$buttonProps === void 0 ? {} : _ref$buttonProps,
68
+ isActive = _ref.isActive;
49
69
  var onClickHander = useCallback(function (event, analyticsEvent) {
50
70
  if (buttonProps.onClick) {
51
71
  buttonProps.onClick(event);
@@ -60,29 +80,26 @@ var MoreIndicator = /*#__PURE__*/forwardRef(function (_ref2, ref) {
60
80
  borderColor: borderColor,
61
81
  ref: ref,
62
82
  onClick: onClickHander
63
- }, function (_ref3) {
64
- var _ = _ref3.testId,
65
- className = _ref3.className,
66
- ref = _ref3.ref,
67
- props = _objectWithoutProperties(_ref3, _excluded);
83
+ }, function (_ref2) {
84
+ var _ = _ref2.testId,
85
+ className = _ref2.className,
86
+ ref = _ref2.ref,
87
+ props = _objectWithoutProperties(_ref2, _excluded);
68
88
 
69
- return jsx(ClassNames, null, function (_ref4) {
70
- var css = _ref4.css,
71
- cx = _ref4.cx;
72
- return jsx("button", _extends({
73
- type: "submit"
74
- }, buttonProps, props, {
75
- ref: ref,
76
- "data-testid": testId,
77
- "aria-controls": ariaControls,
78
- "aria-expanded": ariaExpanded,
79
- "aria-haspopup": ariaHaspopup,
80
- className: cx(className, getButtonStyles(css, {
81
- size: size,
82
- isActive: isActive
83
- }))
84
- }), "+", count > MAX_DISPLAY_COUNT ? MAX_DISPLAY_COUNT : count);
85
- });
89
+ return jsx("button", _extends({
90
+ type: "submit"
91
+ }, buttonProps, props, {
92
+ ref: ref,
93
+ "data-testid": testId,
94
+ "aria-controls": ariaControls,
95
+ "aria-expanded": ariaExpanded,
96
+ "aria-haspopup": ariaHaspopup,
97
+ style: {
98
+ fontSize: FONT_SIZE[size]
99
+ },
100
+ css: [buttonStyles, isActive && buttonActiveStyles],
101
+ className: className
102
+ }), "+", count > MAX_DISPLAY_COUNT ? MAX_DISPLAY_COUNT : count);
86
103
  });
87
104
  });
88
105
  MoreIndicator.displayName = 'MoreIndicator'; // eslint-disable-next-line @repo/internal/react/require-jsdoc
@@ -1,13 +1,21 @@
1
- import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
2
-
3
- var _templateObject;
4
-
5
1
  /** @jsx jsx */
6
2
  import { Children } from 'react';
7
3
  import { css, jsx } from '@emotion/core';
8
4
  import { BORDER_WIDTH } from '@atlaskit/avatar';
9
5
  import { gridSize } from '@atlaskit/theme/constants';
10
6
  var gutter = BORDER_WIDTH * 2 + gridSize() / 2;
7
+ var listStyles = css({
8
+ display: 'flex',
9
+ margin: 0,
10
+ marginRight: gutter,
11
+ padding: 0,
12
+ lineHeight: 1,
13
+ listStyleType: 'none !important'
14
+ });
15
+ var listItemStyles = css({
16
+ margin: 0,
17
+ marginRight: -gutter
18
+ });
11
19
 
12
20
  var Stack = function Stack(_ref) {
13
21
  var children = _ref.children,
@@ -15,11 +23,12 @@ var Stack = function Stack(_ref) {
15
23
  label = _ref['aria-label'];
16
24
  return jsx("ul", {
17
25
  "data-testid": testId,
18
- "aria-label": label // eslint-disable-next-line @repo/internal/react/no-css-string-literals
19
- ,
20
- css: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n // removes default ul styles\n list-style-type: none !important;\n margin: 0;\n padding: 0;\n\n > li {\n margin: 0;\n margin-right: -", "px;\n }\n\n display: flex;\n line-height: 1;\n margin-right: ", "px;\n "])), gutter, gutter)
26
+ "aria-label": label,
27
+ css: listStyles
21
28
  }, Children.map(children, function (child) {
22
- return child && jsx("li", null, child);
29
+ return child && jsx("li", {
30
+ css: listItemStyles
31
+ }, child);
23
32
  }));
24
33
  }; // eslint-disable-next-line @repo/internal/react/require-jsdoc
25
34
 
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/avatar-group",
3
- "version": "8.5.9",
3
+ "version": "8.5.12",
4
4
  "sideEffects": false
5
5
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/avatar-group",
3
- "version": "8.5.9",
3
+ "version": "8.5.12",
4
4
  "description": "An avatar group displays a number of avatars grouped together in a stack or grid.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -24,10 +24,10 @@
24
24
  },
25
25
  "dependencies": {
26
26
  "@atlaskit/avatar": "^20.5.0",
27
- "@atlaskit/menu": "^1.2.0",
27
+ "@atlaskit/menu": "^1.3.0",
28
28
  "@atlaskit/popup": "^1.3.0",
29
29
  "@atlaskit/theme": "^12.1.0",
30
- "@atlaskit/tokens": "^0.6.0",
30
+ "@atlaskit/tokens": "^0.9.0",
31
31
  "@atlaskit/tooltip": "^17.5.0",
32
32
  "@babel/runtime": "^7.0.0",
33
33
  "@emotion/core": "^10.0.9"
@@ -37,10 +37,10 @@
37
37
  },
38
38
  "devDependencies": {
39
39
  "@atlaskit/analytics-next": "^8.2.0",
40
- "@atlaskit/button": "^16.1.0",
40
+ "@atlaskit/button": "^16.2.0",
41
41
  "@atlaskit/code": "^14.3.0",
42
42
  "@atlaskit/docs": "*",
43
- "@atlaskit/field-base": "^15.0.0",
43
+ "@atlaskit/form": "^8.4.5",
44
44
  "@atlaskit/icon": "^21.10.0",
45
45
  "@atlaskit/modal-dialog": "^12.2.0",
46
46
  "@atlaskit/section-message": "^6.1.0",
@@ -53,7 +53,7 @@
53
53
  "@testing-library/react": "^8.0.1",
54
54
  "lodash": "^4.17.21",
55
55
  "react-dom": "^16.8.0",
56
- "typescript": "3.9.6",
56
+ "typescript": "3.9.10",
57
57
  "wait-for-expect": "^1.2.0"
58
58
  },
59
59
  "keywords": [
@@ -72,7 +72,8 @@
72
72
  "theming": "tokens",
73
73
  "deprecation": "no-deprecated-imports",
74
74
  "styling": [
75
- "emotion"
75
+ "emotion",
76
+ "static"
76
77
  ]
77
78
  }
78
79
  },