@atlaskit/editor-common 118.11.0 → 119.0.0

package/CHANGELOG.md

@@ -1,5 +1,55 @@
 # @atlaskit/editor-common
 
+## 119.0.0
+
+### Major Changes
+
+- [`bb37742539a7d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bb37742539a7d) -
+  Rename Quick Insert category analytics from app counts to macro counts, add reusable extension app
+  identity, and track internal, ecosystem, and all macro/app counts for externally provided items
+  behind `platform_editor_slash_app_category_analytics`. GUID-only app identities are grouped as
+  `unknown`.
+
+  Breaking change: `CategoryInformation` and `QuickInsertInformationAttributes` from
+  `@atlaskit/editor-common/analytics/types/quick-insert-events` have changed shape. Update usages to
+  the new fields (`internalMacroCount`, `internalAppCount`, `internalAppMacroMax`,
+  `ecosystemMacroCount`, `ecosystemAppCount`, `ecosystemAppMacroMax`, `allMacroCount`,
+  `allAppCount`, and `allAppMacroMax`) and add the `allCategories` aggregate. Remove references to
+  the removed `appCount` and `appMacros` fields. `ExtensionApp.ownership` has been replaced by
+  `ExtensionApp.source` (`internal` or `ecosystem`); update app metadata producers accordingly.
+
+### Minor Changes
+
+- [`ddb1f3da1e991`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ddb1f3da1e991) -
+  Track acceptance rate for backend-persisted agent edits. These arrive as remote collab steps
+  rather than frontend-streamed transformations, so they previously started no analytics session and
+  were absent from the metric. They now reuse the existing survival definition, and are recorded
+  only on the requesting user's client.
+
+  Gated by `platform_editor_agent_be_streaming`, which controls whether remote agent steps are
+  annotated at all, and by the agent type allowlist in
+  `platform_editor_backend_review_moment_agent_types`, which defaults to empty. Recording cannot
+  occur unless both permit it.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 118.12.0
+
+### Minor Changes
+
+- [`13e86ff9f1588`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/13e86ff9f1588) -
+  [ux] Display avatars for mention nodes.
+- [`da5eaf0bc37da`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/da5eaf0bc37da) -
+  Clean up the platform_editor_editor_ssr_streaming experiment. The SSR streaming code paths are now
+  permanent and the isSSRStreaming() utility has been removed from
+  @atlaskit/editor-common/core-utils.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 118.11.0
 
 ### Minor Changes

package/compass.yml

@@ -1,7 +1,7 @@
 configVersion: 1
 id: ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:component/c5751cc6-3513-4070-9deb-af31e86aed34/8aba7f6e-457b-4200-9b6f-00adf2350107
 name: '@atlaskit/editor-common'
-ownerId: ari:cloud:identity::team/og-da2205cb-ea5e-4059-9215-30c9b26c971f # Fabric - Editor
+ownerId: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb # Editor Developers
 labels:
   - platform-code
   - platform-afm
@@ -23,7 +23,7 @@ links:
 customFields:
   - name: Department
     type: text
-    value: Eng - Editor Frontend Platform
+    value: Editor Developers
   - name: Trusted Reviewer Teams
     type: text
     value: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb

package/dist/cjs/core-utils/index.js

@@ -21,13 +21,6 @@ Object.defineProperty(exports, "isSSR", {
     return _isSsr.isSSR;
   }
 });
-Object.defineProperty(exports, "isSSRStreaming", {
-  enumerable: true,
-  get: function get() {
-    return _isSsrStreaming.isSSRStreaming;
-  }
-});
 var _inside = require("./inside");
 var _documentLogger = require("./document-logger");
-var _isSsr = require("./is-ssr");
-var _isSsrStreaming = require("./is-ssr-streaming");
+var _isSsr = require("./is-ssr");

package/dist/cjs/extensibility/ExtensionSSRReactContextsProvider.js

@@ -8,11 +8,10 @@ exports.ExtensionSSRReactContextsProvider = ExtensionSSRReactContextsProvider;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
 var _isSsr = require("../core-utils/is-ssr");
-var _isSsrStreaming = require("../core-utils/is-ssr-streaming");
 function ExtensionSSRReactContextsProvider(_ref) {
   var children = _ref.children,
     intl = _ref.intl;
-  if (!(0, _isSsr.isSSR)() || !(0, _isSsrStreaming.isSSRStreaming)()) {
+  if (!(0, _isSsr.isSSR)()) {
     return children;
   }
   if (!intl) {

package/dist/cjs/extensions/buildMenuItem.js

@@ -6,17 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildMenuItem = buildMenuItem;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _manifestHelpers = require("./manifest-helpers");
 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; }
 function buildMenuItem(manifest, extensionModule) {
+  var _ref, _extensionModule$app;
   var title = extensionModule.title || manifest.title;
   var key = "".concat(manifest.key, ":").concat(extensionModule.key);
   var node = (0, _manifestHelpers.buildAction)(extensionModule.action, manifest);
   if (!node) {
     throw new Error("Couldn't find any action for ".concat(title, " (").concat(key, ")"));
   }
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_app_category_analytics') ? {
+    app: (_ref = (_extensionModule$app = extensionModule.app) !== null && _extensionModule$app !== void 0 ? _extensionModule$app : manifest.app) !== null && _ref !== void 0 ? _ref : {
+      key: manifest.key
+    }
+  } : {}), {}, {
     key: key,
     title: title,
     extensionType: manifest.type,

package/dist/cjs/monitoring/error.js

@@ -28,7 +28,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "118.10.3";
+var packageVersion = "118.12.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/portal/common.js

@@ -20,7 +20,6 @@ exports.getPortalProviderAPI = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = require("react-dom");
 var _isSsr = require("../core-utils/is-ssr");
-var _isSsrStreaming = require("../core-utils/is-ssr-streaming");
 var _PortalRenderWrapperInner = require("./PortalRenderWrapperInner");
 var _createPortalRendererComponent = require("./createPortalRendererComponent");
 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); }
@@ -60,7 +59,7 @@ var getPortalProviderAPI = exports.getPortalProviderAPI = function getPortalProv
   return {
     render: function render(children, container, key, onBeforeReactDomRender) {
       var immediate = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-      if ((0, _isSsr.isSSR)() && (0, _isSsrStreaming.isSSRStreaming)()) {
+      if ((0, _isSsr.isSSR)()) {
         var html = '';
         try {
           var renderToStaticMarkup = getRenderToStaticMarkup();
@@ -93,7 +92,7 @@ var getPortalProviderAPI = exports.getPortalProviderAPI = function getPortalProv
     },
     remove: function remove(key) {
       var _portalsMap$get;
-      if ((0, _isSsr.isSSR)() && (0, _isSsrStreaming.isSSRStreaming)()) {
+      if ((0, _isSsr.isSSR)()) {
         return;
       }
       (_portalsMap$get = portalsMap.get(key)) === null || _portalsMap$get === void 0 || _portalsMap$get();

package/dist/cjs/react-node-view/NodeViewContentHole.js

@@ -9,7 +9,6 @@ exports.NodeViewContentHole = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _isSsr = require("../core-utils/is-ssr");
-var _isSsrStreaming = require("../core-utils/is-ssr-streaming");
 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); }
 /**
  * A component that serves as a placeholder for the content DOM of a ProseMirror NodeView.
@@ -18,6 +17,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 var NodeViewContentHole = exports.NodeViewContentHole = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, props, {
     ref: ref,
-    "data-ssr-content-dom-ref": (0, _isSsr.isSSR)() && (0, _isSsrStreaming.isSSRStreaming)() ? '' : undefined
+    "data-ssr-content-dom-ref": (0, _isSsr.isSSR)() ? '' : undefined
   }));
 });

package/dist/cjs/react-node-view/index.js

@@ -123,7 +123,7 @@ var ReactNodeView = exports.default = /*#__PURE__*/function () {
         // contentDOMWrapper that was appended above. The React ref callback
         // (forwardRef) never fires in renderToStaticMarkup, so contentDOM is
         // left detached. Re-attach it by finding the marked SSR ref target.
-        if ((0, _coreUtils.isSSR)() && (0, _coreUtils.isSSRStreaming)() && this.domRef) {
+        if ((0, _coreUtils.isSSR)() && this.domRef) {
           var refTarget = this.domRef.querySelector('[data-ssr-content-dom-ref]');
           if (refTarget) {
             this.handleRef(refTarget);

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "118.10.3";
+var packageVersion = "118.12.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/ui/Mention/index.js

@@ -13,6 +13,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _providerFactory = require("../../provider-factory");
 var _mentionWithProviders = require("./mention-with-providers");
@@ -20,6 +21,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @repo/internal/react/no-class-components */
 var MENTION_PROVIDERS = ['mentionProvider', 'profilecardProvider'];
+var GENERIC_MENTION_IDS = ['HipChat', 'all', 'here'];
 var Mention = exports.default = /*#__PURE__*/function (_PureComponent) {
   function Mention(props) {
     var _this;
@@ -34,9 +36,26 @@ var Mention = exports.default = /*#__PURE__*/function (_PureComponent) {
         localId = _this$props.localId,
         userType = _this$props.userType,
         isDisabled = _this$props.isDisabled,
-        disabledTooltip = _this$props.disabledTooltip;
+        disabledTooltip = _this$props.disabledTooltip,
+        mentionNodeDataProvider = _this$props.mentionNodeDataProvider;
       var mentionProvider = providers.mentionProvider,
         profilecardProvider = providers.profilecardProvider;
+      var isAvatarEnabled = Boolean(mentionNodeDataProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_node_avatar');
+      if (isAvatarEnabled && mentionNodeDataProvider) {
+        return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithAvatarProviders, {
+          id: id,
+          text: text,
+          accessLevel: accessLevel,
+          localId: localId,
+          userType: userType,
+          isDisabled: isDisabled,
+          disabledTooltip: disabledTooltip,
+          eventHandlers: eventHandlers,
+          mentionProvider: mentionProvider,
+          mentionNodeDataProvider: mentionNodeDataProvider,
+          profilecardProvider: profilecardProvider
+        });
+      }
       return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithProviders, {
         id: id,
         text: text,

package/dist/cjs/ui/Mention/mention-node-data-provider.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/ui/Mention/mention-with-profilecard.js

@@ -47,11 +47,15 @@ function MentionWithProfileCard(_ref) {
     id = _ref.id,
     text = _ref.text,
     accessLevel = _ref.accessLevel,
+    appType = _ref.appType,
+    avatarUrl = _ref.avatarUrl,
+    isAvatarImagePreShaped = _ref.isAvatarImagePreShaped,
     mentionProvider = _ref.mentionProvider,
     profilecardProvider = _ref.profilecardProvider,
     onClick = _ref.onClick,
     onMouseEnter = _ref.onMouseEnter,
     onMouseLeave = _ref.onMouseLeave,
+    renderAvatarSlot = _ref.renderAvatarSlot,
     localId = _ref.localId,
     ssrPlaceholderId = _ref.ssrPlaceholderId,
     userType = _ref.userType;
@@ -65,11 +69,15 @@ function MentionWithProfileCard(_ref) {
     id: id,
     text: text,
     accessLevel: accessLevel,
+    appType: appType,
+    avatarUrl: avatarUrl,
+    isAvatarImagePreShaped: isAvatarImagePreShaped,
     localId: localId,
     mentionProvider: mentionProvider,
     onClick: onClick,
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave,
+    renderAvatarSlot: renderAvatarSlot,
     ssrPlaceholderId: ssrPlaceholderId
   });
 

package/dist/cjs/ui/Mention/mention-with-providers.js

@@ -5,28 +5,78 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MentionWithProviders = void 0;
+exports.MentionWithProviders = exports.MentionWithAvatarProviders = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _element = require("@atlaskit/mention/element");
 var _mentionWithProfilecard = _interopRequireDefault(require("./mention-with-profilecard"));
+var _excluded = ["id", "mentionNodeDataProvider", "userType"];
 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 GENERIC_USER_IDS = ['HipChat', 'all', 'here'];
-var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.default.memo(function (_ref) {
-  var accessLevel = _ref.accessLevel,
-    disabledTooltip = _ref.disabledTooltip,
-    eventHandlers = _ref.eventHandlers,
-    id = _ref.id,
-    isDisabled = _ref.isDisabled,
-    mentionProvider = _ref.mentionProvider,
-    profilecardProviderResolver = _ref.profilecardProvider,
-    text = _ref.text,
-    localId = _ref.localId,
+var useMentionNodeData = function useMentionNodeData(_ref) {
+  var _state$data;
+  var id = _ref.id,
+    mentionNodeDataProvider = _ref.mentionNodeDataProvider,
     userType = _ref.userType;
-  var _useState = (0, _react.useState)(null),
+  var mention = (0, _react.useMemo)(function () {
+    return {
+      id: id,
+      userType: userType
+    };
+  }, [id, userType]);
+  var mentionKey = "".concat(userType !== null && userType !== void 0 ? userType : 'DEFAULT', ":").concat(id);
+  var synchronousData = (0, _react.useMemo)(function () {
+    return mentionNodeDataProvider.getMentionDataFromCache(mention);
+  }, [mention, mentionNodeDataProvider]);
+  var _useState = (0, _react.useState)(function () {
+      return {
+        data: synchronousData,
+        key: mentionKey
+      };
+    }),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    profilecardProvider = _useState2[0],
-    setProfilecardProvider = _useState2[1];
+    state = _useState2[0],
+    setState = _useState2[1];
+  var data = state.key === mentionKey ? (_state$data = state.data) !== null && _state$data !== void 0 ? _state$data : synchronousData : synchronousData;
+  (0, _react.useEffect)(function () {
+    if (synchronousData) {
+      return;
+    }
+    var isActive = true;
+    mentionNodeDataProvider.getMentionData(mention, function (payload) {
+      if (isActive && payload.data) {
+        setState({
+          data: payload.data,
+          key: mentionKey
+        });
+      }
+    });
+    return function () {
+      isActive = false;
+    };
+  }, [mention, mentionKey, mentionNodeDataProvider, synchronousData]);
+  return data;
+};
+var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.default.memo(function (_ref2) {
+  var accessLevel = _ref2.accessLevel,
+    disabledTooltip = _ref2.disabledTooltip,
+    eventHandlers = _ref2.eventHandlers,
+    id = _ref2.id,
+    isDisabled = _ref2.isDisabled,
+    mentionNodeData = _ref2.mentionNodeData,
+    mentionProvider = _ref2.mentionProvider,
+    profilecardProviderResolver = _ref2.profilecardProvider,
+    _ref2$renderAvatarSlo = _ref2.renderAvatarSlot,
+    renderAvatarSlot = _ref2$renderAvatarSlo === void 0 ? false : _ref2$renderAvatarSlo,
+    text = _ref2.text,
+    localId = _ref2.localId,
+    userType = _ref2.userType;
+  var _useState3 = (0, _react.useState)(null),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    profilecardProvider = _useState4[0],
+    setProfilecardProvider = _useState4[1];
   var mountedRef = (0, _react.useRef)(true);
   (0, _react.useLayoutEffect)(function () {
     mountedRef.current = true;
@@ -61,11 +111,15 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
       accessLevel: accessLevel,
       localId: localId,
       mentionProvider: mentionProvider,
+      appType: mentionNodeData === null || mentionNodeData === void 0 ? void 0 : mentionNodeData.appType,
+      avatarUrl: mentionNodeData === null || mentionNodeData === void 0 ? void 0 : mentionNodeData.avatarUrl,
+      isAvatarImagePreShaped: mentionNodeData === null || mentionNodeData === void 0 ? void 0 : mentionNodeData.isAvatarImagePreShaped,
       isDisabled: true,
       disabledTooltip: disabledTooltip,
       onClick: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onClick,
       onMouseEnter: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseEnter,
       onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave,
+      renderAvatarSlot: renderAvatarSlot,
       ssrPlaceholderId: ssrPlaceholderId
     });
   }
@@ -75,7 +129,10 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
     accessLevel: accessLevel,
     localId: localId,
     userType: userType,
-    mentionProvider: mentionProvider
+    mentionProvider: mentionProvider,
+    appType: mentionNodeData === null || mentionNodeData === void 0 ? void 0 : mentionNodeData.appType,
+    avatarUrl: mentionNodeData === null || mentionNodeData === void 0 ? void 0 : mentionNodeData.avatarUrl,
+    isAvatarImagePreShaped: mentionNodeData === null || mentionNodeData === void 0 ? void 0 : mentionNodeData.isAvatarImagePreShaped
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ,
@@ -83,6 +140,26 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
     onClick: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onClick,
     onMouseEnter: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseEnter,
     onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave,
+    renderAvatarSlot: renderAvatarSlot,
     ssrPlaceholderId: ssrPlaceholderId
   });
+});
+var MentionWithAvatarProviders = exports.MentionWithAvatarProviders = /*#__PURE__*/_react.default.memo(function (_ref3) {
+  var id = _ref3.id,
+    mentionNodeDataProvider = _ref3.mentionNodeDataProvider,
+    userType = _ref3.userType,
+    props = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
+  var mentionNodeData = useMentionNodeData({
+    id: id,
+    mentionNodeDataProvider: mentionNodeDataProvider,
+    userType: userType
+  });
+  return /*#__PURE__*/_react.default.createElement(MentionWithProviders
+  // eslint-disable-next-line react/jsx-props-no-spreading -- The treatment adds only resolved avatar data to the existing mention props.
+  , (0, _extends2.default)({}, props, {
+    id: id,
+    mentionNodeData: mentionNodeData,
+    renderAvatarSlot: true,
+    userType: userType
+  }));
 });

package/dist/es2019/core-utils/index.js

@@ -3,5 +3,4 @@
 
 export { insideTable } from './inside';
 export { getDocStructure } from './document-logger';
-export { isSSR } from './is-ssr';
-export { isSSRStreaming } from './is-ssr-streaming';
+export { isSSR } from './is-ssr';

package/dist/es2019/extensibility/ExtensionSSRReactContextsProvider.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import { RawIntlProvider } from 'react-intl';
 import { isSSR } from '../core-utils/is-ssr';
-import { isSSRStreaming } from '../core-utils/is-ssr-streaming';
 export function ExtensionSSRReactContextsProvider({
   children,
   intl
 }) {
-  if (!isSSR() || !isSSRStreaming()) {
+  if (!isSSR()) {
     return children;
   }
   if (!intl) {

package/dist/es2019/extensions/buildMenuItem.js

@@ -1,5 +1,7 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { buildAction } from './manifest-helpers';
 export function buildMenuItem(manifest, extensionModule) {
+  var _ref, _extensionModule$app;
   const title = extensionModule.title || manifest.title;
   const key = `${manifest.key}:${extensionModule.key}`;
   const node = buildAction(extensionModule.action, manifest);
@@ -7,6 +9,11 @@ export function buildMenuItem(manifest, extensionModule) {
     throw new Error(`Couldn't find any action for ${title} (${key})`);
   }
   return {
+    ...(isExperimentEnabled('platform_editor_slash_app_category_analytics') ? {
+      app: (_ref = (_extensionModule$app = extensionModule.app) !== null && _extensionModule$app !== void 0 ? _extensionModule$app : manifest.app) !== null && _ref !== void 0 ? _ref : {
+        key: manifest.key
+      }
+    } : {}),
     key,
     title,
     extensionType: manifest.type,

package/dist/es2019/monitoring/error.js

@@ -14,7 +14,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "118.10.3";
+const packageVersion = "118.12.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/portal/common.js

@@ -1,7 +1,6 @@
 import React, { memo } from 'react';
 import { createPortal } from 'react-dom';
 import { isSSR } from '../core-utils/is-ssr';
-import { isSSRStreaming } from '../core-utils/is-ssr-streaming';
 import { PortalRenderWrapperInner } from './PortalRenderWrapperInner';
 const PortalRenderWrapper = /*#__PURE__*/memo(PortalRenderWrapperInner);
 PortalRenderWrapper.displayName = 'PortalRenderWrapper';
@@ -36,7 +35,7 @@ export const getPortalProviderAPI = portalManager => {
   const portalsMap = new Map();
   return {
     render: (children, container, key, onBeforeReactDomRender, immediate = false) => {
-      if (isSSR() && isSSRStreaming()) {
+      if (isSSR()) {
         let html = '';
         try {
           const renderToStaticMarkup = getRenderToStaticMarkup();
@@ -67,7 +66,7 @@ export const getPortalProviderAPI = portalManager => {
     },
     remove: key => {
       var _portalsMap$get;
-      if (isSSR() && isSSRStreaming()) {
+      if (isSSR()) {
         return;
       }
       (_portalsMap$get = portalsMap.get(key)) === null || _portalsMap$get === void 0 ? void 0 : _portalsMap$get();

package/dist/es2019/react-node-view/NodeViewContentHole.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { forwardRef } from 'react';
 import { isSSR } from '../core-utils/is-ssr';
-import { isSSRStreaming } from '../core-utils/is-ssr-streaming';
 
 /**
  * A component that serves as a placeholder for the content DOM of a ProseMirror NodeView.
@@ -9,5 +8,5 @@ import { isSSRStreaming } from '../core-utils/is-ssr-streaming';
  */
 export const NodeViewContentHole = /*#__PURE__*/forwardRef((props, ref) => /*#__PURE__*/React.createElement("div", _extends({}, props, {
   ref: ref,
-  "data-ssr-content-dom-ref": isSSR() && isSSRStreaming() ? '' : undefined
+  "data-ssr-content-dom-ref": isSSR() ? '' : undefined
 })));

package/dist/es2019/react-node-view/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 import React from 'react';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
-import { isSSR, isSSRStreaming } from '../core-utils';
+import { isSSR } from '../core-utils';
 import { createDispatch } from '../event-dispatcher';
 import { ErrorBoundary } from '../ui/ErrorBoundary';
 import { getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered } from '../utils';
@@ -89,7 +89,7 @@ export default class ReactNodeView {
       // contentDOMWrapper that was appended above. The React ref callback
       // (forwardRef) never fires in renderToStaticMarkup, so contentDOM is
       // left detached. Re-attach it by finding the marked SSR ref target.
-      if (isSSR() && isSSRStreaming() && this.domRef) {
+      if (isSSR() && this.domRef) {
         const refTarget = this.domRef.querySelector('[data-ssr-content-dom-ref]');
         if (refTarget) {
           this.handleRef(refTarget);

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "118.10.3";
+const packageVersion = "118.12.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/ui/Mention/index.js

@@ -1,10 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /* eslint-disable @repo/internal/react/no-class-components */
 import React, { PureComponent } from 'react';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ProviderFactory, WithProviders } from '../../provider-factory';
-import { MentionWithProviders } from './mention-with-providers';
+import { MentionWithAvatarProviders, MentionWithProviders } from './mention-with-providers';
 const MENTION_PROVIDERS = ['mentionProvider', 'profilecardProvider'];
+const GENERIC_MENTION_IDS = ['HipChat', 'all', 'here'];
 export default class Mention extends PureComponent {
   constructor(props) {
     super(props);
@@ -17,12 +19,29 @@ export default class Mention extends PureComponent {
         localId,
         userType,
         isDisabled,
-        disabledTooltip
+        disabledTooltip,
+        mentionNodeDataProvider
       } = this.props;
       const {
         mentionProvider,
         profilecardProvider
       } = providers;
+      const isAvatarEnabled = Boolean(mentionNodeDataProvider) && userType !== 'SPECIAL' && !GENERIC_MENTION_IDS.includes(id) && isExperimentEnabled('platform_editor_mention_node_avatar');
+      if (isAvatarEnabled && mentionNodeDataProvider) {
+        return /*#__PURE__*/React.createElement(MentionWithAvatarProviders, {
+          id: id,
+          text: text,
+          accessLevel: accessLevel,
+          localId: localId,
+          userType: userType,
+          isDisabled: isDisabled,
+          disabledTooltip: disabledTooltip,
+          eventHandlers: eventHandlers,
+          mentionProvider: mentionProvider,
+          mentionNodeDataProvider: mentionNodeDataProvider,
+          profilecardProvider: profilecardProvider
+        });
+      }
       return /*#__PURE__*/React.createElement(MentionWithProviders, {
         id: id,
         text: text,

package/dist/es2019/ui/Mention/mention-node-data-provider.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/ui/Mention/mention-with-profilecard.js

@@ -31,11 +31,15 @@ export default function MentionWithProfileCard({
   id,
   text,
   accessLevel,
+  appType,
+  avatarUrl,
+  isAvatarImagePreShaped,
   mentionProvider,
   profilecardProvider,
   onClick,
   onMouseEnter,
   onMouseLeave,
+  renderAvatarSlot,
   localId,
   ssrPlaceholderId,
   userType
@@ -50,11 +54,15 @@ export default function MentionWithProfileCard({
     id: id,
     text: text,
     accessLevel: accessLevel,
+    appType: appType,
+    avatarUrl: avatarUrl,
+    isAvatarImagePreShaped: isAvatarImagePreShaped,
     localId: localId,
     mentionProvider: mentionProvider,
     onClick: onClick,
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave,
+    renderAvatarSlot: renderAvatarSlot,
     ssrPlaceholderId: ssrPlaceholderId
   });