@atlaskit/editor-plugin-paste 31.1.7 → 31.2.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-paste
 
+## 31.2.0
+
+### Minor Changes
+
+- [`960570244e4c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/960570244e4c8) -
+  Keep the text of a partially copied panel in the destination table cell, table header or expand
+  instead of inserting a new panel after it, behind platform_editor_paste_panel_c1_into_container
+
+### Patch Changes
+
+- [`4f6171751461e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4f6171751461e) -
+  Clean up experiment `platform_editor_paste_autoconvert_robustness`
+- Updated dependencies
+
+## 31.1.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 31.1.7
 
 ### Patch Changes

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

@@ -381,6 +381,9 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           var _view$state$selection, _view$state$selection2;
           var destinationParentType = (_view$state$selection = (_view$state$selection2 = view.state.selection.$from.node(-1)) === null || _view$state$selection2 === void 0 ? void 0 : _view$state$selection2.type.name) !== null && _view$state$selection !== void 0 ? _view$state$selection : view.state.doc.type.name;
           slice = (0, _handlers.applyContainerNodeTransformToSlice)(slice, schema, destinationParentType);
+          if ((0, _fg.fg)('platform_editor_paste_panel_c1_into_container')) {
+            slice = (0, _handlers.downgradePanelC1ForDestination)(slice, schema, view.state.selection.$from);
+          }
         }
         slice = (0, _handleVSCodeBlock.handleVSCodeBlock)({
           state: state,

package/dist/cjs/pm-plugins/util/handlers.js

@@ -8,6 +8,7 @@ exports.applyContainerNodeTransformToSlice = applyContainerNodeTransformToSlice;
 exports.checkIfSelectionInNestedList = checkIfSelectionInNestedList;
 exports.checkTaskListInList = checkTaskListInList;
 exports.doesSelectionWhichStartsOrEndsInListContainEntireList = void 0;
+exports.downgradePanelC1ForDestination = downgradePanelC1ForDestination;
 exports.flattenNestedListInSlice = flattenNestedListInSlice;
 exports.handleCodeBlock = handleCodeBlock;
 exports.handleExpandPaste = handleExpandPaste;
@@ -52,7 +53,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _replaceTable = require("@atlaskit/editor-tables/utils/replace-table");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _closeHistory = require("@atlaskit/prosemirror-history/closeHistory");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -618,6 +618,15 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
 function getSmartLinkAdf(_x, _x2, _x3) {
   return _getSmartLinkAdf.apply(this, arguments);
 }
+/**
+ * Inserts the pasted content and then replaces it with `macro` as a separate transaction.
+ *
+ * The range the macro replaces is derived from the steps that were actually applied
+ * rather than from `slice.size`. `slice.size` is the slice's own measure and does not
+ * account for ProseMirror's fitting behaviour in `replaceRange`/`replaceSelection`, so
+ * the two can disagree — and when they do the macro would be inserted without removing
+ * the text it should replace, leaving both the pasted text and the macro in the document.
+ */
 function _getSmartLinkAdf() {
   _getSmartLinkAdf = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(text, type, cardOptions) {
     var provider;
@@ -646,46 +655,7 @@ function _getSmartLinkAdf() {
   }));
   return _getSmartLinkAdf.apply(this, arguments);
 }
-function insertAutoMacroOld(slice, macro, view, from, to) {
-  if (view) {
-    // insert the text or linkified/md-converted clipboard data
-    var selection = view.state.tr.selection;
-    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
-    var macroTr = (0, _closeHistory.closeHistory)(view.state.tr).replaceRangeWith(before, before + slice.size, macro).scrollIntoView();
-    (0, _card.addLinkMetadata)(view.state.selection, macroTr, {
-      inputMethod: _enums.INPUT_METHOD.CLIPBOARD,
-      cardAction: 'AUTO_CONVERT'
-    });
-    view.dispatch(macroTr);
-    return true;
-  }
-  return false;
-}
-
-/**
- * Replacement for `insertAutoMacroOld` behind
- * `platform_editor_paste_autoconvert_robustness`.
- *
- * Identical in shape, except that the range the macro replaces is derived from the steps
- * that were actually applied rather than from `slice.size`. `slice.size` is the slice's
- * own measure and does not account for ProseMirror's fitting behaviour in
- * `replaceRange`/`replaceSelection`, so the two can disagree — and when they do the macro
- * is inserted without removing the text it should replace, leaving both the pasted text
- * and the macro in the document.
- */
-function insertAutoMacroNew(slice, macro, view, from, to) {
+function insertAutoMacro(slice, macro, view, from, to) {
   if (!view) {
     return false;
   }
@@ -715,9 +685,6 @@ function insertAutoMacroNew(slice, macro, view, from, to) {
   view.dispatch(macroTr);
   return true;
 }
-function insertAutoMacro(slice, macro, view, from, to) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_paste_autoconvert_robustness') ? insertAutoMacroNew(slice, macro, view, from, to) : insertAutoMacroOld(slice, macro, view, from, to);
-}
 
 /**
  * Locates the range currently occupied by a link that we pasted earlier.
@@ -868,45 +835,27 @@ function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, runMacroAu
         var trackingId = (0, _uuid.v4)();
         var trackingFrom = "handleMacroAutoConvert-from-".concat(trackingId);
         var trackingTo = "handleMacroAutoConvert-to-".concat(trackingId);
-        if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_paste_autoconvert_robustness')) {
-          // Insert the pasted content straight away. The smart link provider is only
-          // consulted to decide whether the inserted link should later be swapped for
-          // a macro, so it does not need to gate the insert — otherwise every
-          // autoconvertible paste appears to do nothing until a network round trip
-          // completes.
-          var insertedRange;
-          handleMarkdownWithInsertedRange(slice, queueCardsFromChangedTr, function (range) {
-            insertedRange = range;
-          })(state, dispatch);
-          if (!insertedRange) {
-            return true;
-          }
-          (0, _commands.startTrackingPastedMacroPositions)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, trackingFrom, insertedRange.from), trackingTo, insertedRange.to))(view.state, dispatch);
-          getSmartLinkAdf(text, 'inline', cardsOptions).catch(function () {
-            // Smart links could not resolve the URL, so fall back to the macro.
-            // we use view.state rather than state because state becomes a stale
-            // state reference after getSmartLinkAdf's async work
-            var _getPastePluginState = (0, _pluginFactory.getPluginState)(view.state),
-              pastedMacroPositions = _getPastePluginState.pastedMacroPositions;
-            replacePastedLinkWithMacro(view, autoConvertMacro, text, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo], editorAnalyticsAPI);
-          }).finally(function () {
-            (0, _commands.stopTrackingPastedMacroPositions)([trackingFrom, trackingTo])(view.state, dispatch);
-          });
+
+        // Insert the pasted content straight away. The smart link provider is only
+        // consulted to decide whether the inserted link should later be swapped for
+        // a macro, so it does not need to gate the insert — otherwise every
+        // autoconvertible paste appears to do nothing until a network round trip
+        // completes.
+        var insertedRange;
+        handleMarkdownWithInsertedRange(slice, queueCardsFromChangedTr, function (range) {
+          insertedRange = range;
+        })(state, dispatch);
+        if (!insertedRange) {
           return true;
         }
-        (0, _commands.startTrackingPastedMacroPositions)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, trackingFrom, state.selection.from), trackingTo, state.selection.to))(state, dispatch);
-        getSmartLinkAdf(text, 'inline', cardsOptions).then(function () {
+        (0, _commands.startTrackingPastedMacroPositions)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, trackingFrom, insertedRange.from), trackingTo, insertedRange.to))(view.state, dispatch);
+        getSmartLinkAdf(text, 'inline', cardsOptions).catch(function () {
+          // Smart links could not resolve the URL, so fall back to the macro.
           // we use view.state rather than state because state becomes a stale
           // state reference after getSmartLinkAdf's async work
-          var _getPastePluginState2 = (0, _pluginFactory.getPluginState)(view.state),
-            pastedMacroPositions = _getPastePluginState2.pastedMacroPositions;
-          if (dispatch) {
-            handleMarkdown(slice, queueCardsFromChangedTr, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
-          }
-        }).catch(function () {
-          var _getPastePluginState3 = (0, _pluginFactory.getPluginState)(view.state),
-            pastedMacroPositions = _getPastePluginState3.pastedMacroPositions;
-          insertAutoMacro(slice, macro, view, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo]);
+          var _getPastePluginState = (0, _pluginFactory.getPluginState)(view.state),
+            pastedMacroPositions = _getPastePluginState.pastedMacroPositions;
+          replacePastedLinkWithMacro(view, autoConvertMacro, text, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo], editorAnalyticsAPI);
         }).finally(function () {
           (0, _commands.stopTrackingPastedMacroPositions)([trackingFrom, trackingTo])(view.state, dispatch);
         });
@@ -1212,8 +1161,7 @@ function resolveParagraphMarks(marks, destinationBlockMarkAttrs, shouldNormalize
 }
 
 /**
- * Variant of `handleMarkdown` used by macro auto-conversion behind
- * `platform_editor_paste_autoconvert_robustness`.
+ * Variant of `handleMarkdown` used by macro auto-conversion.
  *
  * Differs in two ways: the inserted range is derived from the steps that were applied
  * rather than from `markdownSlice.size`, which does not account for ProseMirror's fitting
@@ -1694,6 +1642,63 @@ function applyContainerNodeTransformToSlice(slice, schema, destinationParentType
   }
 }
 
+/**
+ * Finds the type of the nearest ancestor of the paste position that can hold the panel in either
+ * of its forms. That is the node a block-level panel would be placed into, which is not always the
+ * direct parent of the cursor's textblock (e.g. a blockquote inside a table cell).
+ */
+function findNearestPanelHolderType($from, panelAsC1, panelAsPlain) {
+  var panelAsC1Content = _model.Fragment.from(panelAsC1);
+  var panelAsPlainContent = _model.Fragment.from(panelAsPlain);
+  for (var depth = $from.depth; depth >= 0; depth--) {
+    var ancestorType = $from.node(depth).type;
+    if (ancestorType.validContent(panelAsC1Content) || ancestorType.validContent(panelAsPlainContent)) {
+      return ancestorType;
+    }
+  }
+  return undefined;
+}
+
+/**
+ * Turns top-level `panel_c1` children of the slice back into `panel` when the nearest ancestor of
+ * the paste position that can hold a panel accepts `panel` but not `panel_c1`. Only panels whose
+ * content is valid for a plain `panel` are changed, that is content without the containers only
+ * `panel_c1` allows: tables (`platform_editor_nest_table_in_panel`), and expands, nested panels and
+ * other containers when `platform_editor_nest_container_in_panel` is on.
+ *
+ * A partial copy from a top-level panel is re-wrapped as `panel_c1` from the clipboard context, and
+ * a wrapper the destination cannot hold makes the paste insert the panel after the container (e.g.
+ * below a table) instead of pasting the text where the cursor is.
+ */
+function downgradePanelC1ForDestination(slice, schema, $from) {
+  var _schema$nodes4 = schema.nodes,
+    panel = _schema$nodes4.panel,
+    panel_c1 = _schema$nodes4.panel_c1;
+  if (!panel || !panel_c1) {
+    return slice;
+  }
+  var isDowngraded = false;
+  var children = [];
+  slice.content.forEach(function (child) {
+    if (child.type !== panel_c1 || !panel.validContent(child.content)) {
+      children.push(child);
+      return;
+    }
+    var plainPanel = panel.create(child.attrs, child.content, child.marks.filter(function (mark) {
+      return panel.allowsMarkType(mark.type);
+    }));
+    var holderType = findNearestPanelHolderType($from, child, plainPanel);
+    var holderOnlyAcceptsPlainPanel = !!holderType && !holderType.validContent(_model.Fragment.from(child)) && holderType.validContent(_model.Fragment.from(plainPanel));
+    if (holderOnlyAcceptsPlainPanel) {
+      isDowngraded = true;
+      children.push(plainPanel);
+      return;
+    }
+    children.push(child);
+  });
+  return isDowngraded ? new _model.Slice(_model.Fragment.fromArray(children), slice.openStart, slice.openEnd) : slice;
+}
+
 /*
  * When platform_editor_nest_table_in_panel is OFF, move table elements out of panel divs in the
  * clipboard HTML before ProseMirror parses it. This prevents the panel schema from

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

@@ -41,7 +41,7 @@ import { createPluginState, pluginKey as stateKey } from './plugin-factory';
 import { escapeBackslashAndLinksExceptCodeBlock, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from './util';
 import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
 import { getMarkdownSliceViaGfm } from './util/get-markdown-slice';
-import { applyContainerNodeTransformToSlice, splitTablesOutOfPanelHtml, handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
+import { applyContainerNodeTransformToSlice, downgradePanelC1ForDestination, splitTablesOutOfPanelHtml, handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { normalizePastedCodeBlockAttrs } from './util/normalize-pasted-code-block-attrs';
 import { handleSyncBlocksPaste } from './util/sync-block';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
@@ -340,6 +340,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           var _view$state$selection, _view$state$selection2;
           const destinationParentType = (_view$state$selection = (_view$state$selection2 = view.state.selection.$from.node(-1)) === null || _view$state$selection2 === void 0 ? void 0 : _view$state$selection2.type.name) !== null && _view$state$selection !== void 0 ? _view$state$selection : view.state.doc.type.name;
           slice = applyContainerNodeTransformToSlice(slice, schema, destinationParentType);
+          if (fg('platform_editor_paste_panel_c1_into_container')) {
+            slice = downgradePanelC1ForDestination(slice, schema, view.state.selection.$from);
+          }
         }
         slice = handleVSCodeBlock({
           state,

package/dist/es2019/pm-plugins/util/handlers.js

@@ -18,7 +18,6 @@ import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/mo
 import { AllSelection, NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNode, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils/replace-table';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { closeHistory } from '@atlaskit/prosemirror-history/closeHistory';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -612,46 +611,17 @@ async function getSmartLinkAdf(text, type, cardOptions) {
   const provider = await cardOptions.provider;
   return await provider.resolve(text, type);
 }
-function insertAutoMacroOld(slice, macro, view, from, to) {
-  if (view) {
-    // insert the text or linkified/md-converted clipboard data
-    const selection = view.state.tr.selection;
-    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
-    const macroTr = closeHistory(view.state.tr).replaceRangeWith(before, before + slice.size, macro).scrollIntoView();
-    addLinkMetadata(view.state.selection, macroTr, {
-      inputMethod: INPUT_METHOD.CLIPBOARD,
-      cardAction: 'AUTO_CONVERT'
-    });
-    view.dispatch(macroTr);
-    return true;
-  }
-  return false;
-}
 
 /**
- * Replacement for `insertAutoMacroOld` behind
- * `platform_editor_paste_autoconvert_robustness`.
+ * Inserts the pasted content and then replaces it with `macro` as a separate transaction.
  *
- * Identical in shape, except that the range the macro replaces is derived from the steps
- * that were actually applied rather than from `slice.size`. `slice.size` is the slice's
- * own measure and does not account for ProseMirror's fitting behaviour in
- * `replaceRange`/`replaceSelection`, so the two can disagree — and when they do the macro
- * is inserted without removing the text it should replace, leaving both the pasted text
- * and the macro in the document.
+ * The range the macro replaces is derived from the steps that were actually applied
+ * rather than from `slice.size`. `slice.size` is the slice's own measure and does not
+ * account for ProseMirror's fitting behaviour in `replaceRange`/`replaceSelection`, so
+ * the two can disagree — and when they do the macro would be inserted without removing
+ * the text it should replace, leaving both the pasted text and the macro in the document.
  */
-function insertAutoMacroNew(slice, macro, view, from, to) {
+function insertAutoMacro(slice, macro, view, from, to) {
   if (!view) {
     return false;
   }
@@ -683,9 +653,6 @@ function insertAutoMacroNew(slice, macro, view, from, to) {
   view.dispatch(macroTr);
   return true;
 }
-function insertAutoMacro(slice, macro, view, from, to) {
-  return isExperimentEnabled('platform_editor_paste_autoconvert_robustness') ? insertAutoMacroNew(slice, macro, view, from, to) : insertAutoMacroOld(slice, macro, view, from, to);
-}
 
 /**
  * Locates the range currently occupied by a link that we pasted earlier.
@@ -838,54 +805,31 @@ export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, run
         const trackingId = uuid();
         const trackingFrom = `handleMacroAutoConvert-from-${trackingId}`;
         const trackingTo = `handleMacroAutoConvert-to-${trackingId}`;
-        if (isExperimentEnabled('platform_editor_paste_autoconvert_robustness')) {
-          // Insert the pasted content straight away. The smart link provider is only
-          // consulted to decide whether the inserted link should later be swapped for
-          // a macro, so it does not need to gate the insert — otherwise every
-          // autoconvertible paste appears to do nothing until a network round trip
-          // completes.
-          let insertedRange;
-          handleMarkdownWithInsertedRange(slice, queueCardsFromChangedTr, range => {
-            insertedRange = range;
-          })(state, dispatch);
-          if (!insertedRange) {
-            return true;
-          }
-          startTrackingPastedMacroPositions({
-            [trackingFrom]: insertedRange.from,
-            [trackingTo]: insertedRange.to
-          })(view.state, dispatch);
-          getSmartLinkAdf(text, 'inline', cardsOptions).catch(() => {
-            // Smart links could not resolve the URL, so fall back to the macro.
-            // we use view.state rather than state because state becomes a stale
-            // state reference after getSmartLinkAdf's async work
-            const {
-              pastedMacroPositions
-            } = getPastePluginState(view.state);
-            replacePastedLinkWithMacro(view, autoConvertMacro, text, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo], editorAnalyticsAPI);
-          }).finally(() => {
-            stopTrackingPastedMacroPositions([trackingFrom, trackingTo])(view.state, dispatch);
-          });
+
+        // Insert the pasted content straight away. The smart link provider is only
+        // consulted to decide whether the inserted link should later be swapped for
+        // a macro, so it does not need to gate the insert — otherwise every
+        // autoconvertible paste appears to do nothing until a network round trip
+        // completes.
+        let insertedRange;
+        handleMarkdownWithInsertedRange(slice, queueCardsFromChangedTr, range => {
+          insertedRange = range;
+        })(state, dispatch);
+        if (!insertedRange) {
           return true;
         }
         startTrackingPastedMacroPositions({
-          [trackingFrom]: state.selection.from,
-          [trackingTo]: state.selection.to
-        })(state, dispatch);
-        getSmartLinkAdf(text, 'inline', cardsOptions).then(() => {
+          [trackingFrom]: insertedRange.from,
+          [trackingTo]: insertedRange.to
+        })(view.state, dispatch);
+        getSmartLinkAdf(text, 'inline', cardsOptions).catch(() => {
+          // Smart links could not resolve the URL, so fall back to the macro.
           // 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, queueCardsFromChangedTr, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
-          }
-        }).catch(() => {
-          const {
-            pastedMacroPositions
-          } = getPastePluginState(view.state);
-          insertAutoMacro(slice, macro, view, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo]);
+          replacePastedLinkWithMacro(view, autoConvertMacro, text, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo], editorAnalyticsAPI);
         }).finally(() => {
           stopTrackingPastedMacroPositions([trackingFrom, trackingTo])(view.state, dispatch);
         });
@@ -1195,8 +1139,7 @@ function resolveParagraphMarks(marks, destinationBlockMarkAttrs, shouldNormalize
 }
 
 /**
- * Variant of `handleMarkdown` used by macro auto-conversion behind
- * `platform_editor_paste_autoconvert_robustness`.
+ * Variant of `handleMarkdown` used by macro auto-conversion.
  *
  * Differs in two ways: the inserted range is derived from the steps that were applied
  * rather than from `markdownSlice.size`, which does not account for ProseMirror's fitting
@@ -1664,6 +1607,62 @@ export function applyContainerNodeTransformToSlice(slice, schema, destinationPar
   }
 }
 
+/**
+ * Finds the type of the nearest ancestor of the paste position that can hold the panel in either
+ * of its forms. That is the node a block-level panel would be placed into, which is not always the
+ * direct parent of the cursor's textblock (e.g. a blockquote inside a table cell).
+ */
+function findNearestPanelHolderType($from, panelAsC1, panelAsPlain) {
+  const panelAsC1Content = Fragment.from(panelAsC1);
+  const panelAsPlainContent = Fragment.from(panelAsPlain);
+  for (let depth = $from.depth; depth >= 0; depth--) {
+    const ancestorType = $from.node(depth).type;
+    if (ancestorType.validContent(panelAsC1Content) || ancestorType.validContent(panelAsPlainContent)) {
+      return ancestorType;
+    }
+  }
+  return undefined;
+}
+
+/**
+ * Turns top-level `panel_c1` children of the slice back into `panel` when the nearest ancestor of
+ * the paste position that can hold a panel accepts `panel` but not `panel_c1`. Only panels whose
+ * content is valid for a plain `panel` are changed, that is content without the containers only
+ * `panel_c1` allows: tables (`platform_editor_nest_table_in_panel`), and expands, nested panels and
+ * other containers when `platform_editor_nest_container_in_panel` is on.
+ *
+ * A partial copy from a top-level panel is re-wrapped as `panel_c1` from the clipboard context, and
+ * a wrapper the destination cannot hold makes the paste insert the panel after the container (e.g.
+ * below a table) instead of pasting the text where the cursor is.
+ */
+export function downgradePanelC1ForDestination(slice, schema, $from) {
+  const {
+    panel,
+    panel_c1
+  } = schema.nodes;
+  if (!panel || !panel_c1) {
+    return slice;
+  }
+  let isDowngraded = false;
+  const children = [];
+  slice.content.forEach(child => {
+    if (child.type !== panel_c1 || !panel.validContent(child.content)) {
+      children.push(child);
+      return;
+    }
+    const plainPanel = panel.create(child.attrs, child.content, child.marks.filter(mark => panel.allowsMarkType(mark.type)));
+    const holderType = findNearestPanelHolderType($from, child, plainPanel);
+    const holderOnlyAcceptsPlainPanel = !!holderType && !holderType.validContent(Fragment.from(child)) && holderType.validContent(Fragment.from(plainPanel));
+    if (holderOnlyAcceptsPlainPanel) {
+      isDowngraded = true;
+      children.push(plainPanel);
+      return;
+    }
+    children.push(child);
+  });
+  return isDowngraded ? new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd) : slice;
+}
+
 /*
  * When platform_editor_nest_table_in_panel is OFF, move table elements out of panel divs in the
  * clipboard HTML before ProseMirror parses it. This prevents the panel schema from

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

@@ -46,7 +46,7 @@ import { createPluginState, pluginKey as stateKey } from './plugin-factory';
 import { escapeBackslashAndLinksExceptCodeBlock, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from './util';
 import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
 import { getMarkdownSliceViaGfm } from './util/get-markdown-slice';
-import { applyContainerNodeTransformToSlice, splitTablesOutOfPanelHtml, handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
+import { applyContainerNodeTransformToSlice, downgradePanelC1ForDestination, splitTablesOutOfPanelHtml, handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { normalizePastedCodeBlockAttrs } from './util/normalize-pasted-code-block-attrs';
 import { handleSyncBlocksPaste } from './util/sync-block';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
@@ -373,6 +373,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           var _view$state$selection, _view$state$selection2;
           var destinationParentType = (_view$state$selection = (_view$state$selection2 = view.state.selection.$from.node(-1)) === null || _view$state$selection2 === void 0 ? void 0 : _view$state$selection2.type.name) !== null && _view$state$selection !== void 0 ? _view$state$selection : view.state.doc.type.name;
           slice = applyContainerNodeTransformToSlice(slice, schema, destinationParentType);
+          if (fg('platform_editor_paste_panel_c1_into_container')) {
+            slice = downgradePanelC1ForDestination(slice, schema, view.state.selection.$from);
+          }
         }
         slice = handleVSCodeBlock({
           state: state,

package/dist/esm/pm-plugins/util/handlers.js

@@ -27,7 +27,6 @@ import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/mo
 import { AllSelection, NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNode, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils/replace-table';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { closeHistory } from '@atlaskit/prosemirror-history/closeHistory';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -589,6 +588,15 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
 function getSmartLinkAdf(_x, _x2, _x3) {
   return _getSmartLinkAdf.apply(this, arguments);
 }
+/**
+ * Inserts the pasted content and then replaces it with `macro` as a separate transaction.
+ *
+ * The range the macro replaces is derived from the steps that were actually applied
+ * rather than from `slice.size`. `slice.size` is the slice's own measure and does not
+ * account for ProseMirror's fitting behaviour in `replaceRange`/`replaceSelection`, so
+ * the two can disagree — and when they do the macro would be inserted without removing
+ * the text it should replace, leaving both the pasted text and the macro in the document.
+ */
 function _getSmartLinkAdf() {
   _getSmartLinkAdf = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(text, type, cardOptions) {
     var provider;
@@ -617,46 +625,7 @@ function _getSmartLinkAdf() {
   }));
   return _getSmartLinkAdf.apply(this, arguments);
 }
-function insertAutoMacroOld(slice, macro, view, from, to) {
-  if (view) {
-    // insert the text or linkified/md-converted clipboard data
-    var selection = view.state.tr.selection;
-    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
-    var macroTr = closeHistory(view.state.tr).replaceRangeWith(before, before + slice.size, macro).scrollIntoView();
-    addLinkMetadata(view.state.selection, macroTr, {
-      inputMethod: INPUT_METHOD.CLIPBOARD,
-      cardAction: 'AUTO_CONVERT'
-    });
-    view.dispatch(macroTr);
-    return true;
-  }
-  return false;
-}
-
-/**
- * Replacement for `insertAutoMacroOld` behind
- * `platform_editor_paste_autoconvert_robustness`.
- *
- * Identical in shape, except that the range the macro replaces is derived from the steps
- * that were actually applied rather than from `slice.size`. `slice.size` is the slice's
- * own measure and does not account for ProseMirror's fitting behaviour in
- * `replaceRange`/`replaceSelection`, so the two can disagree — and when they do the macro
- * is inserted without removing the text it should replace, leaving both the pasted text
- * and the macro in the document.
- */
-function insertAutoMacroNew(slice, macro, view, from, to) {
+function insertAutoMacro(slice, macro, view, from, to) {
   if (!view) {
     return false;
   }
@@ -686,9 +655,6 @@ function insertAutoMacroNew(slice, macro, view, from, to) {
   view.dispatch(macroTr);
   return true;
 }
-function insertAutoMacro(slice, macro, view, from, to) {
-  return isExperimentEnabled('platform_editor_paste_autoconvert_robustness') ? insertAutoMacroNew(slice, macro, view, from, to) : insertAutoMacroOld(slice, macro, view, from, to);
-}
 
 /**
  * Locates the range currently occupied by a link that we pasted earlier.
@@ -839,45 +805,27 @@ export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, run
         var trackingId = uuid();
         var trackingFrom = "handleMacroAutoConvert-from-".concat(trackingId);
         var trackingTo = "handleMacroAutoConvert-to-".concat(trackingId);
-        if (isExperimentEnabled('platform_editor_paste_autoconvert_robustness')) {
-          // Insert the pasted content straight away. The smart link provider is only
-          // consulted to decide whether the inserted link should later be swapped for
-          // a macro, so it does not need to gate the insert — otherwise every
-          // autoconvertible paste appears to do nothing until a network round trip
-          // completes.
-          var insertedRange;
-          handleMarkdownWithInsertedRange(slice, queueCardsFromChangedTr, function (range) {
-            insertedRange = range;
-          })(state, dispatch);
-          if (!insertedRange) {
-            return true;
-          }
-          startTrackingPastedMacroPositions(_defineProperty(_defineProperty({}, trackingFrom, insertedRange.from), trackingTo, insertedRange.to))(view.state, dispatch);
-          getSmartLinkAdf(text, 'inline', cardsOptions).catch(function () {
-            // Smart links could not resolve the URL, so fall back to the macro.
-            // 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;
-            replacePastedLinkWithMacro(view, autoConvertMacro, text, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo], editorAnalyticsAPI);
-          }).finally(function () {
-            stopTrackingPastedMacroPositions([trackingFrom, trackingTo])(view.state, dispatch);
-          });
+
+        // Insert the pasted content straight away. The smart link provider is only
+        // consulted to decide whether the inserted link should later be swapped for
+        // a macro, so it does not need to gate the insert — otherwise every
+        // autoconvertible paste appears to do nothing until a network round trip
+        // completes.
+        var insertedRange;
+        handleMarkdownWithInsertedRange(slice, queueCardsFromChangedTr, function (range) {
+          insertedRange = range;
+        })(state, dispatch);
+        if (!insertedRange) {
           return true;
         }
-        startTrackingPastedMacroPositions(_defineProperty(_defineProperty({}, trackingFrom, state.selection.from), trackingTo, state.selection.to))(state, dispatch);
-        getSmartLinkAdf(text, 'inline', cardsOptions).then(function () {
+        startTrackingPastedMacroPositions(_defineProperty(_defineProperty({}, trackingFrom, insertedRange.from), trackingTo, insertedRange.to))(view.state, dispatch);
+        getSmartLinkAdf(text, 'inline', cardsOptions).catch(function () {
+          // Smart links could not resolve the URL, so fall back to the macro.
           // we use view.state rather than state because state becomes a stale
           // state reference after getSmartLinkAdf's async work
-          var _getPastePluginState2 = getPastePluginState(view.state),
-            pastedMacroPositions = _getPastePluginState2.pastedMacroPositions;
-          if (dispatch) {
-            handleMarkdown(slice, queueCardsFromChangedTr, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
-          }
-        }).catch(function () {
-          var _getPastePluginState3 = getPastePluginState(view.state),
-            pastedMacroPositions = _getPastePluginState3.pastedMacroPositions;
-          insertAutoMacro(slice, macro, view, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo]);
+          var _getPastePluginState = getPastePluginState(view.state),
+            pastedMacroPositions = _getPastePluginState.pastedMacroPositions;
+          replacePastedLinkWithMacro(view, autoConvertMacro, text, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo], editorAnalyticsAPI);
         }).finally(function () {
           stopTrackingPastedMacroPositions([trackingFrom, trackingTo])(view.state, dispatch);
         });
@@ -1183,8 +1131,7 @@ function resolveParagraphMarks(marks, destinationBlockMarkAttrs, shouldNormalize
 }
 
 /**
- * Variant of `handleMarkdown` used by macro auto-conversion behind
- * `platform_editor_paste_autoconvert_robustness`.
+ * Variant of `handleMarkdown` used by macro auto-conversion.
  *
  * Differs in two ways: the inserted range is derived from the steps that were applied
  * rather than from `markdownSlice.size`, which does not account for ProseMirror's fitting
@@ -1665,6 +1612,63 @@ export function applyContainerNodeTransformToSlice(slice, schema, destinationPar
   }
 }
 
+/**
+ * Finds the type of the nearest ancestor of the paste position that can hold the panel in either
+ * of its forms. That is the node a block-level panel would be placed into, which is not always the
+ * direct parent of the cursor's textblock (e.g. a blockquote inside a table cell).
+ */
+function findNearestPanelHolderType($from, panelAsC1, panelAsPlain) {
+  var panelAsC1Content = Fragment.from(panelAsC1);
+  var panelAsPlainContent = Fragment.from(panelAsPlain);
+  for (var depth = $from.depth; depth >= 0; depth--) {
+    var ancestorType = $from.node(depth).type;
+    if (ancestorType.validContent(panelAsC1Content) || ancestorType.validContent(panelAsPlainContent)) {
+      return ancestorType;
+    }
+  }
+  return undefined;
+}
+
+/**
+ * Turns top-level `panel_c1` children of the slice back into `panel` when the nearest ancestor of
+ * the paste position that can hold a panel accepts `panel` but not `panel_c1`. Only panels whose
+ * content is valid for a plain `panel` are changed, that is content without the containers only
+ * `panel_c1` allows: tables (`platform_editor_nest_table_in_panel`), and expands, nested panels and
+ * other containers when `platform_editor_nest_container_in_panel` is on.
+ *
+ * A partial copy from a top-level panel is re-wrapped as `panel_c1` from the clipboard context, and
+ * a wrapper the destination cannot hold makes the paste insert the panel after the container (e.g.
+ * below a table) instead of pasting the text where the cursor is.
+ */
+export function downgradePanelC1ForDestination(slice, schema, $from) {
+  var _schema$nodes4 = schema.nodes,
+    panel = _schema$nodes4.panel,
+    panel_c1 = _schema$nodes4.panel_c1;
+  if (!panel || !panel_c1) {
+    return slice;
+  }
+  var isDowngraded = false;
+  var children = [];
+  slice.content.forEach(function (child) {
+    if (child.type !== panel_c1 || !panel.validContent(child.content)) {
+      children.push(child);
+      return;
+    }
+    var plainPanel = panel.create(child.attrs, child.content, child.marks.filter(function (mark) {
+      return panel.allowsMarkType(mark.type);
+    }));
+    var holderType = findNearestPanelHolderType($from, child, plainPanel);
+    var holderOnlyAcceptsPlainPanel = !!holderType && !holderType.validContent(Fragment.from(child)) && holderType.validContent(Fragment.from(plainPanel));
+    if (holderOnlyAcceptsPlainPanel) {
+      isDowngraded = true;
+      children.push(plainPanel);
+      return;
+    }
+    children.push(child);
+  });
+  return isDowngraded ? new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd) : slice;
+}
+
 /*
  * When platform_editor_nest_table_in_panel is OFF, move table elements out of panel divs in the
  * clipboard HTML before ProseMirror parses it. This prevents the panel schema from

package/dist/types/pm-plugins/util/handlers.d.ts

@@ -7,7 +7,7 @@ import type { Command } from '@atlaskit/editor-common/types/command';
 import type { RunMacroAutoConvert } from '@atlaskit/editor-plugin-extension/extensionPluginType';
 import type { FindRootParentListNode } from '@atlaskit/editor-plugin-list/types';
 import type { InsertMediaAsMediaSingle } from '@atlaskit/editor-plugin-media/types';
-import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare function handleMention(slice: Slice, schema: Schema): Slice;
@@ -61,4 +61,16 @@ export declare function checkTaskListInList(state: EditorState, slice: Slice): b
 export declare function checkIfSelectionInNestedList(state: EditorState): boolean;
 export declare function handlePasteExpand(slice: Slice): Slice;
 export declare function applyContainerNodeTransformToSlice(slice: Slice, schema: Schema, destinationParentType: string): Slice;
+/**
+ * Turns top-level `panel_c1` children of the slice back into `panel` when the nearest ancestor of
+ * the paste position that can hold a panel accepts `panel` but not `panel_c1`. Only panels whose
+ * content is valid for a plain `panel` are changed, that is content without the containers only
+ * `panel_c1` allows: tables (`platform_editor_nest_table_in_panel`), and expands, nested panels and
+ * other containers when `platform_editor_nest_container_in_panel` is on.
+ *
+ * A partial copy from a top-level panel is re-wrapped as `panel_c1` from the clipboard context, and
+ * a wrapper the destination cannot hold makes the paste insert the panel after the container (e.g.
+ * below a table) instead of pasting the text where the cursor is.
+ */
+export declare function downgradePanelC1ForDestination(slice: Slice, schema: Schema, $from: ResolvedPos): Slice;
 export declare function splitTablesOutOfPanelHtml(html: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "31.1.7",
+	"version": "31.2.0",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
-		"@atlaskit/tmp-editor-statsig": "^257.0.0",
+		"@atlaskit/tmp-editor-statsig": "^258.0.0",
 		"@atlaskit/tokens": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -77,12 +77,9 @@
 		},
 		"platform_editor_paste_strip_invalid_block_marks": {
 			"type": "boolean"
-		}
-	},
-	"platform-experiments": {
-		"platform_editor_paste_autoconvert_robustness": {
-			"param": "isEnabled",
-			"defaultValue": false
+		},
+		"platform_editor_paste_panel_c1_into_container": {
+			"type": "boolean"
 		}
 	}
 }