@atlaskit/editor-plugin-tasks-and-decisions 0.2.15 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 0.3.0
+
+### Minor Changes
+
+- [#68790](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68790) [`c6d8affc52d1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c6d8affc52d1) - Support maybeAdd plugins in usePreset. Add typing support for universal preset.
+
+  Now when using the editor API with the universal preset
+
+### Patch Changes
+
+- [#69144](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69144) [`10e7328aea8c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10e7328aea8c) - [ux] ED-21844 Add fix for enter keybind behaviour for nested actions inside list and relevant testcases
+- Updated dependencies
+
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.2.15
 
 ### Patch Changes

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.findFirstParentListNode = findFirstParentListNode;
 exports.focusCheckboxAndUpdateSelection = focusCheckboxAndUpdateSelection;
 exports.getAllTaskItemsDataInRootTaskList = getAllTaskItemsDataInRootTaskList;
 exports.getCurrentIndentLevel = exports.getBlockRange = void 0;
@@ -296,4 +297,25 @@ function removeCheckboxFocus(view) {
   dispatch(tr.setMeta(_pluginKey.stateKey, {
     action: _types.ACTIONS.FOCUS_BY_LOCALID
   }));
+}
+function findFirstParentListNode($pos) {
+  var currentNode = $pos.doc.nodeAt($pos.pos);
+  var listNodePosition = null;
+  if ((0, _utils.isListNode)(currentNode)) {
+    listNodePosition = $pos.pos;
+  } else {
+    var result = (0, _utils2.findParentNodeClosestToPos)($pos, _utils.isListNode);
+    listNodePosition = result && result.pos;
+  }
+  if (listNodePosition == null) {
+    return null;
+  }
+  var node = $pos.doc.nodeAt(listNodePosition);
+  if (!node) {
+    return null;
+  }
+  return {
+    node: node,
+    pos: listNodePosition
+  };
 }

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

@@ -222,7 +222,38 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
   return false;
 };
 var deleteForwards = (0, _commands.autoJoin)((0, _commands.chainCommands)((0, _utils.deleteEmptyParagraphAndMoveBlockUp)(_helpers.isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
+var deleteExtraListItem = function deleteExtraListItem(tr, $from) {
+  /*
+    After we replace actionItem with empty list item if there's the anomaly of extra empty list item
+    the cursor moves inside the first taskItem of splitted taskList
+    so the extra list item present above the list item containing taskList & cursor
+  */
+
+  var $currentFrom = tr.selection.$from;
+  var listItemContainingActionList = tr.doc.resolve($currentFrom.start($currentFrom.depth - 2));
+  var emptyListItem = tr.doc.resolve(listItemContainingActionList.before() - 1);
+  tr.delete(emptyListItem.start(), listItemContainingActionList.pos);
+};
+var processNestedActionItem = function processNestedActionItem(tr, $from, previousListItemPos) {
+  var parentListNode = (0, _helpers.findFirstParentListNode)($from);
+  var previousChildCountOfList = parentListNode === null || parentListNode === void 0 ? void 0 : parentListNode.node.childCount;
+  var currentParentListNode = (0, _helpers.findFirstParentListNode)(tr.doc.resolve(tr.mapping.map($from.pos)));
+  var currentChildCountOfList = currentParentListNode === null || currentParentListNode === void 0 ? void 0 : currentParentListNode.node.childCount;
+
+  /*
+    While replacing range with empty list item an extra list item gets created in some of the scenarios
+    After splitting only one extra listItem should be created else an extra listItem is created
+  */
+  if (previousChildCountOfList && currentChildCountOfList && previousChildCountOfList + 1 !== currentChildCountOfList) {
+    deleteExtraListItem(tr, $from);
+  }
+
+  // Set custom selection for nested action inside lists using previosuly calculated previousListItem position
+  var stableResolvedPos = tr.doc.resolve(previousListItemPos);
+  tr.setSelection(_state.TextSelection.create(tr.doc, stableResolvedPos.after() + 2));
+};
 var splitListItemWith = function splitListItemWith(tr, content, $from, setSelection) {
+  var _frag$firstChild;
   var origDoc = tr.doc;
 
   // split just before the current item
@@ -230,7 +261,13 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var container = $from.node($from.depth - 2);
   var posInList = $from.index($from.depth - 1);
   var shouldSplit = !(!(0, _helpers.isActionOrDecisionList)(container) && posInList === 0);
-  if (shouldSplit) {
+  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';
+
+  /* We don't split the list item if it's nested inside lists
+    to have consistent behaviour and their resolution.
+  */
+  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, [{
@@ -240,19 +277,25 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
       }
     }]);
   }
+  /*
+    In case of nested action inside lists we explicitly set the cursor
+    We need to insert it relatively to previous doc structure
+    So we calculate the position of previous list item and save that position
+    (The cursor can be placed easily next to list item)
+  */
+  var previousListItemPos = isNestedActionInsideLists ? $from.start($from.depth - 2) : 0;
+
   // and delete the action at the current pos
   // we can do this because we know either first new child will be taskItem or nothing at all
-  var frag = _model.Fragment.from(content);
+
   tr = tr.replace(tr.mapping.map($from.start() - 2), tr.mapping.map($from.end() + 2), frag.size ? new _model.Slice(frag, 0, 0) : _model.Slice.empty);
 
   // put cursor inside paragraph
-  if (setSelection) {
+  if (setSelection && !isNestedActionInsideLists) {
     tr = tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.pos + 1 - (shouldSplit ? 0 : 2))));
   }
-
   // lift list up if the node after the initial one was a taskList
   // which means it would have empty placeholder content if we just immediately delete it
-  //
   // if it's a taskItem then it can stand alone, so it's fine
   var $oldAfter = origDoc.resolve($from.after());
 
@@ -273,14 +316,26 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
       tr = tr.deleteRange(pos - 3, pos - 1);
     }
   }
