@atlaskit/editor-plugin-paste 13.2.3 → 13.3.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-paste
 
+## 13.3.1
+
+### Patch Changes
+
+- [`73743eb8b36e6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73743eb8b36e6) -
+  CLeanup prefer static regex violations
+- Updated dependencies
+
+## 13.3.0
+
+### Minor Changes
+
+- [`3f5a55729ccfa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3f5a55729ccfa) -
+  Fix over-nesting (auto-indent) when pasting a task/action into a bullet list item under the
+  flexible list schema (EDITOR-6738), behind kill switch platform_editor_flexible_list_kill_switch_1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.2.3
 
 ### Patch Changes

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

@@ -13,6 +13,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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _index = require("../index");
 var _lists = require("./lists");
@@ -139,10 +140,35 @@ function insertSliceForTaskInsideList(_ref5) {
   var tr = _ref5.tr,
     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));
-  var nextSelection = _state.Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
-  tr.setSelection(nextSelection);
-  tr.replaceSelection(slice);
+
+  // The corrected insertion path only applies for the flexible list indentation dogfooding audience
+  // (`platform_editor_flexible_list_indentation`), and the kill switch protects that audience from
+  // regressions. Fall back to the legacy path when the experiment is OFF or the kill switch is ON.
+  if (!(0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true) || (0, _platformFeatureFlags.fg)('platform_editor_flexible_list_kill_switch_1')) {
+    //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));
+    var nextSelection = _state.Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+    tr.setSelection(nextSelection);
+    tr.replaceSelection(slice);
+    return tr;
+  }
+
+  // Collapse redundant nested taskList wrappers from the slice context, always keeping a single
+  // outermost taskList so the content can be safely inserted as a sibling of the list item's
+  // paragraph (a listItem cannot directly contain bare taskItems).
+  var taskList = schema.nodes.taskList;
+  var content = slice.content;
+  while (content.childCount === 1 && ((_content$firstChild = content.firstChild) === null || _content$firstChild === void 0 ? void 0 : _content$firstChild.type) === taskList && ((_content$firstChild$f = content.firstChild.firstChild) === null || _content$firstChild$f === void 0 ? void 0 : _content$firstChild$f.type) === taskList) {
+    var _content$firstChild, _content$firstChild$f;
+    content = content.firstChild.content;
+  }
+
+  // safeInsert keeps the task structure intact at the closest schema-valid position, instead of
+  // replacing into an empty taskItem which would add an extra taskList level.
+  tr = (0, _utils2.safeInsert)(content, tr.selection.$to.pos)(tr);
+  updateSelectionAfterReplace({
+    tr: tr
+  });
+  return tr;
 }

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

@@ -107,7 +107,7 @@ function handleMention(slice, schema) {
 }
 function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _transformedSlice$con;
+    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _transformedSlice$con, _transformedSlice$con2;
     var schema = state.schema,
       selection = state.tr.selection;
     var codeMark = schema.marks.code,
@@ -187,9 +187,21 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     // or the slice's first node is a paragraph,
     // then we can replace the selection with our slice.
     var pastingIntoExtendedPanel = selectionIsPanel && panel.validContent(transformedSlice.content);
-    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
+
+    // A task slice carrying its own open taskList wrapper would, on a plain replaceSelection,
+    // nest that wrapper inside the current item and add an extra taskList level. Unwrapping one
+    // level keeps the pasted task(s) at the same level. Guarded by a kill switch.
+    var isOpenTaskListSlice = ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === taskList && transformedSlice.openStart >= 2 && transformedSlice.openEnd >= 1;
+    // Restrict the unwrap to a taskItem destination: its task content is schema-invalid inside a
+    // decisionItem (decisionList only accepts decisionItem), so decisionItem must fall through to
+    // the normal replaceSelection path.
+    var pastingIntoTaskItem = (0, _utils2.hasParentNodeOfType)([taskItem])(selection);
+    if ((0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true) && !(0, _platformFeatureFlags.fg)('platform_editor_flexible_list_kill_switch_1') && isOpenTaskListSlice && pastingIntoTaskItem && !selectionIsPanel) {
+      var unwrappedSlice = new _model.Slice(transformedSlice.content.firstChild.content, transformedSlice.openStart - 1, transformedSlice.openEnd - 1);
+      tr.replaceSelection(unwrappedSlice).scrollIntoView();
+    } else if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
     // Whole codeblock node has reverse slice depths.
