@atlaskit/editor-plugin-tasks-and-decisions 0.2.16 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 0.3.1
+
+### Patch Changes
+
+- [#68640](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68640) [`6a3ea210641a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6a3ea210641a) - Create new context identifier plugin which contains the provider.
+- Updated dependencies
+
+## 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

package/dist/cjs/commands.js

@@ -14,7 +14,6 @@ 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 _pluginKey = require("./pm-plugins/plugin-key");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getContextData = function getContextData() {
@@ -71,7 +70,7 @@ var getListTypes = exports.getListTypes = function getListTypes(listType, schema
     item: decisionItem
   };
 };
-var insertTaskDecisionAction = exports.insertTaskDecisionAction = function insertTaskDecisionAction(editorAnalyticsAPI) {
+var insertTaskDecisionAction = exports.insertTaskDecisionAction = function insertTaskDecisionAction(editorAnalyticsAPI, getContextIdentifierProvider) {
   return function (state, listType) {
     var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.TOOLBAR;
     var addItem = arguments.length > 3 ? arguments[3] : undefined;
@@ -103,7 +102,7 @@ var insertTaskDecisionAction = exports.insertTaskDecisionAction = function inser
       }]).setSelection(new _state.TextSelection(tr.doc.resolve(newItemParagraphPos)));
     };
     var addAndCreateListFn = addItem !== null && addItem !== void 0 ? addItem : addAndCreateList;
-    var tr = insertTaskDecisionWithAnalytics(editorAnalyticsAPI)(state, listType, inputMethod, addAndCreateListFn, addToList, listLocalId, itemLocalId, itemAttrs);
+    var tr = insertTaskDecisionWithAnalytics(editorAnalyticsAPI, getContextIdentifierProvider)(state, listType, inputMethod, addAndCreateListFn, addToList, listLocalId, itemLocalId, itemAttrs);
     if (!tr) {
       return state.tr;
     }
@@ -111,14 +110,14 @@ var insertTaskDecisionAction = exports.insertTaskDecisionAction = function inser
     return tr;
   };
 };