+  if (isNestedActionInsideLists) {
+    processNestedActionItem(tr, $from, previousListItemPos);
+  }
   return tr;
 };
+var creatParentListItemFragement = function creatParentListItemFragement(state) {
+  return state.schema.nodes.listItem.create({}, state.schema.nodes.paragraph.create());
+};
 var splitListItem = function splitListItem(state, dispatch) {
   var tr = state.tr,
     $from = state.selection.$from;
   var paragraph = state.schema.nodes.paragraph;
+  var listItem = state.schema.nodes.listItem;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
+      if ((0, _utils2.hasParentNodeOfType)(listItem)(tr.selection)) {
+        // if we're inside a list item, then we pass in a fragment containing a new list item not a paragraph
+        dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));
+        return true;
+      }
       dispatch(splitListItemWith(tr, paragraph.createChecked(), $from, true));
     }
     return true;

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

@@ -1,4 +1,4 @@
-import { findFarthestParentNode } from '@atlaskit/editor-common/utils';
+import { findFarthestParentNode, isListNode } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
@@ -313,4 +313,25 @@ export function removeCheckboxFocus(view) {
   dispatch(tr.setMeta(stateKey, {
     action: ACTIONS.FOCUS_BY_LOCALID
   }));
+}
+export function findFirstParentListNode($pos) {
+  const currentNode = $pos.doc.nodeAt($pos.pos);
+  let listNodePosition = null;
+  if (isListNode(currentNode)) {
+    listNodePosition = $pos.pos;
+  } else {
+    const result = findParentNodeClosestToPos($pos, isListNode);
+    listNodePosition = result && result.pos;
+  }
+  if (listNodePosition == null) {
+    return null;
+  }
+  const node = $pos.doc.nodeAt(listNodePosition);
+  if (!node) {
+    return null;
+  }
+  return {
+    node,
+    pos: listNodePosition
+  };
 }

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

