@atlaskit/editor-plugin-paste 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-paste
 
+## 2.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.1
+
+### Patch Changes
+
+- [#103729](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103729)
+  [`3188f307d178a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3188f307d178a) -
+  ED-25321: fixes issue where pasting action/task item into the middle of a list item will paste in
+  the wrong location and create an extra empty task item
+
 ## 2.1.0
 
 ### Minor Changes

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

@@ -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;

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/edge-cases/index.js

@@ -12,6 +12,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _index = require("../index");
 var _lists = require("./lists");
 function insertSliceForLists(_ref) {
@@ -105,9 +106,15 @@ function insertSliceForTaskInsideList(_ref5) {
     slice = _ref5.slice;
   var schema = tr.doc.type.schema;
   //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
+  var selectionBeforeReplace = tr.selection.from;
   tr.replaceSelection(new _model.Slice(_model.Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
-  updateSelectionAfterReplace({
-    tr: tr
-  });
+  if ((0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list')) {
+    var nextSelection = _state.Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+    tr.setSelection(nextSelection);
+  } else {
+    updateSelectionAfterReplace({
+      tr: tr
+    });
+  }
   tr.replaceSelection(slice);
 }

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

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkIfSelectionInNestedList = checkIfSelectionInNestedList;
 exports.checkTaskListInList = checkTaskListInList;
 exports.doesSelectionWhichStartsOrEndsInListContainEntireList = void 0;
 exports.flattenNestedListInSlice = flattenNestedListInSlice;
@@ -40,6 +41,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 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");
@@ -265,16 +267,22 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
     var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    var grandParentListNode = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
-    var selectionIsInNestedList = !!grandParentListNode;
-    var selectedListItemHasNestedList = false;
-    selectionParentListItemNode.node.content.forEach(function (child) {
-      if ((0, _utils.isListNode)(child)) {
-        selectedListItemHasNestedList = true;
+    if ((0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list')) {
+      if (checkIfSelectionInNestedList(state)) {
+        return false;
+      }
+    } else {
+      var grandParentListNode = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+      var selectionIsInNestedList = !!grandParentListNode;
+      var selectedListItemHasNestedList = false;
+      selectionParentListItemNode.node.content.forEach(function (child) {
+        if ((0, _utils.isListNode)(child)) {
+          selectedListItemHasNestedList = true;
+        }
+      });
+      if (selectedListItemHasNestedList || selectionIsInNestedList) {
+        return false;
       }
-    });
-    if (selectedListItemHasNestedList || selectionIsInNestedList) {
-      return false;
     }
 
     // Node after the insert position
@@ -1057,7 +1065,7 @@ function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodebloc
       });
       if ((0, _utils.insideTableCell)(state) && (0, _utils.isInListItem)(state) && (0, _utils2.canInsert)(selection.$from, slice.content) && (0, _utils2.canInsert)(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
-      } else if (checkTaskListInList(state, slice)) {
+      } else if (checkTaskListInList(state, slice) && (!(0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list') || !checkIfSelectionInNestedList(state))) {
         (0, _edgeCases.insertSliceForTaskInsideList)({
           tr: tr,
           slice: slice
@@ -1066,6 +1074,11 @@ function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodebloc
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
         tr = (0, _utils2.safeInsert)(slice.content, tr.selection.$to.pos)(tr);
+        if (checkTaskListInList(state, slice) && (0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list')) {
+          (0, _edgeCases.updateSelectionAfterReplace)({
+            tr: tr
+          });
+        }
       }
     }
     tr.setStoredMarks([]);
@@ -1119,4 +1132,26 @@ var handleSelectedTable = exports.handleSelectedTable = function handleSelectedT
 function checkTaskListInList(state, slice) {
   var _slice$content$firstC4;
   return Boolean((0, _utils.isInListItem)(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 || (_slice$content$firstC4 = _slice$content$firstC4.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
+}
+function checkIfSelectionInNestedList(state) {
+  var selection = state.selection,
+    tr = state.tr;
+  var _state$schema$nodes5 = state.schema.nodes,
+    orderedList = _state$schema$nodes5.orderedList,
+    bulletList = _state$schema$nodes5.bulletList,
+    listItem = _state$schema$nodes5.listItem;
+  var selectionParentListItemNode = (0, _utils2.findParentNodeOfType)(listItem)(selection);
+  var selectionParentListNodeWithPos = (0, _utils2.findParentNodeOfType)([bulletList, orderedList])(selection);
+  if (!selectionParentListItemNode || !selectionParentListNodeWithPos) {
+    return false;
+  }
+  var grandParentListNode = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+  var selectionIsInNestedList = !!grandParentListNode;
+  var selectedListItemHasNestedList = false;
+  selectionParentListItemNode.node.content.forEach(function (child) {
+    if ((0, _utils.isListNode)(child)) {
+      selectedListItemHasNestedList = true;
+    }
+  });
+  return selectedListItemHasNestedList || selectionIsInNestedList;
 }

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;

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/edge-cases/index.js

@@ -3,6 +3,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../index';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
 export function insertSliceForLists({
@@ -108,9 +109,15 @@ export function insertSliceForTaskInsideList({
     schema
   } = tr.doc.type;
   //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
+  const selectionBeforeReplace = tr.selection.from;
   tr.replaceSelection(new Slice(Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
-  updateSelectionAfterReplace({
-    tr
-  });
+  if (fg('platform_editor_fix_paste_action_item_in_list')) {
+    const nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+    tr.setSelection(nextSelection);
+  } else {
+    updateSelectionAfterReplace({
+      tr
+    });
+  }
   tr.replaceSelection(slice);
 }

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

@@ -10,13 +10,14 @@ import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/mo
 import { 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';
+import { fg } from '@atlaskit/platform-feature-flags';
 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 } from './edge-cases';
+import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './index';
 const insideExpand = state => {
@@ -243,16 +244,22 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     const listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    const grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
-    const selectionIsInNestedList = !!grandParentListNode;
-    let selectedListItemHasNestedList = false;
-    selectionParentListItemNode.node.content.forEach(child => {
-      if (isListNode(child)) {
-        selectedListItemHasNestedList = true;
+    if (fg('platform_editor_fix_paste_action_item_in_list')) {
+      if (checkIfSelectionInNestedList(state)) {
+        return false;
+      }
+    } else {
+      const grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+      const selectionIsInNestedList = !!grandParentListNode;
+      let selectedListItemHasNestedList = false;
+      selectionParentListItemNode.node.content.forEach(child => {
+        if (isListNode(child)) {
+          selectedListItemHasNestedList = true;
+        }
+      });
+      if (selectedListItemHasNestedList || selectionIsInNestedList) {
+        return false;
       }
-    });
-    if (selectedListItemHasNestedList || selectionIsInNestedList) {
-      return false;
     }
 
     // Node after the insert position
@@ -1041,7 +1048,7 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
-      } else if (checkTaskListInList(state, slice)) {
+      } else if (checkTaskListInList(state, slice) && (!fg('platform_editor_fix_paste_action_item_in_list') || !checkIfSelectionInNestedList(state))) {
         insertSliceForTaskInsideList({
           tr,
           slice
@@ -1050,6 +1057,11 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
         tr = safeInsert(slice.content, tr.selection.$to.pos)(tr);
+        if (checkTaskListInList(state, slice) && fg('platform_editor_fix_paste_action_item_in_list')) {
+          updateSelectionAfterReplace({
+            tr
+          });
+        }
       }
     }
     tr.setStoredMarks([]);
@@ -1101,4 +1113,29 @@ export const handleSelectedTable = editorAnalyticsAPI => slice => (state, dispat
 export function checkTaskListInList(state, slice) {
   var _slice$content$firstC4, _slice$content$firstC5;
   return Boolean(isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : (_slice$content$firstC5 = _slice$content$firstC4.type) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.name) || ''));
+}
+export function checkIfSelectionInNestedList(state) {
+  const {
+    selection,
+    tr
+  } = state;
+  const {
+    orderedList,
+    bulletList,
+    listItem
+  } = state.schema.nodes;
+  const selectionParentListItemNode = findParentNodeOfType(listItem)(selection);
+  const selectionParentListNodeWithPos = findParentNodeOfType([bulletList, orderedList])(selection);
+  if (!selectionParentListItemNode || !selectionParentListNodeWithPos) {
+    return false;
+  }
+  const grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+  const selectionIsInNestedList = !!grandParentListNode;
+  let selectedListItemHasNestedList = false;
+  selectionParentListItemNode.node.content.forEach(child => {
+    if (isListNode(child)) {
+      selectedListItemHasNestedList = true;
+    }
+  });
+  return selectedListItemHasNestedList || selectionIsInNestedList;
 }

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

@@ -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;

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/edge-cases/index.js

@@ -3,6 +3,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../index';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
 export function insertSliceForLists(_ref) {
@@ -96,9 +97,15 @@ export function insertSliceForTaskInsideList(_ref5) {
     slice = _ref5.slice;
   var schema = tr.doc.type.schema;
   //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
+  var selectionBeforeReplace = tr.selection.from;
   tr.replaceSelection(new Slice(Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
-  updateSelectionAfterReplace({
-    tr: tr
-  });
+  if (fg('platform_editor_fix_paste_action_item_in_list')) {
+    var nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+    tr.setSelection(nextSelection);
+  } else {
+    updateSelectionAfterReplace({
+      tr: tr
+    });
+  }
   tr.replaceSelection(slice);
 }

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

@@ -18,13 +18,14 @@ import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/mo
 import { 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';
+import { fg } from '@atlaskit/platform-feature-flags';
 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 } from './edge-cases';
+import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './index';
 var insideExpand = function insideExpand(state) {
@@ -240,16 +241,22 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    var grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
-    var selectionIsInNestedList = !!grandParentListNode;
-    var selectedListItemHasNestedList = false;
-    selectionParentListItemNode.node.content.forEach(function (child) {
-      if (isListNode(child)) {
-        selectedListItemHasNestedList = true;
+    if (fg('platform_editor_fix_paste_action_item_in_list')) {
+      if (checkIfSelectionInNestedList(state)) {
+        return false;
+      }
+    } else {
+      var grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+      var selectionIsInNestedList = !!grandParentListNode;
+      var selectedListItemHasNestedList = false;
+      selectionParentListItemNode.node.content.forEach(function (child) {
+        if (isListNode(child)) {
+          selectedListItemHasNestedList = true;
+        }
+      });
+      if (selectedListItemHasNestedList || selectionIsInNestedList) {
+        return false;
       }
-    });
-    if (selectedListItemHasNestedList || selectionIsInNestedList) {
-      return false;
     }
 
     // Node after the insert position
@@ -1032,7 +1039,7 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
-      } else if (checkTaskListInList(state, slice)) {
+      } else if (checkTaskListInList(state, slice) && (!fg('platform_editor_fix_paste_action_item_in_list') || !checkIfSelectionInNestedList(state))) {
         insertSliceForTaskInsideList({
           tr: tr,
           slice: slice
@@ -1041,6 +1048,11 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
         tr = safeInsert(slice.content, tr.selection.$to.pos)(tr);
+        if (checkTaskListInList(state, slice) && fg('platform_editor_fix_paste_action_item_in_list')) {
+          updateSelectionAfterReplace({
+            tr: tr
+          });
+        }
       }
     }
     tr.setStoredMarks([]);
@@ -1094,4 +1106,26 @@ export var handleSelectedTable = function handleSelectedTable(editorAnalyticsAPI
 export function checkTaskListInList(state, slice) {
   var _slice$content$firstC4;
   return Boolean(isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 || (_slice$content$firstC4 = _slice$content$firstC4.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
+}
+export function checkIfSelectionInNestedList(state) {
+  var selection = state.selection,
+    tr = state.tr;
+  var _state$schema$nodes5 = state.schema.nodes,
+    orderedList = _state$schema$nodes5.orderedList,
+    bulletList = _state$schema$nodes5.bulletList,
+    listItem = _state$schema$nodes5.listItem;
+  var selectionParentListItemNode = findParentNodeOfType(listItem)(selection);
+  var selectionParentListNodeWithPos = findParentNodeOfType([bulletList, orderedList])(selection);
+  if (!selectionParentListItemNode || !selectionParentListNodeWithPos) {
+    return false;
+  }
+  var grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+  var selectionIsInNestedList = !!grandParentListNode;
+  var selectedListItemHasNestedList = false;
+  selectionParentListItemNode.node.content.forEach(function (child) {
+    if (isListNode(child)) {
+      selectedListItemHasNestedList = true;
+    }
+  });
+  return selectedListItemHasNestedList || selectionIsInNestedList;
 }

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

@@ -56,3 +56,4 @@ export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: Qu
 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;
+export declare function checkIfSelectionInNestedList(state: EditorState): boolean;

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

@@ -56,3 +56,4 @@ export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: Qu
 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;
+export declare function checkIfSelectionInNestedList(state: EditorState): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"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.7.0",
 		"@atlaskit/editor-markdown-transformer": "^5.14.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-annotation": "^1.27.0",
@@ -46,7 +47,7 @@
 		"@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/platform-feature-flags": "^1.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.41.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -119,11 +120,17 @@
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
+		"platform_editor_vs_code_block_paste": {
+			"type": "boolean"
+		},
 		"platform_editor_advanced_layouts_post_fix_patch_2": {
 			"type": "boolean"
 		},
 		"platform_editor_fix_captions_on_copy": {
 			"type": "boolean"
+		},
+		"platform_editor_fix_paste_action_item_in_list": {
+			"type": "boolean"
 		}
 	}
 }