-var insertTaskDecisionCommand = exports.insertTaskDecisionCommand = function insertTaskDecisionCommand(editorAnalyticsAPI) {
+var insertTaskDecisionCommand = exports.insertTaskDecisionCommand = function insertTaskDecisionCommand(editorAnalyticsAPI, getContextIdentifierProvider) {
   return function (listType) {
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
     var addItem = arguments.length > 2 ? arguments[2] : undefined;
     var listLocalId = arguments.length > 3 ? arguments[3] : undefined;
     var itemLocalId = arguments.length > 4 ? arguments[4] : undefined;
     return function (state, dispatch) {
-      var tr = insertTaskDecisionAction(editorAnalyticsAPI)(state, listType, inputMethod, addItem, listLocalId, itemLocalId);
+      var tr = insertTaskDecisionAction(editorAnalyticsAPI, getContextIdentifierProvider)(state, listType, inputMethod, addItem, listLocalId, itemLocalId);
       if (dispatch) {
         dispatch(tr);
       }
@@ -126,7 +125,7 @@ var insertTaskDecisionCommand = exports.insertTaskDecisionCommand = function ins
     };
   };
 };
-var insertTaskDecisionWithAnalytics = exports.insertTaskDecisionWithAnalytics = function insertTaskDecisionWithAnalytics(editorAnalyticsAPI) {
+var insertTaskDecisionWithAnalytics = exports.insertTaskDecisionWithAnalytics = function insertTaskDecisionWithAnalytics(editorAnalyticsAPI, getContextIdentifierProvider) {
   return function (state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId, itemAttrs) {
     var schema = state.schema;
     var _getListTypes = getListTypes(listType, schema),
@@ -135,7 +134,7 @@ var insertTaskDecisionWithAnalytics = exports.insertTaskDecisionWithAnalytics =
     var tr = state.tr;
     var $to = state.selection.$to;
     var listNode = (0, _utils2.findParentNodeOfType)(list)(state.selection);
-    var contextIdentifierProvider = _pluginKey.stateKey.getState(state).contextIdentifierProvider;
+    var contextIdentifierProvider = getContextIdentifierProvider();
     var contextData = getContextData(contextIdentifierProvider);
     var insertTrCreator;
     var itemIdx;

package/dist/cjs/plugin.js

@@ -49,6 +49,10 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
     consumeTabs = _ref2$config2.consumeTabs,
     useLongPressSelection = _ref2$config2.useLongPressSelection,
     api = _ref2.api;
+  var getIdentifierProvider = function getIdentifierProvider() {
+    var _api$contextIdentifie;
+    return api === null || api === void 0 || (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 || (_api$contextIdentifie = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie === void 0 ? void 0 : _api$contextIdentifie.contextIdentifierProvider;
+  };
   return {
     name: 'taskDecision',
     nodes: function nodes() {
@@ -81,7 +85,7 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
       };
     },
     actions: {
-      insertTaskDecision: (0, _commands.insertTaskDecisionCommand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertTaskDecision: (0, _commands.insertTaskDecisionCommand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, getIdentifierProvider),
       indentTaskList: (0, _keymaps.getIndentCommand)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
       outdentTaskList: (0, _keymaps.getUnindentCommand)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)
     },
@@ -101,7 +105,7 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
           var _api$analytics4;
           var schema = _ref4.schema,
             featureFlags = _ref4.featureFlags;
-          return (0, _inputRules.default)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(schema, featureFlags);
+          return (0, _inputRules.default)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getIdentifierProvider)(schema, featureFlags);
         }
       }, {
         name: 'tasksAndDecisionsKeyMap',
@@ -144,7 +148,7 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
           },
           action: function action(insert, state) {
             var _api$analytics5;
-            return (0, _commands.insertTaskDecisionAction)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)(state, 'taskList', _analytics.INPUT_METHOD.QUICK_INSERT, addItem(insert, 'taskList', state.schema));
+            return (0, _commands.insertTaskDecisionAction)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, getIdentifierProvider)(state, 'taskList', _analytics.INPUT_METHOD.QUICK_INSERT, addItem(insert, 'taskList', state.schema));
           }
         }, {
           id: 'decision',
@@ -157,7 +161,7 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
           },
           action: function action(insert, state) {
             var _api$analytics6;
-            return (0, _commands.insertTaskDecisionAction)(api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(state, 'decisionList', _analytics.INPUT_METHOD.QUICK_INSERT, addItem(insert, 'decisionList', state.schema));
+            return (0, _commands.insertTaskDecisionAction)(api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions, getIdentifierProvider)(state, 'decisionList', _analytics.INPUT_METHOD.QUICK_INSERT, addItem(insert, 'decisionList', state.schema));
           }
         }];
       }

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/input-rules.js