-    transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === paragraph) {
+    transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con2 = transformedSlice.content.firstChild) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.type) === paragraph) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
     } else {
       var isWholeContentSelected = selection.$from.pos === selection.$from.start() && selection.$to.end() === selection.$to.pos;
@@ -208,14 +220,14 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
           tr.replaceSelection(transformedSlice).scrollIntoView();
         }
       } else {
-        var _transformedSlice$con2;
+        var _transformedSlice$con3;
         if (pastingIntoExtendedPanel && isWholeContentSelected) {
           // if the entire panel content is selected, doing a replaceSelection removes the panel as well. Hence we do delete followed by safeInsert
           tr.delete(selection.$from.pos, selection.$to.pos);
         }
         // This maintains both the selection (destination) and the slice (paste content).
         (0, _utils2.safeInsert)(transformedSlice.content)(tr).scrollIntoView();
-        if (((_transformedSlice$con2 = transformedSlice.content.lastChild) === null || _transformedSlice$con2 === void 0 || (_transformedSlice$con2 = _transformedSlice$con2.type) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.name) === 'rule') {
+        if (((_transformedSlice$con3 = transformedSlice.content.lastChild) === null || _transformedSlice$con3 === void 0 || (_transformedSlice$con3 = _transformedSlice$con3.type) === null || _transformedSlice$con3 === void 0 ? void 0 : _transformedSlice$con3.name) === 'rule') {
           tr.setSelection(_state.TextSelection.near(tr.doc.resolve(tr.selection.$from.pos + transformedSlice.content.size)));
         } else {
           // safeInsert doesn't set correct cursor position
@@ -1231,8 +1243,17 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       });
       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 ((0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true) && !(0, _platformFeatureFlags.fg)('platform_editor_flexible_list_kill_switch_1') && checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
+        // Corrected task-into-list insertion is gated behind the flexible list indentation
+        // experiment and protected by the kill switch.
+        tr = (0, _edgeCases.insertSliceForTaskInsideList)({
+          tr: tr,
+          slice: slice
+        });
       } else if (checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
-        (0, _edgeCases.insertSliceForTaskInsideList)({
+        // Legacy path (experiment OFF or kill switch ON): preserve the previous over-nesting
+        // behaviour via the function's internal fallback.
+        tr = (0, _edgeCases.insertSliceForTaskInsideList)({
           tr: tr,
           slice: slice
         });

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

@@ -29,6 +29,23 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _mediaClient = require("@atlaskit/media-client");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var HTML_CONTAINS_SINGLE_FILE_REGEX = /<img .*>/;
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var ESCAPE_LINKS_INNER_REGEX = /^(https?|ftp|jamfselfservice):\/\/[^\s>"]+$/;
+// Allows up to 3 leading spaces before ``` and optional trailing characters
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var OPENING_CODE_FENCE_REGEX = /^( {0,3})```.*$/;
+// Allows up to 3 leading spaces before ``` and optional trailing spaces or tabs
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var CLOSING_CODE_FENCE_REGEX = /^( {0,3})```[ 	]*$/;
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var SPLIT_ON_ANCHOR_REGEX = /(?=<a)/;
 function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -63,9 +80,7 @@ var isSingleLine = exports.isSingleLine = function isSingleLine(text) {
   return !!text && text.trim().split('\n').length === 1;
 };
 function htmlContainsSingleFile(html) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  return !!html.match(/<img .*>/) && !(0, _mediaClient.isMediaBlobUrl)(html);
+  return !!html.match(HTML_CONTAINS_SINGLE_FILE_REGEX) && !(0, _mediaClient.isMediaBlobUrl)(html);
 }
 function getPasteSource(event) {
   // Ignored via go/ees005
@@ -110,9 +125,7 @@ function escapeLinks(text) {
   // Ignored via go/ees005
   // eslint-disable-next-line require-unicode-regexp
   return text.replace(/(\[([^\]]+)\]\()?((https?|ftp|jamfselfservice):\/\/[^\s>"]+)/g, function (str) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line require-unicode-regexp
-    return str.match(/^(https?|ftp|jamfselfservice):\/\/[^\s>"]+$/) ? "<".concat(str, ">") : str;
+    return str.match(ESCAPE_LINKS_INNER_REGEX) ? "<".concat(str, ">") : str;
   });
 }
 
@@ -127,23 +140,15 @@ function escapeLinks(text) {
  */
 function escapeBackslashAndLinksExceptCodeBlock(textInput) {
   // ref: https://spec.commonmark.org/0.31.2/#fenced-code-blocks
-  // Allows up to 3 leading spaces before ``` and optional trailing characters
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  var openingCodeFenceRegex = /^( {0,3})```.*$/;
-  // Allows up to 3 leading spaces before ``` and optional trailing spaces or tabs
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  var closingCodeFenceRegex = /^( {0,3})```[ \t]*$/;
   var isInsideCodeBlock = false;
   var lines = textInput.split('\n');
   // In the splitted array, we traverse through every line and check if it will be parsed as a codeblock.
   return lines.map(function (line) {
-    if (!isInsideCodeBlock && openingCodeFenceRegex.test(line)) {
+    if (!isInsideCodeBlock && OPENING_CODE_FENCE_REGEX.test(line)) {
       isInsideCodeBlock = true;
       return line;
     }
-    if (isInsideCodeBlock && closingCodeFenceRegex.test(line)) {
+    if (isInsideCodeBlock && CLOSING_CODE_FENCE_REGEX.test(line)) {
       isInsideCodeBlock = false;
       return line;
     }
@@ -244,9 +249,7 @@ var htmlHasInvalidLinkTags = exports.htmlHasInvalidLinkTags = function htmlHasIn
 // <li><a href="http://www.atlassian.com\"<a> href="http://www.atlassian.com\"http://www.atlassian.com</a></a></li>">
 var removeDuplicateInvalidLinks = exports.removeDuplicateInvalidLinks = function removeDuplicateInvalidLinks(html) {
   if (htmlHasInvalidLinkTags(html)) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line require-unicode-regexp
-    var htmlArray = html.split(/(?=<a)/);
+    var htmlArray = html.split(SPLIT_ON_ANCHOR_REGEX);
     var htmlArrayWithoutInvalidLinks = htmlArray.filter(function (item) {
       return !(item.includes('<a') && item.includes('"></a>')) && !(item.includes('<a') && !item.includes('</a>'));
     });

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

@@ -3,7 +3,8 @@ import { isListNode } from '@atlaskit/editor-common/utils';
 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 { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../index';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
@@ -140,10 +141,37 @@ export function insertSliceForTaskInsideList({
   const {
     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));
-  const nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
-  tr.setSelection(nextSelection);
-  tr.replaceSelection(slice);
+
+  // The corrected insertion path only applies for the flexible list indentation dogfooding audience
+  // (`platform_editor_flexible_list_indentation`), and the kill switch protects that audience from
+  // regressions. Fall back to the legacy path when the experiment is OFF or the kill switch is ON.
+  if (!expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) || fg('platform_editor_flexible_list_kill_switch_1')) {
+    //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));
+    const nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+    tr.setSelection(nextSelection);
+    tr.replaceSelection(slice);
+    return tr;
+  }
+
+  // Collapse redundant nested taskList wrappers from the slice context, always keeping a single
+  // outermost taskList so the content can be safely inserted as a sibling of the list item's
+  // paragraph (a listItem cannot directly contain bare taskItems).
+  const {
+    taskList
+  } = schema.nodes;
+  let content = slice.content;
+  while (content.childCount === 1 && ((_content$firstChild = content.firstChild) === null || _content$firstChild === void 0 ? void 0 : _content$firstChild.type) === taskList && ((_content$firstChild$f = content.firstChild.firstChild) === null || _content$firstChild$f === void 0 ? void 0 : _content$firstChild$f.type) === taskList) {
+    var _content$firstChild, _content$firstChild$f;
+    content = content.firstChild.content;
+  }
+
+  // safeInsert keeps the task structure intact at the closest schema-valid position, instead of
+  // replacing into an empty taskItem which would add an extra taskList level.
+  tr = safeInsert(content, tr.selection.$to.pos)(tr);
+  updateSelectionAfterReplace({
+    tr
+  });
+  return tr;
 }

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

@@ -67,7 +67,7 @@ export function handleMention(slice, schema) {
 }
 export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
-    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _transformedSlice$con;
+    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _transformedSlice$con, _transformedSlice$con2;
     const {
       schema,
       tr: {
@@ -154,9 +154,21 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // or the slice's first node is a paragraph,
     // then we can replace the selection with our slice.
     const pastingIntoExtendedPanel = selectionIsPanel && panel.validContent(transformedSlice.content);
-    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
+
+    // A task slice carrying its own open taskList wrapper would, on a plain replaceSelection,
+    // nest that wrapper inside the current item and add an extra taskList level. Unwrapping one
+    // level keeps the pasted task(s) at the same level. Guarded by a kill switch.
+    const isOpenTaskListSlice = ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === taskList && transformedSlice.openStart >= 2 && transformedSlice.openEnd >= 1;
+    // Restrict the unwrap to a taskItem destination: its task content is schema-invalid inside a
+    // decisionItem (decisionList only accepts decisionItem), so decisionItem must fall through to
+    // the normal replaceSelection path.
+    const pastingIntoTaskItem = hasParentNodeOfType([taskItem])(selection);
+    if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) && !fg('platform_editor_flexible_list_kill_switch_1') && isOpenTaskListSlice && pastingIntoTaskItem && !selectionIsPanel) {
+      const unwrappedSlice = new Slice(transformedSlice.content.firstChild.content, transformedSlice.openStart - 1, transformedSlice.openEnd - 1);
+      tr.replaceSelection(unwrappedSlice).scrollIntoView();
+    } else if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
     // Whole codeblock node has reverse slice depths.
-    transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === paragraph) {
+    transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con2 = transformedSlice.content.firstChild) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.type) === paragraph) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
     } else {
       const isWholeContentSelected = selection.$from.pos === selection.$from.start() && selection.$to.end() === selection.$to.pos;
@@ -175,14 +187,14 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
           tr.replaceSelection(transformedSlice).scrollIntoView();
         }
       } else {
-        var _transformedSlice$con2, _transformedSlice$con3;
+        var _transformedSlice$con3, _transformedSlice$con4;
         if (pastingIntoExtendedPanel && isWholeContentSelected) {
           // if the entire panel content is selected, doing a replaceSelection removes the panel as well. Hence we do delete followed by safeInsert
           tr.delete(selection.$from.pos, selection.$to.pos);
         }
         // This maintains both the selection (destination) and the slice (paste content).
         safeInsert(transformedSlice.content)(tr).scrollIntoView();
-        if (((_transformedSlice$con2 = transformedSlice.content.lastChild) === null || _transformedSlice$con2 === void 0 ? void 0 : (_transformedSlice$con3 = _transformedSlice$con2.type) === null || _transformedSlice$con3 === void 0 ? void 0 : _transformedSlice$con3.name) === 'rule') {
+        if (((_transformedSlice$con3 = transformedSlice.content.lastChild) === null || _transformedSlice$con3 === void 0 ? void 0 : (_transformedSlice$con4 = _transformedSlice$con3.type) === null || _transformedSlice$con4 === void 0 ? void 0 : _transformedSlice$con4.name) === 'rule') {
           tr.setSelection(TextSelection.near(tr.doc.resolve(tr.selection.$from.pos + transformedSlice.content.size)));
         } else {
           // safeInsert doesn't set correct cursor position
@@ -1206,8 +1218,17 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
+      } else if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) && !fg('platform_editor_flexible_list_kill_switch_1') && checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
+        // Corrected task-into-list insertion is gated behind the flexible list indentation
+        // experiment and protected by the kill switch.
+        tr = insertSliceForTaskInsideList({
+          tr,
+          slice
+        });
       } else if (checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
-        insertSliceForTaskInsideList({
+        // Legacy path (experiment OFF or kill switch ON): preserve the previous over-nesting
+        // behaviour via the function's internal fallback.
+        tr = insertSliceForTaskInsideList({
           tr,
           slice
         });

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

@@ -7,6 +7,24 @@ import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
+
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+const HTML_CONTAINS_SINGLE_FILE_REGEX = /<img .*>/;
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+const ESCAPE_LINKS_INNER_REGEX = /^(https?|ftp|jamfselfservice):\/\/[^\s>"]+$/;
+// Allows up to 3 leading spaces before ``` and optional trailing characters
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+const OPENING_CODE_FENCE_REGEX = /^( {0,3})```.*$/;
+// Allows up to 3 leading spaces before ``` and optional trailing spaces or tabs
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+const CLOSING_CODE_FENCE_REGEX = /^( {0,3})```[ 	]*$/;
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+const SPLIT_ON_ANCHOR_REGEX = /(?=<a)/;
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -41,9 +59,7 @@ export const isSingleLine = text => {
   return !!text && text.trim().split('\n').length === 1;
 };
 export function htmlContainsSingleFile(html) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  return !!html.match(/<img .*>/) && !isMediaBlobUrl(html);
+  return !!html.match(HTML_CONTAINS_SINGLE_FILE_REGEX) && !isMediaBlobUrl(html);
 }
 export function getPasteSource(event) {
   // Ignored via go/ees005
@@ -88,9 +104,7 @@ export function escapeLinks(text) {
   // Ignored via go/ees005
   // eslint-disable-next-line require-unicode-regexp
   return text.replace(/(\[([^\]]+)\]\()?((https?|ftp|jamfselfservice):\/\/[^\s>"]+)/g, str => {
-    // Ignored via go/ees005
-    // eslint-disable-next-line require-unicode-regexp
-    return str.match(/^(https?|ftp|jamfselfservice):\/\/[^\s>"]+$/) ? `<${str}>` : str;
+    return str.match(ESCAPE_LINKS_INNER_REGEX) ? `<${str}>` : str;
   });
 }
 
@@ -105,23 +119,15 @@ export function escapeLinks(text) {
  */
 export function escapeBackslashAndLinksExceptCodeBlock(textInput) {
   // ref: https://spec.commonmark.org/0.31.2/#fenced-code-blocks
-  // Allows up to 3 leading spaces before ``` and optional trailing characters
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  const openingCodeFenceRegex = /^( {0,3})```.*$/;
-  // Allows up to 3 leading spaces before ``` and optional trailing spaces or tabs
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  const closingCodeFenceRegex = /^( {0,3})```[ \t]*$/;
   let isInsideCodeBlock = false;
   const lines = textInput.split('\n');
   // In the splitted array, we traverse through every line and check if it will be parsed as a codeblock.
   return lines.map(line => {
-    if (!isInsideCodeBlock && openingCodeFenceRegex.test(line)) {
+    if (!isInsideCodeBlock && OPENING_CODE_FENCE_REGEX.test(line)) {
       isInsideCodeBlock = true;
       return line;
     }
-    if (isInsideCodeBlock && closingCodeFenceRegex.test(line)) {
+    if (isInsideCodeBlock && CLOSING_CODE_FENCE_REGEX.test(line)) {
       isInsideCodeBlock = false;
       return line;
     }
@@ -234,9 +240,7 @@ export const htmlHasInvalidLinkTags = html => {
 // <li><a href="http://www.atlassian.com\"<a> href="http://www.atlassian.com\"http://www.atlassian.com</a></a></li>">
 export const removeDuplicateInvalidLinks = html => {
   if (htmlHasInvalidLinkTags(html)) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line require-unicode-regexp
-    const htmlArray = html.split(/(?=<a)/);
+    const htmlArray = html.split(SPLIT_ON_ANCHOR_REGEX);
     const htmlArrayWithoutInvalidLinks = htmlArray.filter(item => {
       return !(item.includes('<a') && item.includes('"></a>')) && !(item.includes('<a') && !item.includes('</a>'));
     });

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

@@ -3,7 +3,8 @@ import { isListNode } from '@atlaskit/editor-common/utils';
 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 { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../index';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
@@ -130,10 +131,35 @@ export function insertSliceForTaskInsideList(_ref5) {
   var tr = _ref5.tr,
     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));
-  var nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
-  tr.setSelection(nextSelection);
-  tr.replaceSelection(slice);
+
+  // The corrected insertion path only applies for the flexible list indentation dogfooding audience
+  // (`platform_editor_flexible_list_indentation`), and the kill switch protects that audience from
+  // regressions. Fall back to the legacy path when the experiment is OFF or the kill switch is ON.
+  if (!expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) || fg('platform_editor_flexible_list_kill_switch_1')) {
+    //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));
+    var nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+    tr.setSelection(nextSelection);
+    tr.replaceSelection(slice);
+    return tr;
+  }
+
+  // Collapse redundant nested taskList wrappers from the slice context, always keeping a single
+  // outermost taskList so the content can be safely inserted as a sibling of the list item's
+  // paragraph (a listItem cannot directly contain bare taskItems).
+  var taskList = schema.nodes.taskList;
+  var content = slice.content;
+  while (content.childCount === 1 && ((_content$firstChild = content.firstChild) === null || _content$firstChild === void 0 ? void 0 : _content$firstChild.type) === taskList && ((_content$firstChild$f = content.firstChild.firstChild) === null || _content$firstChild$f === void 0 ? void 0 : _content$firstChild$f.type) === taskList) {
+    var _content$firstChild, _content$firstChild$f;
+    content = content.firstChild.content;
+  }
+
+  // safeInsert keeps the task structure intact at the closest schema-valid position, instead of
+  // replacing into an empty taskItem which would add an extra taskList level.
+  tr = safeInsert(content, tr.selection.$to.pos)(tr);
+  updateSelectionAfterReplace({
+    tr: tr
+  });
+  return tr;
 }

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

@@ -78,7 +78,7 @@ export function handleMention(slice, schema) {
 }
 export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _transformedSlice$con;
+    var _slice$content$firstC, _slice$content$firstC2, _slice$content$firstC3, _transformedSlice$con, _transformedSlice$con2;
     var schema = state.schema,
       selection = state.tr.selection;
     var codeMark = schema.marks.code,
@@ -158,9 +158,21 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     // or the slice's first node is a paragraph,
     // then we can replace the selection with our slice.
     var pastingIntoExtendedPanel = selectionIsPanel && panel.validContent(transformedSlice.content);
-    if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
+
+    // A task slice carrying its own open taskList wrapper would, on a plain replaceSelection,
+    // nest that wrapper inside the current item and add an extra taskList level. Unwrapping one
+    // level keeps the pasted task(s) at the same level. Guarded by a kill switch.
+    var isOpenTaskListSlice = ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === taskList && transformedSlice.openStart >= 2 && transformedSlice.openEnd >= 1;
+    // Restrict the unwrap to a taskItem destination: its task content is schema-invalid inside a
+    // decisionItem (decisionList only accepts decisionItem), so decisionItem must fall through to
+    // the normal replaceSelection path.
+    var pastingIntoTaskItem = hasParentNodeOfType([taskItem])(selection);
+    if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) && !fg('platform_editor_flexible_list_kill_switch_1') && isOpenTaskListSlice && pastingIntoTaskItem && !selectionIsPanel) {
+      var unwrappedSlice = new Slice(transformedSlice.content.firstChild.content, transformedSlice.openStart - 1, transformedSlice.openEnd - 1);
+      tr.replaceSelection(unwrappedSlice).scrollIntoView();
+    } else if ((transformedSliceIsValidNode || selectionIsValidNode) && !pastingIntoExtendedPanel && !(transformedSlice.openStart === 1 && transformedSlice.openEnd === 0 ||
     // Whole codeblock node has reverse slice depths.
-    transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con = transformedSlice.content.firstChild) === null || _transformedSlice$con === void 0 ? void 0 : _transformedSlice$con.type) === paragraph) {
+    transformedSlice.openStart === 0 && transformedSlice.openEnd === 1) || ((_transformedSlice$con2 = transformedSlice.content.firstChild) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.type) === paragraph) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
     } else {
       var isWholeContentSelected = selection.$from.pos === selection.$from.start() && selection.$to.end() === selection.$to.pos;
@@ -179,14 +191,14 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
           tr.replaceSelection(transformedSlice).scrollIntoView();
         }
       } else {
-        var _transformedSlice$con2;
+        var _transformedSlice$con3;
         if (pastingIntoExtendedPanel && isWholeContentSelected) {
           // if the entire panel content is selected, doing a replaceSelection removes the panel as well. Hence we do delete followed by safeInsert
           tr.delete(selection.$from.pos, selection.$to.pos);
         }
         // This maintains both the selection (destination) and the slice (paste content).
         safeInsert(transformedSlice.content)(tr).scrollIntoView();
-        if (((_transformedSlice$con2 = transformedSlice.content.lastChild) === null || _transformedSlice$con2 === void 0 || (_transformedSlice$con2 = _transformedSlice$con2.type) === null || _transformedSlice$con2 === void 0 ? void 0 : _transformedSlice$con2.name) === 'rule') {
+        if (((_transformedSlice$con3 = transformedSlice.content.lastChild) === null || _transformedSlice$con3 === void 0 || (_transformedSlice$con3 = _transformedSlice$con3.type) === null || _transformedSlice$con3 === void 0 ? void 0 : _transformedSlice$con3.name) === 'rule') {
           tr.setSelection(TextSelection.near(tr.doc.resolve(tr.selection.$from.pos + transformedSlice.content.size)));
         } else {
           // safeInsert doesn't set correct cursor position
@@ -1202,8 +1214,17 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
+      } else if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) && !fg('platform_editor_flexible_list_kill_switch_1') && checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
+        // Corrected task-into-list insertion is gated behind the flexible list indentation
+        // experiment and protected by the kill switch.
+        tr = insertSliceForTaskInsideList({
+          tr: tr,
+          slice: slice
+        });
       } else if (checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
-        insertSliceForTaskInsideList({
+        // Legacy path (experiment OFF or kill switch ON): preserve the previous over-nesting
+        // behaviour via the function's internal fallback.
+        tr = insertSliceForTaskInsideList({
           tr: tr,
           slice: slice
         });

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

@@ -8,6 +8,24 @@ import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
+
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var HTML_CONTAINS_SINGLE_FILE_REGEX = /<img .*>/;
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var ESCAPE_LINKS_INNER_REGEX = /^(https?|ftp|jamfselfservice):\/\/[^\s>"]+$/;
+// Allows up to 3 leading spaces before ``` and optional trailing characters
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var OPENING_CODE_FENCE_REGEX = /^( {0,3})```.*$/;
+// Allows up to 3 leading spaces before ``` and optional trailing spaces or tabs
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var CLOSING_CODE_FENCE_REGEX = /^( {0,3})```[ 	]*$/;
+// Ignored via go/ees005
+// eslint-disable-next-line require-unicode-regexp
+var SPLIT_ON_ANCHOR_REGEX = /(?=<a)/;
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -42,9 +60,7 @@ export var isSingleLine = function isSingleLine(text) {
   return !!text && text.trim().split('\n').length === 1;
 };
 export function htmlContainsSingleFile(html) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  return !!html.match(/<img .*>/) && !isMediaBlobUrl(html);
+  return !!html.match(HTML_CONTAINS_SINGLE_FILE_REGEX) && !isMediaBlobUrl(html);
 }
 export function getPasteSource(event) {
   // Ignored via go/ees005
@@ -89,9 +105,7 @@ export function escapeLinks(text) {
   // Ignored via go/ees005
   // eslint-disable-next-line require-unicode-regexp
   return text.replace(/(\[([^\]]+)\]\()?((https?|ftp|jamfselfservice):\/\/[^\s>"]+)/g, function (str) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line require-unicode-regexp
-    return str.match(/^(https?|ftp|jamfselfservice):\/\/[^\s>"]+$/) ? "<".concat(str, ">") : str;
+    return str.match(ESCAPE_LINKS_INNER_REGEX) ? "<".concat(str, ">") : str;
   });
 }
 
@@ -106,23 +120,15 @@ export function escapeLinks(text) {
  */
 export function escapeBackslashAndLinksExceptCodeBlock(textInput) {
   // ref: https://spec.commonmark.org/0.31.2/#fenced-code-blocks
-  // Allows up to 3 leading spaces before ``` and optional trailing characters
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  var openingCodeFenceRegex = /^( {0,3})```.*$/;
-  // Allows up to 3 leading spaces before ``` and optional trailing spaces or tabs
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp
-  var closingCodeFenceRegex = /^( {0,3})```[ \t]*$/;
   var isInsideCodeBlock = false;
   var lines = textInput.split('\n');
   // In the splitted array, we traverse through every line and check if it will be parsed as a codeblock.
   return lines.map(function (line) {
-    if (!isInsideCodeBlock && openingCodeFenceRegex.test(line)) {
+    if (!isInsideCodeBlock && OPENING_CODE_FENCE_REGEX.test(line)) {
       isInsideCodeBlock = true;
       return line;
     }
-    if (isInsideCodeBlock && closingCodeFenceRegex.test(line)) {
+    if (isInsideCodeBlock && CLOSING_CODE_FENCE_REGEX.test(line)) {
       isInsideCodeBlock = false;
       return line;
     }
@@ -223,9 +229,7 @@ export var htmlHasInvalidLinkTags = function htmlHasInvalidLinkTags(html) {
 // <li><a href="http://www.atlassian.com\"<a> href="http://www.atlassian.com\"http://www.atlassian.com</a></a></li>">
 export var removeDuplicateInvalidLinks = function removeDuplicateInvalidLinks(html) {
   if (htmlHasInvalidLinkTags(html)) {
-    // Ignored via go/ees005
-    // eslint-disable-next-line require-unicode-regexp
-    var htmlArray = html.split(/(?=<a)/);
+    var htmlArray = html.split(SPLIT_ON_ANCHOR_REGEX);
     var htmlArrayWithoutInvalidLinks = htmlArray.filter(function (item) {
       return !(item.includes('<a') && item.includes('"></a>')) && !(item.includes('<a') && !item.includes('</a>'));
     });

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

@@ -15,4 +15,4 @@ export declare function updateSelectionAfterReplace({ tr }: {
 export declare function insertSliceForTaskInsideList({ tr, slice, }: {
     slice: PMSlice;
     tr: Transaction;
-}): void;
+}): Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "13.2.3",
+	"version": "13.3.1",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,7 +21,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^56.0.0",
 		"@atlaskit/adf-utils": "^20.0.0",
-		"@atlaskit/code": "^18.0.0",
+		"@atlaskit/code": "^18.2.0",
 		"@atlaskit/editor-markdown-transformer": "^6.0.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
 		"@atlaskit/editor-plugin-annotation": "^12.0.0",
@@ -31,24 +31,24 @@
 		"@atlaskit/editor-plugin-feature-flags": "^11.0.0",
 		"@atlaskit/editor-plugin-list": "^14.1.0",
 		"@atlaskit/editor-plugin-media": "^14.2.0",
-		"@atlaskit/editor-plugin-mentions": "^14.4.0",
+		"@atlaskit/editor-plugin-mentions": "^14.5.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
-		"@atlaskit/flag": "^18.0.0",
-		"@atlaskit/icon": "^36.0.0",
+		"@atlaskit/flag": "^18.1.0",
+		"@atlaskit/icon": "^36.1.0",
 		"@atlaskit/insm": "^1.0.0",
 		"@atlaskit/media-client": "^37.1.0",
-		"@atlaskit/media-common": "^14.1.0",
+		"@atlaskit/media-common": "^14.2.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/prosemirror-history": "^1.0.0",
-		"@atlaskit/tmp-editor-statsig": "^114.0.0",
-		"@atlaskit/tokens": "^15.0.0",
+		"@atlaskit/tmp-editor-statsig": "^114.5.0",
+		"@atlaskit/tokens": "^15.2.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.13.0",
+		"@atlaskit/editor-common": "^116.17.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -127,6 +127,9 @@
 		},
 		"platform_editor_paste_renderer_analytics": {
 			"type": "boolean"
+		},
+		"platform_editor_flexible_list_kill_switch_1": {
+			"type": "boolean"
 		}
 	}
 }