@atlaskit/editor-common 86.4.0 → 86.4.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-common
 
+## 86.4.1
+
+### 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
+
 ## 86.4.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 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 = "86.4.0";
+var packageVersion = "86.4.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -23,7 +23,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 = "86.4.0";
+var packageVersion = "86.4.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/annotation/index.js

@@ -8,6 +8,7 @@ exports.canApplyAnnotationOnRange = void 0;
 exports.containsAnyAnnotations = containsAnyAnnotations;
 exports.getAnnotationIdsFromRange = void 0;
 exports.getAnnotationInlineNodeTypes = getAnnotationInlineNodeTypes;
+exports.getAnnotationMarksForPos = getAnnotationMarksForPos;
 exports.getRangeInlineNodeNames = getRangeInlineNodeNames;
 exports.hasAnnotationMark = hasAnnotationMark;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -152,4 +153,18 @@ function getAnnotationInlineNodeTypes(state, annotationId) {
 
   // This sorting is done to make human consumption easier (ie. in dev tools, test snapshots, analytics events, ...)
   return (0, _toConsumableArray2.default)(inlineNodeNames).sort();
+}
+
+/*
+	Get the annotations marks from the given position and add them to the original marks array if they exist.
+	Used with the creation of the inline nodes: emoji, status, dates, mentions & inlineCards.
+*/
+function getAnnotationMarksForPos(pos) {
+  if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes')) {
+    return undefined;
+  }
+  var annotationMarks = pos.marks().filter(function (mark) {
+    return mark.type === pos.doc.type.schema.marks.annotation;
+  });
+  return annotationMarks;
 }

package/dist/cjs/utils/index.js

@@ -408,6 +408,12 @@ Object.defineProperty(exports, "getAnnotationInlineNodeTypes", {
     return _annotation.getAnnotationInlineNodeTypes;
   }
 });
+Object.defineProperty(exports, "getAnnotationMarksForPos", {
+  enumerable: true,
+  get: function get() {
+    return _annotation.getAnnotationMarksForPos;
+  }
+});
 Object.defineProperty(exports, "getChangedNodes", {
   enumerable: true,
   get: function get() {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "86.4.0";
+const packageVersion = "86.4.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -12,7 +12,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "86.4.0";
+const packageVersion = "86.4.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/annotation/index.js

@@ -150,4 +150,16 @@ export function getAnnotationInlineNodeTypes(state, annotationId) {
 
   // This sorting is done to make human consumption easier (ie. in dev tools, test snapshots, analytics events, ...)
   return [...inlineNodeNames].sort();
+}
+
+/*
+	Get the annotations marks from the given position and add them to the original marks array if they exist.
+	Used with the creation of the inline nodes: emoji, status, dates, mentions & inlineCards.
+*/
+export function getAnnotationMarksForPos(pos) {
+  if (!fg('editor_inline_comments_paste_insert_nodes')) {
+    return undefined;
+  }
+  const annotationMarks = pos.marks().filter(mark => mark.type === pos.doc.type.schema.marks.annotation);
+  return annotationMarks;
 }

package/dist/es2019/utils/index.js

@@ -2,7 +2,7 @@ import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { hasDocAsParent } from './document';
 import { isEmptyParagraph } from './editor-core-utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export { default as browser } from './browser';
 export { default as ErrorReporter } from './error-reporter';

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "86.4.0";
+var packageVersion = "86.4.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -20,7 +20,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "86.4.0";
+var packageVersion = "86.4.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/annotation/index.js

@@ -140,4 +140,18 @@ export function getAnnotationInlineNodeTypes(state, annotationId) {
 
   // This sorting is done to make human consumption easier (ie. in dev tools, test snapshots, analytics events, ...)
   return _toConsumableArray(inlineNodeNames).sort();
+}
+
+/*
+	Get the annotations marks from the given position and add them to the original marks array if they exist.
+	Used with the creation of the inline nodes: emoji, status, dates, mentions & inlineCards.
+*/
+export function getAnnotationMarksForPos(pos) {
+  if (!fg('editor_inline_comments_paste_insert_nodes')) {
+    return undefined;
+  }
+  var annotationMarks = pos.marks().filter(function (mark) {
+    return mark.type === pos.doc.type.schema.marks.annotation;
+  });
+  return annotationMarks;
 }

package/dist/esm/utils/index.js

@@ -2,7 +2,7 @@ import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { hasDocAsParent } from './document';
 import { isEmptyParagraph } from './editor-core-utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export { default as browser } from './browser';
 export { default as ErrorReporter } from './error-reporter';

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

@@ -1,4 +1,4 @@
-import type { Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Mark, Node as PMNode, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 type Range = {
     from: number;
@@ -30,4 +30,5 @@ export declare function getAnnotationInlineNodeTypes(state: {
     doc: PMNode;
     schema: Schema;
 }, annotationId: string): string[] | undefined;
+export declare function getAnnotationMarksForPos(pos: ResolvedPos): Mark[] | undefined;
 export {};

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

@@ -2,7 +2,7 @@ import type { Node as PMNode, ResolvedPos, Schema } from '@atlaskit/editor-prose
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export type { Params } from './macro';
 export { default as browser } from './browser';

package/dist/types-ts4.5/utils/annotation/index.d.ts

@@ -1,4 +1,4 @@
-import type { Node as PMNode, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Mark, Node as PMNode, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 type Range = {
     from: number;
@@ -30,4 +30,5 @@ export declare function getAnnotationInlineNodeTypes(state: {
     doc: PMNode;
     schema: Schema;
 }, annotationId: string): string[] | undefined;
+export declare function getAnnotationMarksForPos(pos: ResolvedPos): Mark[] | undefined;
 export {};

package/dist/types-ts4.5/utils/index.d.ts

@@ -2,7 +2,7 @@ import type { Node as PMNode, ResolvedPos, Schema } from '@atlaskit/editor-prose
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export type { Params } from './macro';
 export { default as browser } from './browser';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "86.4.0",
+	"version": "86.4.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -115,7 +115,7 @@
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.7.0",
 		"@atlaskit/emoji": "^67.6.0",
-		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/icon": "^22.7.0",
 		"@atlaskit/icon-object": "^6.4.0",
 		"@atlaskit/link-datasource": "^2.5.0",
 		"@atlaskit/link-picker": "^1.39.0",
@@ -262,6 +262,9 @@
 		},
 		"react_18_color_picker_concurrent_mode": {
 			"type": "boolean"
+		},
+		"editor_inline_comments_paste_insert_nodes": {
+			"type": "boolean"
 		}
 	}
 }