@@ -13,7 +13,7 @@ var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _commands = require("../commands");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var createListRule = function createListRule(editorAnalyticsAPI) {
+var createListRule = function createListRule(editorAnalyticsAPI, getContextIdentifierProvider) {
   return function (regex, listType, itemAttrs) {
     return (0, _prosemirrorInputRules.createRule)(regex, function (state, _match, start, end) {
       var paragraph = state.schema.nodes.paragraph;
@@ -26,7 +26,7 @@ var createListRule = function createListRule(editorAnalyticsAPI) {
       if ($end.parent.type !== paragraph || !(0, _utils.canInsert)($endOfParent, list.createAndFill())) {
         return null;
       }
-      var insertTr = (0, _commands.insertTaskDecisionAction)(editorAnalyticsAPI)(state, listType, _analytics.INPUT_METHOD.FORMATTING, addItem(start, end), undefined, undefined, itemAttrs);
+      var insertTr = (0, _commands.insertTaskDecisionAction)(editorAnalyticsAPI, getContextIdentifierProvider)(state, listType, _analytics.INPUT_METHOD.FORMATTING, addItem(start, end), undefined, undefined, itemAttrs);
       return insertTr;
     });
   };
@@ -86,7 +86,7 @@ var addItem = function addItem(start, end) {
     return tr;
   };
 };
-var inputRulePlugin = exports.inputRulePlugin = function inputRulePlugin(editorAnalyticsAPI) {
+var inputRulePlugin = exports.inputRulePlugin = function inputRulePlugin(editorAnalyticsAPI, getContextIdentifierProvider) {
   return function (schema, featureFlags) {
     var rules = [];
     var _schema$nodes = schema.nodes,
@@ -95,11 +95,11 @@ var inputRulePlugin = exports.inputRulePlugin = function inputRulePlugin(editorA
       taskList = _schema$nodes.taskList,
       taskItem = _schema$nodes.taskItem;
     if (decisionList && decisionItem) {
-      rules.push(createListRule(editorAnalyticsAPI)(new RegExp("(^|".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, ")\\<\\>\\s$")), 'decisionList'));
+      rules.push(createListRule(editorAnalyticsAPI, getContextIdentifierProvider)(new RegExp("(^|".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, ")\\<\\>\\s$")), 'decisionList'));
     }
     if (taskList && taskItem) {
-      rules.push(createListRule(editorAnalyticsAPI)(new RegExp("(^|".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, ")\\[\\]\\s$")), 'taskList'));
-      rules.push(createListRule(editorAnalyticsAPI)(new RegExp("(^|".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, ")\\[x\\]\\s$")), 'taskList', {
+      rules.push(createListRule(editorAnalyticsAPI, getContextIdentifierProvider)(new RegExp("(^|".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, ")\\[\\]\\s$")), 'taskList'));
+      rules.push(createListRule(editorAnalyticsAPI, getContextIdentifierProvider)(new RegExp("(^|".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, ")\\[x\\]\\s$")), 'taskList', {
         state: 'DONE'
       }));
     }

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,21 +316,33 @@ 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;
   }
   return false;
 };
-var enter = function enter(editorAnalyticsAPI) {
+var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
   return (0, _utils.filterCommand)(_helpers.isInsideTaskOrDecisionItem, (0, _commands.chainCommands)((0, _utils.filterCommand)(_helpers.isEmptyTaskDecision, (0, _commands.chainCommands)(getUnindentCommand(editorAnalyticsAPI)(), splitListItem)), function (state, dispatch) {
     var selection = state.selection,
       schema = state.schema;
@@ -317,7 +372,7 @@ var enter = function enter(editorAnalyticsAPI) {
         }
       }]);
     };
-    var insertTr = (0, _commands2.insertTaskDecisionWithAnalytics)(editorAnalyticsAPI)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
+    var insertTr = (0, _commands2.insertTaskDecisionWithAnalytics)(editorAnalyticsAPI, getContextIdentifier)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
     if (insertTr && dispatch) {
       insertTr.scrollIntoView();
       dispatch(insertTr);
@@ -347,6 +402,10 @@ var cmdOptEnter = (0, _utils.filterCommand)(_helpers.isInsideTaskOrDecisionItem,
 });
 function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
   var _api$analytics3, _api$analytics4;
+  var getContextIdentifier = function getContextIdentifier() {
+    var _api$contextIdentifie;
+    return api === null || api === void 0 || (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 || (_api$contextIdentifie = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie === void 0 ? void 0 : _api$contextIdentifie.contextIdentifierProvider;
+  };
   var indentHandlers = {
     'Shift-Tab': (0, _utils.filterCommand)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
@@ -369,7 +428,7 @@ function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
     Backspace: backspace(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
     Delete: deleteForwards,
     'Ctrl-d': deleteForwards,
-    Enter: enter(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)
+    Enter: enter(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getContextIdentifier)
   }, _keymaps.toggleTaskItemCheckbox.common, cmdOptEnter), allowNestedTasks ? indentHandlers : defaultHandlers);
   return (0, _keymap.keymap)(keymaps);
 }

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

@@ -28,17 +28,6 @@ function nodesBetweenChanged(tr, f, startPos) {
   }
   tr.doc.nodesBetween(stepRange.from, stepRange.to, f, startPos);
 }
-var setContextIdentifierProvider = function setContextIdentifierProvider(provider) {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(state.tr.setMeta(_pluginKey.stateKey, {
-        action: _types.ACTIONS.SET_CONTEXT_PROVIDER,
-        data: provider
-      }));
-    }
-    return true;
-  };
-};
 function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api) {
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   return new _safePlugin.SafePlugin({
@@ -187,11 +176,6 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
           data = _ref.data;
         var newPluginState = pluginState;
         switch (action) {
-          case _types.ACTIONS.SET_CONTEXT_PROVIDER:
-            newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
-              contextIdentifierProvider: data
-            });
-            break;
           case _types.ACTIONS.FOCUS_BY_LOCALID:
             newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
               focusedTaskItemLocalId: data
@@ -202,21 +186,6 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
         return newPluginState;
       }
     },
