@atlaskit/avatar-group 9.9.0 → 9.9.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/avatar-group
 
+## 9.9.1
+
+### Patch Changes
+
+- [#122942](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122942)
+  [`99084c446171e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/99084c446171e) -
+  Fixes bug where the border color for avatars in the `data` prop were not being passed through. Now
+  the `borderColor` prop from an avatar in the `data` prop will pass through. Preference is given to
+  the `borderColor` prop from avatar group, if both are present.
+
 ## 9.9.0
 
 ### Minor Changes

package/dist/cjs/components/avatar-group.js

@@ -29,7 +29,8 @@ var _utils = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
  * @jsxRuntime classic
- */ /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+ * @jsx jsx
+ */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var MAX_COUNT = {
   grid: 11,
   stack: 5
@@ -235,7 +236,7 @@ var AvatarGroup = function AvatarGroup(_ref) {
     var callback = avatarData.onClick || onAvatarClick;
     var finalAvatar = getOverrides(overrides).Avatar.render(avatar, _objectSpread(_objectSpread({}, avatarData), {}, {
       size: size,
-      borderColor: borderColor,
+      borderColor: borderColor || avatarData.borderColor,
       testId: testId && "".concat(testId, "--avatar-").concat(idx),
       onClick: callback ? function (event, analyticsEvent) {
         callback(event, analyticsEvent, idx);

package/dist/cjs/components/grid.js

@@ -8,8 +8,8 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

package/dist/cjs/components/internal/components/popup-avatar-group.js

@@ -14,8 +14,8 @@ var _focusManager = require("./focus-manager");
 var _excluded = ["maxWidth", "minWidth", "setInitialFocusRef"];
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 /**
  * It sets focus to the first avatar when popup is open.

package/dist/cjs/components/more-indicator.js

@@ -16,8 +16,8 @@ var _colors = require("@atlaskit/theme/colors");
 var _excluded = ["testId", "className", "ref"];
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 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); }
 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; }
@@ -72,7 +72,7 @@ var MoreIndicator = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _ref$appearance = _ref.appearance,
     appearance = _ref$appearance === void 0 ? 'circle' : _ref$appearance,
     _ref$borderColor = _ref.borderColor,
-    borderColor = _ref$borderColor === void 0 ? (0, _platformFeatureFlags.fg)('platform.design-system-team.component-visual-refresh_t8zbo') ? "var(--ds-surface, #FFFFFF)" : "var(--ds-border-inverse, ".concat(_colors.N0, ")") : _ref$borderColor,
+    borderColor = _ref$borderColor === void 0 ? (0, _platformFeatureFlags.fg)('platform-component-visual-refresh') ? "var(--ds-surface, #FFFFFF)" : "var(--ds-border-inverse, ".concat(_colors.N0, ")") : _ref$borderColor,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'medium' : _ref$size,
     _ref$count = _ref.count,

package/dist/cjs/components/stack.js

@@ -10,8 +10,8 @@ var _avatar = require("@atlaskit/avatar");
 var _constants = require("@atlaskit/theme/constants");
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

package/dist/es2019/components/avatar-group.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { useCallback, useEffect, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -206,7 +206,7 @@ const AvatarGroup = ({
     const finalAvatar = getOverrides(overrides).Avatar.render(avatar, {
       ...avatarData,
       size,
-      borderColor,
+      borderColor: borderColor || avatarData.borderColor,
       testId: testId && `${testId}--avatar-${idx}`,
       onClick: callback ? (event, analyticsEvent) => {
         callback(event, analyticsEvent, idx);

package/dist/es2019/components/grid.js

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { Children } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/components/internal/components/popup-avatar-group.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { useContext, useEffect } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/components/more-indicator.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { forwardRef, useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -59,7 +59,7 @@ const buttonStyles = css({
 const MAX_DISPLAY_COUNT = 99;
 const MoreIndicator = /*#__PURE__*/forwardRef(({
   appearance = 'circle',
-  borderColor = fg('platform.design-system-team.component-visual-refresh_t8zbo') ? "var(--ds-surface, #FFFFFF)" : `var(--ds-border-inverse, ${N0})`,
+  borderColor = fg('platform-component-visual-refresh') ? "var(--ds-surface, #FFFFFF)" : `var(--ds-border-inverse, ${N0})`,
   size = 'medium',
   count = 0,
   testId,

package/dist/es2019/components/stack.js

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { Children } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/components/avatar-group.js

@@ -5,8 +5,8 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { useCallback, useEffect, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -232,7 +232,7 @@ var AvatarGroup = function AvatarGroup(_ref) {
     var callback = avatarData.onClick || onAvatarClick;
     var finalAvatar = getOverrides(overrides).Avatar.render(avatar, _objectSpread(_objectSpread({}, avatarData), {}, {
       size: size,
-      borderColor: borderColor,
+      borderColor: borderColor || avatarData.borderColor,
       testId: testId && "".concat(testId, "--avatar-").concat(idx),
       onClick: callback ? function (event, analyticsEvent) {
         callback(event, analyticsEvent, idx);

package/dist/esm/components/grid.js

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { Children } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/components/internal/components/popup-avatar-group.js

@@ -3,8 +3,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["maxWidth", "minWidth", "setInitialFocusRef"];
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { useContext, useEffect } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/components/more-indicator.js

@@ -3,8 +3,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["testId", "className", "ref"];
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { forwardRef, useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -63,7 +63,7 @@ var MoreIndicator = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$appearance = _ref.appearance,
     appearance = _ref$appearance === void 0 ? 'circle' : _ref$appearance,
     _ref$borderColor = _ref.borderColor,
-    borderColor = _ref$borderColor === void 0 ? fg('platform.design-system-team.component-visual-refresh_t8zbo') ? "var(--ds-surface, #FFFFFF)" : "var(--ds-border-inverse, ".concat(N0, ")") : _ref$borderColor,
+    borderColor = _ref$borderColor === void 0 ? fg('platform-component-visual-refresh') ? "var(--ds-surface, #FFFFFF)" : "var(--ds-border-inverse, ".concat(N0, ")") : _ref$borderColor,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'medium' : _ref$size,
     _ref$count = _ref.count,

package/dist/esm/components/stack.js

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { Children } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/types/components/avatar-group.d.ts

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { type ElementType, type MouseEventHandler } from 'react';
 import { jsx } from '@emotion/react';
 import Avatar, { type SizeType } from '@atlaskit/avatar';

package/dist/types/components/grid.d.ts

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { type FC, type ReactNode } from 'react';
 declare const Grid: FC<{
     children: ReactNode;

package/dist/types/components/stack.d.ts

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { type FC, type ReactNode } from 'react';
 declare const Stack: FC<{
     children: ReactNode;

package/dist/types-ts4.5/components/avatar-group.d.ts

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { type ElementType, type MouseEventHandler } from 'react';
 import { jsx } from '@emotion/react';
 import Avatar, { type SizeType } from '@atlaskit/avatar';

package/dist/types-ts4.5/components/grid.d.ts

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { type FC, type ReactNode } from 'react';
 declare const Grid: FC<{
     children: ReactNode;

package/dist/types-ts4.5/components/stack.d.ts

@@ -1,7 +1,7 @@
 /**
  * @jsxRuntime classic
+ * @jsx jsx
  */
-/** @jsx jsx */
 import { type FC, type ReactNode } from 'react';
 declare const Stack: FC<{
     children: ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/avatar-group",
-	"version": "9.9.0",
+	"version": "9.9.1",
 	"description": "An avatar group displays a number of avatars grouped together in a stack or grid.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,11 +29,11 @@
 	"dependencies": {
 		"@atlaskit/avatar": "^21.11.0",
 		"@atlaskit/ds-lib": "^2.3.0",
-		"@atlaskit/menu": "^2.6.0",
+		"@atlaskit/menu": "^2.8.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/popup": "^1.20.0",
 		"@atlaskit/theme": "^12.11.0",
-		"@atlaskit/tokens": "^1.53.0",
+		"@atlaskit/tokens": "^1.56.0",
 		"@atlaskit/tooltip": "^18.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -55,6 +55,7 @@
 		"@testing-library/user-event": "^14.4.3",
 		"lodash": "^4.17.21",
 		"react-dom": "^16.8.0",
+		"react-test-renderer": "^16.8.0",
 		"typescript": "~5.4.2",
 		"wait-for-expect": "^1.2.0"
 	},
@@ -96,7 +97,7 @@
 	},
 	"homepage": "https://atlassian.design/components/avatar-group/",
 	"platform-feature-flags": {
-		"platform.design-system-team.component-visual-refresh_t8zbo": {
+		"platform-component-visual-refresh": {
 			"type": "boolean"
 		}
 	}