@atlaskit/editor-plugin-paste 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-paste
 
+## 2.1.3
+
+### Patch Changes
+
+- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
+  [`bc422d0adbbb5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc422d0adbbb5) -
+  [ux] ED-26378 remove editor_nest_media_and_codeblock_in_quotes_jira
+- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
+  [`cccc7a8347929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cccc7a8347929) -
+  [ux] ED-26378 Remove editor_nest_media_and_codeblock_in_quotes_jira and
+  nestMediaAndCodeblockInQuote
+- Updated dependencies
+
+## 2.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.1.1
 
 ### Patch Changes

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

@@ -314,11 +314,11 @@ var handleMarkdownWithAnalytics = exports.handleMarkdownWithAnalytics = function
     type: _analytics.PasteTypes.markdown
   }))((0, _handlers.handleMarkdown)(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 || (_pluginInjectionApi$c3 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.queueCardsFromChangedTr));
 };
-var handleRichTextWithAnalytics = exports.handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported) {
+var handleRichTextWithAnalytics = exports.handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi) {
   var _pluginInjectionApi$a4, _pluginInjectionApi$c4;
   return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: _analytics.PasteTypes.richText
-  }, pluginInjectionApi))((0, _handlers.handleRichText)(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported));
+  }, pluginInjectionApi))((0, _handlers.handleRichText)(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr));
 };
 var injectAnalyticsPayloadBeforeCommand = function injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI) {
   return function (createPayloadByTransaction) {
@@ -410,12 +410,12 @@ var createPasteMeasurePayload = exports.createPasteMeasurePayload = function cre
     }
   };
 };