@@ -8,11 +8,11 @@ import { autoJoin, chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { normalizeTaskItemsSelection } from '../utils';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
+import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
 const indentationAnalytics = (curIndentLevel, direction, inputMethod) => ({
   action: ACTION.FORMATTED,
   actionSubject: ACTION_SUBJECT.TEXT,
@@ -197,7 +197,38 @@ const unindentTaskOrUnwrapTaskDecisionFollowing = (state, dispatch) => {
   return false;
 };
 const deleteForwards = autoJoin(chainCommands(deleteEmptyParagraphAndMoveBlockUp(isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
+const deleteExtraListItem = (tr, $from) => {
+  /*
+    After we replace actionItem with empty list item if there's the anomaly of extra empty list item
+    the cursor moves inside the first taskItem of splitted taskList
+    so the extra list item present above the list item containing taskList & cursor
+  */
+
+  const $currentFrom = tr.selection.$from;
+  const listItemContainingActionList = tr.doc.resolve($currentFrom.start($currentFrom.depth - 2));
+  const emptyListItem = tr.doc.resolve(listItemContainingActionList.before() - 1);
+  tr.delete(emptyListItem.start(), listItemContainingActionList.pos);
+};
+const processNestedActionItem = (tr, $from, previousListItemPos) => {
+  const parentListNode = findFirstParentListNode($from);
+  const previousChildCountOfList = parentListNode === null || parentListNode === void 0 ? void 0 : parentListNode.node.childCount;
+  const currentParentListNode = findFirstParentListNode(tr.doc.resolve(tr.mapping.map($from.pos)));
+  const currentChildCountOfList = currentParentListNode === null || currentParentListNode === void 0 ? void 0 : currentParentListNode.node.childCount;
+
+  /*
+    While replacing range with empty list item an extra list item gets created in some of the scenarios
+    After splitting only one extra listItem should be created else an extra listItem is created
+  */
+  if (previousChildCountOfList && currentChildCountOfList && previousChildCountOfList + 1 !== currentChildCountOfList) {
+    deleteExtraListItem(tr, $from);
+  }
+
+  // Set custom selection for nested action inside lists using previosuly calculated previousListItem position
+  const stableResolvedPos = tr.doc.resolve(previousListItemPos);
+  tr.setSelection(TextSelection.create(tr.doc, stableResolvedPos.after() + 2));
+};
 const splitListItemWith = (tr, content, $from, setSelection) => {
+  var _frag$firstChild;
   const origDoc = tr.doc;
 
   // split just before the current item
@@ -205,7 +236,13 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
   const container = $from.node($from.depth - 2);
   const posInList = $from.index($from.depth - 1);
   const shouldSplit = !(!isActionOrDecisionList(container) && posInList === 0);
-  if (shouldSplit) {
+  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';
+
+  /* We don't split the list item if it's nested inside lists
+    to have consistent behaviour and their resolution.
+  */
+  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, [{
@@ -215,19 +252,25 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
       }
     }]);
   }
+  /*
+    In case of nested action inside lists we explicitly set the cursor
+    We need to insert it relatively to previous doc structure
+    So we calculate the position of previous list item and save that position
+    (The cursor can be placed easily next to list item)
+  */
+  const previousListItemPos = isNestedActionInsideLists ? $from.start($from.depth - 2) : 0;
+
   // and delete the action at the current pos
   // we can do this because we know either first new child will be taskItem or nothing at all
-  const frag = Fragment.from(content);
+
   tr = tr.replace(tr.mapping.map($from.start() - 2), tr.mapping.map($from.end() + 2), frag.size ? new Slice(frag, 0, 0) : Slice.empty);
 
   // put cursor inside paragraph
-  if (setSelection) {
+  if (setSelection && !isNestedActionInsideLists) {
     tr = tr.setSelection(new TextSelection(tr.doc.resolve($from.pos + 1 - (shouldSplit ? 0 : 2))));
   }
-
   // lift list up if the node after the initial one was a taskList
   // which means it would have empty placeholder content if we just immediately delete it
-  //
   // if it's a taskItem then it can stand alone, so it's fine
   const $oldAfter = origDoc.resolve($from.after());
 
@@ -248,8 +291,14 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
       tr = tr.deleteRange(pos - 3, pos - 1);
     }
   }
+  if (isNestedActionInsideLists) {
+    processNestedActionItem(tr, $from, previousListItemPos);
+  }
   return tr;
 };
+const creatParentListItemFragement = state => {
+  return state.schema.nodes.listItem.create({}, state.schema.nodes.paragraph.create());
+};
 const splitListItem = (state, dispatch) => {
   let {
     tr,
@@ -264,8 +313,16 @@ const splitListItem = (state, dispatch) => {
       }
     }
   } = state;
+  const {
+    listItem
+  } = state.schema.nodes;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
+      if (hasParentNodeOfType(listItem)(tr.selection)) {
+        // if we're inside a list item, then we pass in a fragment containing a new list item not a paragraph
+        dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));
+        return true;
+      }
       dispatch(splitListItemWith(tr, paragraph.createChecked(), $from, true));
     }
     return true;

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

