@atlaskit/editor-core 172.3.2 → 173.0.0

package/dist/esm/plugins/breakout/ui/LayoutButton.js

@@ -147,9 +147,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,
         stick: true,
-        forcePlacement: true,
-        scheduleExtraLayoutUpdates: true,
-        waitForExtraLayoutUpdates: true
+        forcePlacement: true
       }, jsx("div", {
         css: toolbarButtonWrapper
       }, jsx(ToolbarButton, {

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -24,6 +24,7 @@ import { getFeatureFlags } from '../../feature-flags-context';
  */
 
 function replaceLinksToCards(tr, cardAdf, schema, request) {
+  var inlineCard = schema.nodes.inlineCard;
   var url = request.url;
 
   if (!isSafeUrl(url)) {
@@ -43,9 +44,15 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
 
   if (!replaceLink) {
     return;
-  }
+  } // ED-5638: add an extra space after inline cards to avoid re-rendering them
+
 
   var nodes = [cardAdf];
+
+  if (cardAdf.type === inlineCard) {
+    nodes.push(schema.text(' '));
+  }
+
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
   return $pos.node($pos.depth - 1).type.name;
 }

package/dist/esm/plugins/code-block/pm-plugins/ide-ux.js

@@ -1,5 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey, TextSelection } from 'prosemirror-state';
+import { TextSelection } from 'prosemirror-state';
 import { keydownHandler } from 'prosemirror-keymap';
 import { setTextSelection } from 'prosemirror-utils';
 import { getCursor } from '../../../utils';
@@ -9,48 +9,14 @@ import { getAutoClosingBracketInfo, shouldAutoCloseBracket } from '../ide-ux/bra
 import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-handling';
 import { getEndOfCurrentLine, getStartOfCurrentLine, isCursorInsideCodeBlock, isSelectionEntirelyInsideCodeBlock, getLineInfo } from '../ide-ux/line-handling';
 import { insertIndent, outdent, indent, insertNewlineWithIndent } from '../ide-ux/commands';
-var codeBlockIDEKeyBindingsKey = new PluginKey('codeBlockIDEKeyBindings');
+import { isComposing } from '../../base/pm-plugins/composition';
 export default new SafePlugin({
-  key: codeBlockIDEKeyBindingsKey,
-  state: {
-    init: function init() {
-      return {
-        isComposing: false
-      };
-    },
-    apply: function apply(tr, value) {
-      var isComposing = tr.getMeta(codeBlockIDEKeyBindingsKey);
-
-      if (typeof isComposing === 'undefined') {
-        return value;
-      }
-
-      return {
-        isComposing: isComposing
-      };
-    }
-  },
   props: {
-    handleDOMEvents: {
-      compositionstart: function compositionstart(view, event) {
-        var tr = view.state.tr;
-        tr.setMeta(codeBlockIDEKeyBindingsKey, true);
-        view.dispatch(tr);
-        return false;
-      },
-      compositionend: function compositionend(view, event) {
-        var tr = view.state.tr;
-        tr.setMeta(codeBlockIDEKeyBindingsKey, false);
-        view.dispatch(tr);
-        return false;
-      }
-    },
     handleTextInput: function handleTextInput(view, from, to, text) {
       var state = view.state,
           dispatch = view.dispatch;
-      var isComposing = codeBlockIDEKeyBindingsKey.getState(state).isComposing;
 
-      if (isCursorInsideCodeBlock(state) && !isComposing) {
+      if (isCursorInsideCodeBlock(state) && !isComposing(state)) {
         var beforeText = getStartOfCurrentLine(state).text;
         var afterText = getEndOfCurrentLine(state).text; // If text is a closing bracket/quote and we've already inserted it, move the selection after
 

package/dist/esm/plugins/collab-edit/plugin-state.js

@@ -4,6 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Selection } from 'prosemirror-state';
 import { DecorationSet } from 'prosemirror-view';
 import { ReplaceStep } from 'prosemirror-transform';
+import { browser } from '@atlaskit/editor-common/utils';
 import { Participants } from './participants';
 import { findPointers, createTelepointers, getPositionOfTelepointer } from './utils';
 
@@ -158,7 +159,7 @@ export var PluginState = /*#__PURE__*/function () {
           this.decorationSet = this.decorationSet.map(tr.mapping, tr.doc, {
             // Reapplies decorators those got removed by the state change
             onRemove: function onRemove(spec) {
-              if (spec.pointer && spec.pointer.sessionId) {
+              if (spec.pointer && spec.pointer.sessionId && spec.key === "telepointer-".concat(spec.pointer.sessionId)) {
                 var step = tr.steps.filter(isReplaceStep)[0];
 
                 if (step) {
@@ -201,9 +202,14 @@ export var PluginState = /*#__PURE__*/function () {
           if (deco.from === selection.from && deco.to === selection.to) {
             if (!hasTelepointerDimClass) {
               deco.type.toDOM.classList.add(TELEPOINTER_DIM_CLASS);
-            }
+            } // Browser condition here to fix ED-14722 where telepointer
+            // decorations with side -1 in Firefox causes backspace issues.
+            // This is likely caused by contenteditable quirks in Firefox
+
 
-            deco.type.side = -1;
+            if (!browser.gecko) {
+              deco.type.side = -1;
+            }
           } else {
             if (hasTelepointerDimClass) {
               deco.type.toDOM.classList.remove(TELEPOINTER_DIM_CLASS);

package/dist/esm/plugins/collab-edit/utils.js

@@ -5,7 +5,7 @@ import { Selection, TextSelection } from 'prosemirror-state';
 import { Decoration } from 'prosemirror-view';
 import * as themeColors from '@atlaskit/theme/colors';
 import { hexToRgba } from '@atlaskit/adf-schema';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/utils';
 import { addAnalytics } from '../analytics/utils';
 import { EVENT_TYPE, ACTION, ACTION_SUBJECT } from '../analytics/types';
 export var colors = [themeColors.R100, themeColors.R300, themeColors.R500, themeColors.Y100, themeColors.Y300, themeColors.Y500, themeColors.G100, themeColors.G300, themeColors.G500, themeColors.T100, themeColors.T300, themeColors.T500, themeColors.B100, themeColors.B300, themeColors.B500, themeColors.P100, themeColors.P300, themeColors.P500, themeColors.N70, themeColors.N200, themeColors.N800].map(function (solid) {
@@ -58,18 +58,32 @@ export var createTelepointers = function createTelepointers(from, to, sessionId,
     }));
   }
 
+  var spaceJoinerBefore = document.createElement('span');
+  spaceJoinerBefore.textContent = ZERO_WIDTH_JOINER;
+  var spaceJoinerAfter = document.createElement('span');
+  spaceJoinerAfter.textContent = ZERO_WIDTH_JOINER;
   var cursor = document.createElement('span');
-  cursor.textContent = ZERO_WIDTH_SPACE;
+  cursor.textContent = ZERO_WIDTH_JOINER;
   cursor.className = "telepointer color-".concat(color, " telepointer-selection-badge");
   cursor.style.cssText = "".concat(style({
     color: avatarColor.color.solid
   }), ";");
   cursor.setAttribute('data-initial', initial);
-  return decorations.concat(Decoration.widget(to, cursor, {
+  return decorations.concat(Decoration.widget(to, spaceJoinerAfter, {
+    pointer: {
+      sessionId: sessionId
+    },
+    key: "telepointer-".concat(sessionId, "-zero")
+  })).concat(Decoration.widget(to, cursor, {
     pointer: {
       sessionId: sessionId
     },
     key: "telepointer-".concat(sessionId)
+  })).concat(Decoration.widget(to, spaceJoinerBefore, {
+    pointer: {
+      sessionId: sessionId
+    },
+    key: "telepointer-".concat(sessionId, "-zero")
   }));
 };
 export var replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor) {

package/dist/esm/plugins/feature-flags-context/feature-flags-from-props.js

@@ -33,9 +33,10 @@ function getSpellCheck(featureFlags) {
 
 
 export function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$allowTables5, _props$featureFlags9, _props$featureFlags10, _props$allowTables6, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$collabEdit, _props$collabEdit2, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39;
+  var _props$featureFlags, _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags2, _props$featureFlags3, _props$allowTables, _props$featureFlags4, _props$featureFlags5, _props$allowTables2, _props$featureFlags6, _props$featureFlags7, _props$allowTables3, _props$featureFlags8, _props$featureFlags9, _props$allowTables4, _props$allowTables5, _props$featureFlags10, _props$featureFlags11, _props$allowTables6, _props$allowExtension, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40;
 
   var normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
+  var tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
     interactiveExpand: typeof props.allowExpand === 'boolean' ? props.allowExpand : Boolean(props.allowExpand && props.allowExpand.allowInteractiveExpand !== false),
@@ -49,29 +50,30 @@ export function createFeatureFlagsFromProps(props) {
     singleLayout: _typeof(props.allowLayouts) === 'object' && !!((_props$allowLayouts = props.allowLayouts) !== null && _props$allowLayouts !== void 0 && _props$allowLayouts.UNSAFE_allowSingleColumnLayout),
     undoRedoButtons: props.UNSAFE_allowUndoRedoButtons,
     catchAllTracking: (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : (_props$performanceTra2 = _props$performanceTra.catchAllTracking) === null || _props$performanceTra2 === void 0 ? void 0 : _props$performanceTra2.enabled,
-    stickyHeadersOptimization: typeof ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.stickyHeadersOptimization) === 'boolean' ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.stickyHeadersOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables = props.allowTables) !== null && _props$allowTables !== void 0 && _props$allowTables.stickyHeadersOptimization),
-    initialRenderOptimization: typeof ((_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.initialRenderOptimization) === 'boolean' ? !!((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.initialRenderOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables2 = props.allowTables) !== null && _props$allowTables2 !== void 0 && _props$allowTables2.initialRenderOptimization),
-    mouseMoveOptimization: typeof ((_props$featureFlags5 = props.featureFlags) === null || _props$featureFlags5 === void 0 ? void 0 : _props$featureFlags5.mouseMoveOptimization) === 'boolean' ? !!((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.mouseMoveOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables3 = props.allowTables) !== null && _props$allowTables3 !== void 0 && _props$allowTables3.mouseMoveOptimization),
-    tableRenderOptimization: typeof ((_props$featureFlags7 = props.featureFlags) === null || _props$featureFlags7 === void 0 ? void 0 : _props$featureFlags7.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.tableRenderOptimization) : _typeof(props.allowTables) === 'object' && typeof ((_props$allowTables4 = props.allowTables) === null || _props$allowTables4 === void 0 ? void 0 : _props$allowTables4.tableRenderOptimization) === 'boolean' ? (_props$allowTables5 = props.allowTables) === null || _props$allowTables5 === void 0 ? void 0 : _props$allowTables5.tableRenderOptimization : true,
-    tableOverflowShadowsOptimization: typeof ((_props$featureFlags9 = props.featureFlags) === null || _props$featureFlags9 === void 0 ? void 0 : _props$featureFlags9.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.tableOverflowShadowsOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables6 = props.allowTables) !== null && _props$allowTables6 !== void 0 && _props$allowTables6.tableOverflowShadowsOptimization),
+    stickyHeadersOptimization: typeof ((_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.stickyHeadersOptimization) === 'boolean' ? !!((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.stickyHeadersOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables = props.allowTables) !== null && _props$allowTables !== void 0 && _props$allowTables.stickyHeadersOptimization),
+    initialRenderOptimization: typeof ((_props$featureFlags4 = props.featureFlags) === null || _props$featureFlags4 === void 0 ? void 0 : _props$featureFlags4.initialRenderOptimization) === 'boolean' ? !!((_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.initialRenderOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables2 = props.allowTables) !== null && _props$allowTables2 !== void 0 && _props$allowTables2.initialRenderOptimization),
+    mouseMoveOptimization: typeof ((_props$featureFlags6 = props.featureFlags) === null || _props$featureFlags6 === void 0 ? void 0 : _props$featureFlags6.mouseMoveOptimization) === 'boolean' ? !!((_props$featureFlags7 = props.featureFlags) !== null && _props$featureFlags7 !== void 0 && _props$featureFlags7.mouseMoveOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables3 = props.allowTables) !== null && _props$allowTables3 !== void 0 && _props$allowTables3.mouseMoveOptimization),
+    tableRenderOptimization: typeof ((_props$featureFlags8 = props.featureFlags) === null || _props$featureFlags8 === void 0 ? void 0 : _props$featureFlags8.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.tableRenderOptimization) : _typeof(props.allowTables) === 'object' && typeof ((_props$allowTables4 = props.allowTables) === null || _props$allowTables4 === void 0 ? void 0 : _props$allowTables4.tableRenderOptimization) === 'boolean' ? (_props$allowTables5 = props.allowTables) === null || _props$allowTables5 === void 0 ? void 0 : _props$allowTables5.tableRenderOptimization : true,
+    tableOverflowShadowsOptimization: typeof ((_props$featureFlags10 = props.featureFlags) === null || _props$featureFlags10 === void 0 ? void 0 : _props$featureFlags10.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags11 = props.featureFlags) !== null && _props$featureFlags11 !== void 0 && _props$featureFlags11.tableOverflowShadowsOptimization) : _typeof(props.allowTables) === 'object' && !!((_props$allowTables6 = props.allowTables) !== null && _props$allowTables6 !== void 0 && _props$allowTables6.tableOverflowShadowsOptimization),
     extendFloatingToolbar: Boolean(_typeof(props.allowExtension) === 'object' && ((_props$allowExtension = props.allowExtension) === null || _props$allowExtension === void 0 ? void 0 : _props$allowExtension.allowExtendFloatingToolbars)),
-    useUnpredictableInputRule: Boolean(typeof ((_props$featureFlags11 = props.featureFlags) === null || _props$featureFlags11 === void 0 ? void 0 : _props$featureFlags11.useUnpredictableInputRule) === 'boolean' ? !!((_props$featureFlags12 = props.featureFlags) !== null && _props$featureFlags12 !== void 0 && _props$featureFlags12.useUnpredictableInputRule) : props.UNSAFE_allowUndoRedoButtons ? false : true),
-    showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags13 = props.featureFlags) === null || _props$featureFlags13 === void 0 ? void 0 : _props$featureFlags13.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags14 = props.featureFlags) !== null && _props$featureFlags14 !== void 0 && _props$featureFlags14.showAvatarGroupAsPlugin) : false),
-    errorBoundaryDocStructure: Boolean(typeof ((_props$featureFlags15 = props.featureFlags) === null || _props$featureFlags15 === void 0 ? void 0 : _props$featureFlags15.useErrorBoundaryDocStructure) === 'boolean' ? !!((_props$featureFlags16 = props.featureFlags) !== null && _props$featureFlags16 !== void 0 && _props$featureFlags16.useErrorBoundaryDocStructure) : false),
-    synchronyErrorDocStructure: Boolean(typeof ((_props$featureFlags17 = props.featureFlags) === null || _props$featureFlags17 === void 0 ? void 0 : _props$featureFlags17.synchronyErrorDocStructure) === 'boolean' ? !!((_props$featureFlags18 = props.featureFlags) !== null && _props$featureFlags18 !== void 0 && _props$featureFlags18.synchronyErrorDocStructure) : false),
-    enableViewUpdateSubscription: Boolean(typeof ((_props$featureFlags19 = props.featureFlags) === null || _props$featureFlags19 === void 0 ? void 0 : _props$featureFlags19.enableViewUpdateSubscription) === 'boolean' ? !!((_props$featureFlags20 = props.featureFlags) !== null && _props$featureFlags20 !== void 0 && _props$featureFlags20.enableViewUpdateSubscription) : false),
-    plainTextPasteLinkification: Boolean(typeof ((_props$featureFlags21 = props.featureFlags) === null || _props$featureFlags21 === void 0 ? void 0 : _props$featureFlags21.plainTextPasteLinkification) === 'boolean' ? !!((_props$featureFlags22 = props.featureFlags) !== null && _props$featureFlags22 !== void 0 && _props$featureFlags22.plainTextPasteLinkification) : false),
-    collabAvatarScroll: Boolean(typeof ((_props$featureFlags23 = props.featureFlags) === null || _props$featureFlags23 === void 0 ? void 0 : _props$featureFlags23.collabAvatarScroll) === 'boolean' ? !!((_props$featureFlags24 = props.featureFlags) !== null && _props$featureFlags24 !== void 0 && _props$featureFlags24.collabAvatarScroll) : false),
-    ufo: Boolean(typeof ((_props$featureFlags25 = props.featureFlags) === null || _props$featureFlags25 === void 0 ? void 0 : _props$featureFlags25.ufo) === 'boolean' ? !!((_props$featureFlags26 = props.featureFlags) !== null && _props$featureFlags26 !== void 0 && _props$featureFlags26.ufo) : false),
-    twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags27 = props.featureFlags) === null || _props$featureFlags27 === void 0 ? void 0 : _props$featureFlags27.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags28 = props.featureFlags) !== null && _props$featureFlags28 !== void 0 && _props$featureFlags28.twoLineEditorToolbar) : false),
-    saferDispatchedTransactions: Boolean(typeof normalizedFeatureFlags.saferDispatchedTransactions === 'boolean' && !!normalizedFeatureFlags.saferDispatchedTransactions || (typeof ((_props$featureFlags29 = props.featureFlags) === null || _props$featureFlags29 === void 0 ? void 0 : _props$featureFlags29.saferDispatchedTransactions) === 'boolean' ? !!((_props$featureFlags30 = props.featureFlags) !== null && _props$featureFlags30 !== void 0 && _props$featureFlags30.saferDispatchedTransactions) : false)),
+    useUnpredictableInputRule: Boolean(typeof ((_props$featureFlags12 = props.featureFlags) === null || _props$featureFlags12 === void 0 ? void 0 : _props$featureFlags12.useUnpredictableInputRule) === 'boolean' ? !!((_props$featureFlags13 = props.featureFlags) !== null && _props$featureFlags13 !== void 0 && _props$featureFlags13.useUnpredictableInputRule) : props.UNSAFE_allowUndoRedoButtons ? false : true),
+    showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags14 = props.featureFlags) === null || _props$featureFlags14 === void 0 ? void 0 : _props$featureFlags14.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags15 = props.featureFlags) !== null && _props$featureFlags15 !== void 0 && _props$featureFlags15.showAvatarGroupAsPlugin) : false),
+    errorBoundaryDocStructure: Boolean(typeof ((_props$featureFlags16 = props.featureFlags) === null || _props$featureFlags16 === void 0 ? void 0 : _props$featureFlags16.useErrorBoundaryDocStructure) === 'boolean' ? !!((_props$featureFlags17 = props.featureFlags) !== null && _props$featureFlags17 !== void 0 && _props$featureFlags17.useErrorBoundaryDocStructure) : false),
+    synchronyErrorDocStructure: Boolean(typeof ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.synchronyErrorDocStructure) === 'boolean' ? !!((_props$featureFlags19 = props.featureFlags) !== null && _props$featureFlags19 !== void 0 && _props$featureFlags19.synchronyErrorDocStructure) : false),
+    enableViewUpdateSubscription: Boolean(typeof ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.enableViewUpdateSubscription) === 'boolean' ? !!((_props$featureFlags21 = props.featureFlags) !== null && _props$featureFlags21 !== void 0 && _props$featureFlags21.enableViewUpdateSubscription) : false),
+    plainTextPasteLinkification: Boolean(typeof ((_props$featureFlags22 = props.featureFlags) === null || _props$featureFlags22 === void 0 ? void 0 : _props$featureFlags22.plainTextPasteLinkification) === 'boolean' ? !!((_props$featureFlags23 = props.featureFlags) !== null && _props$featureFlags23 !== void 0 && _props$featureFlags23.plainTextPasteLinkification) : false),
+    collabAvatarScroll: Boolean(typeof ((_props$featureFlags24 = props.featureFlags) === null || _props$featureFlags24 === void 0 ? void 0 : _props$featureFlags24.collabAvatarScroll) === 'boolean' ? !!((_props$featureFlags25 = props.featureFlags) !== null && _props$featureFlags25 !== void 0 && _props$featureFlags25.collabAvatarScroll) : false),
+    ufo: Boolean(typeof ((_props$featureFlags26 = props.featureFlags) === null || _props$featureFlags26 === void 0 ? void 0 : _props$featureFlags26.ufo) === 'boolean' ? !!((_props$featureFlags27 = props.featureFlags) !== null && _props$featureFlags27 !== void 0 && _props$featureFlags27.ufo) : false),
+    twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags28 = props.featureFlags) === null || _props$featureFlags28 === void 0 ? void 0 : _props$featureFlags28.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags29 = props.featureFlags) !== null && _props$featureFlags29 !== void 0 && _props$featureFlags29.twoLineEditorToolbar) : false),
+    saferDispatchedTransactions: Boolean(typeof normalizedFeatureFlags.saferDispatchedTransactions === 'boolean' && !!normalizedFeatureFlags.saferDispatchedTransactions || (typeof ((_props$featureFlags30 = props.featureFlags) === null || _props$featureFlags30 === void 0 ? void 0 : _props$featureFlags30.saferDispatchedTransactions) === 'boolean' ? !!((_props$featureFlags31 = props.featureFlags) !== null && _props$featureFlags31 !== void 0 && _props$featureFlags31.saferDispatchedTransactions) : false)),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
-    chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags31 = props.featureFlags) === null || _props$featureFlags31 === void 0 ? void 0 : _props$featureFlags31.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
-    viewChangingExperimentToolbarStyle: typeof ((_props$featureFlags32 = props.featureFlags) === null || _props$featureFlags32 === void 0 ? void 0 : _props$featureFlags32['view-changing-experiment-toolbar-style']) === 'string' ? props.featureFlags['view-changing-experiment-toolbar-style'] || undefined : undefined,
-    showHoverPreview: Boolean(typeof ((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.showHoverPreview) === 'boolean' ? !!((_props$featureFlags34 = props.featureFlags) !== null && _props$featureFlags34 !== void 0 && _props$featureFlags34.showHoverPreview) : false),
-    indentationButtonsInTheToolbar: Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags36 = props.featureFlags) !== null && _props$featureFlags36 !== void 0 && _props$featureFlags36.indentationButtonsInTheToolbar) : false)),
-    floatingToolbarCopyButton: Boolean(typeof normalizedFeatureFlags.floatingToolbarCopyButton === 'boolean' && !!normalizedFeatureFlags.floatingToolbarCopyButton || (typeof ((_props$featureFlags37 = props.featureFlags) === null || _props$featureFlags37 === void 0 ? void 0 : _props$featureFlags37.floatingToolbarCopyButton) === 'boolean' ? !!((_props$featureFlags38 = props.featureFlags) !== null && _props$featureFlags38 !== void 0 && _props$featureFlags38.floatingToolbarCopyButton) : false)),
-    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags39 = props.featureFlags) === null || _props$featureFlags39 === void 0 ? void 0 : _props$featureFlags39['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
+    chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags32 = props.featureFlags) === null || _props$featureFlags32 === void 0 ? void 0 : _props$featureFlags32.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
+    viewChangingExperimentToolbarStyle: typeof ((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33['view-changing-experiment-toolbar-style']) === 'string' ? props.featureFlags['view-changing-experiment-toolbar-style'] || undefined : undefined,
+    tableCellOptionsInFloatingToolbar: typeof tableCellOptionsInFloatingToolbar === 'boolean' ? tableCellOptionsInFloatingToolbar : false,
+    showHoverPreview: Boolean(typeof ((_props$featureFlags34 = props.featureFlags) === null || _props$featureFlags34 === void 0 ? void 0 : _props$featureFlags34.showHoverPreview) === 'boolean' ? !!((_props$featureFlags35 = props.featureFlags) !== null && _props$featureFlags35 !== void 0 && _props$featureFlags35.showHoverPreview) : false),
+    indentationButtonsInTheToolbar: Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags36 = props.featureFlags) === null || _props$featureFlags36 === void 0 ? void 0 : _props$featureFlags36.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags37 = props.featureFlags) !== null && _props$featureFlags37 !== void 0 && _props$featureFlags37.indentationButtonsInTheToolbar) : false)),
+    floatingToolbarCopyButton: Boolean(typeof normalizedFeatureFlags.floatingToolbarCopyButton === 'boolean' && !!normalizedFeatureFlags.floatingToolbarCopyButton || (typeof ((_props$featureFlags38 = props.featureFlags) === null || _props$featureFlags38 === void 0 ? void 0 : _props$featureFlags38.floatingToolbarCopyButton) === 'boolean' ? !!((_props$featureFlags39 = props.featureFlags) !== null && _props$featureFlags39 !== void 0 && _props$featureFlags39.floatingToolbarCopyButton) : false)),
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags40 = props.featureFlags) === null || _props$featureFlags40 === void 0 ? void 0 : _props$featureFlags40['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags)
   });
 }