-var getContentNodeTypes = exports.getContentNodeTypes = function getContentNodeTypes(content) {
+var _getContentNodeTypes = exports.getContentNodeTypes = function getContentNodeTypes(content) {
   var nodeTypes = new Set();
   if (content.size) {
     content.forEach(function (node) {
       if (node.content && node.content.size) {
-        nodeTypes = new Set([].concat((0, _toConsumableArray2.default)(nodeTypes), (0, _toConsumableArray2.default)(getContentNodeTypes(node.content))));
+        nodeTypes = new Set([].concat((0, _toConsumableArray2.default)(nodeTypes), (0, _toConsumableArray2.default)(_getContentNodeTypes(node.content))));
       }
       nodeTypes.add(node.type.name);
     });

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

@@ -30,6 +30,7 @@ var _analytics2 = require("./analytics");
 var _clipboardTextSerializer = require("./clipboard-text-serializer");
 var _pluginFactory = require("./plugin-factory");
 var _util = require("./util");
+var _handleVSCodeBlock = require("./util/edge-cases/handleVSCodeBlock");
 var _handlers = require("./util/handlers");
 var _tinyMCE = require("./util/tinyMCE");
 var isInsideBlockQuote = exports.isInsideBlockQuote = function isInsideBlockQuote(state) {
@@ -275,6 +276,12 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           view.dispatch(tr.setMeta('uiEvent', 'paste'));
         };
         slice = (0, _handlers.handleParagraphBlockMarks)(state, slice);
+        slice = (0, _handleVSCodeBlock.handleVSCodeBlock)({
+          state: state,
+          slice: slice,
+          event: event,
+          text: text
+        });
         var plainTextPasteSlice = (0, _utils.linkifyContent)(state.schema)(slice);
         if ((0, _analytics2.handlePasteAsPlainTextWithAnalytics)(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
@@ -399,7 +406,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l, _pluginInjectionApi$f2;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = (0, _utils.linkifyContent)(state.schema)(slice);
           if ((0, _analytics2.handlePasteLinkOnSelectedTextWithAnalytics)(editorAnalyticsAPI)(view, event, slice, _analytics.PasteTypes.richText)(state, dispatch)) {
@@ -468,8 +475,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           if ((0, _analytics2.handlePasteNonNestableBlockNodesIntoListWithAnalytics)(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          var isNestingMediaOrCodeblockSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.sharedState.currentState()) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.nestMediaAndCodeblockInQuote) || (0, _platformFeatureFlags.fg)('editor_nest_media_and_codeblock_in_quotes_jira');
-          return (0, _analytics2.handleRichTextWithAnalytics)(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported)(state, dispatch);
+          return (0, _analytics2.handleRichTextWithAnalytics)(view, event, slice, pluginInjectionApi)(state, dispatch);
         }
         return false;
       },

package/dist/cjs/pm-plugins/util/edge-cases/handleVSCodeBlock.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleVSCodeBlock = handleVSCodeBlock;
+var _constants = require("@atlaskit/code/constants");
+var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+function safelyGetVSCodeLanguage(editorData) {
+  try {
+    var vscodeData = editorData ? JSON.parse(editorData) : undefined;
+    return vscodeData === null || vscodeData === void 0 ? void 0 : vscodeData.mode;
+  } catch (_e) {}
+}
+function handleVSCodeBlock(_ref) {
+  var _event$clipboardData;
+  var state = _ref.state,
+    slice = _ref.slice,
+    text = _ref.text,
+    event = _ref.event;
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_vs_code_block_paste')) {
+    return slice;
+  }
+  var vscodeData = event === null || event === void 0 || (_event$clipboardData = event.clipboardData) === null || _event$clipboardData === void 0 ? void 0 : _event$clipboardData.getData('vscode-editor-data');
+  var language = safelyGetVSCodeLanguage(vscodeData);
+  if (text && language && _constants.SUPPORTED_LANGUAGES.some(function (l) {
+    return l.alias[0] === language;
+  })) {
+    var schema = state.schema;
+    slice = (0, _utils.mapSlice)(slice, function (node) {
+      var _schema$nodes$codeBlo;
+      if (node.type.name === ((_schema$nodes$codeBlo = schema.nodes.codeBlock) === null || _schema$nodes$codeBlo === void 0 ? void 0 : _schema$nodes$codeBlo.name)) {
+        return schema.nodes.codeBlock.createChecked({
+          language: language
+        }, schema.text(text));
+      }
+      return node;
+    });
+  }
+  return slice;
+}

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

@@ -44,7 +44,6 @@ var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../../editor-commands/commands");
-var _main = require("../main");
 var _pluginFactory = require("../plugin-factory");
 var _edgeCases = require("./edge-cases");
 var _lists = require("./edge-cases/lists");
@@ -971,11 +970,10 @@ function flattenNestedListInSlice(slice) {
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new _model.Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported) {
+function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes4 = state.schema.nodes,
-      blockquote = _state$schema$nodes4.blockquote,
       codeBlock = _state$schema$nodes4.codeBlock,
       heading = _state$schema$nodes4.heading,
       paragraph = _state$schema$nodes4.paragraph,
@@ -1010,25 +1008,12 @@ function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodebloc
     var noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
     var panelParentOverCurrentSelection = (0, _utils2.findParentNodeOfType)(panel)(tr.selection);
     var isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
-    var sliceContainsCodeblockOrMedia = false;
-    var codeBlockAndMediaNodes = ['codeBlock', 'mediaSingle', 'mediaGroup'];
-    slice.content.forEach(function (child) {
-      if (codeBlockAndMediaNodes.includes(child.type.name)) {
-        sliceContainsCodeblockOrMedia = true;
-      }
-    });
-    var blockquoteNode = (0, _utils2.findParentNodeOfType)(blockquote)(tr.selection);
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       (0, _edgeCases.insertSliceForLists)({
         tr: tr,
         slice: slice,
         schema: schema
       });
-    } else if (
-    // If nesting media or codeblock in blockquote is not supported
-    // we want to insert slice after the blockquote.
-    (0, _main.isInsideBlockQuote)(state) && sliceContainsCodeblockOrMedia && !isNestingMediaOrCodeblockSupported && blockquoteNode) {
-      tr = (0, _utils2.safeInsert)(slice.content, blockquoteNode.start + blockquoteNode.node.nodeSize - 1)(tr);
     } else if (noNeedForSafeInsert) {
       var _firstChildOfSlice$ty2, _firstChildOfSlice$co, _firstChildOfSlice$co2;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co !== void 0 && _firstChildOfSlice$co.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {

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

@@ -291,11 +291,11 @@ export const handleMarkdownWithAnalytics = (view, event, slice, pluginInjectionA
     type: PasteTypes.markdown
   }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c5 = pluginInjectionApi.card) === null || _pluginInjectionApi$c5 === void 0 ? void 0 : (_pluginInjectionApi$c6 = _pluginInjectionApi$c5.actions) === null || _pluginInjectionApi$c6 === void 0 ? void 0 : _pluginInjectionApi$c6.queueCardsFromChangedTr));
 };
-export const handleRichTextWithAnalytics = (view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported) => {
+export const handleRichTextWithAnalytics = (view, event, slice, pluginInjectionApi) => {
   var _pluginInjectionApi$a4, _pluginInjectionApi$c7, _pluginInjectionApi$c8;
   return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c7 = pluginInjectionApi.card) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : (_pluginInjectionApi$c8 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c8 === void 0 ? void 0 : _pluginInjectionApi$c8.queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported));
+  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c7 = pluginInjectionApi.card) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : (_pluginInjectionApi$c8 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c8 === void 0 ? void 0 : _pluginInjectionApi$c8.queueCardsFromChangedTr));
 };
 const injectAnalyticsPayloadBeforeCommand = editorAnalyticsAPI => createPayloadByTransaction => {
   return mainCommand => {

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

@@ -20,6 +20,7 @@ import { createPasteMeasurePayload, getContentNodeTypes, handleCodeBlockWithAnal
 import { clipboardTextSerializer } from './clipboard-text-serializer';
 import { createPluginState, pluginKey as stateKey } from './plugin-factory';
 import { escapeLinks, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from './util';
+import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
 export const isInsideBlockQuote = state => {
@@ -249,6 +250,12 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           view.dispatch(tr.setMeta('uiEvent', 'paste'));
         };
         slice = handleParagraphBlockMarks(state, slice);
+        slice = handleVSCodeBlock({
+          state,
+          slice,
+          event,
+          text
+        });
         const plainTextPasteSlice = linkifyContent(state.schema)(slice);
         if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
@@ -375,7 +382,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$f, _pluginInjectionApi$f2, _pluginInjectionApi$l, _pluginInjectionApi$f3, _pluginInjectionApi$f4;
+          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$f, _pluginInjectionApi$f2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -442,8 +449,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (handlePasteNonNestableBlockNodesIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          const isNestingMediaOrCodeblockSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.sharedState.currentState()) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
-          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported)(state, dispatch);
+          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);
         }
         return false;
       },

