@atlaskit/editor-plugin-mentions 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-mentions
 
+## 2.0.3
+
+### Patch Changes
+
+- [#122612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122612)
+  [`01a85ce0a88ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01a85ce0a88ec) -
+  [ux] ED-23705 Add logic to handle annotations on inline nodes when they are inserted or pasted.
+  Covers the following inline nodes: emoji, status, mention, date, inlineCard
+- Updated dependencies
+
+## 2.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.0.1
 
 ### Patch Changes

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

@@ -13,14 +13,16 @@ 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 _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = 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 _analytics = require("../analytics");
-var _utils2 = require("../pm-plugins/utils");
+var _utils3 = require("../pm-plugins/utils");
 var _InviteItem = _interopRequireWildcard(require("../ui/InviteItem"));
-var _utils3 = require("../utils");
+var _utils4 = require("../utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -59,7 +61,7 @@ var withInviteItem = function withInviteItem(_ref3) {
       mentionProvider: mentionProvider,
       onInviteItemMount: onInviteItemMount
     });
-    var keepInviteItem = (0, _utils3.shouldKeepInviteItem)(currentQuery, firstQueryWithoutResults);
+    var keepInviteItem = (0, _utils4.shouldKeepInviteItem)(currentQuery, firstQueryWithoutResults);
     if (mentionItems.length === 0) {
       return keepInviteItem ? [inviteItem] : [];
     }
@@ -117,7 +119,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
     var duration = 0;
     var userOrTeamIds = null;
     var teams = null;
-    if (!(0, _utils3.isTeamStats)(stats)) {
+    if (!(0, _utils4.isTeamStats)(stats)) {
       // is from primary mention endpoint which could be just user mentions or user/team mentions
       duration = stats && stats.duration;
       teams = null;
@@ -129,7 +131,7 @@ var buildAndSendElementsTypeAheadAnalytics = function buildAndSendElementsTypeAh
       duration = stats && stats.teamMentionDuration;
       userOrTeamIds = null;
       teams = mentions.map(function (mention) {
-        return (0, _utils3.isTeamType)(mention.userType) ? {
+        return (0, _utils4.isTeamType)(mention.userType) ? {
           teamId: mention.id,
           includesYou: mention.context.includesYou,
           memberCount: mention.context.memberCount
@@ -216,7 +218,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var _api$contextIdentifie, _api$contextIdentifie2;
       var query = _ref7.query,
         editorState = _ref7.editorState;
-      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
+      var pluginState = (0, _utils3.getMentionPluginState)(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
       }
@@ -275,7 +277,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         query = _ref9.query,
         sourceListItem = _ref9.sourceListItem;
       var schema = state.schema;
-      var pluginState = (0, _utils2.getMentionPluginState)(state);
+      var pluginState = (0, _utils3.getMentionPluginState)(state);
       var mentionProvider = pluginState.mentionProvider;
       var _item$mention = item.mention,
         id = _item$mention.id,
@@ -290,13 +292,13 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var mentionContext = _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
         sessionId: sessionId
       });
-      if (mentionProvider && !(0, _utils3.isInviteItem)(item.mention)) {
+      if (mentionProvider && !(0, _utils4.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, _utils3.isInviteItem)(item.mention)) {
+      if (mentionProvider && mentionProvider.shouldEnableInvite && (0, _utils4.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));
@@ -307,10 +309,10 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         return state.tr;
       }
       var taskListId, taskItemId;
-      var taskList = (0, _utils.findParentNodeOfType)(state.schema.nodes.taskList)(state.selection);
+      var taskList = (0, _utils2.findParentNodeOfType)(state.schema.nodes.taskList)(state.selection);
       if (taskList) {
         taskListId = taskList.node.attrs.localId;
-        var taskItem = (0, _utils.findParentNodeOfType)(state.schema.nodes.taskItem)(state.selection);
+        var taskItem = (0, _utils2.findParentNodeOfType)(state.schema.nodes.taskItem)(state.selection);
         if (taskItem) {
           taskItemId = taskItem.node.attrs.localId;
         }
@@ -320,7 +322,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         return x.mention;
       }), query, contextIdentifierProvider, taskListId, taskItemId));
       sessionId = (0, _uuid.default)();
-      if (mentionProvider && (0, _utils3.isTeamType)(userType)) {
+      if (mentionProvider && (0, _utils4.isTeamType)(userType)) {
         return insert(buildNodesForTeamMention(schema, item.mention, mentionProvider, sanitizePrivateContent));
       }
 
@@ -330,14 +332,15 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
         // 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,
         id: id,
         accessLevel: accessLevel,
         userType: userType === 'DEFAULT' ? null : userType,
         localId: mentionLocalId
-      });
-      var space = schema.text(' ');
+      }, 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]));
     },
     dismiss: function dismiss(_ref11) {
@@ -350,7 +353,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       if (!wasItemInserted) {
         fireEvent((0, _analytics.buildTypeAheadCancelPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, query || ''));
       }
-      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
+      var pluginState = (0, _utils3.getMentionPluginState)(editorState);
       if (pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider) {
         var mentionProvider = pluginState.mentionProvider;
         var _iterator = _createForOfIteratorHelper(subscriptionKeys),

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

@@ -16,7 +16,10 @@ var _colors = require("@atlaskit/theme/colors");
 var _styles = require("./styles");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

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

@@ -1,10 +1,12 @@
 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';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { buildTypeAheadCancelPayload, buildTypeAheadInsertedPayload, buildTypeAheadInviteItemClickedPayload, buildTypeAheadInviteItemViewedPayload, buildTypeAheadRenderedPayload } from '../analytics';
 import { getMentionPluginState } from '../pm-plugins/utils';
 import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../ui/InviteItem';
@@ -314,14 +316,15 @@ export const createTypeAheadConfig = ({
         // 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,
         id,
         accessLevel,
         userType: userType === 'DEFAULT' ? null : userType,
         localId: mentionLocalId
-      });
-      const space = schema.text(' ');
+      }, 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]));
     },
     dismiss({

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

@@ -1,5 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 import React, { useCallback, useEffect } from 'react';
 

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

@@ -8,10 +8,12 @@ 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';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { buildTypeAheadCancelPayload, buildTypeAheadInsertedPayload, buildTypeAheadInviteItemClickedPayload, buildTypeAheadInviteItemViewedPayload, buildTypeAheadRenderedPayload } from '../analytics';
 import { getMentionPluginState } from '../pm-plugins/utils';
 import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../ui/InviteItem';
@@ -318,14 +320,15 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         // 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,
         id: id,
         accessLevel: accessLevel,
         userType: userType === 'DEFAULT' ? null : userType,
         localId: mentionLocalId
-      });
-      var space = schema.text(' ');
+      }, 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]));
     },
     dismiss: function dismiss(_ref11) {

package/dist/esm/ui/InviteItem/index.js

@@ -1,5 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 import React, { useCallback, useEffect } from 'react';
 

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import type { SyntheticEvent } from 'react';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';

package/dist/types-ts4.5/ui/InviteItem/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import type { SyntheticEvent } from 'react';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "2.0.1",
+	"version": "2.0.3",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,16 +35,16 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
-		"@atlaskit/editor-common": "^85.0.0",
+		"@atlaskit/editor-common": "^86.4.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.1.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.4.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
-		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/icon": "^22.7.0",
 		"@atlaskit/mention": "^23.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/theme": "^12.11.0",
-		"@atlaskit/tokens": "^1.54.0",
+		"@atlaskit/tokens": "^1.56.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"uuid": "^3.1.0"
@@ -107,6 +107,9 @@
 	"platform-feature-flags": {
 		"platform.editor.mentions-in-editor-popup-on-click": {
 			"type": "boolean"
+		},
+		"editor_inline_comments_paste_insert_nodes": {
+			"type": "boolean"
 		}
 	}
 }