-    view: function view(editorView) {
-      var providerHandler = function providerHandler(name, providerPromise) {
-        if (name === 'contextIdentifierProvider') {
-          if (!providerPromise) {
-            setContextIdentifierProvider(undefined)(editorView.state, editorView.dispatch);
-          } else {
-            providerPromise.then(function (provider) {
-              setContextIdentifierProvider(provider)(editorView.state, editorView.dispatch);
-            });
-          }
-        }
-      };
-      providerFactory.subscribe('contextIdentifierProvider', providerHandler);
-      return {};
-    },
     key: _pluginKey.stateKey,
     /*
      * After each transaction, we search through the document for any decisionList/Item & taskList/Item nodes

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ACTIONS = void 0;
 var ACTIONS = exports.ACTIONS = /*#__PURE__*/function (ACTIONS) {
-  ACTIONS[ACTIONS["SET_CONTEXT_PROVIDER"] = 0] = "SET_CONTEXT_PROVIDER";
-  ACTIONS[ACTIONS["FOCUS_BY_LOCALID"] = 1] = "FOCUS_BY_LOCALID";
+  ACTIONS[ACTIONS["FOCUS_BY_LOCALID"] = 0] = "FOCUS_BY_LOCALID";
   return ACTIONS;
 }({});

package/dist/cjs/ui/ToolbarDecision/index.js

