@atlaskit/editor-plugin-mentions 8.2.6 → 8.2.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-mentions
 
+## 8.2.7
+
+### Patch Changes
+
+- [`0a9692c1ee81f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0a9692c1ee81f) -
+  Cleanup minor refactor.
+- Updated dependencies
+
 ## 8.2.6
 
 ### Patch Changes

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

@@ -25,7 +25,7 @@ var ACTIONS = exports.ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "8.2.5";
+var PACKAGE_VERSION = "0.0.0-development";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

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

@@ -13,18 +13,17 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireDefault(require("react"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
-var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _item = require("@atlaskit/mention/item");
 var _resource = require("@atlaskit/mention/resource");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../../editor-commands");
-var _utils3 = require("../../pm-plugins/utils");
+var _utils2 = require("../../pm-plugins/utils");
 var _InviteItem = _interopRequireWildcard(require("../InviteItem"));
 var _analytics = require("./analytics");
-var _utils4 = require("./utils");
+var _utils3 = require("./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); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -62,7 +61,7 @@ var withInviteItem = function withInviteItem(_ref3) {
       mentionProvider: mentionProvider,
       onInviteItemMount: onInviteItemMount
     });
-    var keepInviteItem = (0, _utils4.shouldKeepInviteItem)(currentQuery, firstQueryWithoutResults);
+    var keepInviteItem = (0, _utils3.shouldKeepInviteItem)(currentQuery, firstQueryWithoutResults);
     if (mentionItems.length === 0) {
       return keepInviteItem ? [inviteItem] : [];
     }
@@ -123,7 +122,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
     var userOrTeamIds = null;
     var teams = null;
     var xProductMentionsLength = 0;
-    if (!(0, _utils4.isTeamStats)(stats)) {
+    if (!(0, _utils3.isTeamStats)(stats)) {
       // is from primary mention endpoint which could be just user mentions or user/team mentions
       duration = stats && stats.duration;
       teams = null;
@@ -138,7 +137,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
       duration = stats && stats.teamMentionDuration;
       userOrTeamIds = null;
       teams = mentions.map(function (mention) {
-        return (0, _utils4.isTeamType)(mention.userType) ? {
+        return (0, _utils3.isTeamType)(mention.userType) ? {
           teamId: mention.id,
           // Ignored via go/ees005
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -235,7 +234,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var _api$contextIdentifie, _api$contextIdentifie2;
       var query = _ref7.query,
         editorState = _ref7.editorState;
-      var pluginState = (0, _utils3.getMentionPluginState)(editorState);
+      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
@@ -300,7 +299,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         query = _ref9.query,
         sourceListItem = _ref9.sourceListItem;
       var schema = state.schema;
-      var pluginState = (0, _utils3.getMentionPluginState)(state);
+      var pluginState = (0, _utils2.getMentionPluginState)(state);
       var mentionProvider = pluginState.mentionProvider;
       var _item$mention = item.mention,
         id = _item$mention.id,
@@ -309,20 +308,18 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         accessLevel = _item$mention.accessLevel,
         userType = _item$mention.userType,
         isXProductUser = _item$mention.isXProductUser;
-      var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
-      var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
       var _ref0 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
         contextIdentifierProvider = _ref0.contextIdentifierProvider;
       var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
-      if (mentionProvider && !(0, _utils4.isInviteItem)(item.mention)) {
+      if (mentionProvider && !(0, _utils3.isInviteItem)(item.mention)) {
         mentionProvider.recordMentionSelection(item.mention, mentionContext);
       }
 
       // use same timer as StatsModifier
       var pickerElapsedTime = stats.startedAt ? performance.now() - stats.startedAt : 0;
-      if (mentionProvider && mentionProvider.shouldEnableInvite && (0, _utils4.isInviteItem)(item.mention)) {
+      if (mentionProvider && mentionProvider.shouldEnableInvite && (0, _utils3.isInviteItem)(item.mention)) {
         // Don't fire event and the callback with selection by space press
         if (mode !== 'space') {
           fireEvent((0, _analytics.buildTypeAheadInviteItemClickedPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, mode, query, contextIdentifierProvider, mentionProvider.userRole));
@@ -333,10 +330,10 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         return state.tr;
       }
       var taskListId, taskItemId;
-      var taskList = (0, _utils2.findParentNodeOfType)(state.schema.nodes.taskList)(state.selection);
+      var taskList = (0, _utils.findParentNodeOfType)(state.schema.nodes.taskList)(state.selection);
       if (taskList) {
         taskListId = taskList.node.attrs.localId;
-        var taskItem = (0, _utils2.findParentNodeOfType)(state.schema.nodes.taskItem)(state.selection);
+        var taskItem = (0, _utils.findParentNodeOfType)(state.schema.nodes.taskItem)(state.selection);
         if (taskItem) {
           taskItemId = taskItem.node.attrs.localId;
         }
@@ -364,47 +361,26 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         return x.mention;
       }), query, contextIdentifierProvider, taskListId, taskItemId));
       sessionId = (0, _uuid.default)();
-      if (mentionProvider && (0, _utils4.isTeamType)(userType)) {
+      if (mentionProvider && (0, _utils3.isTeamType)(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
       if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
         mentionProvider.inviteXProductUser(id, name);
       }
-
-      // This replaces logic below
-      if ((0, _platformFeatureFlags.fg)('platform_mention_insert_mention_refactor')) {
-        return insert((0, _editorCommands.createSingleMentionFragment)({
-          mentionProvider: mentionProvider,
-          mentionInsertDisplayName: mentionInsertDisplayName,
-          tr: state.tr,
-          sanitizePrivateContent: sanitizePrivateContent
-        })({
-          name: name,
-          id: id,
-          userType: userType,
-          nickname: nickname,
-          localId: mentionLocalId,
-          accessLevel: accessLevel,
-          isXProductUser: isXProductUser
-        }));
-      }
-
-      // Don't insert into document if document data is sanitized.
-      var text = sanitizePrivateContent ? '' : "@".concat(renderName);
-      if (sanitizePrivateContent && (0, _resource.isResolvingMentionProvider)(mentionProvider)) {
-        // Cache (locally) for later rendering
-        mentionProvider.cacheMentionName(id, renderName);
-      }
-      var annotationMarksForPos = (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? (0, _utils.getAnnotationMarksForPos)(state.tr.selection.$head) : undefined;
-      var mentionNode = schema.nodes.mention.createChecked({
-        text: text,
+      return insert((0, _editorCommands.createSingleMentionFragment)({
+        mentionProvider: mentionProvider,
+        mentionInsertDisplayName: mentionInsertDisplayName,
+        tr: state.tr,
+        sanitizePrivateContent: sanitizePrivateContent
+      })({
+        name: name,
         id: id,
+        userType: userType,
+        nickname: nickname,
+        localId: mentionLocalId,
         accessLevel: accessLevel,
-        userType: userType === 'DEFAULT' ? null : userType,
-        localId: mentionLocalId
-      }, null, (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      var space = schema.text(' ', (0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      return insert(_model.Fragment.from([mentionNode, space]));
+        isXProductUser: isXProductUser
+      }));
     },
     dismiss: function dismiss(_ref1) {
       var editorState = _ref1.editorState,
@@ -416,7 +392,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       if (!wasItemInserted) {
         fireEvent((0, _analytics.buildTypeAheadCancelPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, query || ''), 'fabric-elements');
       }
-      var pluginState = (0, _utils3.getMentionPluginState)(editorState);
+      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
       if (pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider) {
         var mentionProvider = pluginState.mentionProvider;
         var _iterator = _createForOfIteratorHelper(subscriptionKeys),

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

@@ -14,7 +14,7 @@ export const ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "8.2.5";
+const PACKAGE_VERSION = "0.0.0-development";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import uuid from 'uuid';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
-import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { MENTION_ITEM_HEIGHT, MentionItem } from '@atlaskit/mention/item';
@@ -292,8 +291,6 @@ export const createTypeAheadConfig = ({
         userType,
         isXProductUser
       } = item.mention;
-      const trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
-      const renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
       const {
         contextIdentifierProvider
       } = (_api$contextIdentifie3 = api === null || api === void 0 ? void 0 : (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {};
@@ -353,41 +350,20 @@ export const createTypeAheadConfig = ({
       if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
         mentionProvider.inviteXProductUser(id, name);
       }
-
-      // This replaces logic below
-      if (fg('platform_mention_insert_mention_refactor')) {
-        return insert(createSingleMentionFragment({
-          mentionProvider,
-          mentionInsertDisplayName,
-          tr: state.tr,
-          sanitizePrivateContent
-        })({
-          name,
-          id,
-          userType,
-          nickname,
-          localId: mentionLocalId,
-          accessLevel,
-          isXProductUser
-        }));
-      }
-
-      // Don't insert into document if document data is sanitized.
-      const text = sanitizePrivateContent ? '' : `@${renderName}`;
-      if (sanitizePrivateContent && isResolvingMentionProvider(mentionProvider)) {
-        // Cache (locally) for later rendering
-        mentionProvider.cacheMentionName(id, renderName);
-      }
-      const annotationMarksForPos = fg('editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(state.tr.selection.$head) : undefined;
-      const mentionNode = schema.nodes.mention.createChecked({
-        text,
+      return insert(createSingleMentionFragment({
+        mentionProvider,
+        mentionInsertDisplayName,
+        tr: state.tr,
+        sanitizePrivateContent
+      })({
+        name,
         id,
+        userType,
+        nickname,
+        localId: mentionLocalId,
         accessLevel,
-        userType: userType === 'DEFAULT' ? null : userType,
-        localId: mentionLocalId
-      }, null, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      const space = schema.text(' ', fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      return insert(Fragment.from([mentionNode, space]));
+        isXProductUser
+      }));
     },
     dismiss({
       editorState,

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

@@ -17,7 +17,7 @@ export var ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER'
 };
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "8.2.5";
+var PACKAGE_VERSION = "0.0.0-development";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

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

@@ -8,7 +8,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import uuid from 'uuid';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
-import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { MENTION_ITEM_HEIGHT, MentionItem } from '@atlaskit/mention/item';
@@ -298,8 +297,6 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         accessLevel = _item$mention.accessLevel,
         userType = _item$mention.userType,
         isXProductUser = _item$mention.isXProductUser;
-      var trimmedNickname = nickname && nickname.startsWith('@') ? nickname.slice(1) : nickname;
-      var renderName = mentionInsertDisplayName || !trimmedNickname ? name : trimmedNickname;
       var _ref0 = (_api$contextIdentifie3 = api === null || api === void 0 || (_api$contextIdentifie4 = api.contextIdentifier) === null || _api$contextIdentifie4 === void 0 ? void 0 : _api$contextIdentifie4.sharedState.currentState()) !== null && _api$contextIdentifie3 !== void 0 ? _api$contextIdentifie3 : {},
         contextIdentifierProvider = _ref0.contextIdentifierProvider;
       var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
@@ -359,41 +356,20 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       if (isXProductUser && mentionProvider && mentionProvider.inviteXProductUser) {
         mentionProvider.inviteXProductUser(id, name);
       }
-
-      // This replaces logic below
-      if (fg('platform_mention_insert_mention_refactor')) {
-        return insert(createSingleMentionFragment({
-          mentionProvider: mentionProvider,
-          mentionInsertDisplayName: mentionInsertDisplayName,
-          tr: state.tr,
-          sanitizePrivateContent: sanitizePrivateContent
-        })({
-          name: name,
-          id: id,
-          userType: userType,
-          nickname: nickname,
-          localId: mentionLocalId,
-          accessLevel: accessLevel,
-          isXProductUser: isXProductUser
-        }));
-      }
-
-      // Don't insert into document if document data is sanitized.
-      var text = sanitizePrivateContent ? '' : "@".concat(renderName);
-      if (sanitizePrivateContent && isResolvingMentionProvider(mentionProvider)) {
-        // Cache (locally) for later rendering
-        mentionProvider.cacheMentionName(id, renderName);
-      }
-      var annotationMarksForPos = fg('editor_inline_comments_paste_insert_nodes') ? getAnnotationMarksForPos(state.tr.selection.$head) : undefined;
-      var mentionNode = schema.nodes.mention.createChecked({
-        text: text,
+      return insert(createSingleMentionFragment({
+        mentionProvider: mentionProvider,
+        mentionInsertDisplayName: mentionInsertDisplayName,
+        tr: state.tr,
+        sanitizePrivateContent: sanitizePrivateContent
+      })({
+        name: name,
         id: id,
+        userType: userType,
+        nickname: nickname,
+        localId: mentionLocalId,
         accessLevel: accessLevel,
-        userType: userType === 'DEFAULT' ? null : userType,
-        localId: mentionLocalId
-      }, null, fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      var space = schema.text(' ', fg('editor_inline_comments_paste_insert_nodes') ? annotationMarksForPos : undefined);
-      return insert(Fragment.from([mentionNode, space]));
+        isXProductUser: isXProductUser
+      }));
     },
     dismiss: function dismiss(_ref1) {
       var editorState = _ref1.editorState,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "8.2.6",
+	"version": "8.2.7",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,13 +40,13 @@
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/insm": "^0.2.0",
 		"@atlaskit/link": "^3.2.0",
-		"@atlaskit/mention": "^24.3.0",
+		"@atlaskit/mention": "^24.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popper": "^7.1.0",
 		"@atlaskit/portal": "^5.1.0",
 		"@atlaskit/profilecard": "^24.20.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.26.0",
+		"@atlaskit/tmp-editor-statsig": "^13.30.0",
 		"@atlaskit/tokens": "^7.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
@@ -55,7 +55,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.22.0",
+		"@atlaskit/editor-common": "^110.23.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -113,9 +113,6 @@
 		"platform_editor_mention_provider_via_plugin_config": {
 			"type": "boolean"
 		},
-		"platform_mention_insert_mention_refactor": {
-			"type": "boolean"
-		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		},