@atlaskit/editor-core 172.3.2 → 173.0.1

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

@@ -2,6 +2,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';
 
@@ -142,7 +143,7 @@ export class PluginState {
         this.decorationSet = this.decorationSet.map(tr.mapping, tr.doc, {
           // Reapplies decorators those got removed by the state change
           onRemove: spec => {
-            if (spec.pointer && spec.pointer.sessionId) {
+            if (spec.pointer && spec.pointer.sessionId && spec.key === `telepointer-${spec.pointer.sessionId}`) {
               const step = tr.steps.filter(isReplaceStep)[0];
 
               if (step) {
@@ -194,9 +195,14 @@ export class PluginState {
         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/es2019/plugins/collab-edit/utils.js

@@ -3,7 +3,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 const 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(solid => ({
@@ -50,18 +50,32 @@ export const createTelepointers = (from, to, sessionId, isSelection, initial) =>
     }));
   }
 
+  const spaceJoinerBefore = document.createElement('span');
+  spaceJoinerBefore.textContent = ZERO_WIDTH_JOINER;
+  const spaceJoinerAfter = document.createElement('span');
+  spaceJoinerAfter.textContent = ZERO_WIDTH_JOINER;
   const cursor = document.createElement('span');
-  cursor.textContent = ZERO_WIDTH_SPACE;
+  cursor.textContent = ZERO_WIDTH_JOINER;
   cursor.className = `telepointer color-${color} telepointer-selection-badge`;
   cursor.style.cssText = `${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
+    },
+    key: `telepointer-${sessionId}-zero`
+  })).concat(Decoration.widget(to, cursor, {
     pointer: {
       sessionId
     },
     key: `telepointer-${sessionId}`
+  })).concat(Decoration.widget(to, spaceJoinerBefore, {
+    pointer: {
+      sessionId
+    },
+    key: `telepointer-${sessionId}-zero`
   }));
 };
 export const replaceDocument = (doc, state, version, options, reserveCursor) => {

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

@@ -26,9 +26,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;
 
   const normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
+  const tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
   return { ...normalizedFeatureFlags,
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
     interactiveExpand: typeof props.allowExpand === 'boolean' ? props.allowExpand : Boolean(props.allowExpand && props.allowExpand.allowInteractiveExpand !== false),
@@ -42,29 +43,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/es2019/plugins/floating-toolbar/ui/Dropdown.js

@@ -32,11 +32,18 @@ export default class Dropdown extends Component {
       isOpen: false
     });
 
-    _defineProperty(this, "renderArrayOptions", options => jsx(DropdownMenu, {
-      hide: this.hide,
-      dispatchCommand: this.props.dispatchCommand,
-      items: options
-    }));
+    _defineProperty(this, "renderArrayOptions", options => {
+      const {
+        showSelected,
+        dispatchCommand
+      } = this.props;
+      return jsx(DropdownMenu, {
+        hide: this.hide,
+        dispatchCommand: dispatchCommand,
+        items: options,
+        showSelected: showSelected
+      });
+    });
 
     _defineProperty(this, "toggleOpen", () => {
       this.setState({
@@ -66,7 +73,8 @@ export default class Dropdown extends Component {
       hideExpandIcon,
       disabled,
       tooltip,
-      buttonTestId
+      buttonTestId,
+      dropdownWidth
     } = this.props;
     let trigger;
 
@@ -104,7 +112,7 @@ export default class Dropdown extends Component {
 
 
     const fitTolerance = 10;
-    const fitWidth = Array.isArray(options) ? menuItemDimensions.width : options.width;
+    const fitWidth = Array.isArray(options) ? dropdownWidth || menuItemDimensions.width : options.width;
     const fitHeight = Array.isArray(options) ? options.length * menuItemDimensions.height + itemSpacing * 2 : options.height;
     return jsx(UiDropdown, {
       mountTo: mountPoint,

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

@@ -47,6 +47,7 @@ class Dropdown extends Component {
       const itemContent = jsx(ButtonItem, {
         key: idx,
         iconBefore: this.renderSelected(item, intl),
+        iconAfter: item.elemAfter,
         onClick: () => {
           /**
            * The order of dispatching the event and hide() is important, because
@@ -76,21 +77,24 @@ class Dropdown extends Component {
   }
 
   renderSelected(item, intl) {
+    const {
+      showSelected = true
+    } = this.props;
     const {
       selected
     } = item;
 
-    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/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -88,8 +88,6 @@ export const isSameItem = (leftItem, rightItem) => {
     case 'extensions-placeholder':
       return compareItemWithKeys(leftItem, rightItem);
   }
-
-  return true;
 };
 export const areSameItems = (leftArr, rightArr) => {
   if (leftArr === undefined && rightArr === undefined) {
@@ -245,7 +243,9 @@ class Toolbar extends Component {
             hideExpandIcon: item.hideExpandIcon,
             mountPoint: popupsMountPoint,
             boundariesElement: popupsBoundariesElement,
-            scrollableElement: popupsScrollableElement
+            scrollableElement: popupsScrollableElement,
+            dropdownWidth: item.dropdownWidth,
+            showSelected: item.showSelected
           });
 
         case 'select':

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

@@ -0,0 +1,6 @@
+export let 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/es2019/plugins/paste/commands.js

@@ -0,0 +1,27 @@
+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 const startTrackingPastedMacroPositions = pastedMacroPositions => createCommand(() => {
+  return {
+    type: ActionTypes.START_TRACKING_PASTED_MACRO_POSITIONS,
+    pastedMacroPositions
+  };
+});
+export const stopTrackingPastedMacroPositions = pastedMacroPositionKeys => createCommand(() => {
+  return {
+    type: ActionTypes.STOP_TRACKING_PASTED_MACRO_POSITIONS,
+    pastedMacroPositionKeys
+  };
+});

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

@@ -2,6 +2,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';
@@ -15,7 +16,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, node => {
@@ -297,12 +300,21 @@ async function getSmartLinkAdf(text, type, cardOptions) {
   return await provider.resolve(text, type);
 }
 
-function insertAutoMacro(slice, macro, view) {
+function insertAutoMacro(slice, macro, view, from, to) {
   if (view) {
     // insert the text or linkified/md-converted clipboard data
     const selection = view.state.tr.selection;
-    const tr = view.state.tr.replaceSelection(slice);
-    const before = tr.mapping.map(selection.from, -1);
+    let tr;
+    let 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
 
@@ -339,11 +351,35 @@ export function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoC
           return insertAutoMacro(slice, macro, view);
         }
 
+        if (!view) {
+          throw new Error('View is missing');
+        }
+
+        const trackingId = uuid();
+        const trackingFrom = `handleMacroAutoConvert-from-${trackingId}`;
+        const trackingTo = `handleMacroAutoConvert-to-${trackingId}`;
+        startTrackingPastedMacroPositions({
+          [trackingFrom]: state.selection.from,
+          [trackingTo]: state.selection.to
+        })(state, dispatch);
         getSmartLinkAdf(text, 'inline', cardsOptions).then(() => {
+          // we use view.state rather than state because state becomes a stale
+          // state reference after getSmartLinkAdf's async work
+          const {
+            pastedMacroPositions
+          } = getPastePluginState(view.state);
+
           if (dispatch) {
-            handleMarkdown(slice)(state, dispatch);
+            handleMarkdown(slice, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
           }
-        }).catch(() => insertAutoMacro(slice, macro, view));
+        }).catch(() => {
+          const {
+            pastedMacroPositions
+          } = getPastePluginState(view.state);
+          insertAutoMacro(slice, macro, view, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo]);
+        }).finally(() => {
+          stopTrackingPastedMacroPositions([trackingFrom, trackingTo])(view.state, dispatch);
+        });
         return true;
       }
 
@@ -471,10 +507,16 @@ export function handleExpandPasteInTable(slice) {
     return false;
   };
 }
-export function handleMarkdown(markdownSlice) {
+export function handleMarkdown(markdownSlice, from, to) {
   return (state, dispatch) => {
     const 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/es2019/plugins/paste/index.js

@@ -13,8 +13,9 @@ const pastePlugin = ({
       plugin: ({
         schema,
         providerFactory,
-        dispatchAnalyticsEvent
-      }) => createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory)
+        dispatchAnalyticsEvent,
+        dispatch
+      }) => createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory)
     }];
   }
 

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

@@ -1,8 +1,8 @@
 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';
@@ -14,7 +14,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';
@@ -27,16 +27,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 const 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) {
   const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
 
   function getMarkdownSlice(text, openStart, openEnd) {
     let textInput = text;
 
-    if (textInput.includes(':\\\\')) {
-      textInput = textInput.replace(/:\\\\/g, ':\\\\\\\\');
+    if (textInput.includes('\\')) {
+      textInput = textInput.replace(/\\/g, '\\\\');
     }
 
     const doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
@@ -71,6 +72,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinki
   let pastedFromBitBucket = false;
   return new SafePlugin({
     key: stateKey,
+    state: createPluginState(dispatch, {
+      pastedMacroPositions: {}
+    }),
     props: {
       // For serialising to plain text
       clipboardTextSerializer,
@@ -269,6 +273,25 @@ 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
+          const {
+            blockquote
+          } = schema.nodes;
+          const children = [];
+          mapChildren(slice.content, node => {
+            if (node.type === blockquote) {
+              for (let 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
 
 

package/dist/es2019/plugins/paste/pm-plugins/plugin-factory.js

@@ -0,0 +1,33 @@
+import { PluginKey } from 'prosemirror-state';
+import { pluginFactory } from '../../../utils/plugin-state-factory';
+import { reducer } from '../reducer';
+export const pluginKey = new PluginKey('pastePlugin');
+export const {
+  createPluginState,
+  createCommand,
+  getPluginState
+} = pluginFactory(pluginKey, reducer, {
+  mapping: (tr, pluginState) => {
+    if (tr.docChanged) {
+      let atLeastOnePositionChanged = false;
+      const positionsMappedThroughChanges = Object.entries(pluginState.pastedMacroPositions).reduce((acc, [key, position]) => {
+        const mappedPosition = tr.mapping.map(position);
+
+        if (position !== mappedPosition) {
+          atLeastOnePositionChanged = true;
+        }
+
+        acc[key] = tr.mapping.map(position);
+        return acc;
+      }, {});
+
+      if (atLeastOnePositionChanged) {
+        return { ...pluginState,
+          pastedMacroPositions: positionsMappedThroughChanges
+        };
+      }
+    }
+
+    return pluginState;
+  }
+});

package/dist/es2019/plugins/paste/reducer.js

@@ -0,0 +1,24 @@
+import { PastePluginActionTypes as ActionTypes } from './actions';
+export const reducer = (state, action) => {
+  switch (action.type) {
+    case ActionTypes.START_TRACKING_PASTED_MACRO_POSITIONS:
+      {
+        return { ...state,
+          pastedMacroPositions: { ...state.pastedMacroPositions,
+            ...action.pastedMacroPositions
+          }
+        };
+      }
+
+    case ActionTypes.STOP_TRACKING_PASTED_MACRO_POSITIONS:
+      {
+        const filteredMacroPositions = Object.fromEntries(Object.entries(state.pastedMacroPositions).filter(([key]) => !action.pastedMacroPositionKeys.includes(key)));
+        return { ...state,
+          pastedMacroPositions: filteredMacroPositions
+        };
+      }
+
+    default:
+      return state;
+  }
+};

package/dist/es2019/plugins/paste/types.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/plugins/placeholder/index.js

@@ -8,6 +8,7 @@ import { placeHolderClassName } from './styles';
 export const pluginKey = new PluginKey('placeholderPlugin');
 import { focusStateKey } from '../base/pm-plugins/focus-handler';
 import { isTypeAheadOpen } from '../type-ahead/utils';
+import { isComposing } from '../base/pm-plugins/composition';
 
 function getPlaceholderState(editorState) {
   return pluginKey.getState(editorState);
@@ -138,7 +139,7 @@ export function createPlugin(defaultPlaceholderText, placeholderHints, bracketPl
           pos
         } = getPlaceholderState(editorState);
 
-        if (hasPlaceholder && placeholderText && pos !== undefined) {
+        if (hasPlaceholder && placeholderText && pos !== undefined && !isComposing(editorState)) {
           return createPlaceholderDecoration(editorState, placeholderText, pos);
         }
 

package/dist/es2019/plugins/placeholder-text/index.js

@@ -69,10 +69,20 @@ export function createPlugin(dispatch, options) {
         const placeholderNodeType = newState.schema.nodes.placeholder;
 
         if (adjacentNode && adjacentNode.type === placeholderNodeType && didPlaceholderExistBeforeTxn) {
-          // Check that cursor has moved forward in the document **and** that there is content before the cursor
-          const wasContentAdded = oldState.selection.$head.pos < newState.selection.$head.pos && !isNodeEmpty(newState.selection.$head.nodeBefore);
+          var _$newHead$nodeBefore;
 
-          if (wasContentAdded) {
+          const {
+            $head: $newHead
+          } = newState.selection;
+          const {
+            $head: $oldHead
+          } = oldState.selection; // Check that cursor has moved forward in the document **and** that there is content before the cursor
+
+          const cursorMoved = $oldHead.pos < $newHead.pos;
+          const nodeBeforeHasContent = !isNodeEmpty($newHead.nodeBefore);
+          const nodeBeforeIsInline = (_$newHead$nodeBefore = $newHead.nodeBefore) === null || _$newHead$nodeBefore === void 0 ? void 0 : _$newHead$nodeBefore.type.isInline;
+
+          if (cursorMoved && (nodeBeforeHasContent || nodeBeforeIsInline)) {
             const {
               $from,
               $to

package/dist/es2019/plugins/status/ui/statusPicker.js

@@ -38,7 +38,11 @@ export class StatusPickerWithoutAnalytcs extends React.Component {
     _defineProperty(this, "handleClickOutside", event => {
       event.preventDefault();
       this.inputMethod = InputMethod.blur;
-      this.props.closeStatusPicker();
+      const selectedText = window.getSelection();
+
+      if (!selectedText) {
+        this.props.closeStatusPicker();
+      }
     });
 
     _defineProperty(this, "handleEscapeKeydown", event => {