@@ -1,4 +1,4 @@
-import { findFarthestParentNode } from '@atlaskit/editor-common/utils';
+import { findFarthestParentNode, isListNode } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
@@ -282,4 +282,25 @@ export function removeCheckboxFocus(view) {
   dispatch(tr.setMeta(stateKey, {
     action: ACTIONS.FOCUS_BY_LOCALID
   }));
+}
+export function findFirstParentListNode($pos) {
+  var currentNode = $pos.doc.nodeAt($pos.pos);
+  var listNodePosition = null;
+  if (isListNode(currentNode)) {
+    listNodePosition = $pos.pos;
+  } else {
+    var result = findParentNodeClosestToPos($pos, isListNode);
+    listNodePosition = result && result.pos;
+  }
+  if (listNodePosition == null) {
+    return null;
+  }
+  var node = $pos.doc.nodeAt(listNodePosition);
+  if (!node) {
+    return null;
+  }
+  return {
+    node: node,
+    pos: listNodePosition
+  };
 }

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

@@ -11,11 +11,11 @@ import { autoJoin, chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { normalizeTaskItemsSelection } from '../utils';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
+import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction, inputMethod) {
   return {
     action: ACTION.FORMATTED,
@@ -214,7 +214,38 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
   return false;
 };
 var deleteForwards = autoJoin(chainCommands(deleteEmptyParagraphAndMoveBlockUp(isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
+var deleteExtraListItem = function deleteExtraListItem(tr, $from) {
+  /*
+    After we replace actionItem with empty list item if there's the anomaly of extra empty list item
+    the cursor moves inside the first taskItem of splitted taskList
+    so the extra list item present above the list item containing taskList & cursor
+  */
+
+  var $currentFrom = tr.selection.$from;
+  var listItemContainingActionList = tr.doc.resolve($currentFrom.start($currentFrom.depth - 2));
+  var emptyListItem = tr.doc.resolve(listItemContainingActionList.before() - 1);
+  tr.delete(emptyListItem.start(), listItemContainingActionList.pos);
+};
+var processNestedActionItem = function processNestedActionItem(tr, $from, previousListItemPos) {
+  var parentListNode = findFirstParentListNode($from);
+  var previousChildCountOfList = parentListNode === null || parentListNode === void 0 ? void 0 : parentListNode.node.childCount;
+  var currentParentListNode = findFirstParentListNode(tr.doc.resolve(tr.mapping.map($from.pos)));
+  var currentChildCountOfList = currentParentListNode === null || currentParentListNode === void 0 ? void 0 : currentParentListNode.node.childCount;
+
+  /*
+    While replacing range with empty list item an extra list item gets created in some of the scenarios
+    After splitting only one extra listItem should be created else an extra listItem is created
+  */
+  if (previousChildCountOfList && currentChildCountOfList && previousChildCountOfList + 1 !== currentChildCountOfList) {
+    deleteExtraListItem(tr, $from);
+  }
+
+  // Set custom selection for nested action inside lists using previosuly calculated previousListItem position
+  var stableResolvedPos = tr.doc.resolve(previousListItemPos);
+  tr.setSelection(TextSelection.create(tr.doc, stableResolvedPos.after() + 2));
+};
 var splitListItemWith = function splitListItemWith(tr, content, $from, setSelection) {
+  var _frag$firstChild;
   var origDoc = tr.doc;
 
   // split just before the current item
@@ -222,7 +253,13 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   var container = $from.node($from.depth - 2);
   var posInList = $from.index($from.depth - 1);
   var shouldSplit = !(!isActionOrDecisionList(container) && posInList === 0);
-  if (shouldSplit) {
+  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';
+
+  /* We don't split the list item if it's nested inside lists
+    to have consistent behaviour and their resolution.
+  */
+  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, [{
@@ -232,19 +269,25 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
       }
     }]);
   }
+  /*
+    In case of nested action inside lists we explicitly set the cursor
+    We need to insert it relatively to previous doc structure
+    So we calculate the position of previous list item and save that position
+    (The cursor can be placed easily next to list item)
+  */
+  var previousListItemPos = isNestedActionInsideLists ? $from.start($from.depth - 2) : 0;
+
   // and delete the action at the current pos
   // we can do this because we know either first new child will be taskItem or nothing at all
-  var frag = Fragment.from(content);
+
   tr = tr.replace(tr.mapping.map($from.start() - 2), tr.mapping.map($from.end() + 2), frag.size ? new Slice(frag, 0, 0) : Slice.empty);
 
   // put cursor inside paragraph
-  if (setSelection) {
+  if (setSelection && !isNestedActionInsideLists) {
     tr = tr.setSelection(new TextSelection(tr.doc.resolve($from.pos + 1 - (shouldSplit ? 0 : 2))));
   }
-
   // lift list up if the node after the initial one was a taskList
   // which means it would have empty placeholder content if we just immediately delete it
-  //
   // if it's a taskItem then it can stand alone, so it's fine
   var $oldAfter = origDoc.resolve($from.after());
 
@@ -265,14 +308,26 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
       tr = tr.deleteRange(pos - 3, pos - 1);
     }
   }
+  if (isNestedActionInsideLists) {
+    processNestedActionItem(tr, $from, previousListItemPos);
+  }
   return tr;
 };
+var creatParentListItemFragement = function creatParentListItemFragement(state) {
+  return state.schema.nodes.listItem.create({}, state.schema.nodes.paragraph.create());
+};
 var splitListItem = function splitListItem(state, dispatch) {
   var tr = state.tr,
     $from = state.selection.$from;
   var paragraph = state.schema.nodes.paragraph;
+  var listItem = state.schema.nodes.listItem;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
+      if (hasParentNodeOfType(listItem)(tr.selection)) {
+        // if we're inside a list item, then we pass in a fragment containing a new list item not a paragraph
+        dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));
+        return true;
+      }
       dispatch(splitListItemWith(tr, paragraph.createChecked(), $from, true));
     }
     return true;

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { tasksAndDecisionsPlugin } from './plugin';
-export type { TasksAndDecisionsPlugin } from './types';
+export type { TasksAndDecisionsPlugin, TaskDecisionPluginOptions, TaskAndDecisionsSharedState, TaskDecisionListType, AddItemTransactionCreator, } from './types';

