@atlaskit/editor-plugin-tasks-and-decisions 8.4.9 → 9.0.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 9.0.0
+
+### Patch Changes
+
+- [`133f7636e3a6c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/133f7636e3a6c) -
+  [ux] EDITOR-1750 Refactoring and improving delete key behaviours for block task item
+- Updated dependencies
+
+## 8.5.0
+
+### Minor Changes
+
+- [`687c1b8fa7801`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/687c1b8fa7801) -
+  EDITOR-1566 bump adf-schema + update validator
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.4.9
 
 ### Patch Changes

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

@@ -225,6 +225,7 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
             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);
@@ -260,40 +261,131 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
     taskList = _state$schema$nodes4.taskList,
     doc = _state$schema$nodes4.doc,
     paragraph = _state$schema$nodes4.paragraph,
+    blockTaskItem = _state$schema$nodes4.blockTaskItem,
+    taskItem = _state$schema$nodes4.taskItem,
     tr = state.tr;
+  if ((0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3')) {
+    var _$next$node, _$from$node, _$next$node2, _$from$node2, _$next$node3;
+    // only run if cursor is at the end of the node
+    if (!(0, _utils.isEmptySelectionAtEnd)(state) || !dispatch) {
+      return false;
+    }
 
-  // only run if cursor is at the end of the node
-  if (!(0, _utils.isEmptySelectionAtEnd)(state) || !dispatch) {
-    return false;
-  }
+    // look for the node after this current one
+    var $next = (0, _helpers.walkOut)($from);
 
-  // look for the node after this current one
-  var $next = (0, _helpers.walkOut)($from);
+    // this is a top-level node it wont have $next.before()
+    if (!$next.parent || $next.parent.type === doc) {
+      return false;
+    }
 
-  // this is a top-level node it wont have $next.before()
-  if (!$next.parent || $next.parent.type === doc) {
-    return false;
-  }
+    // get resolved position of parent
+    var $parentPos = $from.doc.resolve($from.start($from.depth - 1));
+    var currentNode = $from.node();
+    var parentNode = $parentPos.node();
 
-  // if nested, just unindent
-  if ($next.node($next.depth - 2).type === taskList ||
-  // this is for the case when we are on a non-nested item and next one is nested
-  $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
-    (0, _helpers.liftBlock)(tr, $next, $next);
-    dispatch(tr);
-    return true;
-  }
+    // if current position isn't an action or decision item, return false
+    if (!(0, _helpers.isActionOrDecisionItem)(currentNode) && !(0, _helpers.isActionOrDecisionItem)(parentNode)) {
+      return false;
+    }
+    var resultOfCurrentFindBlockTaskItem = (0, _utils3.findBlockTaskItem)($next);
+    var isCurrentEmptyBlockTaskItem = false;
+    if (resultOfCurrentFindBlockTaskItem) {
+      var _blockTaskItemNode$fi;
+      var blockTaskItemNode = resultOfCurrentFindBlockTaskItem.blockTaskItemNode;
+      isCurrentEmptyBlockTaskItem = blockTaskItem && blockTaskItemNode && blockTaskItemNode.childCount === 1 && ((_blockTaskItemNode$fi = blockTaskItemNode.firstChild) === null || _blockTaskItemNode$fi === void 0 ? void 0 : _blockTaskItemNode$fi.type) === paragraph && blockTaskItemNode.firstChild.childCount === 0;
+    }
+    var isEmptyActionOrDecisionItem = currentNode && (0, _helpers.isActionOrDecisionItem)(currentNode) && currentNode.childCount === 0;
+
+    // If empty item, use default handler
+    if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
+      return false;
+    }
 
-  // if next node is of same type, remove the node wrapping and create paragraph
-  if (!(0, _helpers.isTable)($next.nodeAfter) && (0, _helpers.isActionOrDecisionItem)($from.parent) && actionDecisionFollowsOrNothing($from) &&
-  // only forward delete if the node is same type
-  $next.node().type.name === $from.node().type.name) {
-    var taskContent = state.doc.slice($next.start(), $next.end()).content;
+    // Check if next node is a blockTaskItem paragraph
+    var resultOfNextFindBlockTaskItem = (0, _utils3.findBlockTaskItem)($next);
+    var isNextInBlockTaskItemParagraph = resultOfNextFindBlockTaskItem && (resultOfNextFindBlockTaskItem === null || resultOfNextFindBlockTaskItem === void 0 ? void 0 : resultOfNextFindBlockTaskItem.hasParagraph);
 
-    // might be end of document after
-    var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : [];
-    dispatch(splitListItemWith(tr, slice, $next, false));
-    return true;
+    // if nested, just unindent
+    if ($next.node($next.depth - 2).type === taskList ||
+    // this is for the case when we are on a non-nested item and next one is nested
+    $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
+      (0, _helpers.liftBlock)(tr, $next, $next);
+      dispatch(tr);
+      return true;
+    }
+    var isNextCompatibleWithBlockTaskItem = blockTaskItem && (($next === null || $next === void 0 || (_$next$node = $next.node()) === null || _$next$node === void 0 ? void 0 : _$next$node.type) === taskItem && ($from === null || $from === void 0 || (_$from$node = $from.node()) === null || _$from$node === void 0 ? void 0 : _$from$node.type) === blockTaskItem || ($next === null || $next === void 0 || (_$next$node2 = $next.node()) === null || _$next$node2 === void 0 ? void 0 : _$next$node2.type) === blockTaskItem && ($from === null || $from === void 0 || (_$from$node2 = $from.node()) === null || _$from$node2 === void 0 ? void 0 : _$from$node2.type) === taskItem || [taskItem, blockTaskItem].includes($next === null || $next === void 0 || (_$next$node3 = $next.node()) === null || _$next$node3 === void 0 ? void 0 : _$next$node3.type) && resultOfCurrentFindBlockTaskItem && resultOfCurrentFindBlockTaskItem.blockTaskItemNode);
+
+    // if next node is of same type or compatible type, remove the node wrapping and create paragraph
+    if (!(0, _helpers.isTable)($next.nodeAfter) && (0, _helpers.isActionOrDecisionItem)($from.parent) || resultOfCurrentFindBlockTaskItem && resultOfCurrentFindBlockTaskItem.blockTaskItemNode && actionDecisionFollowsOrNothing($from) && (
+    // only forward delete if the node is same type or compatible
+    $next.node().type.name === $from.node().type.name || isNextCompatibleWithBlockTaskItem)) {
+      if (dispatch) {
+        // If next node is 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 = isNextInBlockTaskItemParagraph ? state.doc.slice($next.start($next.depth - 1), $next.end($next.depth - 1)).content : state.doc.slice($next.start(), $next.end()).content;
+        var slice;
+        try {
+          slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+
+          // might be end of document after
+          var _tr4 = splitListItemWith(state.tr, slice, $next, false);
+          dispatch(_tr4);
+          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 (resultOfNextFindBlockTaskItem && resultOfNextFindBlockTaskItem.blockTaskItemNode) {
+            var _$next$node$firstChil;
+            // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+            slice = Array.from(taskContent.content);
+            var $splitPos = $next;
+            if ((_$next$node$firstChil = $next.node().firstChild) !== null && _$next$node$firstChil !== void 0 && _$next$node$firstChil.isTextblock) {
+              // set $next to the resolved position of inside the textblock
+              $splitPos = $next.doc.resolve($next.pos + 1);
+            }
+            var _tr5 = splitListItemWith(state.tr, slice, $splitPos, false);
+            dispatch(_tr5);
+            return true;
+          }
+        }
+      }
+    }
+  } else {
+    // only run if cursor is at the end of the node
+    if (!(0, _utils.isEmptySelectionAtEnd)(state) || !dispatch) {
+      return false;
+    }
+
+    // look for the node after this current one
+    var _$next = (0, _helpers.walkOut)($from);
+
+    // this is a top-level node it wont have $next.before()
+    if (!_$next.parent || _$next.parent.type === doc) {
+      return false;
+    }
+
+    // if nested, just unindent
+    if (_$next.node(_$next.depth - 2).type === taskList ||
+    // this is for the case when we are on a non-nested item and next one is nested
+    _$next.node(_$next.depth - 1).type === taskList && _$next.parent.type === taskList) {
+      (0, _helpers.liftBlock)(tr, _$next, _$next);
+      dispatch(tr);
+      return true;
+    }
+
+    // if next node is of same type, remove the node wrapping and create paragraph
+    if (!(0, _helpers.isTable)(_$next.nodeAfter) && (0, _helpers.isActionOrDecisionItem)($from.parent) && actionDecisionFollowsOrNothing($from) &&
+    // only forward delete if the node is same type
+    _$next.node().type.name === $from.node().type.name) {
+      var _taskContent2 = state.doc.slice(_$next.start(), _$next.end()).content;
+
+      // might be end of document after
+      var _slice2 = _taskContent2.size ? paragraph.createChecked(undefined, _taskContent2) : [];
+      dispatch(splitListItemWith(tr, _slice2, _$next, false));
+      return true;
+    }
   }
   return false;
 };
@@ -341,11 +433,13 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var deleteBlockModifier = 0;
   var shouldSplitBlockTaskItem = true;
   var isGapCursorSelection = false;
+  var hasBlockTaskItem = false;
   if (blockTaskItem) {
     var result = (0, _utils3.findBlockTaskItem)($from);
     if (result) {
       var blockTaskItemNode = result.blockTaskItemNode,
         hasParagraph = result.hasParagraph;
+      hasBlockTaskItem = (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3') && !!blockTaskItemNode;
       if (blockTaskItemNode) {
         var _$oldAfter$nodeAfter, _$posPreviousSibling$;
         // If the case there is a paragraph in the block task item we need to
@@ -391,7 +485,9 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   if (shouldSplit && !isNestedActionInsideLists) {
     // this only splits a node to delete it, so we probably don't need a random uuid
     // but generate one anyway for correctness
-    tr = tr.split($from.pos, 1, [{
+    tr = tr.split($from.pos,
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3') && hasBlockTaskItem ? 0 : 1, [{
       type: $from.parent.type,
       attrs: {
         localId: _adfSchema.uuid.generate()

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

@@ -201,6 +201,7 @@ const backspaceFrom = editorAnalyticsAPI => $from => (state, dispatch) => {
         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);
@@ -231,44 +232,137 @@ const unindentTaskOrUnwrapTaskDecisionFollowing = (state, dispatch) => {
       nodes: {
         taskList,
         doc,
-        paragraph
+        paragraph,
+        blockTaskItem,
+        taskItem
       }
     },
     tr
   } = state;
+  if (fg('platform_editor_blocktaskitem_patch_3')) {
+    var _$next$node, _$from$node, _$next$node2, _$from$node2, _$next$node3;
+    // only run if cursor is at the end of the node
+    if (!isEmptySelectionAtEnd(state) || !dispatch) {
+      return false;
+    }
 
-  // only run if cursor is at the end of the node
-  if (!isEmptySelectionAtEnd(state) || !dispatch) {
-    return false;
-  }
+    // look for the node after this current one
+    const $next = walkOut($from);
 
-  // look for the node after this current one
-  const $next = walkOut($from);
+    // this is a top-level node it wont have $next.before()
+    if (!$next.parent || $next.parent.type === doc) {
+      return false;
+    }
 
-  // this is a top-level node it wont have $next.before()
-  if (!$next.parent || $next.parent.type === doc) {
-    return false;
-  }
+    // get resolved position of parent
+    const $parentPos = $from.doc.resolve($from.start($from.depth - 1));
+    const currentNode = $from.node();
+    const parentNode = $parentPos.node();
 
-  // if nested, just unindent
-  if ($next.node($next.depth - 2).type === taskList ||
-  // this is for the case when we are on a non-nested item and next one is nested
-  $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
-    liftBlock(tr, $next, $next);
-    dispatch(tr);
-    return true;
-  }
+    // if current position isn't an action or decision item, return false
+    if (!isActionOrDecisionItem(currentNode) && !isActionOrDecisionItem(parentNode)) {
+      return false;
+    }
+    const resultOfCurrentFindBlockTaskItem = findBlockTaskItem($next);
+    let isCurrentEmptyBlockTaskItem = false;
+    if (resultOfCurrentFindBlockTaskItem) {
+      var _blockTaskItemNode$fi;
+      const {
+        blockTaskItemNode
+      } = resultOfCurrentFindBlockTaskItem;
+      isCurrentEmptyBlockTaskItem = blockTaskItem && blockTaskItemNode && blockTaskItemNode.childCount === 1 && ((_blockTaskItemNode$fi = blockTaskItemNode.firstChild) === null || _blockTaskItemNode$fi === void 0 ? void 0 : _blockTaskItemNode$fi.type) === paragraph && blockTaskItemNode.firstChild.childCount === 0;
+    }
+    const isEmptyActionOrDecisionItem = currentNode && isActionOrDecisionItem(currentNode) && currentNode.childCount === 0;
 
-  // if next node is of same type, remove the node wrapping and create paragraph
-  if (!isTable($next.nodeAfter) && isActionOrDecisionItem($from.parent) && actionDecisionFollowsOrNothing($from) &&
-  // only forward delete if the node is same type
-  $next.node().type.name === $from.node().type.name) {
-    const taskContent = state.doc.slice($next.start(), $next.end()).content;
+    // If empty item, use default handler
+    if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
+      return false;
+    }
 
-    // might be end of document after
-    const slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : [];
-    dispatch(splitListItemWith(tr, slice, $next, false));
-    return true;
+    // Check if next node is a blockTaskItem paragraph
+    const resultOfNextFindBlockTaskItem = findBlockTaskItem($next);
+    const isNextInBlockTaskItemParagraph = resultOfNextFindBlockTaskItem && (resultOfNextFindBlockTaskItem === null || resultOfNextFindBlockTaskItem === void 0 ? void 0 : resultOfNextFindBlockTaskItem.hasParagraph);
+
+    // if nested, just unindent
+    if ($next.node($next.depth - 2).type === taskList ||
+    // this is for the case when we are on a non-nested item and next one is nested
+    $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
+      liftBlock(tr, $next, $next);
+      dispatch(tr);
+      return true;
+    }
+    const isNextCompatibleWithBlockTaskItem = blockTaskItem && (($next === null || $next === void 0 ? void 0 : (_$next$node = $next.node()) === null || _$next$node === void 0 ? void 0 : _$next$node.type) === taskItem && ($from === null || $from === void 0 ? void 0 : (_$from$node = $from.node()) === null || _$from$node === void 0 ? void 0 : _$from$node.type) === blockTaskItem || ($next === null || $next === void 0 ? void 0 : (_$next$node2 = $next.node()) === null || _$next$node2 === void 0 ? void 0 : _$next$node2.type) === blockTaskItem && ($from === null || $from === void 0 ? void 0 : (_$from$node2 = $from.node()) === null || _$from$node2 === void 0 ? void 0 : _$from$node2.type) === taskItem || [taskItem, blockTaskItem].includes($next === null || $next === void 0 ? void 0 : (_$next$node3 = $next.node()) === null || _$next$node3 === void 0 ? void 0 : _$next$node3.type) && resultOfCurrentFindBlockTaskItem && resultOfCurrentFindBlockTaskItem.blockTaskItemNode);
+
+    // if next node is of same type or compatible type, remove the node wrapping and create paragraph
+    if (!isTable($next.nodeAfter) && isActionOrDecisionItem($from.parent) || resultOfCurrentFindBlockTaskItem && resultOfCurrentFindBlockTaskItem.blockTaskItemNode && actionDecisionFollowsOrNothing($from) && (
+    // only forward delete if the node is same type or compatible
+    $next.node().type.name === $from.node().type.name || isNextCompatibleWithBlockTaskItem)) {
+      if (dispatch) {
+        // If next node is 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 = isNextInBlockTaskItemParagraph ? state.doc.slice($next.start($next.depth - 1), $next.end($next.depth - 1)).content : state.doc.slice($next.start(), $next.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, $next, false);
+          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 (resultOfNextFindBlockTaskItem && resultOfNextFindBlockTaskItem.blockTaskItemNode) {
+            var _$next$node$firstChil;
+            // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+            slice = Array.from(taskContent.content);
+            let $splitPos = $next;
+            if ((_$next$node$firstChil = $next.node().firstChild) !== null && _$next$node$firstChil !== void 0 && _$next$node$firstChil.isTextblock) {
+              // set $next to the resolved position of inside the textblock
+              $splitPos = $next.doc.resolve($next.pos + 1);
+            }
+            const tr = splitListItemWith(state.tr, slice, $splitPos, false);
+            dispatch(tr);
+            return true;
+          }
+        }
+      }
+    }
+  } else {
+    // only run if cursor is at the end of the node
+    if (!isEmptySelectionAtEnd(state) || !dispatch) {
+      return false;
+    }
+
+    // look for the node after this current one
+    const $next = walkOut($from);
+
+    // this is a top-level node it wont have $next.before()
+    if (!$next.parent || $next.parent.type === doc) {
+      return false;
+    }
+
+    // if nested, just unindent
+    if ($next.node($next.depth - 2).type === taskList ||
+    // this is for the case when we are on a non-nested item and next one is nested
+    $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
+      liftBlock(tr, $next, $next);
+      dispatch(tr);
+      return true;
+    }
+
+    // if next node is of same type, remove the node wrapping and create paragraph
+    if (!isTable($next.nodeAfter) && isActionOrDecisionItem($from.parent) && actionDecisionFollowsOrNothing($from) &&
+    // only forward delete if the node is same type
+    $next.node().type.name === $from.node().type.name) {
+      const taskContent = state.doc.slice($next.start(), $next.end()).content;
+
+      // might be end of document after
+      const slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : [];
+      dispatch(splitListItemWith(tr, slice, $next, false));
+      return true;
+    }
   }
   return false;
 };
@@ -317,6 +411,7 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
   let deleteBlockModifier = 0;
   let shouldSplitBlockTaskItem = true;
   let isGapCursorSelection = false;
+  let hasBlockTaskItem = false;
   if (blockTaskItem) {
     const result = findBlockTaskItem($from);
     if (result) {
@@ -324,6 +419,7 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
         blockTaskItemNode,
         hasParagraph
       } = result;
+      hasBlockTaskItem = fg('platform_editor_blocktaskitem_patch_3') && !!blockTaskItemNode;
       if (blockTaskItemNode) {
         var _$oldAfter$nodeAfter, _$posPreviousSibling$;
         // If the case there is a paragraph in the block task item we need to
@@ -369,7 +465,9 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
   if (shouldSplit && !isNestedActionInsideLists) {
     // this only splits a node to delete it, so we probably don't need a random uuid
     // but generate one anyway for correctness
-    tr = tr.split($from.pos, 1, [{
+    tr = tr.split($from.pos,
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform_editor_blocktaskitem_patch_3') && hasBlockTaskItem ? 0 : 1, [{
       type: $from.parent.type,
       attrs: {
         localId: uuid.generate()

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

@@ -217,6 +217,7 @@ var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
             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);
@@ -252,40 +253,131 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
     taskList = _state$schema$nodes4.taskList,
     doc = _state$schema$nodes4.doc,
     paragraph = _state$schema$nodes4.paragraph,
+    blockTaskItem = _state$schema$nodes4.blockTaskItem,
+    taskItem = _state$schema$nodes4.taskItem,
     tr = state.tr;
+  if (fg('platform_editor_blocktaskitem_patch_3')) {
+    var _$next$node, _$from$node, _$next$node2, _$from$node2, _$next$node3;
+    // only run if cursor is at the end of the node
+    if (!isEmptySelectionAtEnd(state) || !dispatch) {
+      return false;
+    }
 
-  // only run if cursor is at the end of the node
-  if (!isEmptySelectionAtEnd(state) || !dispatch) {
-    return false;
-  }
+    // look for the node after this current one
+    var $next = walkOut($from);
 
-  // look for the node after this current one
-  var $next = walkOut($from);
+    // this is a top-level node it wont have $next.before()
+    if (!$next.parent || $next.parent.type === doc) {
+      return false;
+    }
 
-  // this is a top-level node it wont have $next.before()
-  if (!$next.parent || $next.parent.type === doc) {
-    return false;
-  }
+    // get resolved position of parent
+    var $parentPos = $from.doc.resolve($from.start($from.depth - 1));
+    var currentNode = $from.node();
+    var parentNode = $parentPos.node();
 
-  // if nested, just unindent
-  if ($next.node($next.depth - 2).type === taskList ||
-  // this is for the case when we are on a non-nested item and next one is nested
-  $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
-    liftBlock(tr, $next, $next);
-    dispatch(tr);
-    return true;
-  }
+    // if current position isn't an action or decision item, return false
+    if (!isActionOrDecisionItem(currentNode) && !isActionOrDecisionItem(parentNode)) {
+      return false;
+    }
+    var resultOfCurrentFindBlockTaskItem = findBlockTaskItem($next);
+    var isCurrentEmptyBlockTaskItem = false;
+    if (resultOfCurrentFindBlockTaskItem) {
+      var _blockTaskItemNode$fi;
+      var blockTaskItemNode = resultOfCurrentFindBlockTaskItem.blockTaskItemNode;
+      isCurrentEmptyBlockTaskItem = blockTaskItem && blockTaskItemNode && blockTaskItemNode.childCount === 1 && ((_blockTaskItemNode$fi = blockTaskItemNode.firstChild) === null || _blockTaskItemNode$fi === void 0 ? void 0 : _blockTaskItemNode$fi.type) === paragraph && blockTaskItemNode.firstChild.childCount === 0;
+    }
+    var isEmptyActionOrDecisionItem = currentNode && isActionOrDecisionItem(currentNode) && currentNode.childCount === 0;
+
+    // If empty item, use default handler
+    if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
+      return false;
+    }
 
-  // if next node is of same type, remove the node wrapping and create paragraph
-  if (!isTable($next.nodeAfter) && isActionOrDecisionItem($from.parent) && actionDecisionFollowsOrNothing($from) &&
-  // only forward delete if the node is same type
-  $next.node().type.name === $from.node().type.name) {
-    var taskContent = state.doc.slice($next.start(), $next.end()).content;
+    // Check if next node is a blockTaskItem paragraph
+    var resultOfNextFindBlockTaskItem = findBlockTaskItem($next);
+    var isNextInBlockTaskItemParagraph = resultOfNextFindBlockTaskItem && (resultOfNextFindBlockTaskItem === null || resultOfNextFindBlockTaskItem === void 0 ? void 0 : resultOfNextFindBlockTaskItem.hasParagraph);
 
-    // might be end of document after
-    var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : [];
-    dispatch(splitListItemWith(tr, slice, $next, false));
-    return true;
+    // if nested, just unindent
+    if ($next.node($next.depth - 2).type === taskList ||
+    // this is for the case when we are on a non-nested item and next one is nested
+    $next.node($next.depth - 1).type === taskList && $next.parent.type === taskList) {
+      liftBlock(tr, $next, $next);
+      dispatch(tr);
+      return true;
+    }
+    var isNextCompatibleWithBlockTaskItem = blockTaskItem && (($next === null || $next === void 0 || (_$next$node = $next.node()) === null || _$next$node === void 0 ? void 0 : _$next$node.type) === taskItem && ($from === null || $from === void 0 || (_$from$node = $from.node()) === null || _$from$node === void 0 ? void 0 : _$from$node.type) === blockTaskItem || ($next === null || $next === void 0 || (_$next$node2 = $next.node()) === null || _$next$node2 === void 0 ? void 0 : _$next$node2.type) === blockTaskItem && ($from === null || $from === void 0 || (_$from$node2 = $from.node()) === null || _$from$node2 === void 0 ? void 0 : _$from$node2.type) === taskItem || [taskItem, blockTaskItem].includes($next === null || $next === void 0 || (_$next$node3 = $next.node()) === null || _$next$node3 === void 0 ? void 0 : _$next$node3.type) && resultOfCurrentFindBlockTaskItem && resultOfCurrentFindBlockTaskItem.blockTaskItemNode);
+
+    // if next node is of same type or compatible type, remove the node wrapping and create paragraph
+    if (!isTable($next.nodeAfter) && isActionOrDecisionItem($from.parent) || resultOfCurrentFindBlockTaskItem && resultOfCurrentFindBlockTaskItem.blockTaskItemNode && actionDecisionFollowsOrNothing($from) && (
+    // only forward delete if the node is same type or compatible
+    $next.node().type.name === $from.node().type.name || isNextCompatibleWithBlockTaskItem)) {
+      if (dispatch) {
+        // If next node is 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 = isNextInBlockTaskItemParagraph ? state.doc.slice($next.start($next.depth - 1), $next.end($next.depth - 1)).content : state.doc.slice($next.start(), $next.end()).content;
+        var slice;
+        try {
+          slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+
+          // might be end of document after
+          var _tr4 = splitListItemWith(state.tr, slice, $next, false);
+          dispatch(_tr4);
+          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 (resultOfNextFindBlockTaskItem && resultOfNextFindBlockTaskItem.blockTaskItemNode) {
+            var _$next$node$firstChil;
+            // Create an array from the fragment to pass into splitListItemWith, as the `content` property is readonly
+            slice = Array.from(taskContent.content);
+            var $splitPos = $next;
+            if ((_$next$node$firstChil = $next.node().firstChild) !== null && _$next$node$firstChil !== void 0 && _$next$node$firstChil.isTextblock) {
+              // set $next to the resolved position of inside the textblock
+              $splitPos = $next.doc.resolve($next.pos + 1);
+            }
+            var _tr5 = splitListItemWith(state.tr, slice, $splitPos, false);
+            dispatch(_tr5);
+            return true;
+          }
+        }
+      }
+    }
+  } else {
+    // only run if cursor is at the end of the node
+    if (!isEmptySelectionAtEnd(state) || !dispatch) {
+      return false;
+    }
+
+    // look for the node after this current one
+    var _$next = walkOut($from);
+
+    // this is a top-level node it wont have $next.before()
+    if (!_$next.parent || _$next.parent.type === doc) {
+      return false;
+    }
+
+    // if nested, just unindent
+    if (_$next.node(_$next.depth - 2).type === taskList ||
+    // this is for the case when we are on a non-nested item and next one is nested
+    _$next.node(_$next.depth - 1).type === taskList && _$next.parent.type === taskList) {
+      liftBlock(tr, _$next, _$next);
+      dispatch(tr);
+      return true;
+    }
+
+    // if next node is of same type, remove the node wrapping and create paragraph
+    if (!isTable(_$next.nodeAfter) && isActionOrDecisionItem($from.parent) && actionDecisionFollowsOrNothing($from) &&
+    // only forward delete if the node is same type
+    _$next.node().type.name === $from.node().type.name) {
+      var _taskContent2 = state.doc.slice(_$next.start(), _$next.end()).content;
+
+      // might be end of document after
+      var _slice2 = _taskContent2.size ? paragraph.createChecked(undefined, _taskContent2) : [];
+      dispatch(splitListItemWith(tr, _slice2, _$next, false));
+      return true;
+    }
   }
   return false;
 };
@@ -333,11 +425,13 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var deleteBlockModifier = 0;
   var shouldSplitBlockTaskItem = true;
   var isGapCursorSelection = false;
+  var hasBlockTaskItem = false;
   if (blockTaskItem) {
     var result = findBlockTaskItem($from);
     if (result) {
       var blockTaskItemNode = result.blockTaskItemNode,
         hasParagraph = result.hasParagraph;
+      hasBlockTaskItem = fg('platform_editor_blocktaskitem_patch_3') && !!blockTaskItemNode;
       if (blockTaskItemNode) {
         var _$oldAfter$nodeAfter, _$posPreviousSibling$;
         // If the case there is a paragraph in the block task item we need to
@@ -383,7 +477,9 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   if (shouldSplit && !isNestedActionInsideLists) {
     // this only splits a node to delete it, so we probably don't need a random uuid
     // but generate one anyway for correctness
-    tr = tr.split($from.pos, 1, [{
+    tr = tr.split($from.pos,
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform_editor_blocktaskitem_patch_3') && hasBlockTaskItem ? 0 : 1, [{
       type: $from.parent.type,
       attrs: {
         localId: uuid.generate()

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "8.4.9",
+	"version": "9.0.0",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,34 +29,34 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.1.2",
-		"@atlaskit/analytics-namespaced-context": "^7.0.0",
+		"@atlaskit/adf-schema": "^51.2.0",
+		"@atlaskit/analytics-namespaced-context": "^7.1.0",
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/css": "^0.14.0",
-		"@atlaskit/editor-plugin-analytics": "^5.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^3.2.0",
-		"@atlaskit/editor-plugin-context-identifier": "^5.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^7.0.0",
-		"@atlaskit/editor-plugin-selection": "^5.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^5.2.0",
+		"@atlaskit/editor-plugin-analytics": "^6.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^4.0.0",
+		"@atlaskit/editor-plugin-context-identifier": "^6.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
+		"@atlaskit/editor-plugin-selection": "^6.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^6.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-toolbar": "^0.9.0",
 		"@atlaskit/heading": "^5.2.0",
-		"@atlaskit/icon": "^28.2.0",
+		"@atlaskit/icon": "^28.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popup": "^4.4.0",
 		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^12.28.0",
+		"@atlaskit/tmp-editor-statsig": "^12.31.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.11.0",
+		"@atlaskit/editor-common": "^110.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -65,7 +65,7 @@
 		"@af/integration-testing": "workspace:^",
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/util-data-test": "^18.2.0",
+		"@atlaskit/util-data-test": "^18.3.0",
 		"@testing-library/react": "^13.4.0",
 		"wait-for-expect": "^1.2.0"
 	},
@@ -113,6 +113,9 @@
 		},
 		"platform_editor_block_menu_format_rank_revised": {
 			"type": "boolean"
+		},
+		"platform_editor_blocktaskitem_patch_3": {
+			"type": "boolean"
 		}
 	}
 }