@atlaskit/editor-plugin-mentions 8.2.4 → 8.2.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-mentions
 
+## 8.2.6
+
+### Patch Changes
+
+- [`7f9ecfde4b371`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7f9ecfde4b371) -
+  Update mention nodes to have the local id in their HTML.
+- Updated dependencies
+
+## 8.2.5
+
+### Patch Changes
+
+- [`4880d63481d80`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4880d63481d80) -
+  Fix range error bug in new mentions detection logic
+
 ## 8.2.4
 
 ### Patch Changes

package/dist/cjs/nodeviews/mentionNodeView.js

@@ -8,13 +8,14 @@ exports.MentionNodeView = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _browser = require("@atlaskit/editor-common/browser");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _resource = require("@atlaskit/mention/resource");
 var _types = require("@atlaskit/mention/types");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _profileCardRenderer2 = require("./profileCardRenderer");
 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; }
@@ -36,6 +37,11 @@ var toDOM = function toDOM(node) {
     'data-prosemirror-node-view-type': 'vanilla',
     class: 'mentionView-content-wrap inlineNodeView'
   };
+  if ((0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid')) {
+    mentionAttrs = _objectSpread(_objectSpread({}, mentionAttrs), {}, {
+      'data-local-id': node.attrs.localId
+    });
+  }
   var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
   return ['span', mentionAttrs, ['span', {
     class: 'zeroWidthSpaceContainer'

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.3";
+var PACKAGE_VERSION = "8.2.5";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -100,8 +100,12 @@ function createMentionPlugin(_ref) {
           (_insm$session = _insm.insm.session) === null || _insm$session === void 0 || _insm$session.startFeature('mentionDeletionDetection');
           var mentionSchema = newState.schema.nodes.mention;
           var mentionsRemoved = new Map();
-          tr.steps.forEach(function (step) {
-            step.getMap().forEach(function (oldStart, oldEnd, newStart, newEnd) {
+          tr.steps.forEach(function (step, index) {
+            step.getMap().forEach(function (from, to) {
+              var newStart = tr.mapping.slice(index).map(from, -1);
+              var newEnd = tr.mapping.slice(index).map(to);
+              var oldStart = tr.mapping.invert().map(newStart, -1);
+              var oldEnd = tr.mapping.invert().map(newEnd);
               var oldSlice = oldState.doc.slice(oldStart, oldEnd);
               var newSlice = newState.doc.slice(newStart, newEnd);
               var mentionsBefore = new Map();

package/dist/es2019/nodeviews/mentionNodeView.js

@@ -4,6 +4,7 @@ import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { isResolvingMentionProvider, MentionNameStatus } from '@atlaskit/mention/resource';
 import { isRestricted } from '@atlaskit/mention/types';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { profileCardRenderer } from './profileCardRenderer';
 const primitiveClassName = 'editor-mention-primitive';
@@ -11,7 +12,7 @@ const primitiveClassName = 'editor-mention-primitive';
 const getAccessibilityLabelFromName = name => name.replace(/^@/u, '');
 const toDOM = node => {
   // packages/elements/mention/src/components/Mention/index.tsx
-  const mentionAttrs = {
+  let mentionAttrs = {
     contenteditable: 'false',
     'data-access-level': node.attrs.accessLevel,
     'data-mention-id': node.attrs.id,
@@ -21,6 +22,12 @@ const toDOM = node => {
     'data-prosemirror-node-view-type': 'vanilla',
     class: 'mentionView-content-wrap inlineNodeView'
   };
+  if (fg('platform_editor_adf_with_localid')) {
+    mentionAttrs = {
+      ...mentionAttrs,
+      'data-local-id': node.attrs.localId
+    };
+  }
   const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
   return ['span', mentionAttrs, ['span', {
     class: 'zeroWidthSpaceContainer'

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.3";
+const PACKAGE_VERSION = "8.2.5";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {
@@ -92,8 +92,12 @@ export function createMentionPlugin({
           (_insm$session = insm.session) === null || _insm$session === void 0 ? void 0 : _insm$session.startFeature('mentionDeletionDetection');
           const mentionSchema = newState.schema.nodes.mention;
           const mentionsRemoved = new Map();
-          tr.steps.forEach(step => {
-            step.getMap().forEach((oldStart, oldEnd, newStart, newEnd) => {
+          tr.steps.forEach((step, index) => {
+            step.getMap().forEach((from, to) => {
+              const newStart = tr.mapping.slice(index).map(from, -1);
+              const newEnd = tr.mapping.slice(index).map(to);
+              const oldStart = tr.mapping.invert().map(newStart, -1);
+              const oldEnd = tr.mapping.invert().map(newEnd);
               const oldSlice = oldState.doc.slice(oldStart, oldEnd);
               const newSlice = newState.doc.slice(newStart, newEnd);
               const mentionsBefore = new Map();

package/dist/esm/nodeviews/mentionNodeView.js

@@ -1,15 +1,16 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { isResolvingMentionProvider, MentionNameStatus } from '@atlaskit/mention/resource';
 import { isRestricted } from '@atlaskit/mention/types';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { profileCardRenderer } from './profileCardRenderer';
 var primitiveClassName = 'editor-mention-primitive';
@@ -29,6 +30,11 @@ var toDOM = function toDOM(node) {
     'data-prosemirror-node-view-type': 'vanilla',
     class: 'mentionView-content-wrap inlineNodeView'
   };
+  if (fg('platform_editor_adf_with_localid')) {
+    mentionAttrs = _objectSpread(_objectSpread({}, mentionAttrs), {}, {
+      'data-local-id': node.attrs.localId
+    });
+  }
   var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
   return ['span', mentionAttrs, ['span', {
     class: 'zeroWidthSpaceContainer'

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.3";
+var PACKAGE_VERSION = "8.2.5";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -92,8 +92,12 @@ export function createMentionPlugin(_ref) {
           (_insm$session = insm.session) === null || _insm$session === void 0 || _insm$session.startFeature('mentionDeletionDetection');
           var mentionSchema = newState.schema.nodes.mention;
           var mentionsRemoved = new Map();
-          tr.steps.forEach(function (step) {
-            step.getMap().forEach(function (oldStart, oldEnd, newStart, newEnd) {
+          tr.steps.forEach(function (step, index) {
+            step.getMap().forEach(function (from, to) {
+              var newStart = tr.mapping.slice(index).map(from, -1);
+              var newEnd = tr.mapping.slice(index).map(to);
+              var oldStart = tr.mapping.invert().map(newStart, -1);
+              var oldEnd = tr.mapping.invert().map(newEnd);
               var oldSlice = oldState.doc.slice(oldStart, oldEnd);
               var newSlice = newState.doc.slice(newStart, newEnd);
               var mentionsBefore = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "8.2.4",
+	"version": "8.2.6",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,8 +46,8 @@
 		"@atlaskit/portal": "^5.1.0",
 		"@atlaskit/profilecard": "^24.20.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.23.0",
-		"@atlaskit/tokens": "^7.0.0",
+		"@atlaskit/tmp-editor-statsig": "^13.26.0",
+		"@atlaskit/tokens": "^7.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
 		"bind-event-listener": "^3.0.0",
@@ -55,7 +55,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.20.0",
+		"@atlaskit/editor-common": "^110.22.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -116,6 +116,9 @@
 		"platform_mention_insert_mention_refactor": {
 			"type": "boolean"
 		},
+		"platform_editor_adf_with_localid": {
+			"type": "boolean"
+		},
 		"dst-a11y__replace-anchor-with-link__editor-ai": {
 			"type": "boolean"
 		}