package/dist/es2019/pm-plugins/util/edge-cases/handleVSCodeBlock.js

@@ -0,0 +1,37 @@
+import { SUPPORTED_LANGUAGES } from '@atlaskit/code/constants';
+import { mapSlice } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
+function safelyGetVSCodeLanguage(editorData) {
+  try {
+    const vscodeData = editorData ? JSON.parse(editorData) : undefined;
+    return vscodeData === null || vscodeData === void 0 ? void 0 : vscodeData.mode;
+  } catch (_e) {}
+}
+export function handleVSCodeBlock({
+  state,
+  slice,
+  text,
+  event
+}) {
+  var _event$clipboardData;
+  if (!fg('platform_editor_vs_code_block_paste')) {
+    return slice;
+  }
+  const vscodeData = event === null || event === void 0 ? void 0 : (_event$clipboardData = event.clipboardData) === null || _event$clipboardData === void 0 ? void 0 : _event$clipboardData.getData('vscode-editor-data');
+  const language = safelyGetVSCodeLanguage(vscodeData);
+  if (text && language && SUPPORTED_LANGUAGES.some(l => l.alias[0] === language)) {
+    const {
+      schema
+    } = state;
+    slice = mapSlice(slice, node => {
+      var _schema$nodes$codeBlo;
+      if (node.type.name === ((_schema$nodes$codeBlo = schema.nodes.codeBlock) === null || _schema$nodes$codeBlo === void 0 ? void 0 : _schema$nodes$codeBlo.name)) {
+        return schema.nodes.codeBlock.createChecked({
+          language
+        }, schema.text(text));
+      }
+      return node;
+    });
+  }
+  return slice;
+}

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