@@ -23,7 +23,11 @@ var ToolbarDecision = function ToolbarDecision(_ref) {
     if (!editorView) {
       return false;
     }
-    (0, _commands.insertTaskDecisionCommand)(editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions)('decisionList')(editorView.state, editorView.dispatch);
+    var getContextIdentifier = function getContextIdentifier() {
+      var _editorAPI$contextIde;
+      return editorAPI === null || editorAPI === void 0 || (_editorAPI$contextIde = editorAPI.contextIdentifier) === null || _editorAPI$contextIde === void 0 || (_editorAPI$contextIde = _editorAPI$contextIde.sharedState.currentState()) === null || _editorAPI$contextIde === void 0 ? void 0 : _editorAPI$contextIde.contextIdentifierProvider;
+    };
+    (0, _commands.insertTaskDecisionCommand)(editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions, getContextIdentifier)('decisionList')(editorView.state, editorView.dispatch);
     return true;
   };
   return /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarButton, {

package/dist/cjs/ui/ToolbarTask/index.js

@@ -23,7 +23,11 @@ var ToolbarTask = function ToolbarTask(_ref) {
     if (!editorView) {
       return false;
     }
-    (0, _commands.insertTaskDecisionCommand)(editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions)('taskList')(editorView.state, editorView.dispatch);
+    var getContextIdentifier = function getContextIdentifier() {
+      var _editorAPI$contextIde;
+      return editorAPI === null || editorAPI === void 0 || (_editorAPI$contextIde = editorAPI.contextIdentifier) === null || _editorAPI$contextIde === void 0 || (_editorAPI$contextIde = _editorAPI$contextIde.sharedState.currentState()) === null || _editorAPI$contextIde === void 0 ? void 0 : _editorAPI$contextIde.contextIdentifierProvider;
+    };
+    (0, _commands.insertTaskDecisionCommand)(editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions, getContextIdentifier)('taskList')(editorView.state, editorView.dispatch);
     return true;
   };
   return /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarButton, {

package/dist/es2019/commands.js

@@ -6,7 +6,6 @@ import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType, hasParentNodeOfType, replaceParentNodeOfType, safeInsert, setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { stateKey as taskDecisionStateKey } from './pm-plugins/plugin-key';
 const getContextData = (contextProvider = {}) => {
   const {
     objectId,
@@ -65,7 +64,7 @@ export const getListTypes = (listType, schema) => {
     item: decisionItem
   };
 };
-export const insertTaskDecisionAction = editorAnalyticsAPI => (state, listType, inputMethod = INPUT_METHOD.TOOLBAR, addItem, listLocalId, itemLocalId, itemAttrs) => {
+export const insertTaskDecisionAction = (editorAnalyticsAPI, getContextIdentifierProvider) => (state, listType, inputMethod = INPUT_METHOD.TOOLBAR, addItem, listLocalId, itemLocalId, itemAttrs) => {
   const {
     schema
   } = state;
@@ -95,21 +94,21 @@ export const insertTaskDecisionAction = editorAnalyticsAPI => (state, listType,
     }]).setSelection(new TextSelection(tr.doc.resolve(newItemParagraphPos)));
   };
   const addAndCreateListFn = addItem !== null && addItem !== void 0 ? addItem : addAndCreateList;
-  const tr = insertTaskDecisionWithAnalytics(editorAnalyticsAPI)(state, listType, inputMethod, addAndCreateListFn, addToList, listLocalId, itemLocalId, itemAttrs);
+  const tr = insertTaskDecisionWithAnalytics(editorAnalyticsAPI, getContextIdentifierProvider)(state, listType, inputMethod, addAndCreateListFn, addToList, listLocalId, itemLocalId, itemAttrs);
   if (!tr) {
     return state.tr;
   }
   autoJoinTr(tr, ['taskList', 'decisionList']);
   return tr;
 };
-export const insertTaskDecisionCommand = editorAnalyticsAPI => (listType, inputMethod = INPUT_METHOD.TOOLBAR, addItem, listLocalId, itemLocalId) => (state, dispatch) => {
-  const tr = insertTaskDecisionAction(editorAnalyticsAPI)(state, listType, inputMethod, addItem, listLocalId, itemLocalId);
+export const insertTaskDecisionCommand = (editorAnalyticsAPI, getContextIdentifierProvider) => (listType, inputMethod = INPUT_METHOD.TOOLBAR, addItem, listLocalId, itemLocalId) => (state, dispatch) => {
+  const tr = insertTaskDecisionAction(editorAnalyticsAPI, getContextIdentifierProvider)(state, listType, inputMethod, addItem, listLocalId, itemLocalId);
   if (dispatch) {
     dispatch(tr);
   }
   return true;
 };
-export const insertTaskDecisionWithAnalytics = editorAnalyticsAPI => (state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId, itemAttrs) => {
+export const insertTaskDecisionWithAnalytics = (editorAnalyticsAPI, getContextIdentifierProvider) => (state, listType, inputMethod, addAndCreateList, addToList, listLocalId, itemLocalId, itemAttrs) => {
   const {
     schema
   } = state;
@@ -124,7 +123,7 @@ export const insertTaskDecisionWithAnalytics = editorAnalyticsAPI => (state, lis
     $to
   } = state.selection;
   const listNode = findParentNodeOfType(list)(state.selection);
-  const contextIdentifierProvider = taskDecisionStateKey.getState(state).contextIdentifierProvider;
+  const contextIdentifierProvider = getContextIdentifierProvider();
   const contextData = getContextData(contextIdentifierProvider);
   let insertTrCreator;
   let itemIdx;

package/dist/es2019/plugin.js

@@ -39,6 +39,10 @@ export const tasksAndDecisionsPlugin = ({
   api
 }) => {
   var _api$analytics, _api$analytics2, _api$analytics3;
+  const getIdentifierProvider = () => {
+    var _api$contextIdentifie, _api$contextIdentifie2;
+    return api === null || api === void 0 ? void 0 : (_api$contextIdentifie = api.contextIdentifier) === null || _api$contextIdentifie === void 0 ? void 0 : (_api$contextIdentifie2 = _api$contextIdentifie.sharedState.currentState()) === null || _api$contextIdentifie2 === void 0 ? void 0 : _api$contextIdentifie2.contextIdentifierProvider;
+  };
   return {
     name: 'taskDecision',
     nodes() {
@@ -71,7 +75,7 @@ export const tasksAndDecisionsPlugin = ({
       };
     },
     actions: {
-      insertTaskDecision: insertTaskDecisionCommand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      insertTaskDecision: insertTaskDecisionCommand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, getIdentifierProvider),
       indentTaskList: getIndentCommand(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
       outdentTaskList: getUnindentCommand(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)
     },
@@ -93,7 +97,7 @@ export const tasksAndDecisionsPlugin = ({
           featureFlags
         }) => {
           var _api$analytics4;
-          return inputRulePlugin(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(schema, featureFlags);
+          return inputRulePlugin(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, getIdentifierProvider)(schema, featureFlags);
         }
       }, {
         name: 'tasksAndDecisionsKeyMap',
@@ -135,7 +139,7 @@ export const tasksAndDecisionsPlugin = ({
         icon: () => jsx(IconAction, null),
         action(insert, state) {
           var _api$analytics5;
-          return insertTaskDecisionAction(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)(state, 'taskList', INPUT_METHOD.QUICK_INSERT, addItem(insert, 'taskList', state.schema));
+          return insertTaskDecisionAction(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, getIdentifierProvider)(state, 'taskList', INPUT_METHOD.QUICK_INSERT, addItem(insert, 'taskList', state.schema));
         }
       }, {
         id: 'decision',
@@ -146,7 +150,7 @@ export const tasksAndDecisionsPlugin = ({
         icon: () => jsx(IconDecision, null),
         action(insert, state) {
           var _api$analytics6;
-          return insertTaskDecisionAction(api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(state, 'decisionList', INPUT_METHOD.QUICK_INSERT, addItem(insert, 'decisionList', state.schema));
+          return insertTaskDecisionAction(api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions, getIdentifierProvider)(state, 'decisionList', INPUT_METHOD.QUICK_INSERT, addItem(insert, 'decisionList', state.schema));
         }
       }]
     }

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/input-rules.js

@@ -3,7 +3,7 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { canInsert } from '@atlaskit/editor-prosemirror/utils';
 import { createPlugin, createRule, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { changeInDepth, getListTypes, insertTaskDecisionAction } from '../commands';
-const createListRule = editorAnalyticsAPI => (regex, listType, itemAttrs) => {
+const createListRule = (editorAnalyticsAPI, getContextIdentifierProvider) => (regex, listType, itemAttrs) => {
   return createRule(regex, (state, _match, start, end) => {
     const {
       paragraph
@@ -18,7 +18,7 @@ const createListRule = editorAnalyticsAPI => (regex, listType, itemAttrs) => {
     if ($end.parent.type !== paragraph || !canInsert($endOfParent, list.createAndFill())) {
       return null;
     }
-    const insertTr = insertTaskDecisionAction(editorAnalyticsAPI)(state, listType, INPUT_METHOD.FORMATTING, addItem(start, end), undefined, undefined, itemAttrs);
+    const insertTr = insertTaskDecisionAction(editorAnalyticsAPI, getContextIdentifierProvider)(state, listType, INPUT_METHOD.FORMATTING, addItem(start, end), undefined, undefined, itemAttrs);
     return insertTr;
   });
 };
@@ -85,7 +85,7 @@ const addItem = (start, end) => ({
   tr.doc.nodeAt($from.pos + 1).content)])).setSelection(new TextSelection(tr.doc.resolve($from.pos + depthAdjustment))).delete(start, end + 1);
   return tr;
 };
-export const inputRulePlugin = editorAnalyticsAPI => (schema, featureFlags) => {
+export const inputRulePlugin = (editorAnalyticsAPI, getContextIdentifierProvider) => (schema, featureFlags) => {
   const rules = [];
   const {
     decisionList,
@@ -94,11 +94,11 @@ export const inputRulePlugin = editorAnalyticsAPI => (schema, featureFlags) => {
     taskItem
   } = schema.nodes;
   if (decisionList && decisionItem) {
-    rules.push(createListRule(editorAnalyticsAPI)(new RegExp(`(^|${leafNodeReplacementCharacter})\\<\\>\\s$`), 'decisionList'));
+    rules.push(createListRule(editorAnalyticsAPI, getContextIdentifierProvider)(new RegExp(`(^|${leafNodeReplacementCharacter})\\<\\>\\s$`), 'decisionList'));
   }
   if (taskList && taskItem) {
-    rules.push(createListRule(editorAnalyticsAPI)(new RegExp(`(^|${leafNodeReplacementCharacter})\\[\\]\\s$`), 'taskList'));
-    rules.push(createListRule(editorAnalyticsAPI)(new RegExp(`(^|${leafNodeReplacementCharacter})\\[x\\]\\s$`), 'taskList', {
+    rules.push(createListRule(editorAnalyticsAPI, getContextIdentifierProvider)(new RegExp(`(^|${leafNodeReplacementCharacter})\\[\\]\\s$`), 'taskList'));
+    rules.push(createListRule(editorAnalyticsAPI, getContextIdentifierProvider)(new RegExp(`(^|${leafNodeReplacementCharacter})\\[x\\]\\s$`), 'taskList', {
       state: 'DONE'
     }));
   }