@atlaskit/editor-core 190.1.19 → 190.1.23

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-core
 
+## 190.1.23
+
+### Patch Changes
+
+- [#63348](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63348) [`2d6eebf2ed74`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2d6eebf2ed74) - Extract annotation plugin from editor-core to @atlaskit/editor-plugin-annotation.
+- Updated dependencies
+
+## 190.1.20
+
+### Patch Changes
+
+- [#63392](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63392) [`7240ee0cf279`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7240ee0cf279) - [ED-21646] Only rerender once in error boundary to avoid overreporting and infinite rerendering
+- [#62416](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/62416) [`9f3c36680d89`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9f3c36680d89) - [ux] Updated table context menu styling.
+- Updated dependencies
+
 ## 190.1.19
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -64,6 +64,9 @@
         {
             "path": "../../editor-plugin-analytics/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../editor-plugin-annotation/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../editor-plugin-base/afm-cc/tsconfig.json"
         },

package/dist/cjs/create-editor/ErrorBoundary.js

@@ -16,13 +16,13 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _uuid = _interopRequireDefault(require("uuid"));
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _ufo = require("@atlaskit/editor-common/ufo");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
-var _analytics = require("@atlaskit/editor-common/analytics");
 var _documentLogger = require("../utils/document-logger");
 var _WithEditorView = require("./WithEditorView");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
 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) { (0, _defineProperty2.default)(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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -151,6 +151,10 @@ var ErrorBoundaryWithEditorView = exports.ErrorBoundaryWithEditorView = /*#__PUR
     key: "componentDidCatch",
     value: function componentDidCatch(error, errorInfo) {
       var _this2 = this;
+      // Only report and re-render once, to avoid over-reporting errors and infinite rerendering
+      if (this.state.error) {
+        return;
+      }
       if (this.props.errorTracking) {
         this.sendErrorData({
           error: error,
@@ -159,13 +163,13 @@ var ErrorBoundaryWithEditorView = exports.ErrorBoundaryWithEditorView = /*#__PUR
         });
       }
 
-      // // Update state to allow a re-render to attempt graceful recovery (in the event that
-      // // the error was caused by a race condition or is intermittent)
+      // Update state to allow a re-render to attempt graceful recovery (in the event that
+      // the error was caused by a race condition or is intermittent)
       this.setState({
         error: error
       }, function () {
         if (_this2.props.rethrow) {
-          // Now that a re-render has occured, we re-throw to allow product error boundaries
+          // Now that a re-render has occurred, we re-throw to allow product error boundaries
           // to catch and handle the error too.
           //
           // Note that when rethrowing inside a error boundary, the stack trace

package/dist/cjs/index.js

@@ -172,7 +172,7 @@ var _ContextPanel = _interopRequireDefault(require("./ui/ContextPanel"));
 var _resource = require("@atlaskit/emoji/resource");
 var _resource2 = require("@atlaskit/mention/resource");
 var _teamResource = require("@atlaskit/mention/team-resource");
-var _annotation = require("./plugins/annotation");
+var _annotation = require("@atlaskit/editor-common/annotation");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("./utils");
 var _actions = _interopRequireDefault(require("./actions"));

package/dist/cjs/plugins/index.js

@@ -4,12 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "annotationPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _annotation.default;
-  }
-});
 Object.defineProperty(exports, "avatarGroupPlugin", {
   enumerable: true,
   get: function get() {
@@ -62,7 +56,6 @@ var _collabEdit = _interopRequireDefault(require("./collab-edit"));
 var _extension = _interopRequireDefault(require("./extension"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _paste = _interopRequireDefault(require("./paste"));
-var _annotation = _interopRequireDefault(require("./annotation"));
 var _feedbackDialog = _interopRequireDefault(require("./feedback-dialog"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));
 var _avatarGroup = _interopRequireDefault(require("./avatar-group"));

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createPlugin = createPlugin;
+exports.isInsideBlockQuote = void 0;
 Object.defineProperty(exports, "stateKey", {
   enumerable: true,
   get: function get() {
@@ -28,16 +29,18 @@ var _util = require("../util");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _handlers = require("../handlers");
 var _analytics2 = require("./analytics");
-var _utils3 = require("../../../utils");
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _commands = require("../commands");
-var _utils4 = require("../../annotation/utils");
 var _clipboardTextSerializer = require("./clipboard-text-serializer");
 var _tinyMCE = require("../util/tinyMCE");
 var _pluginFactory = require("./plugin-factory");
-var _utils5 = require("@atlaskit/editor-prosemirror/utils");
+var _utils3 = require("@atlaskit/editor-prosemirror/utils");
 var _actions = require("../actions");
-// TODO: ED-20519 It requires annotation extraction to use the plugin injection API
-
+var isInsideBlockQuote = exports.isInsideBlockQuote = function isInsideBlockQuote(state) {
+  var blockquote = state.schema.nodes.blockquote;
+  return (0, _utils3.hasParentNodeOfType)(blockquote)(state.selection);
+};
+var PASTE = 'Editor Paste Plugin Paste Duration';
 function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pluginInjectionApi, cardOptions, sanitizePrivateContent, providerFactory) {
   var _pluginInjectionApi$a;
   var editorAnalyticsAPI = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
@@ -180,7 +183,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if (pasteTrackingEnabled) {
           var content = (0, _analytics2.getContentNodeTypes)(slice.content);
           var pasteId = (0, _uuid.default)();
-          var measureName = "".concat(_utils3.measurements.PASTE, "_").concat(pasteId);
+          var measureName = "".concat(PASTE, "_").concat(pasteId);
           (0, _utils.measureRender)(measureName, function (_ref) {
             var duration = _ref.duration,
               distortedDuration = _ref.distortedDuration;
@@ -207,7 +210,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // Don't add closeHistory if we're pasting over layout columns, as we will appendTransaction
           // to cleanup the layout's structure and we want to keep the paste and re-structuring as
           // one event.
-          var isPastingOverLayoutColumns = (0, _utils5.hasParentNodeOfType)(state.schema.nodes.layoutColumn)(state.selection);
+          var isPastingOverLayoutColumns = (0, _utils3.hasParentNodeOfType)(state.schema.nodes.layoutColumn)(state.selection);
 
           // don't add closeHistory call if we're pasting a table, as some tables may involve additional
           // appendedTransactions to repair them (if they're partial or incomplete) and we don't want
@@ -323,7 +326,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           }
           return (0, _analytics2.handleMarkdownWithAnalytics)(view, event, markdownSlice, pluginInjectionApi)(state, dispatch);
         }
-        if (isRichText && (0, _utils3.isInsideBlockQuote)(state)) {
+        if (isRichText && isInsideBlockQuote(state)) {
           //If pasting inside blockquote
           //Skip the blockquote node and keep remaining nodes as they are
           var blockquote = schema.nodes.blockquote;
@@ -370,7 +373,8 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // remove annotation marks from the pasted data if they are not present in the document
           // for the cases when they are pasted from external pages
           if (slice.content.size && (0, _utils.containsAnyAnnotations)(slice, state)) {
-            (0, _utils4.stripNonExistingAnnotations)(slice, state);
+            var _pluginInjectionApi$a3;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.actions.stripNonExistingAnnotations(slice, state);
           }
 
           // ED-4732
@@ -397,7 +401,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           if ((0, _analytics2.handleExpandWithAnalytics)(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          if (!(0, _utils3.insideTable)(state)) {
+          if (!(0, _coreUtils.insideTable)(state)) {
             slice = (0, _transforms.transformSliceNestedExpandToExpand)(slice, state.schema);
           }
 

package/dist/cjs/presets/default.js

@@ -25,7 +25,7 @@ var _editorPluginFloatingToolbar = require("@atlaskit/editor-plugin-floating-too
 var _editorPluginClipboard = require("@atlaskit/editor-plugin-clipboard");
 var _editorPluginAnalytics = require("@atlaskit/editor-plugin-analytics");
 var _editorPluginPlaceholder = require("@atlaskit/editor-plugin-placeholder");
-var _annotation = _interopRequireDefault(require("../plugins/annotation"));
+var _editorPluginAnnotation = require("@atlaskit/editor-plugin-annotation");
 var _editorPluginComposition = require("@atlaskit/editor-plugin-composition");
 var _editorPluginQuickInsert = require("@atlaskit/editor-plugin-quick-insert");
 var _editorPluginSelection = require("@atlaskit/editor-plugin-selection");
@@ -61,7 +61,7 @@ function createDefaultPreset(options) {
       return builder.add(p);
     }
     return builder;
-  }).add([_editorPluginBlockType.blockTypePlugin, options.blockType]).add(_editorPluginClearMarksOnEmptyDoc.clearMarksOnEmptyDocPlugin).maybeAdd(_annotation.default, function (p, builder) {
+  }).add([_editorPluginBlockType.blockTypePlugin, options.blockType]).add(_editorPluginClearMarksOnEmptyDoc.clearMarksOnEmptyDocPlugin).maybeAdd(_editorPluginAnnotation.annotationPlugin, function (p, builder) {
     if (options.annotationProviders) {
       return builder.add([p, options.annotationProviders]);
     }

package/dist/cjs/presets/universal.js

@@ -46,6 +46,7 @@ var _editorPluginToolbarListsIndentation = require("@atlaskit/editor-plugin-tool
 var _editorPluginCustomAutoformat = require("@atlaskit/editor-plugin-custom-autoformat");
 var _editorPluginAlignment = require("@atlaskit/editor-plugin-alignment");
 var _editorPluginDataConsumer = require("@atlaskit/editor-plugin-data-consumer");
+var _editorPluginAnnotation = require("@atlaskit/editor-plugin-annotation");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _plugins = require("../plugins");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -283,7 +284,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.annotationPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginAnnotation.annotationPlugin, function (plugin, builder) {
     // See default list for when adding annotations with a provider
     if (!props.annotationProviders && props.allowConfluenceInlineComment) {
       return builder.add([plugin, undefined]);

package/dist/cjs/utils/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "SetAttrsStep", {
 Object.defineProperty(exports, "checkNodeDown", {
   enumerable: true,
   get: function get() {
-    return _utils2.checkNodeDown;
+    return _utils.checkNodeDown;
   }
 });
 Object.defineProperty(exports, "getNodesCount", {
@@ -32,32 +32,31 @@ Object.defineProperty(exports, "insideTable", {
 Object.defineProperty(exports, "insideTableCell", {
   enumerable: true,
   get: function get() {
-    return _utils2.insideTableCell;
+    return _utils.insideTableCell;
   }
 });
 Object.defineProperty(exports, "isElementInTableCell", {
   enumerable: true,
   get: function get() {
-    return _utils2.isElementInTableCell;
+    return _utils.isElementInTableCell;
   }
 });
 Object.defineProperty(exports, "isEmptyNode", {
   enumerable: true,
   get: function get() {
-    return _utils2.isEmptyNode;
+    return _utils.isEmptyNode;
   }
 });
 Object.defineProperty(exports, "isInListItem", {
   enumerable: true,
   get: function get() {
-    return _utils2.isInListItem;
+    return _utils.isInListItem;
   }
 });
-exports.isInsideBlockQuote = void 0;
 Object.defineProperty(exports, "isLastItemMediaGroup", {
   enumerable: true,
   get: function get() {
-    return _utils2.isLastItemMediaGroup;
+    return _utils.isLastItemMediaGroup;
   }
 });
 Object.defineProperty(exports, "isLinkMark", {
@@ -76,7 +75,7 @@ Object.defineProperty(exports, "isParagraph", {
 Object.defineProperty(exports, "isSelectionInsideLastNodeInDocument", {
   enumerable: true,
   get: function get() {
-    return _utils2.isSelectionInsideLastNodeInDocument;
+    return _utils.isSelectionInsideLastNodeInDocument;
   }
 });
 exports.isTemporary = void 0;
@@ -89,7 +88,7 @@ Object.defineProperty(exports, "isText", {
 Object.defineProperty(exports, "isTextSelection", {
   enumerable: true,
   get: function get() {
-    return _utils2.isTextSelection;
+    return _utils.isTextSelection;
   }
 });
 Object.defineProperty(exports, "measurements", {
@@ -101,7 +100,7 @@ Object.defineProperty(exports, "measurements", {
 Object.defineProperty(exports, "nodeToJSON", {
   enumerable: true,
   get: function get() {
-    return _utils2.nodeToJSON;
+    return _utils.nodeToJSON;
   }
 });
 Object.defineProperty(exports, "nodesBetweenChanged", {
@@ -113,7 +112,7 @@ Object.defineProperty(exports, "nodesBetweenChanged", {
 Object.defineProperty(exports, "nonNullable", {
   enumerable: true,
   get: function get() {
-    return _utils2.nonNullable;
+    return _utils.nonNullable;
   }
 });
 Object.defineProperty(exports, "setNodeSelection", {
@@ -133,13 +132,12 @@ exports.sum = sum;
 Object.defineProperty(exports, "toJSON", {
   enumerable: true,
   get: function get() {
-    return _utils2.toJSON;
+    return _utils.toJSON;
   }
 });
 exports.whichTransitionEvent = whichTransitionEvent;
 var _commands = require("@atlaskit/editor-prosemirror/commands");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _utils2 = require("@atlaskit/editor-common/utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _document = require("./document");
 var _nodes = require("./nodes");
@@ -234,10 +232,6 @@ var isTemporary = exports.isTemporary = function isTemporary(id) {
 var hasOpenEnd = exports.hasOpenEnd = function hasOpenEnd(slice) {
   return slice.openStart > 0 || slice.openEnd > 0;
 };
-var isInsideBlockQuote = exports.isInsideBlockQuote = function isInsideBlockQuote(state) {
-  var blockquote = state.schema.nodes.blockquote;
-  return (0, _utils.hasParentNodeOfType)(blockquote)(state.selection);
-};
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
     return val + f(x);

package/dist/cjs/utils/performance/measure-enum.js

@@ -8,6 +8,5 @@ var _default = exports.default = {
   EDITOR_MOUNTED: 'Editor Component Mount Time',
   PROSEMIRROR_RENDERED: 'ProseMirror Render Time',
   PROSEMIRROR_CONTENT_RENDERED: 'ProseMirror Content Render Time',
-  ON_EDITOR_READY_CALLBACK: 'onEditorReady Callback Duration',
-  PASTE: 'Editor Paste Plugin Paste Duration'
+  ON_EDITOR_READY_CALLBACK: 'onEditorReady Callback Duration'
 };

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "190.1.19";
+var version = exports.version = "190.1.23";

package/dist/es2019/create-editor/ErrorBoundary.js

@@ -1,14 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import uuid from 'uuid';
+import { ACTION, ACTION_SUBJECT, editorAnalyticsChannel, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { IntlErrorBoundary } from '@atlaskit/editor-common/ui';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE, editorAnalyticsChannel } from '@atlaskit/editor-common/analytics';
+import { isOutdatedBrowser, sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
 import { getDocStructure } from '../utils/document-logger';
 import { WithEditorView } from './WithEditorView';
-import { isOutdatedBrowser } from '@atlaskit/editor-common/utils';
-import { logException } from '@atlaskit/editor-common/monitoring';
 export class ErrorBoundaryWithEditorView extends React.Component {
   constructor(props) {
     super(props);
@@ -99,6 +98,10 @@ export class ErrorBoundaryWithEditorView extends React.Component {
     }
   }
   componentDidCatch(error, errorInfo) {
+    // Only report and re-render once, to avoid over-reporting errors and infinite rerendering
+    if (this.state.error) {
+      return;
+    }
     if (this.props.errorTracking) {
       this.sendErrorData({
         error,
@@ -107,13 +110,13 @@ export class ErrorBoundaryWithEditorView extends React.Component {
       });
     }
 
-    // // Update state to allow a re-render to attempt graceful recovery (in the event that
-    // // the error was caused by a race condition or is intermittent)
+    // Update state to allow a re-render to attempt graceful recovery (in the event that
+    // the error was caused by a race condition or is intermittent)
     this.setState({
       error
     }, () => {
       if (this.props.rethrow) {
-        // Now that a re-render has occured, we re-throw to allow product error boundaries
+        // Now that a re-render has occurred, we re-throw to allow product error boundaries
         // to catch and handle the error too.
         //
         // Note that when rethrowing inside a error boundary, the stack trace

package/dist/es2019/index.js

@@ -11,7 +11,20 @@ export { default as ContextPanel } from './ui/ContextPanel';
 export { EmojiResource } from '@atlaskit/emoji/resource';
 export { MentionResource } from '@atlaskit/mention/resource';
 export { TeamMentionResource } from '@atlaskit/mention/team-resource';
-export { AnnotationUpdateEmitter } from './plugins/annotation';
+/**
+ * @deprecated
+ * DO NOT USE THIS WILL BE REMOVED SOON AND IS UNSAFE.
+ * This is here while we work to extract the annotation plugin.
+ * Please use the export from `@atlaskit/editor-common/annotation`.
+ */
+export { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
+
+/**
+ * @deprecated
+ * DO NOT USE THIS WILL BE REMOVED SOON AND IS UNSAFE.
+ * This is here while we work to extract the annotation plugin.
+ * Please use the export from `@atlaskit/editor-plugin-annotation`.
+ */
 
 // Used in mobile bridge
 

package/dist/es2019/plugins/index.js

@@ -2,7 +2,6 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as pastePlugin } from './paste';
-export { default as annotationPlugin } from './annotation';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
 export { default as findReplacePlugin } from './find-replace';
 export { default as avatarGroupPlugin } from './avatar-group';

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

@@ -13,16 +13,21 @@ import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExce
 import { transformSliceNestedExpandToExpand, transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark, transformSliceToDecisionList } from '@atlaskit/editor-common/transforms';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
 import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelOrDecisionIntoListWithAnalytics, handlePasteNonNestableBlockNodesIntoListWithAnalytics } from './analytics';
-import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
+import { insideTable } from '@atlaskit/editor-common/core-utils';
 import { upgradeTextToLists, splitParagraphs } from '../commands';
-// TODO: ED-20519 It requires annotation extraction to use the plugin injection API
-import { stripNonExistingAnnotations } from '../../annotation/utils';
 import { clipboardTextSerializer } from './clipboard-text-serializer';
 import { htmlHasIncompleteTable, tryRebuildCompleteTableHtml, isPastedFromTinyMCEConfluence } from '../util/tinyMCE';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { PastePluginActionTypes } from '../actions';
+export const isInsideBlockQuote = state => {
+  const {
+    blockquote
+  } = state.schema.nodes;
+  return hasParentNodeOfType(blockquote)(state.selection);
+};
+const PASTE = 'Editor Paste Plugin Paste Duration';
 export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pluginInjectionApi, cardOptions, sanitizePrivateContent, providerFactory) {
   var _pluginInjectionApi$a;
   const editorAnalyticsAPI = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
@@ -144,7 +149,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (pasteTrackingEnabled) {
           const content = getContentNodeTypes(slice.content);
           const pasteId = uuid();
-          const measureName = `${measurements.PASTE}_${pasteId}`;
+          const measureName = `${PASTE}_${pasteId}`;
           measureRender(measureName, ({
             duration,
             distortedDuration
@@ -339,7 +344,8 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // remove annotation marks from the pasted data if they are not present in the document
           // for the cases when they are pasted from external pages
           if (slice.content.size && containsAnyAnnotations(slice, state)) {
-            stripNonExistingAnnotations(slice, state);
+            var _pluginInjectionApi$a4;
+            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions.stripNonExistingAnnotations(slice, state);
           }
 
           // ED-4732

package/dist/es2019/presets/default.js

@@ -19,7 +19,7 @@ import { floatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar'
 import { clipboardPlugin } from '@atlaskit/editor-plugin-clipboard';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { placeholderPlugin } from '@atlaskit/editor-plugin-placeholder';
-import annotationPlugin from '../plugins/annotation';
+import { annotationPlugin } from '@atlaskit/editor-plugin-annotation';
 import { compositionPlugin } from '@atlaskit/editor-plugin-composition';
 import { quickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
 import { selectionPlugin } from '@atlaskit/editor-plugin-selection';

package/dist/es2019/presets/universal.js

@@ -36,8 +36,9 @@ import { toolbarListsIndentationPlugin } from '@atlaskit/editor-plugin-toolbar-l
 import { customAutoformatPlugin } from '@atlaskit/editor-plugin-custom-autoformat';
 import { alignmentPlugin } from '@atlaskit/editor-plugin-alignment';
 import { dataConsumerPlugin } from '@atlaskit/editor-plugin-data-consumer';
+import { annotationPlugin } from '@atlaskit/editor-plugin-annotation';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { annotationPlugin, avatarGroupPlugin, beforePrimaryToolbarPlugin, collabEditPlugin, extensionPlugin, feedbackDialogPlugin, findReplacePlugin, jiraIssuePlugin } from '../plugins';
+import { avatarGroupPlugin, beforePrimaryToolbarPlugin, collabEditPlugin, extensionPlugin, feedbackDialogPlugin, findReplacePlugin, jiraIssuePlugin } from '../plugins';
 import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 import { createDefaultPreset } from './default';

package/dist/es2019/utils/index.js

@@ -1,5 +1,4 @@
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
-import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export { isEmptyNode, isSelectionInsideLastNodeInDocument, checkNodeDown, insideTableCell, isInListItem, toJSON, nodeToJSON } from '@atlaskit/editor-common/utils';
 export { insideTable } from '@atlaskit/editor-common/core-utils';
 export { nodesBetweenChanged, getNodesCount } from './document';
@@ -94,12 +93,6 @@ export const isTemporary = id => {
 export const hasOpenEnd = slice => {
   return slice.openStart > 0 || slice.openEnd > 0;
 };
-export const isInsideBlockQuote = state => {
-  const {
-    blockquote
-  } = state.schema.nodes;
-  return hasParentNodeOfType(blockquote)(state.selection);
-};
 export { isTextSelection, isElementInTableCell, isLastItemMediaGroup, nonNullable } from '@atlaskit/editor-common/utils';
 export function sum(arr, f) {
   return arr.reduce((val, x) => val + f(x), 0);

package/dist/es2019/utils/performance/measure-enum.js

@@ -2,6 +2,5 @@ export default {
   EDITOR_MOUNTED: 'Editor Component Mount Time',
   PROSEMIRROR_RENDERED: 'ProseMirror Render Time',
   PROSEMIRROR_CONTENT_RENDERED: 'ProseMirror Content Render Time',
-  ON_EDITOR_READY_CALLBACK: 'onEditorReady Callback Duration',
-  PASTE: 'Editor Paste Plugin Paste Duration'
+  ON_EDITOR_READY_CALLBACK: 'onEditorReady Callback Duration'
 };

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "190.1.19";
+export const version = "190.1.23";

package/dist/esm/create-editor/ErrorBoundary.js

@@ -13,14 +13,13 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
 import uuid from 'uuid';
+import { ACTION, ACTION_SUBJECT, editorAnalyticsChannel, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { IntlErrorBoundary } from '@atlaskit/editor-common/ui';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE, editorAnalyticsChannel } from '@atlaskit/editor-common/analytics';
+import { isOutdatedBrowser, sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
 import { getDocStructure } from '../utils/document-logger';
 import { WithEditorView } from './WithEditorView';
-import { isOutdatedBrowser } from '@atlaskit/editor-common/utils';
-import { logException } from '@atlaskit/editor-common/monitoring';
 export var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component) {
   _inherits(ErrorBoundaryWithEditorView, _React$Component);
   var _super = _createSuper(ErrorBoundaryWithEditorView);
@@ -145,6 +144,10 @@ export var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component
     key: "componentDidCatch",
     value: function componentDidCatch(error, errorInfo) {
       var _this2 = this;
+      // Only report and re-render once, to avoid over-reporting errors and infinite rerendering
+      if (this.state.error) {
+        return;
+      }
       if (this.props.errorTracking) {
         this.sendErrorData({
           error: error,
@@ -153,13 +156,13 @@ export var ErrorBoundaryWithEditorView = /*#__PURE__*/function (_React$Component
         });
       }
 
-      // // Update state to allow a re-render to attempt graceful recovery (in the event that
-      // // the error was caused by a race condition or is intermittent)
+      // Update state to allow a re-render to attempt graceful recovery (in the event that
+      // the error was caused by a race condition or is intermittent)
       this.setState({
         error: error
       }, function () {
         if (_this2.props.rethrow) {
-          // Now that a re-render has occured, we re-throw to allow product error boundaries
+          // Now that a re-render has occurred, we re-throw to allow product error boundaries
           // to catch and handle the error too.
           //
           // Note that when rethrowing inside a error boundary, the stack trace

package/dist/esm/index.js

@@ -11,7 +11,20 @@ export { default as ContextPanel } from './ui/ContextPanel';
 export { EmojiResource } from '@atlaskit/emoji/resource';
 export { MentionResource } from '@atlaskit/mention/resource';
 export { TeamMentionResource } from '@atlaskit/mention/team-resource';
-export { AnnotationUpdateEmitter } from './plugins/annotation';
+/**
+ * @deprecated
+ * DO NOT USE THIS WILL BE REMOVED SOON AND IS UNSAFE.
+ * This is here while we work to extract the annotation plugin.
+ * Please use the export from `@atlaskit/editor-common/annotation`.
+ */
+export { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
+
+/**
+ * @deprecated
+ * DO NOT USE THIS WILL BE REMOVED SOON AND IS UNSAFE.
+ * This is here while we work to extract the annotation plugin.
+ * Please use the export from `@atlaskit/editor-plugin-annotation`.
+ */
 
 // Used in mobile bridge
 

package/dist/esm/plugins/index.js

@@ -2,7 +2,6 @@ export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as pastePlugin } from './paste';
-export { default as annotationPlugin } from './annotation';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
 export { default as findReplacePlugin } from './find-replace';
 export { default as avatarGroupPlugin } from './avatar-group';