@@ -15,7 +15,6 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from '../../editor-commands/commands';
-import { isInsideBlockQuote } from '../main';
 import { getPluginState as getPastePluginState } from '../plugin-factory';
 import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
@@ -951,11 +950,10 @@ export function flattenNestedListInSlice(slice) {
   const contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported) {
+export function handleRichText(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     const {
-      blockquote,
       codeBlock,
       heading,
       paragraph,
@@ -993,25 +991,12 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
     const noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
     const panelParentOverCurrentSelection = findParentNodeOfType(panel)(tr.selection);
     const isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
-    let sliceContainsCodeblockOrMedia = false;
-    const codeBlockAndMediaNodes = ['codeBlock', 'mediaSingle', 'mediaGroup'];
-    slice.content.forEach(child => {
-      if (codeBlockAndMediaNodes.includes(child.type.name)) {
-        sliceContainsCodeblockOrMedia = true;
-      }
-    });
-    const blockquoteNode = findParentNodeOfType(blockquote)(tr.selection);
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       insertSliceForLists({
         tr,
         slice,
         schema
       });
-    } else if (
-    // If nesting media or codeblock in blockquote is not supported
-    // we want to insert slice after the blockquote.
-    isInsideBlockQuote(state) && sliceContainsCodeblockOrMedia && !isNestingMediaOrCodeblockSupported && blockquoteNode) {
-      tr = safeInsert(slice.content, blockquoteNode.start + blockquoteNode.node.nodeSize - 1)(tr);
     } else if (noNeedForSafeInsert) {
       var _firstChildOfSlice$ty2, _firstChildOfSlice$co, _firstChildOfSlice$co2;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co !== void 0 && _firstChildOfSlice$co.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {

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

@@ -302,11 +302,11 @@ export var handleMarkdownWithAnalytics = function handleMarkdownWithAnalytics(vi
     type: PasteTypes.markdown
   }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 || (_pluginInjectionApi$c3 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.queueCardsFromChangedTr));
 };
-export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported) {
+export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi) {
   var _pluginInjectionApi$a4, _pluginInjectionApi$c4;
   return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported));
+  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr));
 };
 var injectAnalyticsPayloadBeforeCommand = function injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI) {
   return function (createPayloadByTransaction) {
@@ -398,15 +398,16 @@ export var createPasteMeasurePayload = function createPasteMeasurePayload(_ref3)
     }
   };
 };
-export var getContentNodeTypes = function getContentNodeTypes(content) {
+var _getContentNodeTypes = function getContentNodeTypes(content) {
   var nodeTypes = new Set();
   if (content.size) {
     content.forEach(function (node) {
       if (node.content && node.content.size) {
-        nodeTypes = new Set([].concat(_toConsumableArray(nodeTypes), _toConsumableArray(getContentNodeTypes(node.content))));
+        nodeTypes = new Set([].concat(_toConsumableArray(nodeTypes), _toConsumableArray(_getContentNodeTypes(node.content))));
       }
       nodeTypes.add(node.type.name);
     });
   }
   return Array.from(nodeTypes);
-};
+};
+export { _getContentNodeTypes as getContentNodeTypes };

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

@@ -22,6 +22,7 @@ import { createPasteMeasurePayload, getContentNodeTypes, handleCodeBlockWithAnal
 import { clipboardTextSerializer } from './clipboard-text-serializer';
 import { createPluginState, pluginKey as stateKey } from './plugin-factory';
 import { escapeLinks, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from './util';
+import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
 export var isInsideBlockQuote = function isInsideBlockQuote(state) {
@@ -267,6 +268,12 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           view.dispatch(tr.setMeta('uiEvent', 'paste'));
         };
         slice = handleParagraphBlockMarks(state, slice);
+        slice = handleVSCodeBlock({
+          state: state,
+          slice: slice,
+          event: event,
+          text: text
+        });
         var plainTextPasteSlice = linkifyContent(state.schema)(slice);
         if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
@@ -391,7 +398,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l, _pluginInjectionApi$f2;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -460,8 +467,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (handlePasteNonNestableBlockNodesIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          var isNestingMediaOrCodeblockSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.sharedState.currentState()) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
-          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported)(state, dispatch);
+          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);
         }
         return false;
       },

