@atlaskit/avatar 25.14.2 → 25.15.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/avatar
 
+## 25.15.1
+
+### Patch Changes
+
+- [`d39a9f06a8508`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d39a9f06a8508) -
+  [ux] Bug fix: square avatars allow size to be set to xlarge and xxlarge, which are invalid sizes
+  that should not be available for square avatars (only circle and hexagonal avatars).
+
+## 25.15.0
+
+### Minor Changes
+
+- [`e52f0046ff01d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e52f0046ff01d) -
+  Cleanup feature gate `platform_dst_hexagon_avatar_unified_size`. Hexagonal avatars now
+  consistently use unified sizing to align with other avatar types. We have not seen any regression
+  with this breaking alignment, but it's possible to have subtle breaking changes with unsafe style
+  overrides.
+
 ## 25.14.2
 
 ### Patch Changes

package/dist/cjs/avatar-content.compiled.css

@@ -13,10 +13,6 @@
 ._18zr1dm9{padding-inline:var(--ds-border-width-selected,2px)}
 ._18zruxly{padding-inline:calc(var(--ds-border-width-selected, 2px)*.4)}
 ._195g1ksc{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1)}
-._195g1ukp{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 8px)}
-._195g8ocb{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 4px)}
-._195gcwjc{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 1px)}
-._195gs7t4{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 2px)}
 ._195gzwb8{margin-inline:calc(var(--ds-border-width-selected, 2px)*.4*-1)}
 ._1mou18m8{margin-block:calc(var(--ds-border-width-selected, 2px)*.5*-1)}
 ._1mou5h37{margin-block:calc(var(--ds-border-width-selected, 2px)*1.25*-1)}

package/dist/cjs/avatar-content.js

@@ -29,11 +29,9 @@ var styles = {
 var unboundStyles = {
   rootCustomBorder: "_11q7cxp3",
   root: "_vchh1ntv _bfhkcxp3 _16qs1nhn",
-  hexagonFocusContainer: "_1rjc1wgn _18zr1dm9 _1mou5h37 _bfhk1j28 _mkrz1k6g _1o9o1v1w",
-  hexagonFocusContainerMarginFg: "_195g1ksc",
+  hexagonFocusContainer: "_1rjc1wgn _18zr1dm9 _1mou5h37 _195g1ksc _bfhk1j28 _mkrz1k6g _1o9o1v1w",
   hexagonBorderContainerCustomBorder: "_11q7cxp3",
-  hexagonBorderContainer: "_1rjcf6hp _18zruxly _bfhkcxp3 _mkrz1kw7 _1o9ovuon",
-  hexagonBorderContainerMarginFg: "_1mou18m8 _195gzwb8",
+  hexagonBorderContainer: "_1rjcf6hp _18zruxly _1mou18m8 _195gzwb8 _bfhkcxp3 _mkrz1kw7 _1o9ovuon",
   hexagon: "_2rkoidpf _mkrz1kw7 _16qsn7od _14mjidpf _1ejjn7od _128midpf _4davidpf",
   interactive: "_80omtlke _4tpu1f0r _ez1ykb7n _gcm1jer9 _eeh8kb7n _jlxit94y",
   interactiveMotion: "_v5641krm _1llweo6y"
@@ -46,14 +44,6 @@ var widthHeightMap = {
   xlarge: "_1bsb16xz _4t3i16xz",
   xxlarge: "_1bsb1qr7 _4t3i1qr7"
 };
-var marginAdjustmentMap = {
-  xsmall: "_195gcwjc",
-  small: "_195gcwjc",
-  medium: "_195gs7t4",
-  large: "_195gs7t4",
-  xlarge: "_195g8ocb",
-  xxlarge: "_195g1ukp"
-};
 /**
  * __Avatar content__
  *
@@ -115,9 +105,9 @@ var AvatarContent = exports.AvatarContent = /*#__PURE__*/(0, _react.forwardRef)(
   return /*#__PURE__*/React.createElement("div", {
     style: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, bgColorCssVar, borderColor), boxShadowCssVar, "0 0 0 2px ".concat(borderColor)),
     "data-testid": testId ? "".concat(testId, "-hexagon-focus-container") : 'hexagon-focus-container',
-    className: (0, _runtime.ax)([unboundStyles.hexagonFocusContainer, !(0, _platformFeatureFlags.fg)('platform_dst_hexagon_avatar_unified_size') && marginAdjustmentMap[size], (0, _platformFeatureFlags.fg)('platform_dst_hexagon_avatar_unified_size') && unboundStyles.hexagonFocusContainerMarginFg, isInteractive && !isDisabled && (0, _platformFeatureFlags.fg)('platform-dst-motion-uplift') && unboundStyles.interactiveMotion])
+    className: (0, _runtime.ax)([unboundStyles.hexagonFocusContainer, isInteractive && !isDisabled && (0, _platformFeatureFlags.fg)('platform-dst-motion-uplift') && unboundStyles.interactiveMotion])
   }, /*#__PURE__*/React.createElement("div", {
     "data-testid": testId ? "".concat(testId, "-hexagon-border-container") : 'hexagon-border-container',
-    className: (0, _runtime.ax)([unboundStyles.hexagonBorderContainer, (0, _platformFeatureFlags.fg)('avatar-custom-border') && unboundStyles.hexagonBorderContainerCustomBorder, (0, _platformFeatureFlags.fg)('platform_dst_hexagon_avatar_unified_size') && unboundStyles.hexagonBorderContainerMarginFg])
+    className: (0, _runtime.ax)([unboundStyles.hexagonBorderContainer, (0, _platformFeatureFlags.fg)('avatar-custom-border') && unboundStyles.hexagonBorderContainerCustomBorder])
   }, renderedContent));
 });

package/dist/cjs/avatar.js

@@ -21,12 +21,13 @@ var _ensureIsInsideAvatarContext = require("./internal/ensure-is-inside-avatar-c
 var _getCustomElement = _interopRequireDefault(require("./internal/get-custom-element"));
 var _presenceWrapper = _interopRequireDefault(require("./internal/presence-wrapper"));
 var _statusWrapper = _interopRequireDefault(require("./internal/status-wrapper"));
+var _sizeUtils = require("./size-utils");
 var _useAvatarContext = require("./use-avatar-context");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
 var packageName = "@atlaskit/avatar";
-var packageVersion = "25.14.1";
+var packageVersion = "25.15.0";
 var containerStyles = null;
 
 // eslint-disable-next-line @repo/internal/react/consistent-types-definitions
@@ -69,7 +70,10 @@ var Avatar = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var context = (0, _useAvatarContext.useAvatarContext)();
-  var size = sizeProp || (context === null || context === void 0 ? void 0 : context.size) || 'medium';
+  var size = (0, _sizeUtils.getAvatarSize)({
+    appearance: appearance,
+    size: sizeProp || (context === null || context === void 0 ? void 0 : context.size) || 'medium'
+  });
   var customPresenceNode = /*#__PURE__*/(0, _react.isValidElement)(presence) ? presence : null;
   var customStatusNode = /*#__PURE__*/(0, _react.isValidElement)(status) ? status : null;
   var isValidIconSize = size !== 'xxlarge' && size !== 'xsmall';

package/dist/cjs/size-utils.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAvatarSize = exports.SQUARE_AVATAR_MAX_SIZE_FF = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var SQUARE_AVATAR_MAX_SIZE_FF = exports.SQUARE_AVATAR_MAX_SIZE_FF = 'platform_square_avatar_remove_xlarge_xxlarge_sizes';
+var getAvatarSize = exports.getAvatarSize = function getAvatarSize(_ref) {
+  var appearance = _ref.appearance,
+    size = _ref.size;
+  if (appearance === 'square' && (size === 'xlarge' || size === 'xxlarge') && (0, _platformFeatureFlags.fg)('platform_square_avatar_remove_xlarge_xxlarge_sizes')) {
+    return 'large';
+  }
+  return size;
+};

package/dist/cjs/skeleton.js

@@ -11,6 +11,7 @@ require("./skeleton.compiled.css");
 var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _sizeUtils = require("./size-utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var bgColorCssVar = '--avatar-skeleton-background-color';
 var styles = {
@@ -38,12 +39,17 @@ var sizeStyles = {
  */
 var Skeleton = function Skeleton(_ref) {
   var size = _ref.size,
-    appearance = _ref.appearance,
+    _ref$appearance = _ref.appearance,
+    appearance = _ref$appearance === void 0 ? 'circle' : _ref$appearance,
     color = _ref.color,
     weight = _ref.weight;
+  var avatarSize = (0, _sizeUtils.getAvatarSize)({
+    appearance: appearance,
+    size: size !== null && size !== void 0 ? size : 'medium'
+  });
   return /*#__PURE__*/React.createElement("div", {
     style: (0, _defineProperty2.default)({}, bgColorCssVar, color !== null && color !== void 0 ? color : 'currentColor'),
-    className: (0, _runtime.ax)([styles.root, sizeStyles[size !== null && size !== void 0 ? size : 'medium'], appearance === 'square' && styles.square, appearance === 'hexagon' && styles.hexagon, weight === 'strong' && styles.strongOpacity])
+    className: (0, _runtime.ax)([styles.root, sizeStyles[avatarSize], appearance === 'square' && styles.square, appearance === 'hexagon' && styles.hexagon, weight === 'strong' && styles.strongOpacity])
   });
 };
 var _default = exports.default = Skeleton;

package/dist/es2019/avatar-content.compiled.css

@@ -13,10 +13,6 @@
 ._18zr1dm9{padding-inline:var(--ds-border-width-selected,2px)}
 ._18zruxly{padding-inline:calc(var(--ds-border-width-selected, 2px)*.4)}
 ._195g1ksc{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1)}
-._195g1ukp{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 8px)}
-._195g8ocb{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 4px)}
-._195gcwjc{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 1px)}
-._195gs7t4{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 2px)}
 ._195gzwb8{margin-inline:calc(var(--ds-border-width-selected, 2px)*.4*-1)}
 ._1mou18m8{margin-block:calc(var(--ds-border-width-selected, 2px)*.5*-1)}
 ._1mou5h37{margin-block:calc(var(--ds-border-width-selected, 2px)*1.25*-1)}

package/dist/es2019/avatar-content.js

@@ -19,11 +19,9 @@ const styles = {
 const unboundStyles = {
   rootCustomBorder: "_11q7cxp3",
   root: "_vchh1ntv _bfhkcxp3 _16qs1nhn",
-  hexagonFocusContainer: "_1rjc1wgn _18zr1dm9 _1mou5h37 _bfhk1j28 _mkrz1k6g _1o9o1v1w",
-  hexagonFocusContainerMarginFg: "_195g1ksc",
+  hexagonFocusContainer: "_1rjc1wgn _18zr1dm9 _1mou5h37 _195g1ksc _bfhk1j28 _mkrz1k6g _1o9o1v1w",
   hexagonBorderContainerCustomBorder: "_11q7cxp3",
-  hexagonBorderContainer: "_1rjcf6hp _18zruxly _bfhkcxp3 _mkrz1kw7 _1o9ovuon",
-  hexagonBorderContainerMarginFg: "_1mou18m8 _195gzwb8",
+  hexagonBorderContainer: "_1rjcf6hp _18zruxly _1mou18m8 _195gzwb8 _bfhkcxp3 _mkrz1kw7 _1o9ovuon",
   hexagon: "_2rkoidpf _mkrz1kw7 _16qsn7od _14mjidpf _1ejjn7od _128midpf _4davidpf",
   interactive: "_80omtlke _4tpu1f0r _ez1ykb7n _gcm1jer9 _eeh8kb7n _jlxit94y",
   interactiveMotion: "_v5641krm _1llweo6y"
@@ -36,14 +34,6 @@ const widthHeightMap = {
   xlarge: "_1bsb16xz _4t3i16xz",
   xxlarge: "_1bsb1qr7 _4t3i1qr7"
 };
-const marginAdjustmentMap = {
-  xsmall: "_195gcwjc",
-  small: "_195gcwjc",
-  medium: "_195gs7t4",
-  large: "_195gs7t4",
-  xlarge: "_195g8ocb",
-  xxlarge: "_195g1ukp"
-};
 /**
  * __Avatar content__
  *
@@ -112,9 +102,9 @@ export const AvatarContent = /*#__PURE__*/forwardRef(({
       [boxShadowCssVar]: `0 0 0 2px ${borderColor}`
     },
     "data-testid": testId ? `${testId}-hexagon-focus-container` : 'hexagon-focus-container',
-    className: ax([unboundStyles.hexagonFocusContainer, !fg('platform_dst_hexagon_avatar_unified_size') && marginAdjustmentMap[size], fg('platform_dst_hexagon_avatar_unified_size') && unboundStyles.hexagonFocusContainerMarginFg, isInteractive && !isDisabled && fg('platform-dst-motion-uplift') && unboundStyles.interactiveMotion])
+    className: ax([unboundStyles.hexagonFocusContainer, isInteractive && !isDisabled && fg('platform-dst-motion-uplift') && unboundStyles.interactiveMotion])
   }, /*#__PURE__*/React.createElement("div", {
     "data-testid": testId ? `${testId}-hexagon-border-container` : 'hexagon-border-container',
-    className: ax([unboundStyles.hexagonBorderContainer, fg('avatar-custom-border') && unboundStyles.hexagonBorderContainerCustomBorder, fg('platform_dst_hexagon_avatar_unified_size') && unboundStyles.hexagonBorderContainerMarginFg])
+    className: ax([unboundStyles.hexagonBorderContainer, fg('avatar-custom-border') && unboundStyles.hexagonBorderContainerCustomBorder])
   }, renderedContent));
 });

package/dist/es2019/avatar.js

@@ -12,9 +12,10 @@ import { EnsureIsInsideAvatarContext } from './internal/ensure-is-inside-avatar-
 import getCustomElement from './internal/get-custom-element';
 import PresenceWrapper from './internal/presence-wrapper';
 import StatusWrapper from './internal/status-wrapper';
+import { getAvatarSize } from './size-utils';
 import { useAvatarContext } from './use-avatar-context';
 const packageName = "@atlaskit/avatar";
-const packageVersion = "25.14.1";
+const packageVersion = "25.15.0";
 const containerStyles = null;
 
 // eslint-disable-next-line @repo/internal/react/consistent-types-definitions
@@ -56,7 +57,10 @@ const Avatar = /*#__PURE__*/forwardRef(({
     createAnalyticsEvent
   } = useAnalyticsEvents();
   const context = useAvatarContext();
-  const size = sizeProp || (context === null || context === void 0 ? void 0 : context.size) || 'medium';
+  const size = getAvatarSize({
+    appearance,
+    size: sizeProp || (context === null || context === void 0 ? void 0 : context.size) || 'medium'
+  });
   const customPresenceNode = /*#__PURE__*/isValidElement(presence) ? presence : null;
   const customStatusNode = /*#__PURE__*/isValidElement(status) ? status : null;
   const isValidIconSize = size !== 'xxlarge' && size !== 'xsmall';

package/dist/es2019/size-utils.js

@@ -0,0 +1,11 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+export const SQUARE_AVATAR_MAX_SIZE_FF = 'platform_square_avatar_remove_xlarge_xxlarge_sizes';
+export const getAvatarSize = ({
+  appearance,
+  size
+}) => {
+  if (appearance === 'square' && (size === 'xlarge' || size === 'xxlarge') && fg('platform_square_avatar_remove_xlarge_xxlarge_sizes')) {
+    return 'large';
+  }
+  return size;
+};

package/dist/es2019/skeleton.js

@@ -2,6 +2,7 @@
 import "./skeleton.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
+import { getAvatarSize } from './size-utils';
 const bgColorCssVar = '--avatar-skeleton-background-color';
 const styles = {
   root: "_2rko1qll _189e1dm9 _1dqonqa1 _1h6d1j28 _1e0c1o8l _bfhk1r8p _tzy4nh7s",
@@ -28,13 +29,19 @@ const sizeStyles = {
  */
 const Skeleton = ({
   size,
-  appearance,
+  appearance = 'circle',
   color,
   weight
-}) => /*#__PURE__*/React.createElement("div", {
-  style: {
-    [bgColorCssVar]: color !== null && color !== void 0 ? color : 'currentColor'
-  },
-  className: ax([styles.root, sizeStyles[size !== null && size !== void 0 ? size : 'medium'], appearance === 'square' && styles.square, appearance === 'hexagon' && styles.hexagon, weight === 'strong' && styles.strongOpacity])
-});
+}) => {
+  const avatarSize = getAvatarSize({
+    appearance,
+    size: size !== null && size !== void 0 ? size : 'medium'
+  });
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      [bgColorCssVar]: color !== null && color !== void 0 ? color : 'currentColor'
+    },
+    className: ax([styles.root, sizeStyles[avatarSize], appearance === 'square' && styles.square, appearance === 'hexagon' && styles.hexagon, weight === 'strong' && styles.strongOpacity])
+  });
+};
 export default Skeleton;

package/dist/esm/avatar-content.compiled.css

@@ -13,10 +13,6 @@
 ._18zr1dm9{padding-inline:var(--ds-border-width-selected,2px)}
 ._18zruxly{padding-inline:calc(var(--ds-border-width-selected, 2px)*.4)}
 ._195g1ksc{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1)}
-._195g1ukp{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 8px)}
-._195g8ocb{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 4px)}
-._195gcwjc{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 1px)}
-._195gs7t4{margin-inline:calc(var(--ds-border-width-selected, 2px)*-1 - 2px)}
 ._195gzwb8{margin-inline:calc(var(--ds-border-width-selected, 2px)*.4*-1)}
 ._1mou18m8{margin-block:calc(var(--ds-border-width-selected, 2px)*.5*-1)}
 ._1mou5h37{margin-block:calc(var(--ds-border-width-selected, 2px)*1.25*-1)}

package/dist/esm/avatar-content.js

@@ -20,11 +20,9 @@ var styles = {
 var unboundStyles = {
   rootCustomBorder: "_11q7cxp3",
   root: "_vchh1ntv _bfhkcxp3 _16qs1nhn",
-  hexagonFocusContainer: "_1rjc1wgn _18zr1dm9 _1mou5h37 _bfhk1j28 _mkrz1k6g _1o9o1v1w",
-  hexagonFocusContainerMarginFg: "_195g1ksc",
+  hexagonFocusContainer: "_1rjc1wgn _18zr1dm9 _1mou5h37 _195g1ksc _bfhk1j28 _mkrz1k6g _1o9o1v1w",
   hexagonBorderContainerCustomBorder: "_11q7cxp3",
-  hexagonBorderContainer: "_1rjcf6hp _18zruxly _bfhkcxp3 _mkrz1kw7 _1o9ovuon",
-  hexagonBorderContainerMarginFg: "_1mou18m8 _195gzwb8",
+  hexagonBorderContainer: "_1rjcf6hp _18zruxly _1mou18m8 _195gzwb8 _bfhkcxp3 _mkrz1kw7 _1o9ovuon",
   hexagon: "_2rkoidpf _mkrz1kw7 _16qsn7od _14mjidpf _1ejjn7od _128midpf _4davidpf",
   interactive: "_80omtlke _4tpu1f0r _ez1ykb7n _gcm1jer9 _eeh8kb7n _jlxit94y",
   interactiveMotion: "_v5641krm _1llweo6y"
@@ -37,14 +35,6 @@ var widthHeightMap = {
   xlarge: "_1bsb16xz _4t3i16xz",
   xxlarge: "_1bsb1qr7 _4t3i1qr7"
 };
-var marginAdjustmentMap = {
-  xsmall: "_195gcwjc",
-  small: "_195gcwjc",
-  medium: "_195gs7t4",
-  large: "_195gs7t4",
-  xlarge: "_195g8ocb",
-  xxlarge: "_195g1ukp"
-};
 /**
  * __Avatar content__
  *
@@ -106,9 +96,9 @@ export var AvatarContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", {
     style: _defineProperty(_defineProperty({}, bgColorCssVar, borderColor), boxShadowCssVar, "0 0 0 2px ".concat(borderColor)),
     "data-testid": testId ? "".concat(testId, "-hexagon-focus-container") : 'hexagon-focus-container',
-    className: ax([unboundStyles.hexagonFocusContainer, !fg('platform_dst_hexagon_avatar_unified_size') && marginAdjustmentMap[size], fg('platform_dst_hexagon_avatar_unified_size') && unboundStyles.hexagonFocusContainerMarginFg, isInteractive && !isDisabled && fg('platform-dst-motion-uplift') && unboundStyles.interactiveMotion])
+    className: ax([unboundStyles.hexagonFocusContainer, isInteractive && !isDisabled && fg('platform-dst-motion-uplift') && unboundStyles.interactiveMotion])
   }, /*#__PURE__*/React.createElement("div", {
     "data-testid": testId ? "".concat(testId, "-hexagon-border-container") : 'hexagon-border-container',
-    className: ax([unboundStyles.hexagonBorderContainer, fg('avatar-custom-border') && unboundStyles.hexagonBorderContainerCustomBorder, fg('platform_dst_hexagon_avatar_unified_size') && unboundStyles.hexagonBorderContainerMarginFg])
+    className: ax([unboundStyles.hexagonBorderContainer, fg('avatar-custom-border') && unboundStyles.hexagonBorderContainerCustomBorder])
   }, renderedContent));
 });

package/dist/esm/avatar.js

@@ -15,9 +15,10 @@ import { EnsureIsInsideAvatarContext } from './internal/ensure-is-inside-avatar-
 import getCustomElement from './internal/get-custom-element';
 import PresenceWrapper from './internal/presence-wrapper';
 import StatusWrapper from './internal/status-wrapper';
+import { getAvatarSize } from './size-utils';
 import { useAvatarContext } from './use-avatar-context';
 var packageName = "@atlaskit/avatar";
-var packageVersion = "25.14.1";
+var packageVersion = "25.15.0";
 var containerStyles = null;
 
 // eslint-disable-next-line @repo/internal/react/consistent-types-definitions
@@ -60,7 +61,10 @@ var Avatar = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _useAnalyticsEvents = useAnalyticsEvents(),
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var context = useAvatarContext();
-  var size = sizeProp || (context === null || context === void 0 ? void 0 : context.size) || 'medium';
+  var size = getAvatarSize({
+    appearance: appearance,
+    size: sizeProp || (context === null || context === void 0 ? void 0 : context.size) || 'medium'
+  });
   var customPresenceNode = /*#__PURE__*/isValidElement(presence) ? presence : null;
   var customStatusNode = /*#__PURE__*/isValidElement(status) ? status : null;
   var isValidIconSize = size !== 'xxlarge' && size !== 'xsmall';

package/dist/esm/size-utils.js

@@ -0,0 +1,10 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+export var SQUARE_AVATAR_MAX_SIZE_FF = 'platform_square_avatar_remove_xlarge_xxlarge_sizes';
+export var getAvatarSize = function getAvatarSize(_ref) {
+  var appearance = _ref.appearance,
+    size = _ref.size;
+  if (appearance === 'square' && (size === 'xlarge' || size === 'xxlarge') && fg('platform_square_avatar_remove_xlarge_xxlarge_sizes')) {
+    return 'large';
+  }
+  return size;
+};

package/dist/esm/skeleton.js

@@ -3,6 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import "./skeleton.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
+import { getAvatarSize } from './size-utils';
 var bgColorCssVar = '--avatar-skeleton-background-color';
 var styles = {
   root: "_2rko1qll _189e1dm9 _1dqonqa1 _1h6d1j28 _1e0c1o8l _bfhk1r8p _tzy4nh7s",
@@ -29,12 +30,17 @@ var sizeStyles = {
  */
 var Skeleton = function Skeleton(_ref) {
   var size = _ref.size,
-    appearance = _ref.appearance,
+    _ref$appearance = _ref.appearance,
+    appearance = _ref$appearance === void 0 ? 'circle' : _ref$appearance,
     color = _ref.color,
     weight = _ref.weight;
+  var avatarSize = getAvatarSize({
+    appearance: appearance,
+    size: size !== null && size !== void 0 ? size : 'medium'
+  });
   return /*#__PURE__*/React.createElement("div", {
     style: _defineProperty({}, bgColorCssVar, color !== null && color !== void 0 ? color : 'currentColor'),
-    className: ax([styles.root, sizeStyles[size !== null && size !== void 0 ? size : 'medium'], appearance === 'square' && styles.square, appearance === 'hexagon' && styles.hexagon, weight === 'strong' && styles.strongOpacity])
+    className: ax([styles.root, sizeStyles[avatarSize], appearance === 'square' && styles.square, appearance === 'hexagon' && styles.hexagon, weight === 'strong' && styles.strongOpacity])
   });
 };
 export default Skeleton;

package/dist/types/size-utils.d.ts

@@ -0,0 +1,6 @@
+import { type AppearanceType, type SizeType } from './types';
+export declare const SQUARE_AVATAR_MAX_SIZE_FF = "platform_square_avatar_remove_xlarge_xxlarge_sizes";
+export declare const getAvatarSize: ({ appearance, size, }: {
+    appearance: AppearanceType;
+    size: SizeType;
+}) => SizeType;

package/dist/types-ts4.5/size-utils.d.ts

@@ -0,0 +1,6 @@
+import { type AppearanceType, type SizeType } from './types';
+export declare const SQUARE_AVATAR_MAX_SIZE_FF = "platform_square_avatar_remove_xlarge_xxlarge_sizes";
+export declare const getAvatarSize: ({ appearance, size, }: {
+    appearance: AppearanceType;
+    size: SizeType;
+}) => SizeType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/avatar",
-	"version": "25.14.2",
+	"version": "25.15.1",
 	"description": "An avatar is a visual representation of a user or entity.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -63,7 +63,7 @@
 		"@atlaskit/heading": "^5.4.0",
 		"@atlaskit/link": "^3.4.0",
 		"@atlaskit/range": "^10.1.0",
-		"@atlaskit/section-message": "^8.12.0",
+		"@atlaskit/section-message": "^8.13.0",
 		"@atlaskit/textfield": "^8.3.0",
 		"@atlaskit/tooltip": "^22.2.0",
 		"@atlassian/feature-flags-test-utils": "^1.1.0",
@@ -74,6 +74,7 @@
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/user-event": "^14.4.3",
 		"jest-in-case": "^1.0.2",
+		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
 	"keywords": [
@@ -109,12 +110,11 @@
 		"avatar-custom-border": {
 			"type": "boolean"
 		},
-		"platform_dst_hexagon_avatar_unified_size": {
-			"type": "boolean",
-			"showOnWebsiteForTransitiveDependencies": true
-		},
 		"platform-dst-motion-uplift": {
 			"type": "boolean"
+		},
+		"platform_square_avatar_remove_xlarge_xxlarge_sizes": {
+			"type": "boolean"
 		}
 	}
 }