package/dist/types/pm-plugins/helpers.d.ts

@@ -74,3 +74,7 @@ export declare function getTaskItemDataToFocus(view: EditorView, direction: 'nex
 } | undefined;
 export declare function focusCheckboxAndUpdateSelection(view: EditorView, taskItemData: TaskItemData): void;
 export declare function removeCheckboxFocus(view: EditorView): void;
+export declare function findFirstParentListNode($pos: ResolvedPos): {
+    pos: number;
+    node: Node;
+} | null;

package/dist/types-ts4.5/index.d.ts

@@ -1,2 +1,2 @@
 export { tasksAndDecisionsPlugin } from './plugin';
-export type { TasksAndDecisionsPlugin } from './types';
+export type { TasksAndDecisionsPlugin, TaskDecisionPluginOptions, TaskAndDecisionsSharedState, TaskDecisionListType, AddItemTransactionCreator, } from './types';

package/dist/types-ts4.5/pm-plugins/helpers.d.ts

@@ -74,3 +74,7 @@ export declare function getTaskItemDataToFocus(view: EditorView, direction: 'nex
 } | undefined;
 export declare function focusCheckboxAndUpdateSelection(view: EditorView, taskItemData: TaskItemData): void;
 export declare function removeCheckboxFocus(view: EditorView): void;
+export declare function findFirstParentListNode($pos: ResolvedPos): {
+    pos: number;
+    node: Node;
+} | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-tasks-and-decisions",
-  "version": "0.2.15",
+  "version": "0.3.0",
   "description": "Tasks and decisions plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -36,7 +36,7 @@
     "@atlaskit/adf-schema": "^35.3.0",
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^76.41.0",
+    "@atlaskit/editor-common": "^77.1.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-type-ahead": "^0.9.0",
     "@atlaskit/editor-prosemirror": "1.1.0",