package/dist/esm/pm-plugins/util/edge-cases/handleVSCodeBlock.js

@@ -0,0 +1,36 @@
+import { SUPPORTED_LANGUAGES } from '@atlaskit/code/constants';
+import { mapSlice } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
+function safelyGetVSCodeLanguage(editorData) {
+  try {
+    var vscodeData = editorData ? JSON.parse(editorData) : undefined;
+    return vscodeData === null || vscodeData === void 0 ? void 0 : vscodeData.mode;
+  } catch (_e) {}
+}
+export function handleVSCodeBlock(_ref) {
+  var _event$clipboardData;
+  var state = _ref.state,
+    slice = _ref.slice,
+    text = _ref.text,
+    event = _ref.event;
+  if (!fg('platform_editor_vs_code_block_paste')) {
+    return slice;
+  }
+  var vscodeData = event === null || event === void 0 || (_event$clipboardData = event.clipboardData) === null || _event$clipboardData === void 0 ? void 0 : _event$clipboardData.getData('vscode-editor-data');
+  var language = safelyGetVSCodeLanguage(vscodeData);
+  if (text && language && SUPPORTED_LANGUAGES.some(function (l) {
+    return l.alias[0] === language;
+  })) {
+    var schema = state.schema;
+    slice = mapSlice(slice, function (node) {
+      var _schema$nodes$codeBlo;
+      if (node.type.name === ((_schema$nodes$codeBlo = schema.nodes.codeBlock) === null || _schema$nodes$codeBlo === void 0 ? void 0 : _schema$nodes$codeBlo.name)) {
+        return schema.nodes.codeBlock.createChecked({
+          language: language
+        }, schema.text(text));
+      }
+      return node;
+    });
+  }
+  return slice;
+}

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

@@ -23,7 +23,6 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from '../../editor-commands/commands';
-import { isInsideBlockQuote } from '../main';
 import { getPluginState as getPastePluginState } from '../plugin-factory';
 import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
@@ -945,11 +944,10 @@ export function flattenNestedListInSlice(slice) {
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported) {
+export function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes4 = state.schema.nodes,
-      blockquote = _state$schema$nodes4.blockquote,
       codeBlock = _state$schema$nodes4.codeBlock,
       heading = _state$schema$nodes4.heading,
       paragraph = _state$schema$nodes4.paragraph,
@@ -984,25 +982,12 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
     var noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
     var panelParentOverCurrentSelection = findParentNodeOfType(panel)(tr.selection);
     var isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
-    var sliceContainsCodeblockOrMedia = false;
-    var codeBlockAndMediaNodes = ['codeBlock', 'mediaSingle', 'mediaGroup'];
-    slice.content.forEach(function (child) {
-      if (codeBlockAndMediaNodes.includes(child.type.name)) {
-        sliceContainsCodeblockOrMedia = true;
-      }
-    });
-    var blockquoteNode = findParentNodeOfType(blockquote)(tr.selection);
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       insertSliceForLists({
         tr: tr,
         slice: slice,
         schema: schema
       });
-    } else if (
-    // If nesting media or codeblock in blockquote is not supported
-    // we want to insert slice after the blockquote.
-    isInsideBlockQuote(state) && sliceContainsCodeblockOrMedia && !isNestingMediaOrCodeblockSupported && blockquoteNode) {
-      tr = safeInsert(slice.content, blockquoteNode.start + blockquoteNode.node.nodeSize - 1)(tr);
     } else if (noNeedForSafeInsert) {
       var _firstChildOfSlice$ty2, _firstChildOfSlice$co, _firstChildOfSlice$co2;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co !== void 0 && _firstChildOfSlice$co.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {

package/dist/types/pm-plugins/analytics.d.ts

@@ -28,7 +28,7 @@ export declare const handleCodeBlockWithAnalytics: (editorAnalyticsAPI: EditorAn
 export declare const handleMediaSingleWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined) => Command;
 export declare const handlePastePreservingMarksWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handleMarkdownWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
-export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined, isNestingMediaOrCodeblockSupported: boolean) => Command;
+export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handlePastePanelOrDecisionIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, findRootParentListNode: FindRootParentListNode | undefined) => Command;
 export declare const handlePasteNonNestableBlockNodesIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
 export declare const handleExpandWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported: boolean) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;

