@atlaskit/editor-plugin-tasks-and-decisions 8.4.6 → 8.4.7

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 8.4.7
+
+### Patch Changes
+
+- [`99f97d44476b4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/99f97d44476b4) -
+  [EDITOR-1632] When backspacing multi-line blockTaskItems with a paragraph as the first line in the
+  blockTaskItem and extensions/ other content subsequent then make sure all the content in the
+  blockTaskItem is preserved when it's moved out of the blockTaskItem
+
 ## 8.4.6
 
 ### Patch Changes

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

@@ -170,10 +170,41 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
         }
 
         // If nested in a taskList, unindent
-        var parentDepth = isInBlockTaskItemParagraph ? $from.depth - 3 : $from.depth - 2;
+        var depthFromSelectionToBlockTaskItem = isInBlockTaskItemParagraph ? 2 : 1;
+        var depthFromSelectionToNestedTaskList = depthFromSelectionToBlockTaskItem + 1;
+        var parentDepth = $from.depth - depthFromSelectionToNestedTaskList;
         if ($from.node(parentDepth).type === taskList) {
           return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
         }
+
+        // If at the end of an item, unwrap contents into a paragraph
+        // we achieve this by slicing the content out, and replacing
+        if (actionDecisionFollowsOrNothing($from)) {
+          if (dispatch) {
+            // If we are in a blockTaskItem paragraph, we need to get the content of the whole blockTaskItem
+            // So we reduce the depth by 1 to get to the blockTaskItem node content
+            var taskContent = isInBlockTaskItemParagraph ? state.doc.slice($from.start($from.depth - 1), $from.end($from.depth - 1)).content : state.doc.slice($from.start(), $from.end()).content;
+            var slice;
+            try {
+              slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+              // might be end of document after
+              var tr = splitListItemWith(state.tr, slice, $from, true);
+              dispatch(tr);
+              return true;
+            } catch (error) {
+              // If there's an error creating a paragraph, check if we are in a blockTaskItem
+              // Block task item's can have non-text content that cannot be wrapped in a paragraph
+              // So if the selection is in a blockTaskItem, just pass the content as is
+              if (resultOfFindBlockTaskItem && resultOfFindBlockTaskItem.blockTaskItemNode) {
+                // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+                slice = Array.from(taskContent.content);
+                var _tr = splitListItemWith(state.tr, slice, $from, true);
+                dispatch(_tr);
+                return true;
+              }
+            }
+          }
+        }
       } else {
         // previous was empty, just delete backwards
         var taskBefore = $from.doc.resolve($from.before());
@@ -185,29 +216,29 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
         if ($from.node($from.depth - 2).type === taskList) {
           return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
         }
-      }
 
-      // If at the end of an item, unwrap contents into a paragraph
-      // we achieve this by slicing the content out, and replacing
-      if (actionDecisionFollowsOrNothing($from)) {
-        if (dispatch) {
-          var taskContent = state.doc.slice($from.start(), $from.end()).content;
-          var slice;
-          try {
-            slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
-            // might be end of document after
-            var tr = splitListItemWith(state.tr, slice, $from, true);
-            dispatch(tr);
-            return true;
-          } catch (error) {
-            // If there's an error creating a paragraph, then just pass the content as is
-            // Block task item's can have non-text content that cannot be wrapped in a paragraph
-            if (blockTaskItem) {
-              // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
-              slice = Array.from(taskContent.content);
-              var _tr = splitListItemWith(state.tr, slice, $from, true);
-              dispatch(_tr);
+        // If at the end of an item, unwrap contents into a paragraph
+        // we achieve this by slicing the content out, and replacing
+        if (actionDecisionFollowsOrNothing($from)) {
+          if (dispatch) {
+            var _taskContent = state.doc.slice($from.start(), $from.end()).content;
+            var _slice;
+            try {
+              _slice = _taskContent.size ? paragraph.createChecked(undefined, _taskContent) : paragraph.createChecked();
+              // might be end of document after
+              var _tr2 = splitListItemWith(state.tr, _slice, $from, true);
+              dispatch(_tr2);
               return true;
+            } catch (error) {
+              // If there's an error creating a paragraph, then just pass the content as is
+              // Block task item's can have non-text content that cannot be wrapped in a paragraph
+              if (blockTaskItem) {
+                // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+                _slice = Array.from(_taskContent.content);
+                var _tr3 = splitListItemWith(state.tr, _slice, $from, true);
+                dispatch(_tr3);
+                return true;
+              }
             }
           }
         }
@@ -307,8 +338,8 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var $oldAfter = origDoc.resolve($from.after());
   var textSelectionModifier = 0;
   var replaceFromModifier = 0;
-  var replaceToModifier = 0;
   var deleteBlockModifier = 0;
+  var shouldSplitBlockTaskItem = true;
   var isGapCursorSelection = false;
   if (blockTaskItem) {
     var result = (0, _utils3.findBlockTaskItem)($from);
@@ -321,10 +352,10 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
         // adjust some calculations
         if (hasParagraph) {
           baseDepth = $from.depth - 1;
-          $oldAfter = origDoc.resolve($from.after() + 1);
+          $oldAfter = origDoc.resolve($from.after(baseDepth));
 
           // When we're removing the extra empty task item we need to reduce the range a bit
-          deleteBlockModifier = 2;
+          deleteBlockModifier = 1;
         } else {
           textSelectionModifier = 1;
           isGapCursorSelection = true;
@@ -332,14 +363,13 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
         textSelectionModifier = 1;
         var hasSiblingTaskList = ((_$oldAfter$nodeAfter = $oldAfter.nodeAfter) === null || _$oldAfter$nodeAfter === void 0 ? void 0 : _$oldAfter$nodeAfter.type) === taskList;
         if (hasSiblingTaskList) {
-          // Make sure we're wrapping around the whole list
-          replaceToModifier = hasParagraph ? 3 : 1;
+          // Don't use the split command if there is a sibling taskList
+          shouldSplitBlockTaskItem = false;
         }
         var posPreviousSibling = $from.start(hasParagraph ? $from.depth - 1 : $from.depth) - 1;
         var $posPreviousSibling = tr.doc.resolve(posPreviousSibling);
         var hasPreviousTaskItem = ((_$posPreviousSibling$ = $posPreviousSibling.nodeBefore) === null || _$posPreviousSibling$ === void 0 ? void 0 : _$posPreviousSibling$.type) === blockTaskItem;
-        if (!hasPreviousTaskItem && hasParagraph) {
-          // Go down one step to get to the doc node
+        if (hasPreviousTaskItem && hasParagraph) {
           replaceFromModifier = 1;
         }
       }
@@ -350,7 +380,7 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   // we can only split if there was a list item before us
   var container = $from.node(baseDepth - 2);
   var posInList = $from.index(baseDepth - 1);
-  var shouldSplit = !(!(0, _helpers.isActionOrDecisionList)(container) && posInList === 0);
+  var shouldSplit = !(!(0, _helpers.isActionOrDecisionList)(container) && posInList === 0) && shouldSplitBlockTaskItem;
   var frag = _model.Fragment.from(content);
   var isNestedActionInsideLists = frag.childCount === 1 && ((_frag$firstChild = frag.firstChild) === null || _frag$firstChild === void 0 ? void 0 : _frag$firstChild.type.name) === 'listItem';
 
@@ -376,7 +406,7 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
    * (The cursor can be placed easily next to list item)
    */
   var previousListItemPos = isNestedActionInsideLists ? $from.start(baseDepth - 2) : 0;
-  tr = tr.replace(tr.mapping.map($from.start() - (2 + replaceFromModifier)), tr.mapping.map($from.end() + (2 + replaceToModifier)), frag.size ? new _model.Slice(frag, 0, 0) : _model.Slice.empty);
+  tr = tr.replace(tr.mapping.map($from.start(baseDepth) - 2 + replaceFromModifier), tr.mapping.map($from.end(baseDepth) + 2), frag.size ? new _model.Slice(frag, 0, 0) : _model.Slice.empty);
   if (setSelection && !isNestedActionInsideLists) {
     var newPos = $from.pos + 1 - ((shouldSplit ? 0 : 2) + textSelectionModifier);
     if (isGapCursorSelection) {

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

@@ -146,10 +146,41 @@ const backspaceFrom = editorAnalyticsAPI => $from => (state, dispatch) => {
     }
 
     // If nested in a taskList, unindent
-    const parentDepth = isInBlockTaskItemParagraph ? $from.depth - 3 : $from.depth - 2;
+    const depthFromSelectionToBlockTaskItem = isInBlockTaskItemParagraph ? 2 : 1;
+    const depthFromSelectionToNestedTaskList = depthFromSelectionToBlockTaskItem + 1;
+    const parentDepth = $from.depth - depthFromSelectionToNestedTaskList;
     if ($from.node(parentDepth).type === taskList) {
       return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
     }
+
+    // If at the end of an item, unwrap contents into a paragraph
+    // we achieve this by slicing the content out, and replacing
+    if (actionDecisionFollowsOrNothing($from)) {
+      if (dispatch) {
+        // If we are in a blockTaskItem paragraph, we need to get the content of the whole blockTaskItem
+        // So we reduce the depth by 1 to get to the blockTaskItem node content
+        const taskContent = isInBlockTaskItemParagraph ? state.doc.slice($from.start($from.depth - 1), $from.end($from.depth - 1)).content : state.doc.slice($from.start(), $from.end()).content;
+        let slice;
+        try {
+          slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+          // might be end of document after
+          const tr = splitListItemWith(state.tr, slice, $from, true);
+          dispatch(tr);
+          return true;
+        } catch (error) {
+          // If there's an error creating a paragraph, check if we are in a blockTaskItem
+          // Block task item's can have non-text content that cannot be wrapped in a paragraph
+          // So if the selection is in a blockTaskItem, just pass the content as is
+          if (resultOfFindBlockTaskItem && resultOfFindBlockTaskItem.blockTaskItemNode) {
+            // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+            slice = Array.from(taskContent.content);
+            const tr = splitListItemWith(state.tr, slice, $from, true);
+            dispatch(tr);
+            return true;
+          }
+        }
+      }
+    }
   } else {
     // previous was empty, just delete backwards
     const taskBefore = $from.doc.resolve($from.before());
@@ -161,29 +192,29 @@ const backspaceFrom = editorAnalyticsAPI => $from => (state, dispatch) => {
     if ($from.node($from.depth - 2).type === taskList) {
       return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
     }
-  }
 
-  // If at the end of an item, unwrap contents into a paragraph
-  // we achieve this by slicing the content out, and replacing
-  if (actionDecisionFollowsOrNothing($from)) {
-    if (dispatch) {
-      const taskContent = state.doc.slice($from.start(), $from.end()).content;
-      let slice;
-      try {
-        slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
-        // might be end of document after
-        const tr = splitListItemWith(state.tr, slice, $from, true);
-        dispatch(tr);
-        return true;
-      } catch (error) {
-        // If there's an error creating a paragraph, then just pass the content as is
-        // Block task item's can have non-text content that cannot be wrapped in a paragraph
-        if (blockTaskItem) {
-          // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
-          slice = Array.from(taskContent.content);
+    // If at the end of an item, unwrap contents into a paragraph
+    // we achieve this by slicing the content out, and replacing
+    if (actionDecisionFollowsOrNothing($from)) {
+      if (dispatch) {
+        const taskContent = state.doc.slice($from.start(), $from.end()).content;
+        let slice;
+        try {
+          slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+          // might be end of document after
           const tr = splitListItemWith(state.tr, slice, $from, true);
           dispatch(tr);
           return true;
+        } catch (error) {
+          // If there's an error creating a paragraph, then just pass the content as is
+          // Block task item's can have non-text content that cannot be wrapped in a paragraph
+          if (blockTaskItem) {
+            // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+            slice = Array.from(taskContent.content);
+            const tr = splitListItemWith(state.tr, slice, $from, true);
+            dispatch(tr);
+            return true;
+          }
         }
       }
     }
@@ -283,8 +314,8 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
   let $oldAfter = origDoc.resolve($from.after());
   let textSelectionModifier = 0;
   let replaceFromModifier = 0;
-  let replaceToModifier = 0;
   let deleteBlockModifier = 0;
+  let shouldSplitBlockTaskItem = true;
   let isGapCursorSelection = false;
   if (blockTaskItem) {
     const result = findBlockTaskItem($from);
@@ -299,10 +330,10 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
         // adjust some calculations
         if (hasParagraph) {
           baseDepth = $from.depth - 1;
-          $oldAfter = origDoc.resolve($from.after() + 1);
+          $oldAfter = origDoc.resolve($from.after(baseDepth));
 
           // When we're removing the extra empty task item we need to reduce the range a bit
-          deleteBlockModifier = 2;
+          deleteBlockModifier = 1;
         } else {
           textSelectionModifier = 1;
           isGapCursorSelection = true;
@@ -310,14 +341,13 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
         textSelectionModifier = 1;
         const hasSiblingTaskList = ((_$oldAfter$nodeAfter = $oldAfter.nodeAfter) === null || _$oldAfter$nodeAfter === void 0 ? void 0 : _$oldAfter$nodeAfter.type) === taskList;
         if (hasSiblingTaskList) {
-          // Make sure we're wrapping around the whole list
-          replaceToModifier = hasParagraph ? 3 : 1;
+          // Don't use the split command if there is a sibling taskList
+          shouldSplitBlockTaskItem = false;
         }
         const posPreviousSibling = $from.start(hasParagraph ? $from.depth - 1 : $from.depth) - 1;
         const $posPreviousSibling = tr.doc.resolve(posPreviousSibling);
         const hasPreviousTaskItem = ((_$posPreviousSibling$ = $posPreviousSibling.nodeBefore) === null || _$posPreviousSibling$ === void 0 ? void 0 : _$posPreviousSibling$.type) === blockTaskItem;
-        if (!hasPreviousTaskItem && hasParagraph) {
-          // Go down one step to get to the doc node
+        if (hasPreviousTaskItem && hasParagraph) {
           replaceFromModifier = 1;
         }
       }
@@ -328,7 +358,7 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
   // we can only split if there was a list item before us
   const container = $from.node(baseDepth - 2);
   const posInList = $from.index(baseDepth - 1);
-  const shouldSplit = !(!isActionOrDecisionList(container) && posInList === 0);
+  const shouldSplit = !(!isActionOrDecisionList(container) && posInList === 0) && shouldSplitBlockTaskItem;
   const frag = Fragment.from(content);
   const isNestedActionInsideLists = frag.childCount === 1 && ((_frag$firstChild = frag.firstChild) === null || _frag$firstChild === void 0 ? void 0 : _frag$firstChild.type.name) === 'listItem';
 
@@ -354,7 +384,7 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
    * (The cursor can be placed easily next to list item)
    */
   const previousListItemPos = isNestedActionInsideLists ? $from.start(baseDepth - 2) : 0;
-  tr = tr.replace(tr.mapping.map($from.start() - (2 + replaceFromModifier)), tr.mapping.map($from.end() + (2 + replaceToModifier)), frag.size ? new Slice(frag, 0, 0) : Slice.empty);
+  tr = tr.replace(tr.mapping.map($from.start(baseDepth) - 2 + replaceFromModifier), tr.mapping.map($from.end(baseDepth) + 2), frag.size ? new Slice(frag, 0, 0) : Slice.empty);
   if (setSelection && !isNestedActionInsideLists) {
     const newPos = $from.pos + 1 - ((shouldSplit ? 0 : 2) + textSelectionModifier);
     if (isGapCursorSelection) {

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

@@ -162,10 +162,41 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
         }
 
         // If nested in a taskList, unindent
-        var parentDepth = isInBlockTaskItemParagraph ? $from.depth - 3 : $from.depth - 2;
+        var depthFromSelectionToBlockTaskItem = isInBlockTaskItemParagraph ? 2 : 1;
+        var depthFromSelectionToNestedTaskList = depthFromSelectionToBlockTaskItem + 1;
+        var parentDepth = $from.depth - depthFromSelectionToNestedTaskList;
         if ($from.node(parentDepth).type === taskList) {
           return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
         }
+
+        // If at the end of an item, unwrap contents into a paragraph
+        // we achieve this by slicing the content out, and replacing
+        if (actionDecisionFollowsOrNothing($from)) {
+          if (dispatch) {
+            // If we are in a blockTaskItem paragraph, we need to get the content of the whole blockTaskItem
+            // So we reduce the depth by 1 to get to the blockTaskItem node content
+            var taskContent = isInBlockTaskItemParagraph ? state.doc.slice($from.start($from.depth - 1), $from.end($from.depth - 1)).content : state.doc.slice($from.start(), $from.end()).content;
+            var slice;
+            try {
+              slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+              // might be end of document after
+              var tr = splitListItemWith(state.tr, slice, $from, true);
+              dispatch(tr);
+              return true;
+            } catch (error) {
+              // If there's an error creating a paragraph, check if we are in a blockTaskItem
+              // Block task item's can have non-text content that cannot be wrapped in a paragraph
+              // So if the selection is in a blockTaskItem, just pass the content as is
+              if (resultOfFindBlockTaskItem && resultOfFindBlockTaskItem.blockTaskItemNode) {
+                // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+                slice = Array.from(taskContent.content);
+                var _tr = splitListItemWith(state.tr, slice, $from, true);
+                dispatch(_tr);
+                return true;
+              }
+            }
+          }
+        }
       } else {
         // previous was empty, just delete backwards
         var taskBefore = $from.doc.resolve($from.before());
@@ -177,29 +208,29 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
         if ($from.node($from.depth - 2).type === taskList) {
           return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
         }
-      }
 
-      // If at the end of an item, unwrap contents into a paragraph
-      // we achieve this by slicing the content out, and replacing
-      if (actionDecisionFollowsOrNothing($from)) {
-        if (dispatch) {
-          var taskContent = state.doc.slice($from.start(), $from.end()).content;
-          var slice;
-          try {
-            slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
-            // might be end of document after
-            var tr = splitListItemWith(state.tr, slice, $from, true);
-            dispatch(tr);
-            return true;
-          } catch (error) {
-            // If there's an error creating a paragraph, then just pass the content as is
-            // Block task item's can have non-text content that cannot be wrapped in a paragraph
-            if (blockTaskItem) {
-              // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
-              slice = Array.from(taskContent.content);
-              var _tr = splitListItemWith(state.tr, slice, $from, true);
-              dispatch(_tr);
+        // If at the end of an item, unwrap contents into a paragraph
+        // we achieve this by slicing the content out, and replacing
+        if (actionDecisionFollowsOrNothing($from)) {
+          if (dispatch) {
+            var _taskContent = state.doc.slice($from.start(), $from.end()).content;
+            var _slice;
+            try {
+              _slice = _taskContent.size ? paragraph.createChecked(undefined, _taskContent) : paragraph.createChecked();
+              // might be end of document after
+              var _tr2 = splitListItemWith(state.tr, _slice, $from, true);
+              dispatch(_tr2);
               return true;
+            } catch (error) {
+              // If there's an error creating a paragraph, then just pass the content as is
+              // Block task item's can have non-text content that cannot be wrapped in a paragraph
+              if (blockTaskItem) {
+                // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+                _slice = Array.from(_taskContent.content);
+                var _tr3 = splitListItemWith(state.tr, _slice, $from, true);
+                dispatch(_tr3);
+                return true;
+              }
             }
           }
         }
@@ -299,8 +330,8 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var $oldAfter = origDoc.resolve($from.after());
   var textSelectionModifier = 0;
   var replaceFromModifier = 0;
-  var replaceToModifier = 0;
   var deleteBlockModifier = 0;
+  var shouldSplitBlockTaskItem = true;
   var isGapCursorSelection = false;
   if (blockTaskItem) {
     var result = findBlockTaskItem($from);
@@ -313,10 +344,10 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
         // adjust some calculations
         if (hasParagraph) {
           baseDepth = $from.depth - 1;
-          $oldAfter = origDoc.resolve($from.after() + 1);
+          $oldAfter = origDoc.resolve($from.after(baseDepth));
 
           // When we're removing the extra empty task item we need to reduce the range a bit
-          deleteBlockModifier = 2;
+          deleteBlockModifier = 1;
         } else {
           textSelectionModifier = 1;
           isGapCursorSelection = true;
@@ -324,14 +355,13 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
         textSelectionModifier = 1;
         var hasSiblingTaskList = ((_$oldAfter$nodeAfter = $oldAfter.nodeAfter) === null || _$oldAfter$nodeAfter === void 0 ? void 0 : _$oldAfter$nodeAfter.type) === taskList;
         if (hasSiblingTaskList) {
-          // Make sure we're wrapping around the whole list
-          replaceToModifier = hasParagraph ? 3 : 1;
+          // Don't use the split command if there is a sibling taskList
+          shouldSplitBlockTaskItem = false;
         }
         var posPreviousSibling = $from.start(hasParagraph ? $from.depth - 1 : $from.depth) - 1;
         var $posPreviousSibling = tr.doc.resolve(posPreviousSibling);
         var hasPreviousTaskItem = ((_$posPreviousSibling$ = $posPreviousSibling.nodeBefore) === null || _$posPreviousSibling$ === void 0 ? void 0 : _$posPreviousSibling$.type) === blockTaskItem;
-        if (!hasPreviousTaskItem && hasParagraph) {
-          // Go down one step to get to the doc node
+        if (hasPreviousTaskItem && hasParagraph) {
           replaceFromModifier = 1;
         }
       }
@@ -342,7 +372,7 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   // we can only split if there was a list item before us
   var container = $from.node(baseDepth - 2);
   var posInList = $from.index(baseDepth - 1);
-  var shouldSplit = !(!isActionOrDecisionList(container) && posInList === 0);
+  var shouldSplit = !(!isActionOrDecisionList(container) && posInList === 0) && shouldSplitBlockTaskItem;
   var frag = Fragment.from(content);
   var isNestedActionInsideLists = frag.childCount === 1 && ((_frag$firstChild = frag.firstChild) === null || _frag$firstChild === void 0 ? void 0 : _frag$firstChild.type.name) === 'listItem';
 
@@ -368,7 +398,7 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
    * (The cursor can be placed easily next to list item)
    */
   var previousListItemPos = isNestedActionInsideLists ? $from.start(baseDepth - 2) : 0;
-  tr = tr.replace(tr.mapping.map($from.start() - (2 + replaceFromModifier)), tr.mapping.map($from.end() + (2 + replaceToModifier)), frag.size ? new Slice(frag, 0, 0) : Slice.empty);
+  tr = tr.replace(tr.mapping.map($from.start(baseDepth) - 2 + replaceFromModifier), tr.mapping.map($from.end(baseDepth) + 2), frag.size ? new Slice(frag, 0, 0) : Slice.empty);
   if (setSelection && !isNestedActionInsideLists) {
     var newPos = $from.pos + 1 - ((shouldSplit ? 0 : 2) + textSelectionModifier);
     if (isGapCursorSelection) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "8.4.6",
+	"version": "8.4.7",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",