@atlaskit/editor-plugin-tasks-and-decisions 8.0.2 → 8.0.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 8.0.4
+
+### Patch Changes
+
+- [`5b8be893d14b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5b8be893d14b5) -
+  [EDITOR-1433] Handle deleting blockTaskItems with backspace and refactor to remove iterative depth
+  search for blockTaskItems and instead use position logic to get the relevant nodes
+- [`68424716235d0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/68424716235d0) -
+  [ux] EDITOR-1156 Allow checkbox in blockTaskItem node to be selected with keyboard arrows
+- Updated dependencies
+
+## 8.0.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.0.2
 
 ### Patch Changes

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

@@ -5,13 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.wrapSelectionInTaskList = exports.liftSelection = exports.joinAtCut = void 0;
 var _commands = require("@atlaskit/editor-common/commands");
-var _utils = require("@atlaskit/editor-common/utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _helpers = require("./helpers");
-var _utils3 = require("./utils");
+var _utils = require("./utils");
 var liftSelection = exports.liftSelection = function liftSelection(state, dispatch) {
-  var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
+  var normalizedSelection = (0, _utils.normalizeTaskItemsSelection)(state.selection);
   var $from = normalizedSelection.$from,
     $to = normalizedSelection.$to;
   var tr = (0, _helpers.liftBlock)(state.tr, $from, $to);
@@ -39,7 +37,7 @@ var liftSelection = exports.liftSelection = function liftSelection(state, dispat
  * ```
  */
 var wrapSelectionInTaskList = exports.wrapSelectionInTaskList = function wrapSelectionInTaskList(state, dispatch) {
-  var _normalizeTaskItemsSe = (0, _utils3.normalizeTaskItemsSelection)(state.selection),
+  var _normalizeTaskItemsSe = (0, _utils.normalizeTaskItemsSelection)(state.selection),
     $from = _normalizeTaskItemsSe.$from,
     $to = _normalizeTaskItemsSe.$to;
 
@@ -49,17 +47,17 @@ var wrapSelectionInTaskList = exports.wrapSelectionInTaskList = function wrapSel
     taskItem = _state$schema$nodes.taskItem,
     blockTaskItem = _state$schema$nodes.blockTaskItem;
   var maxDepth = (0, _helpers.subtreeHeight)($from, $to, [taskList, taskItem]);
-  var isBlockTaskItem = (0, _utils2.hasParentNodeOfType)([blockTaskItem])(state.selection);
-  var blockTaskItemNode = (0, _utils.findFarthestParentNode)(function (node) {
-    return node.type === blockTaskItem;
-  })($from);
-  if (blockTaskItem && isBlockTaskItem && blockTaskItemNode) {
-    // If the selection is inside a nested node inside the blockTaskItem
-    // Remove the difference in depth between the selection and the blockTaskItemNode
-    if ($from.depth > blockTaskItemNode.depth) {
-      maxDepth = (0, _helpers.subtreeHeight)($from, $to, [taskList, blockTaskItem]) - ($from.depth - blockTaskItemNode.depth);
-    } else {
-      maxDepth = (0, _helpers.subtreeHeight)($from, $to, [taskList, blockTaskItem]);
+  if (blockTaskItem) {
+    var resultOfFindBlockTaskItem = (0, _utils.findBlockTaskItem)($from);
+    if (resultOfFindBlockTaskItem) {
+      var hasParagraph = resultOfFindBlockTaskItem.hasParagraph;
+      // If the selection is inside a nested node inside the blockTaskItem
+      // Remove the difference in depth between the selection and the blockTaskItemNode
+      if (hasParagraph) {
+        maxDepth = (0, _helpers.subtreeHeight)($from, $to, [taskList, blockTaskItem]) - 1;
+      } else {
+        maxDepth = (0, _helpers.subtreeHeight)($from, $to, [taskList, blockTaskItem]);
+      }
     }
   }
   if (maxDepth >= 6) {

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

@@ -16,13 +16,16 @@ exports.liftBlock = exports.isTable = exports.isInsideTaskOrDecisionItem = expor
 exports.openRequestEditPopupAt = openRequestEditPopupAt;
 exports.removeCheckboxFocus = removeCheckboxFocus;
 exports.walkOut = exports.subtreeHeight = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _pluginKey = require("./plugin-key");
 var _types = require("./types");
+var _utils3 = require("./utils");
 var isInsideTaskOrDecisionItem = exports.isInsideTaskOrDecisionItem = function isInsideTaskOrDecisionItem(state) {
   var _state$schema$nodes = state.schema.nodes,
     decisionItem = _state$schema$nodes.decisionItem,
@@ -80,51 +83,52 @@ var getBlockRange = exports.getBlockRange = function getBlockRange(_ref) {
     taskItem = _$from$doc$type$schem.taskItem,
     blockTaskItem = _$from$doc$type$schem.blockTaskItem,
     paragraph = _$from$doc$type$schem.paragraph;
-  var blockTaskItemNode = (0, _utils.findFarthestParentNode)(function (node) {
-    return node.type === blockTaskItem;
-  })($from);
-  if (blockTaskItem && blockTaskItemNode) {
-    var _$prevNode$nodeBefore;
-    var startOfBlockRange = blockTaskItemNode.start - 1;
-    var endNode = $to.end();
-    var _$after = $to.doc.resolve(endNode + 1);
-    var _after = _$after.nodeAfter;
-    var lastNode = $to.node($to.depth);
-    var rangeDepth = blockTaskItemNode.depth - 1;
-    var endOfBlockRange = $to.start() + lastNode.nodeSize;
+  if (blockTaskItem) {
+    var result = (0, _utils3.findBlockTaskItem)($from);
+    if (result) {
+      var _$prevNode$nodeBefore;
+      var hasParagraph = result.hasParagraph;
+      var blockTaskItemDepth = hasParagraph ? $from.depth - 1 : $from.depth;
+      var blockRangeDepth = blockTaskItemDepth - 1;
 
-    // If the lastNode is a paragraph need to resolve a little bit further to get the node after the block task item
-    if (lastNode.type === paragraph) {
-      _$after = $to.doc.resolve(endNode + 2);
-      _after = _$after.nodeAfter;
-    }
-    // Otherwise assume it's a block node so increase the range depth
-    else {
-      rangeDepth = rangeDepth - 1;
-      endOfBlockRange = endOfBlockRange - 1;
-    }
+      // Calculate start position of the block range
+      var startPos = $from.start(blockTaskItemDepth) - 1;
 
-    // If the after node is a sibling taskList of the blockTaskItem, then extend the range
-    if (_after && _after.type === taskList && _$after.depth === blockTaskItemNode.depth - 1) {
-      endOfBlockRange = endOfBlockRange + _after.nodeSize;
-    }
+      // Calculate end position and get node after the current selection
+      var endPos = $to.end();
+      var _$after = $to.doc.resolve(endPos + 1);
+      var afterNode = _$after.nodeAfter;
+      var lastNode = $to.node($to.depth);
+      var endRangePos = $to.start() + lastNode.nodeSize;
+
+      // Make adjustments for paragraph nodes
+      if (lastNode.type === paragraph) {
+        _$after = $to.doc.resolve(endPos + 2);
+        afterNode = _$after.nodeAfter;
+      } else {
+        blockRangeDepth--;
+        endRangePos--;
+      }
+
+      // Extend range if there's a sibling taskList
+      if (afterNode && afterNode.type === taskList && _$after.depth === blockTaskItemDepth - 1) {
+        endRangePos += afterNode.nodeSize;
+      }
 
-    // Is after another taskItem/ blockTaskItem
-    var $prevNode = $from.doc.resolve(startOfBlockRange - 1);
-    var prevNodeSize = (_$prevNode$nodeBefore = $prevNode.nodeBefore) === null || _$prevNode$nodeBefore === void 0 ? void 0 : _$prevNode$nodeBefore.nodeSize;
-    var $prevNodeParent = $from.doc.resolve($prevNode.pos - (prevNodeSize || 0) - 1);
-    var prevNodeParent = $prevNodeParent.nodeAfter;
+      // Check if preceded by another taskItem/blockTaskItem
+      var $prevNode = $from.doc.resolve(startPos - 1);
+      var prevNodeSize = ((_$prevNode$nodeBefore = $prevNode.nodeBefore) === null || _$prevNode$nodeBefore === void 0 ? void 0 : _$prevNode$nodeBefore.nodeSize) || 0;
+      var $prevNodeParent = $from.doc.resolve($prevNode.pos - prevNodeSize - 1);
+      var prevNodeParent = $prevNodeParent.nodeAfter;
+      if (prevNodeParent && [blockTaskItem, taskItem].includes(prevNodeParent.type)) {
+        blockRangeDepth = blockTaskItemDepth - 1;
+        endRangePos -= 2;
+        startPos += 1;
+      }
 
-    // If after another taskItem/ blockTaskItem
-    if (prevNodeParent && [blockTaskItem, taskItem].includes(prevNodeParent.type)) {
-      rangeDepth = blockTaskItemNode.depth - 1;
-      endOfBlockRange = endOfBlockRange - 2;
-      startOfBlockRange = startOfBlockRange + 1;
+      // Create and return the NodeRange
+      return new _model.NodeRange($to.doc.resolve(startPos), $to.doc.resolve(endRangePos), blockRangeDepth);
     }
-    var $endOfBlockRange = $to.doc.resolve(endOfBlockRange);
-    var $startOfBlockRange = $to.doc.resolve(startOfBlockRange);
-    var nodeRange = new _model.NodeRange($startOfBlockRange, $endOfBlockRange, rangeDepth);
-    return nodeRange;
   }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
@@ -300,29 +304,45 @@ function getTaskItemDataAtPos(view) {
   var selection = state.selection,
     schema = state.schema;
   var $from = selection.$from;
-  var isInTaskItem = $from.node().type === schema.nodes.taskItem;
+  if ((0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true)) {
+    var _schema$nodes = schema.nodes,
+      taskItem = _schema$nodes.taskItem,
+      blockTaskItem = _schema$nodes.blockTaskItem;
+    var maybeTask = (0, _utils2.findParentNodeOfTypeClosestToPos)($from, [taskItem, blockTaskItem]);
 
-  // current selection has to be inside taskitem
-  if (isInTaskItem) {
-    var taskItemPos = $from.before();
-    return {
-      pos: taskItemPos,
-      localId: $from.node().attrs.localId
-    };
+    // current selection has to be inside taskitem
+    if (maybeTask) {
+      return {
+        pos: maybeTask === null || maybeTask === void 0 ? void 0 : maybeTask.pos,
+        localId: maybeTask === null || maybeTask === void 0 ? void 0 : maybeTask.node.attrs.localId
+      };
+    }
+  } else {
+    var isInTaskItem = $from.node().type === schema.nodes.taskItem;
+
+    // current selection has to be inside taskitem
+    if (isInTaskItem) {
+      var taskItemPos = $from.before();
+      return {
+        pos: taskItemPos,
+        localId: $from.node().attrs.localId
+      };
+    }
   }
 }
 function getAllTaskItemsDataInRootTaskList(view) {
   var state = view.state;
   var schema = state.schema;
   var $fromPos = state.selection.$from;
-  var isInTaskItem = $fromPos.node().type === schema.nodes.taskItem;
+  var isInTaskItem = (0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true) ? isInsideTask(state) : $fromPos.node().type === schema.nodes.taskItem;
   // if not inside task item then return undefined;
   if (!isInTaskItem) {
     return;
   }
-  var _schema$nodes = schema.nodes,
-    taskList = _schema$nodes.taskList,
-    taskItem = _schema$nodes.taskItem;
+  var _schema$nodes2 = schema.nodes,
+    taskList = _schema$nodes2.taskList,
+    taskItem = _schema$nodes2.taskItem,
+    blockTaskItem = _schema$nodes2.blockTaskItem;
   var rootTaskListData = (0, _utils.findFarthestParentNode)(function (node) {
     return node.type === taskList;
   })($fromPos);
@@ -331,7 +351,7 @@ function getAllTaskItemsDataInRootTaskList(view) {
     var rootTaskListStartPos = rootTaskListData.start;
     var allTaskItems = [];
     rootTaskList.descendants(function (node, pos, parent, index) {
-      if (node.type === taskItem) {
+      if (node.type === taskItem || (0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true) && blockTaskItem && node.type === blockTaskItem) {
         allTaskItems.push({
           node: node,
           pos: pos + rootTaskListStartPos,
@@ -343,17 +363,27 @@ function getAllTaskItemsDataInRootTaskList(view) {
   }
 }
 function getCurrentTaskItemIndex(view, allTaskItems) {
+  var _findParentNodeOfType;
   var state = view.state;
+  var schema = state.schema;
+  var _schema$nodes3 = schema.nodes,
+    taskItem = _schema$nodes3.taskItem,
+    blockTaskItem = _schema$nodes3.blockTaskItem;
   var $fromPos = state.selection.$from;
   var allTaskItemNodes = allTaskItems.map(function (nodeData) {
     return nodeData.node;
   });
-  var currentTaskItem = $fromPos.node($fromPos.depth);
-  var currentTaskItemIndex = allTaskItemNodes.indexOf(currentTaskItem);
-  return currentTaskItemIndex;
+  var currentTaskItem = (0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true) ? (_findParentNodeOfType = (0, _utils2.findParentNodeOfTypeClosestToPos)($fromPos, [taskItem, blockTaskItem])) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node : $fromPos.node($fromPos.depth);
+  if (currentTaskItem) {
+    var currentTaskItemIndex = allTaskItemNodes.indexOf(currentTaskItem);
+    return currentTaskItemIndex;
+  } else {
+    return -1;
+  }
 }
 function getTaskItemDataToFocus(view, direction) {
   var allTaskItems = getAllTaskItemsDataInRootTaskList(view);
+
   // if not inside task item then allTaskItems will be undefined;
   if (!allTaskItems) {
     return;
@@ -383,13 +413,26 @@ function focusCheckbox(view, taskItemData) {
   }
 }
 function focusCheckboxAndUpdateSelection(view, taskItemData) {
+  var _doc$resolve$nodeAfte, _doc$resolve$nodeAfte2;
   var pos = taskItemData.pos,
     localId = taskItemData.localId;
   var state = view.state,
     dispatch = view.dispatch;
   var doc = state.doc;
+  var schema = state.schema;
+  var extension = schema.nodes.extension;
   var tr = state.tr;
-  tr.setSelection(new _state.TextSelection(doc.resolve(pos + 1)));
+
+  // if there's an extension at this position, we're in a blockTaskItem, set a gapCursor
+  if ((0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true) && extension && ((_doc$resolve$nodeAfte = doc.resolve(pos + 1).nodeAfter) === null || _doc$resolve$nodeAfte === void 0 ? void 0 : _doc$resolve$nodeAfte.type) === extension) {
+    tr.setSelection(new _selection.GapCursorSelection(doc.resolve(pos + 1)));
+    // if there's a textblock at this position, we're in a blockTaskItem, add an extra hop into the content
+  } else if ((0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true) && (_doc$resolve$nodeAfte2 = doc.resolve(pos + 1).nodeAfter) !== null && _doc$resolve$nodeAfte2 !== void 0 && _doc$resolve$nodeAfte2.isTextblock) {
+    tr.setSelection(new _state.TextSelection(doc.resolve(pos + 2)));
+    // else, this is an ordinary task item with inline content
+  } else {
+    tr.setSelection(new _state.TextSelection(doc.resolve(pos + 1)));
+  }
   tr.setMeta(_pluginKey.stateKey, {
     action: _types.ACTIONS.FOCUS_BY_LOCALID,
     data: localId

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

@@ -12,6 +12,7 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
@@ -151,10 +152,8 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
       if ((0, _expValEquals.expValEquals)('editor_refactor_backspace_task_and_decisions', 'isEnabled', true)) {
         var _nodeBefore$firstChil, _nodeBefore$firstChil2;
         // Check if selection is inside a blockTaskItem paragraph
-        var blockTaskItemNode = (0, _utils.findFarthestParentNode)(function (node) {
-          return node.type === blockTaskItem;
-        })($from);
-        var isInBlockTaskItemParagraph = !!blockTaskItemNode && $from.parent.type === paragraph;
+        var resultOfFindBlockTaskItem = (0, _utils3.findBlockTaskItem)($from);
+        var isInBlockTaskItemParagraph = resultOfFindBlockTaskItem && (resultOfFindBlockTaskItem === null || resultOfFindBlockTaskItem === void 0 ? void 0 : resultOfFindBlockTaskItem.hasParagraph);
 
         // Get the node before the current position
         var beforePos = isInBlockTaskItemParagraph ? $from.before() - 1 : $from.before();
@@ -192,12 +191,25 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
       if (actionDecisionFollowsOrNothing($from)) {
         if (dispatch) {
           var taskContent = state.doc.slice($from.start(), $from.end()).content;
-
-          // might be end of document after
-          var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
-          dispatch(splitListItemWith(state.tr, slice, $from, true));
+          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);
+              return true;
+            }
+          }
         }
-        return true;
       }
       return false;
     };
@@ -289,7 +301,6 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var origDoc = tr.doc;
   var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
     blockTaskItem = _tr$doc$type$schema$n.blockTaskItem,
-    paragraph = _tr$doc$type$schema$n.paragraph,
     taskList = _tr$doc$type$schema$n.taskList;
   var baseDepth = $from.depth;
   var $oldAfter = origDoc.resolve($from.after());
@@ -297,36 +308,40 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var replaceFromModifier = 0;
   var replaceToModifier = 0;
   var deleteBlockModifier = 0;
+  var isGapCursorSelection = false;
   if (blockTaskItem) {
-    var blockTaskItemNode = (0, _utils.findFarthestParentNode)(function (node) {
-      return node.type === blockTaskItem;
-    })($from);
-    if (blockTaskItemNode) {
-      var _blockTaskItemNode$no, _$oldAfter$nodeAfter;
-      var isParagraphChild = ((_blockTaskItemNode$no = blockTaskItemNode.node.firstChild) === null || _blockTaskItemNode$no === void 0 ? void 0 : _blockTaskItemNode$no.type) === paragraph;
-      // If the case there is a paragraph in the block task item we need to
-      // adjust some calculations
-      if (isParagraphChild) {
-        baseDepth = $from.depth - 1;
-        $oldAfter = origDoc.resolve(blockTaskItemNode.pos + blockTaskItemNode.node.nodeSize);
+    var result = (0, _utils3.findBlockTaskItem)($from);
+    if (result) {
+      var blockTaskItemNode = result.blockTaskItemNode,
+        hasParagraph = result.hasParagraph;
+      if (blockTaskItemNode) {
+        var _$oldAfter$nodeAfter, _$posPreviousSibling$;
+        // If the case there is a paragraph in the block task item we need to
+        // adjust some calculations
+        if (hasParagraph) {
+          baseDepth = $from.depth - 1;
+          $oldAfter = origDoc.resolve($from.after() + 1);
+
+          // When we're removing the extra empty task item we need to reduce the range a bit
+          deleteBlockModifier = 2;
+        } else {
+          textSelectionModifier = 1;
+          isGapCursorSelection = true;
+        }
         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;
+        }
+        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
+          replaceFromModifier = 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 = 3;
-      }
-      var posNodeBefore = origDoc.resolve($oldAfter.pos - blockTaskItemNode.node.nodeSize - 1);
-      var hasPreviousTaskItem = !!(0, _utils.findFarthestParentNode)(function (node) {
-        return node.type === blockTaskItem;
-      })(posNodeBefore);
-      if (!hasPreviousTaskItem) {
-        // Go down one step to get to the doc node
-        replaceFromModifier = 1;
-      }
-
-      // When we're removing the extra empty task item we need to reduce the range a bit
-      deleteBlockModifier = 2;
     }
   }
 
@@ -362,7 +377,12 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   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);
   if (setSelection && !isNestedActionInsideLists) {
-    tr = tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.pos + 1 - ((shouldSplit ? 0 : 2) + textSelectionModifier))));
+    var newPos = $from.pos + 1 - ((shouldSplit ? 0 : 2) + textSelectionModifier);
+    if (isGapCursorSelection) {
+      tr = tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(newPos), _selection.Side.LEFT));
+    } else {
+      tr = tr.setSelection(new _state.TextSelection(tr.doc.resolve(newPos)));
+    }
   }
 
   // if different levels then we shouldn't lift

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

@@ -93,7 +93,7 @@ function createPlugin(portalProviderAPI, eventDispatcher, dispatch, api, getIntl
         var $from = selection.$from,
           $to = selection.$to;
         var parentOffset = $from.parentOffset;
-        var isInTaskItem = $from.node().type === schema.nodes.taskItem;
+        var isInTaskItem = (0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true) ? (0, _helpers.isInsideTask)(state) : $from.node().type === schema.nodes.taskItem;
         var focusedTaskItemLocalId = _pluginKey.stateKey.getState(state).focusedTaskItemLocalId;
         var currentTaskItemData = (0, _helpers.getTaskItemDataAtPos)(view);
         var currentTaskItemFocused = focusedTaskItemLocalId === (currentTaskItemData === null || currentTaskItemData === void 0 ? void 0 : currentTaskItemData.localId);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeTaskItemsSelection = void 0;
+exports.normalizeTaskItemsSelection = exports.findBlockTaskItem = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 function isTaskListNode(node) {
   return Boolean(node && node.type && 'taskList' === node.type.name);
@@ -31,4 +31,37 @@ var normalizeTaskItemsSelection = exports.normalizeTaskItemsSelection = function
   var head = resolvePositionToStartOfTaskItem($from);
   var anchor = resolvePositionToEndOfTaskItem($to);
   return new _state.TextSelection(anchor, head);
+};
+
+/**
+ * Gets the blockTaskItem node and whether it has a paragraph child if it exists near the given resolved position.
+ * @param $from resolved position, typically from the selection when the selection is an empty selection at the start of a task item
+ * @returns {{ blockTaskItemNode: PMNode; hasParagraph: boolean } | false} An object with blockTaskItemNode and hasParagraph if found, or false if there is no blockTaskItem node.
+ */
+var findBlockTaskItem = exports.findBlockTaskItem = function findBlockTaskItem($from) {
+  var _$from$doc$type$schem = $from.doc.type.schema.nodes,
+    blockTaskItem = _$from$doc$type$schem.blockTaskItem,
+    paragraph = _$from$doc$type$schem.paragraph;
+  var firstParent = $from.parent;
+  if (firstParent.type === blockTaskItem) {
+    return {
+      blockTaskItemNode: firstParent,
+      hasParagraph: false
+    };
+  } else if (firstParent.type === paragraph) {
+    if ($from.depth >= 1) {
+      var secondParent = $from.node($from.depth - 1);
+      if (secondParent.type === blockTaskItem) {
+        return {
+          blockTaskItemNode: secondParent,
+          hasParagraph: true
+        };
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  }
+  return false;
 };

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

@@ -1,9 +1,7 @@
 import { findCutBefore } from '@atlaskit/editor-common/commands';
-import { findFarthestParentNode } from '@atlaskit/editor-common/utils';
 import { findWrapping, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
-import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getBlockRange, isActionOrDecisionItem, isActionOrDecisionList, liftBlock, subtreeHeight } from './helpers';
-import { normalizeTaskItemsSelection } from './utils';
+import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
 export const liftSelection = (state, dispatch) => {
   const normalizedSelection = normalizeTaskItemsSelection(state.selection);
   const {
@@ -47,15 +45,19 @@ export const wrapSelectionInTaskList = (state, dispatch) => {
     blockTaskItem
   } = state.schema.nodes;
   let maxDepth = subtreeHeight($from, $to, [taskList, taskItem]);
-  const isBlockTaskItem = hasParentNodeOfType([blockTaskItem])(state.selection);
-  const blockTaskItemNode = findFarthestParentNode(node => node.type === blockTaskItem)($from);
-  if (blockTaskItem && isBlockTaskItem && blockTaskItemNode) {
-    // If the selection is inside a nested node inside the blockTaskItem
-    // Remove the difference in depth between the selection and the blockTaskItemNode
-    if ($from.depth > blockTaskItemNode.depth) {
-      maxDepth = subtreeHeight($from, $to, [taskList, blockTaskItem]) - ($from.depth - blockTaskItemNode.depth);
-    } else {
-      maxDepth = subtreeHeight($from, $to, [taskList, blockTaskItem]);
+  if (blockTaskItem) {
+    const resultOfFindBlockTaskItem = findBlockTaskItem($from);
+    if (resultOfFindBlockTaskItem) {
+      const {
+        hasParagraph
+      } = resultOfFindBlockTaskItem;
+      // If the selection is inside a nested node inside the blockTaskItem
+      // Remove the difference in depth between the selection and the blockTaskItemNode
+      if (hasParagraph) {
+        maxDepth = subtreeHeight($from, $to, [taskList, blockTaskItem]) - 1;
+      } else {
+        maxDepth = subtreeHeight($from, $to, [taskList, blockTaskItem]);
+      }
     }
   }
   if (maxDepth >= 6) {