package/dist/types/pm-plugins/util/edge-cases/handleVSCodeBlock.d.ts

@@ -0,0 +1,10 @@
+import { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+interface VSCodeBlockParams {
+    state: EditorState;
+    slice: Slice;
+    text: string;
+    event: ClipboardEvent;
+}
+export declare function handleVSCodeBlock({ state, slice, text, event }: VSCodeBlockParams): Slice;
+export {};

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

@@ -52,7 +52,7 @@ export declare function handleParagraphBlockMarks(state: EditorState, slice: Sli
  *     ┗━p -> "two"
  */
 export declare function flattenNestedListInSlice(slice: Slice): Slice;
-export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, isNestingMediaOrCodeblockSupported?: boolean): Command;
+export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined): Command;
 export declare function handlePasteIntoCaption(slice: Slice): Command;
 export declare const handleSelectedTable: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (slice: Slice) => Command;
 export declare function checkTaskListInList(state: EditorState, slice: Slice): boolean;

package/dist/types-ts4.5/pm-plugins/analytics.d.ts

@@ -28,7 +28,7 @@ export declare const handleCodeBlockWithAnalytics: (editorAnalyticsAPI: EditorAn
 export declare const handleMediaSingleWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined) => Command;
 export declare const handlePastePreservingMarksWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handleMarkdownWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
-export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined, isNestingMediaOrCodeblockSupported: boolean) => Command;
+export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handlePastePanelOrDecisionIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, findRootParentListNode: FindRootParentListNode | undefined) => Command;
 export declare const handlePasteNonNestableBlockNodesIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
 export declare const handleExpandWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported: boolean) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;

package/dist/types-ts4.5/pm-plugins/util/edge-cases/handleVSCodeBlock.d.ts

@@ -0,0 +1,10 @@
+import { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+interface VSCodeBlockParams {
+    state: EditorState;
+    slice: Slice;
+    text: string;
+    event: ClipboardEvent;
+}
+export declare function handleVSCodeBlock({ state, slice, text, event }: VSCodeBlockParams): Slice;
+export {};

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

@@ -52,7 +52,7 @@ export declare function handleParagraphBlockMarks(state: EditorState, slice: Sli
  *     ┗━p -> "two"
  */
 export declare function flattenNestedListInSlice(slice: Slice): Slice;
-export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, isNestingMediaOrCodeblockSupported?: boolean): Command;
+export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined): Command;
 export declare function handlePasteIntoCaption(slice: Slice): Command;
 export declare const handleSelectedTable: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (slice: Slice) => Command;
 export declare function checkTaskListInList(state: EditorState, slice: Slice): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.1.1",
+	"version": "2.1.3",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.6.0",
+		"@atlaskit/code": "^15.6.9",
+		"@atlaskit/editor-common": "^99.8.0",
 		"@atlaskit/editor-markdown-transformer": "^5.14.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-annotation": "^1.27.0",
@@ -46,8 +47,8 @@
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/media-client": "^31.1.0",
 		"@atlaskit/media-common": "^11.8.0",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.41.0",
+		"@atlaskit/platform-feature-flags": "^1.0.0",
+		"@atlaskit/tmp-editor-statsig": "^2.42.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
@@ -113,10 +114,10 @@
 		"platform_editor_nest_nested_expand_in_expand_jira": {
 			"type": "boolean"
 		},
-		"editor_nest_media_and_codeblock_in_quotes_jira": {
+		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_use_nested_table_pm_nodes": {
+		"platform_editor_vs_code_block_paste": {
 			"type": "boolean"
 		},
 		"platform_editor_advanced_layouts_post_fix_patch_2": {