package/dist/esm/plugins/floating-toolbar/ui/Dropdown.js

@@ -55,10 +55,14 @@ var Dropdown = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderArrayOptions", function (options) {
+      var _this$props = _this.props,
+          showSelected = _this$props.showSelected,
+          dispatchCommand = _this$props.dispatchCommand;
       return jsx(DropdownMenu, {
         hide: _this.hide,
-        dispatchCommand: _this.props.dispatchCommand,
-        items: options
+        dispatchCommand: dispatchCommand,
+        items: options,
+        showSelected: showSelected
       });
     });
 
@@ -81,18 +85,19 @@ var Dropdown = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var isOpen = this.state.isOpen;
-      var _this$props = this.props,
-          title = _this$props.title,
-          icon = _this$props.icon,
-          options = _this$props.options,
-          dispatchCommand = _this$props.dispatchCommand,
-          mountPoint = _this$props.mountPoint,
-          boundariesElement = _this$props.boundariesElement,
-          scrollableElement = _this$props.scrollableElement,
-          hideExpandIcon = _this$props.hideExpandIcon,
-          disabled = _this$props.disabled,
-          tooltip = _this$props.tooltip,
-          buttonTestId = _this$props.buttonTestId;
+      var _this$props2 = this.props,
+          title = _this$props2.title,
+          icon = _this$props2.icon,
+          options = _this$props2.options,
+          dispatchCommand = _this$props2.dispatchCommand,
+          mountPoint = _this$props2.mountPoint,
+          boundariesElement = _this$props2.boundariesElement,
+          scrollableElement = _this$props2.scrollableElement,
+          hideExpandIcon = _this$props2.hideExpandIcon,
+          disabled = _this$props2.disabled,
+          tooltip = _this$props2.tooltip,
+          buttonTestId = _this$props2.buttonTestId,
+          dropdownWidth = _this$props2.dropdownWidth;
       var trigger;
 
       if (icon) {
@@ -129,7 +134,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
 
 
       var fitTolerance = 10;
-      var fitWidth = Array.isArray(options) ? menuItemDimensions.width : options.width;
+      var fitWidth = Array.isArray(options) ? dropdownWidth || menuItemDimensions.width : options.width;
       var fitHeight = Array.isArray(options) ? options.length * menuItemDimensions.height + itemSpacing * 2 : options.height;
       return jsx(UiDropdown, {
         mountTo: mountPoint,

package/dist/esm/plugins/floating-toolbar/ui/DropdownMenu.js

@@ -59,6 +59,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         var itemContent = jsx(ButtonItem, {
           key: idx,
           iconBefore: _this.renderSelected(item, intl),
+          iconAfter: item.elemAfter,
           onClick: function onClick() {
             /**
              * The order of dispatching the event and hide() is important, because
@@ -89,19 +90,21 @@ var Dropdown = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderSelected",
     value: function renderSelected(item, intl) {
+      var _this$props$showSelec = this.props.showSelected,
+          showSelected = _this$props$showSelec === void 0 ? true : _this$props$showSelec;
       var selected = item.selected;
 
-      if (selected !== undefined) {
-        return selected ? jsx(EditorDoneIcon, {
+      if (showSelected && selected) {
+        return jsx(EditorDoneIcon, {
           primaryColor: token('color.icon.selected', B400),
           size: "small",
           label: intl.formatMessage(messages.confirmModalOK)
-        }) : jsx("span", {
-          css: spacer
         });
       }
 
-      return;
+      return jsx("span", {
+        css: spacer
+      });
     }
   }]);
 

package/dist/esm/plugins/floating-toolbar/ui/Toolbar.js

@@ -100,8 +100,6 @@ export var isSameItem = function isSameItem(leftItem, rightItem) {
     case 'extensions-placeholder':
       return compareItemWithKeys(leftItem, rightItem);
   }
-
-  return true;
 };
 export var areSameItems = function areSameItems(leftArr, rightArr) {
   if (leftArr === undefined && rightArr === undefined) {
@@ -286,7 +284,9 @@ var Toolbar = /*#__PURE__*/function (_Component) {
               hideExpandIcon: item.hideExpandIcon,
               mountPoint: popupsMountPoint,
               boundariesElement: popupsBoundariesElement,
-              scrollableElement: popupsScrollableElement
+              scrollableElement: popupsScrollableElement,
+              dropdownWidth: item.dropdownWidth,
+              showSelected: item.showSelected
             });
 
           case 'select':

package/dist/esm/plugins/paste/actions.js

@@ -0,0 +1,6 @@
+export var PastePluginActionTypes;
+
+(function (PastePluginActionTypes) {
+  PastePluginActionTypes["START_TRACKING_PASTED_MACRO_POSITIONS"] = "START_TRACKING_PASTED_MACRO_POSITIONS";
+  PastePluginActionTypes["STOP_TRACKING_PASTED_MACRO_POSITIONS"] = "STOP_TRACKING_PASTED_MACRO_POSITIONS";
+})(PastePluginActionTypes || (PastePluginActionTypes = {}));

package/dist/esm/plugins/paste/commands.js

@@ -0,0 +1,31 @@
+import { createCommand } from './pm-plugins/plugin-factory';
+import { PastePluginActionTypes as ActionTypes } from './actions';
+/**
+ * Use this to register macro link positions during a paste operation, that you
+ * want to track in a document over time, through any document changes.
+ *
+ * @param positions a map of string keys (custom position references) and position values e.g. { ['my-key-1']: 11 }
+ *
+ * **Context**: This is neccessary if there is an async process or an unknown period of time
+ * between obtaining an original position, and wanting to know about what its final eventual
+ * value. In that scenario, positions will need to be actively tracked and mapped in plugin
+ * state so that they can be mapped through any other independent document change transactions being
+ * dispatched to the editor that could affect their value.
+ */
+
+export var startTrackingPastedMacroPositions = function startTrackingPastedMacroPositions(pastedMacroPositions) {
+  return createCommand(function () {
+    return {
+      type: ActionTypes.START_TRACKING_PASTED_MACRO_POSITIONS,
+      pastedMacroPositions: pastedMacroPositions
+    };
+  });
+};
+export var stopTrackingPastedMacroPositions = function stopTrackingPastedMacroPositions(pastedMacroPositionKeys) {
+  return createCommand(function () {
+    return {
+      type: ActionTypes.STOP_TRACKING_PASTED_MACRO_POSITIONS,
+      pastedMacroPositionKeys: pastedMacroPositionKeys
+    };
+  });
+};

package/dist/esm/plugins/paste/handlers.js

@@ -16,6 +16,7 @@ import { closeHistory } from 'prosemirror-history';
 import { Fragment, Node as PMNode, Slice } from 'prosemirror-model';
 import { TextSelection, NodeSelection } from 'prosemirror-state';
 import { findParentNodeOfType, hasParentNodeOfType, safeInsert } from 'prosemirror-utils';
+import uuid from 'uuid/v4';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell } from '../../utils';
 import { mapSlice } from '../../utils/slice';
@@ -29,7 +30,9 @@ import { pluginKey as textFormattingPluginKey } from '../text-formatting/pm-plug
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 import { isListNode, isListItemNode } from '../list/utils/node';
 import { canLinkBeCreatedInRange } from '../hyperlink/pm-plugins/main';
-import { insertSliceForLists } from './edge-cases'; // remove text attribute from mention for copy/paste (GDPR)
+import { insertSliceForLists } from './edge-cases';
+import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
+import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory'; // remove text attribute from mention for copy/paste (GDPR)
 
 export function handleMention(slice, schema) {
   return mapSlice(slice, function (node) {
@@ -323,12 +326,21 @@ function _getSmartLinkAdf() {
   return _getSmartLinkAdf.apply(this, arguments);
 }
 
-function insertAutoMacro(slice, macro, view) {
+function insertAutoMacro(slice, macro, view, from, to) {
   if (view) {
     // insert the text or linkified/md-converted clipboard data
     var selection = view.state.tr.selection;
-    var tr = view.state.tr.replaceSelection(slice);
-    var before = tr.mapping.map(selection.from, -1);
+    var tr;
+    var before;
+
+    if (typeof from === 'number' && typeof to === 'number') {
+      tr = view.state.tr.replaceRange(from, to, slice);
+      before = tr.mapping.map(from, -1);
+    } else {
+      tr = view.state.tr.replaceSelection(slice);
+      before = tr.mapping.map(selection.from, -1);
+    }
+
     view.dispatch(tr); // replace the text with the macro as a separate transaction
     // so the autoconversion generates 2 undo steps
 
@@ -361,16 +373,36 @@ export function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoC
        * if FF enabled, run through smart links and check for result
        */
       if (cardsOptions && cardsOptions.resolveBeforeMacros && cardsOptions.resolveBeforeMacros.length) {
+        var _startTrackingPastedM;
+
         if (cardsOptions.resolveBeforeMacros.indexOf(macro.attrs.extensionKey) < 0) {
           return insertAutoMacro(slice, macro, view);
         }
 
+        if (!view) {
+          throw new Error('View is missing');
+        }
+
+        var trackingId = uuid();
+        var trackingFrom = "handleMacroAutoConvert-from-".concat(trackingId);
+        var trackingTo = "handleMacroAutoConvert-to-".concat(trackingId);
+        startTrackingPastedMacroPositions((_startTrackingPastedM = {}, _defineProperty(_startTrackingPastedM, trackingFrom, state.selection.from), _defineProperty(_startTrackingPastedM, trackingTo, state.selection.to), _startTrackingPastedM))(state, dispatch);
         getSmartLinkAdf(text, 'inline', cardsOptions).then(function () {
+          // we use view.state rather than state because state becomes a stale
+          // state reference after getSmartLinkAdf's async work
+          var _getPastePluginState = getPastePluginState(view.state),
+              pastedMacroPositions = _getPastePluginState.pastedMacroPositions;
+
           if (dispatch) {
-            handleMarkdown(slice)(state, dispatch);
+            handleMarkdown(slice, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
           }
         }).catch(function () {
-          return insertAutoMacro(slice, macro, view);
+          var _getPastePluginState2 = getPastePluginState(view.state),
+              pastedMacroPositions = _getPastePluginState2.pastedMacroPositions;
+
+          insertAutoMacro(slice, macro, view, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo]);
+        }).finally(function () {
+          stopTrackingPastedMacroPositions([trackingFrom, trackingTo])(view.state, dispatch);
         });
         return true;
       }
@@ -490,10 +522,16 @@ export function handleExpandPasteInTable(slice) {
     return false;
   };
 }
-export function handleMarkdown(markdownSlice) {
+export function handleMarkdown(markdownSlice, from, to) {
   return function (state, dispatch) {
     var tr = closeHistory(state.tr);
-    tr.replaceSelection(markdownSlice);
+
+    if (typeof from === 'number' && typeof to === 'number') {
+      tr.replaceRange(from, to, markdownSlice);
+    } else {
+      tr.replaceSelection(markdownSlice);
+    }
+
     queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
 
     if (dispatch) {

package/dist/esm/plugins/paste/index.js

@@ -12,8 +12,9 @@ var pastePlugin = function pastePlugin(_ref) {
         plugin: function plugin(_ref2) {
           var schema = _ref2.schema,
               providerFactory = _ref2.providerFactory,
-              dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
-          return createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory);
+              dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
+              dispatch = _ref2.dispatch;
+          return createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory);
         }
       }];
     }

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

@@ -2,9 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Slice, Fragment } from 'prosemirror-model';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey } from 'prosemirror-state';
 import uuid from 'uuid';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
+import { mapChildren } from '../../../utils/slice';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
 sendPasteAnalyticsEvent;
 import * as clipboard from '../../../utils/clipboard';
@@ -16,7 +16,7 @@ import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from
 import { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark } from '../../code-block/utils';
 import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelIntoListWithAnalytics } from './analytics';
 import { analyticsPluginKey, PasteTypes } from '../../analytics';
-import { insideTable, measurements } from '../../../utils';
+import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
 import { measureRender } from '@atlaskit/editor-common/utils';
 import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
 import { upgradeTextToLists, splitParagraphs } from '../../list/transforms';
@@ -29,16 +29,17 @@ import { clipboardTextSerializer } from './clipboard-text-serializer';
 import { htmlHasIncompleteTable, tryRebuildCompleteTableHtml, isPastedFromTinyMCEConfluence } from '../util/tinyMCE';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { extractSliceFromStep } from '../../../utils/step';
-export var stateKey = new PluginKey('pastePlugin');
+import { pluginKey as stateKey, createPluginState } from './plugin-factory';
+export { pluginKey as stateKey } from './plugin-factory';
 export { md } from '../md';
-export function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory) {
+export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory) {
   var atlassianMarkDownParser = new MarkdownTransformer(schema, md);
 
   function getMarkdownSlice(text, openStart, openEnd) {
     var textInput = text;
 
-    if (textInput.includes(':\\\\')) {
-      textInput = textInput.replace(/:\\\\/g, ':\\\\\\\\');
+    if (textInput.includes('\\')) {
+      textInput = textInput.replace(/\\/g, '\\\\');
     }
 
     var doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
@@ -103,6 +104,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinki
   var pastedFromBitBucket = false;
   return new SafePlugin({
     key: stateKey,
+    state: createPluginState(dispatch, {
+      pastedMacroPositions: {}
+    }),
     props: {
       // For serialising to plain text
       clipboardTextSerializer: clipboardTextSerializer,
@@ -295,6 +299,23 @@ export function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinki
           }
 
           return handleMarkdownWithAnalytics(view, event, markdownSlice)(state, dispatch);
+        }
+
+        if (isRichText && isInsideBlockQuote(state)) {
+          //If pasting inside blockquote
+          //Skip the blockquote node and keep remaining nodes as they are
+          var blockquote = schema.nodes.blockquote;
+          var children = [];
+          mapChildren(slice.content, function (node) {
+            if (node.type === blockquote) {
+              for (var i = 0; i < node.childCount; i++) {
+                children.push(node.child(i));
+              }
+            } else {
+              children.push(node);
+            }
+          });
+          slice = new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
         } // finally, handle rich-text copy-paste