@atlaskit/editor-plugin-mentions 32.0.11 → 32.1.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-mentions
 
+## 32.1.0
+
+### Minor Changes
+
+- [`71401187eef88`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/71401187eef88) -
+  Add a consumer-owned agent section lozenge for confluence_agentic_awareness_enabled.
+
+  Allow `platform_editor_agent_mentions_hide_labs_lozenge` to suppress both the default Labs lozenge
+  and any consumer-supplied lozenge.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 32.0.12
+
+### Patch Changes
+
+- [`3382e70050534`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3382e70050534) -
+  Clean up feature gate `platform_editor_mention_typeahead_profilecard`
+- Updated dependencies
+
 ## 32.0.11
 
 ### Patch Changes

package/dist/cjs/mentionsPlugin.js

@@ -108,6 +108,7 @@ var mentionsPlugin = exports.mentionsPlugin = function mentionsPlugin(_ref3) {
     fireAnalyticsEvent(payload, channel);
   };
   var typeAhead = (0, _typeAhead.createTypeAheadConfig)({
+    agentSectionLozenge: options === null || options === void 0 ? void 0 : options.agentSectionLozenge,
     canOpenTypeAhead: options === null || options === void 0 ? void 0 : options.canOpenTypeAhead,
     sanitizePrivateContent: options === null || options === void 0 ? void 0 : options.sanitizePrivateContent,
     mentionInsertDisplayName: options === null || options === void 0 ? void 0 : options.insertDisplayName,

package/dist/cjs/pm-plugins/main.js

@@ -45,7 +45,7 @@ var ACTIONS = exports.ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "32.0.10";
+var PACKAGE_VERSION = "32.0.12";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/cjs/ui/type-ahead/index.js

@@ -171,7 +171,7 @@ var makeMentionToTypeaheadItem = function makeMentionToTypeaheadItem(_ref4) {
         var isSelected = _ref7.isSelected,
           onClick = _ref7.onClick,
           onHover = _ref7.onHover;
-        return (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) && (0, _fg.fg)('platform_editor_mention_typeahead_profilecard') || (0, _fg.fg)('platform_editor_agent_card_fixes') ? /*#__PURE__*/_react.default.createElement(_MentionItemWithProfileCard.MentionItemWithProfileCard, {
+        return (0, _expVal.expVal)('platform_editor_agent_mentions', 'isEnabled', false) || (0, _fg.fg)('platform_editor_agent_card_fixes') ? /*#__PURE__*/_react.default.createElement(_MentionItemWithProfileCard.MentionItemWithProfileCard, {
           mention: mention,
           selected: isSelected,
           onSelection: onClick,
@@ -399,7 +399,8 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
   };
 };
 var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeAheadConfig(_ref1) {
-  var canOpenTypeAhead = _ref1.canOpenTypeAhead,
+  var agentSectionLozenge = _ref1.agentSectionLozenge,
+    canOpenTypeAhead = _ref1.canOpenTypeAhead,
     sanitizePrivateContent = _ref1.sanitizePrivateContent,
     mentionInsertDisplayName = _ref1.mentionInsertDisplayName,
     fireEvent = _ref1.fireEvent,
@@ -437,6 +438,20 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       profilecardProvider: profilecardProvider
     })).call
   });
+  var getAgentSectionLozenge = function getAgentSectionLozenge(label) {
+    if ((0, _fg.fg)('platform_editor_agent_mentions_hide_labs_lozenge')) {
+      return null;
+    }
+    if (agentSectionLozenge !== undefined) {
+      return agentSectionLozenge;
+    }
+    if (!(0, _fg.fg)('platform_editor_agent_mentions_drop_one_fixes') || showAgentMentionsLabsLozenge) {
+      return /*#__PURE__*/_react.default.createElement(_lozenge.default, {
+        appearance: "discovery"
+      }, label);
+    }
+    return null;
+  };
   var typeAhead = {
     canOpen: canOpenTypeAhead,
     id: _typeAhead.TypeAheadAvailableNodes.MENTION,
@@ -531,9 +546,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
           showWhenQueryPresent: false,
           showWhenOnlySection: true
         },
-        lozenge: !(0, _fg.fg)('platform_editor_agent_mentions_hide_labs_lozenge') && (!(0, _fg.fg)('platform_editor_agent_mentions_drop_one_fixes') || showAgentMentionsLabsLozenge) ? /*#__PURE__*/_react.default.createElement(_lozenge.default, {
-          appearance: "discovery"
-        }, intl.formatMessage(_mentions.mentionMessages.typeAheadSectionAgentsLabsLozengeLabel)) : null
+        lozenge: getAgentSectionLozenge(intl.formatMessage(_mentions.mentionMessages.typeAheadSectionAgentsLabsLozengeLabel))
       }];
     },
     onOpen: function onOpen() {

package/dist/cjs/ui/useFocusTrap.js

@@ -13,6 +13,8 @@ var _focusTrap = _interopRequireDefault(require("focus-trap"));
  * copied from useFocusManager in @atlaskit/popup
  */
 
+// eslint-disable-next-line @atlaskit/design-system/no-third-party-focus-traps -- existing usage from before this rule was added
+
 var useFocusTrap = exports.useFocusTrap = function useFocusTrap(_ref) {
   var targetRef = _ref.targetRef,
     _ref$enabled = _ref.enabled,

package/dist/es2019/mentionsPlugin.js

@@ -104,6 +104,7 @@ const mentionsPlugin = ({
     fireAnalyticsEvent(payload, channel);
   };
   const typeAhead = createTypeAheadConfig({
+    agentSectionLozenge: options === null || options === void 0 ? void 0 : options.agentSectionLozenge,
     canOpenTypeAhead: options === null || options === void 0 ? void 0 : options.canOpenTypeAhead,
     sanitizePrivateContent: options === null || options === void 0 ? void 0 : options.sanitizePrivateContent,
     mentionInsertDisplayName: options === null || options === void 0 ? void 0 : options.insertDisplayName,

package/dist/es2019/pm-plugins/main.js

@@ -34,7 +34,7 @@ export const ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "32.0.10";
+const PACKAGE_VERSION = "32.0.12";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/es2019/ui/type-ahead/index.js

@@ -138,7 +138,7 @@ const makeMentionToTypeaheadItem = ({
       isSelected,
       onClick,
       onHover
-    }) => expVal('platform_editor_agent_mentions', 'isEnabled', false) && fg('platform_editor_mention_typeahead_profilecard') || fg('platform_editor_agent_card_fixes') ? /*#__PURE__*/React.createElement(MentionItemWithProfileCard, {
+    }) => expVal('platform_editor_agent_mentions', 'isEnabled', false) || fg('platform_editor_agent_card_fixes') ? /*#__PURE__*/React.createElement(MentionItemWithProfileCard, {
       mention: mention,
       selected: isSelected,
       onSelection: onClick,
@@ -357,6 +357,7 @@ const makeTransformMentionsToTypeAheadItems = ({
   };
 };
 export const createTypeAheadConfig = ({
+  agentSectionLozenge,
   canOpenTypeAhead,
   sanitizePrivateContent,
   mentionInsertDisplayName,
@@ -390,6 +391,20 @@ export const createTypeAheadConfig = ({
       profilecardProvider
     })).call
   });
+  const getAgentSectionLozenge = label => {
+    if (fg('platform_editor_agent_mentions_hide_labs_lozenge')) {
+      return null;
+    }
+    if (agentSectionLozenge !== undefined) {
+      return agentSectionLozenge;
+    }
+    if (!fg('platform_editor_agent_mentions_drop_one_fixes') || showAgentMentionsLabsLozenge) {
+      return /*#__PURE__*/React.createElement(Lozenge, {
+        appearance: "discovery"
+      }, label);
+    }
+    return null;
+  };
   const typeAhead = {
     canOpen: canOpenTypeAhead,
     id: TypeAheadAvailableNodes.MENTION,
@@ -488,9 +503,7 @@ export const createTypeAheadConfig = ({
           showWhenQueryPresent: false,
           showWhenOnlySection: true
         },
-        lozenge: !fg('platform_editor_agent_mentions_hide_labs_lozenge') && (!fg('platform_editor_agent_mentions_drop_one_fixes') || showAgentMentionsLabsLozenge) ? /*#__PURE__*/React.createElement(Lozenge, {
-          appearance: "discovery"
-        }, intl.formatMessage(mentionMessages.typeAheadSectionAgentsLabsLozengeLabel)) : null
+        lozenge: getAgentSectionLozenge(intl.formatMessage(mentionMessages.typeAheadSectionAgentsLabsLozengeLabel))
       }];
     },
     onOpen: () => {

package/dist/es2019/ui/useFocusTrap.js

@@ -4,6 +4,8 @@
  * copied from useFocusManager in @atlaskit/popup
  */
 import { useEffect } from 'react';
+
+// eslint-disable-next-line @atlaskit/design-system/no-third-party-focus-traps -- existing usage from before this rule was added
 import createFocusTrap from 'focus-trap';
 export const useFocusTrap = ({
   targetRef,

package/dist/esm/mentionsPlugin.js

@@ -100,6 +100,7 @@ var mentionsPlugin = function mentionsPlugin(_ref3) {
     fireAnalyticsEvent(payload, channel);
   };
   var typeAhead = createTypeAheadConfig({
+    agentSectionLozenge: options === null || options === void 0 ? void 0 : options.agentSectionLozenge,
     canOpenTypeAhead: options === null || options === void 0 ? void 0 : options.canOpenTypeAhead,
     sanitizePrivateContent: options === null || options === void 0 ? void 0 : options.sanitizePrivateContent,
     mentionInsertDisplayName: options === null || options === void 0 ? void 0 : options.insertDisplayName,

package/dist/esm/pm-plugins/main.js

@@ -37,7 +37,7 @@ export var ACTIONS = {
   CLEAR_PENDING_PASTED_AGENT_MENTION: 'CLEAR_PENDING_PASTED_AGENT_MENTION'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "32.0.10";
+var PACKAGE_VERSION = "32.0.12";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/esm/ui/type-ahead/index.js

@@ -162,7 +162,7 @@ var makeMentionToTypeaheadItem = function makeMentionToTypeaheadItem(_ref4) {
         var isSelected = _ref7.isSelected,
           onClick = _ref7.onClick,
           onHover = _ref7.onHover;
-        return expVal('platform_editor_agent_mentions', 'isEnabled', false) && fg('platform_editor_mention_typeahead_profilecard') || fg('platform_editor_agent_card_fixes') ? /*#__PURE__*/React.createElement(MentionItemWithProfileCard, {
+        return expVal('platform_editor_agent_mentions', 'isEnabled', false) || fg('platform_editor_agent_card_fixes') ? /*#__PURE__*/React.createElement(MentionItemWithProfileCard, {
           mention: mention,
           selected: isSelected,
           onSelection: onClick,
@@ -390,7 +390,8 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
   };
 };
 export var createTypeAheadConfig = function createTypeAheadConfig(_ref1) {
-  var canOpenTypeAhead = _ref1.canOpenTypeAhead,
+  var agentSectionLozenge = _ref1.agentSectionLozenge,
+    canOpenTypeAhead = _ref1.canOpenTypeAhead,
     sanitizePrivateContent = _ref1.sanitizePrivateContent,
     mentionInsertDisplayName = _ref1.mentionInsertDisplayName,
     fireEvent = _ref1.fireEvent,
@@ -428,6 +429,20 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref1) {
       profilecardProvider: profilecardProvider
     })).call
   });
+  var getAgentSectionLozenge = function getAgentSectionLozenge(label) {
+    if (fg('platform_editor_agent_mentions_hide_labs_lozenge')) {
+      return null;
+    }
+    if (agentSectionLozenge !== undefined) {
+      return agentSectionLozenge;
+    }
+    if (!fg('platform_editor_agent_mentions_drop_one_fixes') || showAgentMentionsLabsLozenge) {
+      return /*#__PURE__*/React.createElement(Lozenge, {
+        appearance: "discovery"
+      }, label);
+    }
+    return null;
+  };
   var typeAhead = {
     canOpen: canOpenTypeAhead,
     id: TypeAheadAvailableNodes.MENTION,
@@ -522,9 +537,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref1) {
           showWhenQueryPresent: false,
           showWhenOnlySection: true
         },
-        lozenge: !fg('platform_editor_agent_mentions_hide_labs_lozenge') && (!fg('platform_editor_agent_mentions_drop_one_fixes') || showAgentMentionsLabsLozenge) ? /*#__PURE__*/React.createElement(Lozenge, {
-          appearance: "discovery"
-        }, intl.formatMessage(mentionMessages.typeAheadSectionAgentsLabsLozengeLabel)) : null
+        lozenge: getAgentSectionLozenge(intl.formatMessage(mentionMessages.typeAheadSectionAgentsLabsLozengeLabel))
       }];
     },
     onOpen: function onOpen() {

package/dist/esm/ui/useFocusTrap.js

@@ -4,6 +4,8 @@
  * copied from useFocusManager in @atlaskit/popup
  */
 import { useEffect } from 'react';
+
+// eslint-disable-next-line @atlaskit/design-system/no-third-party-focus-traps -- existing usage from before this rule was added
 import createFocusTrap from 'focus-trap';
 export var useFocusTrap = function useFocusTrap(_ref) {
   var targetRef = _ref.targetRef,

package/dist/types/types/index.d.ts

@@ -28,6 +28,8 @@ export type MentionChange = {
 };
 export type MentionsChangedHandler = (changes: MentionChange[]) => void;
 export interface MentionsPluginOptions extends MentionPluginConfig {
+    /** Undefined preserves the legacy Labs policy; null hides the badge. The Platform hide gate overrides all values. */
+    agentSectionLozenge?: React.ReactNode;
     allowZeroWidthSpaceAfter?: boolean;
     /**
      * Optional predicate evaluated before opening the @mention typeahead. When

package/dist/types/ui/type-ahead/index.d.ts

@@ -14,6 +14,7 @@ export declare function memoize<ResultFn extends (mention: MentionDescription) =
     clear(): void;
 };
 type Props = {
+    agentSectionLozenge?: React.ReactNode;
     api: ExtractInjectionAPI<MentionsPlugin> | undefined;
     canOpenTypeAhead?: () => boolean;
     enableAgentSectioning?: boolean;
@@ -25,5 +26,5 @@ type Props = {
     sanitizePrivateContent?: boolean;
     showAgentMentionsLabsLozenge?: boolean;
 };
-export declare const createTypeAheadConfig: ({ canOpenTypeAhead, sanitizePrivateContent, mentionInsertDisplayName, fireEvent, HighlightComponent, api, handleMentionsChanged, enableAgentSectioning, showAgentMentionsLabsLozenge, profilecardProvider, }: Props) => TypeAheadHandler;
+export declare const createTypeAheadConfig: ({ agentSectionLozenge, canOpenTypeAhead, sanitizePrivateContent, mentionInsertDisplayName, fireEvent, HighlightComponent, api, handleMentionsChanged, enableAgentSectioning, showAgentMentionsLabsLozenge, profilecardProvider, }: Props) => TypeAheadHandler;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "32.0.11",
+	"version": "32.1.0",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,11 +42,11 @@
 		"@atlaskit/popup": "^10.2.0",
 		"@atlaskit/portal": "^7.1.0",
 		"@atlaskit/primitives": "^22.6.0",
-		"@atlaskit/profilecard": "^27.4.0",
+		"@atlaskit/profilecard": "^27.5.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/teams-app-config": "^3.1.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^253.0.0",
+		"@atlaskit/tmp-editor-statsig": "^254.0.0",
 		"@atlaskit/tokens": "^20.9.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/user-picker": "^14.5.0",
@@ -59,14 +59,14 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.6.0",
+		"@atlaskit/editor-common": "^134.7.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
 	"devDependencies": {
 		"@atlaskit/button": "^25.7.0",
-		"@atlaskit/editor-common": "^134.6.0",
+		"@atlaskit/editor-common": "^134.7.0",
 		"@atlaskit/editor-core": "^242.0.0",
 		"@atlassian/workbench": "workspace:*",
 		"react": "^19.2.0",
@@ -103,9 +103,6 @@
 		"platform_editor_agent_mentions_drop_one_fixes": {
 			"type": "boolean"
 		},
-		"platform_editor_mention_typeahead_profilecard": {
-			"type": "boolean"
-		},
 		"platform_editor_agent_mentions_invite_order": {
 			"type": "boolean"
 		},