@atlaskit/editor-plugin-tasks-and-decisions 11.3.0 → 11.3.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 11.3.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.3.1
+
+### Patch Changes
+
+- [`aa4e1fcb89ca8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/aa4e1fcb89ca8) -
+  Added new `platform_editor_flexible_list_schema` experiment that independently enables ADF schema
+  and CSS rendering support for flexible lists, without creation behaviour. Updated schema node
+  selection, CSS rendering, ADF validation, and task list schema to use the new gate. Indent/outdent
+  behaviour remains on the existing `platform_editor_flexible_list_indentation` gate.
+- Updated dependencies
+
 ## 11.3.0
 
 ### Minor Changes

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

@@ -22,7 +22,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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _pluginKey = require("./plugin-key");
 var _types = require("./types");
@@ -254,7 +253,7 @@ var subtreeHeight = exports.subtreeHeight = function subtreeHeight($from, $to, t
   // and get the max height from the current position to the
   // deepest leaf node
   var maxChildDepth = $from.depth;
-  $from.doc.nodesBetween(blockRange.start, blockRange.end, function (descendent, relPos, parent) {
+  $from.doc.nodesBetween(blockRange.start, blockRange.end, function (descendent, relPos, _parent) {
     maxChildDepth = Math.max($from.doc.resolve(relPos).depth, maxChildDepth);
 
     // keep descending down the tree if we can
@@ -288,7 +287,7 @@ var isEmptyTaskDecision = exports.isEmptyTaskDecision = function isEmptyTaskDeci
   // If in an empty paragraph that's not at the doc level
   node.content.size === 0 && node.type === paragraph && $from.depth > 0 &&
   // and it's parent is a blockTaskItem with only this paragraph inside it
-  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1 && (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3');
+  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1;
   return isEmptyTaskOrDecisionItem || isInEmptyBlockTaskItem;
 };
 

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

@@ -19,7 +19,6 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _moveSelectedTaskListItems = require("./actions/move-selected-task-list-items");
 var _commands2 = require("./commands");
@@ -247,6 +246,7 @@ var backspace = function backspace(editorAnalyticsAPI) {
   })), ['taskList', 'decisionList']));
 };
 var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
+  var _$next$node, _$from$node, _$next$node2, _$from$node2, _$next$node3;
   var $from = state.selection.$from,
     _state$schema$nodes4 = state.schema.nodes,
     taskList = _state$schema$nodes4.taskList,
@@ -255,128 +255,92 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
     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;
-    }
 
-    // look for the node after this current one
-    var $next = (0, _helpers.walkOut)($from);
+  // only run if cursor is at the end of the node
+  if (!(0, _utils.isEmptySelectionAtEnd)(state) || !dispatch) {
+    return false;
+  }
 
-    // this is a top-level node it wont have $next.before()
-    if (!$next.parent || $next.parent.type === doc) {
-      return false;
-    }
+  // look for the node after this current one
+  var $next = (0, _helpers.walkOut)($from);
 
-    // get resolved position of parent
-    var $parentPos = $from.doc.resolve($from.start($from.depth - 1));
-    var currentNode = $from.node();
-    var parentNode = $parentPos.node();
+  // this is a top-level node it wont have $next.before()
+  if (!$next.parent || $next.parent.type === doc) {
+    return false;
+  }
 
-    // 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;
+  // get resolved position of parent
+  var $parentPos = $from.doc.resolve($from.start($from.depth - 1));
+  var currentNode = $from.node();
+  var parentNode = $parentPos.node();
 
-    // If empty item, use default handler
-    if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
-      return false;
-    }
+  // 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;
 
-    // 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);
+  // If empty item, use default handler
+  if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
+    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;
-    }
-    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 _tr2 = splitListItemWith(state.tr, slice, $next, false);
-          dispatch(_tr2);
-          return true;
-        } catch (_unused2) {
-          // 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 _tr3 = splitListItemWith(state.tr, slice, $splitPos, false);
-            dispatch(_tr3);
-            return true;
+  // 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);
+
+  // 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 _tr2 = splitListItemWith(state.tr, slice, $next, false);
+        dispatch(_tr2);
+        return true;
+      } catch (_unused2) {
+        // 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 _tr3 = splitListItemWith(state.tr, slice, $splitPos, false);
+          dispatch(_tr3);
+          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 _taskContent = state.doc.slice(_$next.start(), _$next.end()).content;
-
-      // might be end of document after
-      var _slice = _taskContent.size ? paragraph.createChecked(undefined, _taskContent) : [];
-      dispatch(splitListItemWith(tr, _slice, _$next, false));
-      return true;
-    }
   }
   return false;
 };
@@ -430,7 +394,7 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
     if (result) {
       var blockTaskItemNode = result.blockTaskItemNode,
         hasParagraph = result.hasParagraph;
-      hasBlockTaskItem = (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3') && !!blockTaskItemNode;
+      hasBlockTaskItem = !!blockTaskItemNode;
       if (blockTaskItemNode) {
         var _$oldAfter$nodeAfter, _$posPreviousSibling$;
         // If the case there is a paragraph in the block task item we need to
@@ -476,9 +440,7 @@ 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,
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3') && hasBlockTaskItem ? 0 : 1, [{
+    tr = tr.split($from.pos, hasBlockTaskItem ? 0 : 1, [{
       type: $from.parent.type,
       attrs: {
         localId: _adfSchema.uuid.generate()
@@ -545,17 +507,15 @@ var splitListItem = function splitListItem(state, dispatch) {
     paragraph = _state$schema$nodes5.paragraph;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3')) {
-        // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
-        var nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
-        if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
-          if ($from.parent.type === taskItem) {
-            var nodeSize = $from.parent.nodeSize;
-            tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
-            tr.insert($from.pos, paragraph.createChecked());
-            dispatch(tr);
-            return true;
-          }
+      // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
+      var nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
+      if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
+        if ($from.parent.type === taskItem) {
+          var nodeSize = $from.parent.nodeSize;
+          tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
+          tr.insert($from.pos, paragraph.createChecked());
+          dispatch(tr);
+          return true;
         }
       }
       if ((0, _utils2.hasParentNodeOfType)(listItem)(tr.selection)) {

package/dist/cjs/tasksAndDecisionsPlugin.js

@@ -176,7 +176,7 @@ var tasksAndDecisionsPlugin = exports.tasksAndDecisionsPlugin = function tasksAn
         node: (0, _decisionItem.decisionItemSpecWithFixedToDOM)()
       }, {
         name: 'taskList',
-        node: (0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true) ? _adfSchema.taskListWithFlexibleFirstChildStage0 : _adfSchema.taskList
+        node: (0, _expValEquals.expValEquals)('platform_editor_flexible_list_schema', 'isEnabled', true) ? _adfSchema.taskListWithFlexibleFirstChildStage0 : _adfSchema.taskList
       }, {
         name: 'taskItem',
         node: (0, _taskItemNodeSpec.taskItemNodeSpec)()

package/dist/cjs/ui/Task/RequestToEditPopup.js

@@ -171,7 +171,7 @@ var RequestToEditPopup = exports.RequestToEditPopup = function RequestToEditPopu
     }), /*#__PURE__*/React.createElement("div", {
       className: (0, _runtime.ax)(["_19pku2gc _otyru2gc _18u0u2gc _2hwxu2gc _1e0c1o8l _1bsbyh40 _4t3iyh40 _bfhk16e3", "_2rko1rr0"])
     }), /*#__PURE__*/React.createElement(_compiled.Box, null, /*#__PURE__*/React.createElement(_compiled.Pressable
-    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) 
+    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     , {
       onClick: function onClick() {
         var _api$analytics2;

package/dist/cjs/ui/Task/task-item-with-providers.js

@@ -123,7 +123,7 @@ var TaskItemWithProviders = exports.default = /*#__PURE__*/function (_Component)
         objectId = _ref.objectId;
       var userContext = objectId ? 'edit' : 'new';
       return /*#__PURE__*/_react.default.createElement(_analyticsNamespacedContext.FabricElementsAnalyticsContext
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) 
+      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       , {
         data: {
           userContext: userContext

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

@@ -4,7 +4,6 @@ import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { stateKey } from './plugin-key';
 import { ACTIONS } from './types';
@@ -242,7 +241,7 @@ export const subtreeHeight = ($from, $to, types) => {
   // and get the max height from the current position to the
   // deepest leaf node
   let maxChildDepth = $from.depth;
-  $from.doc.nodesBetween(blockRange.start, blockRange.end, (descendent, relPos, parent) => {
+  $from.doc.nodesBetween(blockRange.start, blockRange.end, (descendent, relPos, _parent) => {
     maxChildDepth = Math.max($from.doc.resolve(relPos).depth, maxChildDepth);
 
     // keep descending down the tree if we can
@@ -281,7 +280,7 @@ export const isEmptyTaskDecision = state => {
   // If in an empty paragraph that's not at the doc level
   node.content.size === 0 && node.type === paragraph && $from.depth > 0 &&
   // and it's parent is a blockTaskItem with only this paragraph inside it
-  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1 && fg('platform_editor_blocktaskitem_patch_3');
+  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1;
   return isEmptyTaskOrDecisionItem || isInEmptyBlockTaskItem;
 };
 

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

@@ -10,7 +10,6 @@ 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, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { moveSelectedTaskListItems } from './actions/move-selected-task-list-items';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
@@ -215,6 +214,7 @@ const backspaceFrom = editorAnalyticsAPI => $from => (state, dispatch) => {
 };
 const backspace = editorAnalyticsAPI => filter(isEmptySelectionAtStart, autoJoin(chainCommands((state, dispatch) => joinAtCut(state.selection.$from)(state, dispatch), filter(isInsideTaskOrDecisionItem, (state, dispatch) => backspaceFrom(editorAnalyticsAPI)(state.selection.$from)(state, dispatch))), ['taskList', 'decisionList']));
 const unindentTaskOrUnwrapTaskDecisionFollowing = (state, dispatch) => {
+  var _$next$node, _$from$node, _$next$node2, _$from$node2, _$next$node3;
   const {
     selection: {
       $from
@@ -230,130 +230,94 @@ const unindentTaskOrUnwrapTaskDecisionFollowing = (state, dispatch) => {
     },
     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;
-    }
 
-    // look for the node after this current one
-    const $next = walkOut($from);
+  // only run if cursor is at the end of the node
+  if (!isEmptySelectionAtEnd(state) || !dispatch) {
+    return false;
+  }
 
-    // this is a top-level node it wont have $next.before()
-    if (!$next.parent || $next.parent.type === doc) {
-      return false;
-    }
+  // look for the node after this current one
+  const $next = walkOut($from);
 
-    // get resolved position of parent
-    const $parentPos = $from.doc.resolve($from.start($from.depth - 1));
-    const currentNode = $from.node();
-    const parentNode = $parentPos.node();
+  // this is a top-level node it wont have $next.before()
+  if (!$next.parent || $next.parent.type === doc) {
+    return false;
+  }
 
-    // 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;
+  // get resolved position of parent
+  const $parentPos = $from.doc.resolve($from.start($from.depth - 1));
+  const currentNode = $from.node();
+  const parentNode = $parentPos.node();
 
-    // If empty item, use default handler
-    if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
-      return false;
-    }
+  // 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 empty item, use default handler
+  if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
+    return false;
+  }
 
-    // Check if next node is a blockTaskItem paragraph
-    const resultOfNextFindBlockTaskItem = findBlockTaskItem($next);
-    const isNextInBlockTaskItemParagraph = resultOfNextFindBlockTaskItem && (resultOfNextFindBlockTaskItem === null || resultOfNextFindBlockTaskItem === void 0 ? void 0 : resultOfNextFindBlockTaskItem.hasParagraph);
+  // 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);
+  // 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 {
+        // 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;
-        } catch {
-          // 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;
 };
@@ -410,7 +374,7 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
         blockTaskItemNode,
         hasParagraph
       } = result;
-      hasBlockTaskItem = fg('platform_editor_blocktaskitem_patch_3') && !!blockTaskItemNode;
+      hasBlockTaskItem = !!blockTaskItemNode;
       if (blockTaskItemNode) {
         var _$oldAfter$nodeAfter, _$posPreviousSibling$;
         // If the case there is a paragraph in the block task item we need to
@@ -456,9 +420,7 @@ 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,
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform_editor_blocktaskitem_patch_3') && hasBlockTaskItem ? 0 : 1, [{
+    tr = tr.split($from.pos, hasBlockTaskItem ? 0 : 1, [{
       type: $from.parent.type,
       attrs: {
         localId: uuid.generate()
@@ -530,17 +492,15 @@ const splitListItem = (state, dispatch) => {
   } = state.schema.nodes;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
-      if (fg('platform_editor_blocktaskitem_patch_3')) {
-        // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
-        const nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
-        if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
-          if ($from.parent.type === taskItem) {
-            const nodeSize = $from.parent.nodeSize;
-            tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
-            tr.insert($from.pos, paragraph.createChecked());
-            dispatch(tr);
-            return true;
-          }
+      // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
+      const nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
+      if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
+        if ($from.parent.type === taskItem) {
+          const nodeSize = $from.parent.nodeSize;
+          tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
+          tr.insert($from.pos, paragraph.createChecked());
+          dispatch(tr);
+          return true;
         }
       }
       if (hasParentNodeOfType(listItem)(tr.selection)) {

package/dist/es2019/tasksAndDecisionsPlugin.js

@@ -164,7 +164,7 @@ export const tasksAndDecisionsPlugin = ({
         node: decisionItemSpecWithFixedToDOM()
       }, {
         name: 'taskList',
-        node: expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) ? taskListWithFlexibleFirstChildStage0 : taskList
+        node: expValEquals('platform_editor_flexible_list_schema', 'isEnabled', true) ? taskListWithFlexibleFirstChildStage0 : taskList
       }, {
         name: 'taskItem',
         node: taskItemNodeSpec()

package/dist/es2019/ui/Task/RequestToEditPopup.js

@@ -156,7 +156,7 @@ export const RequestToEditPopup = ({
   }), /*#__PURE__*/React.createElement("div", {
     className: ax(["_19pku2gc _otyru2gc _18u0u2gc _2hwxu2gc _1e0c1o8l _1bsbyh40 _4t3iyh40 _bfhk16e3", "_2rko1rr0"])
   }), /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(Pressable
-  // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) 
+  // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
   , {
     onClick: () => {
       var _api$analytics2;

package/dist/es2019/ui/Task/task-item-with-providers.js

@@ -62,7 +62,7 @@ export default class TaskItemWithProviders extends Component {
     } = this.state.resolvedContextProvider || {};
     const userContext = objectId ? 'edit' : 'new';
     return /*#__PURE__*/React.createElement(FabricElementsAnalyticsContext
-    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) 
+    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     , {
       data: {
         userContext

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

@@ -4,7 +4,6 @@ import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { stateKey } from './plugin-key';
 import { ACTIONS } from './types';
@@ -236,7 +235,7 @@ export var subtreeHeight = function subtreeHeight($from, $to, types) {
   // and get the max height from the current position to the
   // deepest leaf node
   var maxChildDepth = $from.depth;
-  $from.doc.nodesBetween(blockRange.start, blockRange.end, function (descendent, relPos, parent) {
+  $from.doc.nodesBetween(blockRange.start, blockRange.end, function (descendent, relPos, _parent) {
     maxChildDepth = Math.max($from.doc.resolve(relPos).depth, maxChildDepth);
 
     // keep descending down the tree if we can
@@ -270,7 +269,7 @@ export var isEmptyTaskDecision = function isEmptyTaskDecision(state) {
   // If in an empty paragraph that's not at the doc level
   node.content.size === 0 && node.type === paragraph && $from.depth > 0 &&
   // and it's parent is a blockTaskItem with only this paragraph inside it
-  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1 && fg('platform_editor_blocktaskitem_patch_3');
+  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1;
   return isEmptyTaskOrDecisionItem || isInEmptyBlockTaskItem;
 };
 

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

@@ -13,7 +13,6 @@ 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, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { moveSelectedTaskListItems } from './actions/move-selected-task-list-items';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
@@ -239,6 +238,7 @@ var backspace = function backspace(editorAnalyticsAPI) {
   })), ['taskList', 'decisionList']));
 };
 var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
+  var _$next$node, _$from$node, _$next$node2, _$from$node2, _$next$node3;
   var $from = state.selection.$from,
     _state$schema$nodes4 = state.schema.nodes,
     taskList = _state$schema$nodes4.taskList,
@@ -247,128 +247,92 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
     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;
-    }
 
-    // look for the node after this current one
-    var $next = walkOut($from);
+  // only run if cursor is at the end of the node
+  if (!isEmptySelectionAtEnd(state) || !dispatch) {
+    return false;
+  }
 
-    // this is a top-level node it wont have $next.before()
-    if (!$next.parent || $next.parent.type === doc) {
-      return false;
-    }
+  // look for the node after this current one
+  var $next = walkOut($from);
 
-    // get resolved position of parent
-    var $parentPos = $from.doc.resolve($from.start($from.depth - 1));
-    var currentNode = $from.node();
-    var parentNode = $parentPos.node();
+  // this is a top-level node it wont have $next.before()
+  if (!$next.parent || $next.parent.type === doc) {
+    return false;
+  }
 
-    // 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;
+  // get resolved position of parent
+  var $parentPos = $from.doc.resolve($from.start($from.depth - 1));
+  var currentNode = $from.node();
+  var parentNode = $parentPos.node();
 
-    // If empty item, use default handler
-    if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
-      return false;
-    }
+  // 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;
 
-    // Check if next node is a blockTaskItem paragraph
-    var resultOfNextFindBlockTaskItem = findBlockTaskItem($next);
-    var isNextInBlockTaskItemParagraph = resultOfNextFindBlockTaskItem && (resultOfNextFindBlockTaskItem === null || resultOfNextFindBlockTaskItem === void 0 ? void 0 : resultOfNextFindBlockTaskItem.hasParagraph);
+  // If empty item, use default handler
+  if (isEmptyActionOrDecisionItem || isCurrentEmptyBlockTaskItem) {
+    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;
-    }
-    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 _tr2 = splitListItemWith(state.tr, slice, $next, false);
-          dispatch(_tr2);
-          return true;
-        } catch (_unused2) {
-          // 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 _tr3 = splitListItemWith(state.tr, slice, $splitPos, false);
-            dispatch(_tr3);
-            return true;
+  // Check if next node is a blockTaskItem paragraph
+  var resultOfNextFindBlockTaskItem = findBlockTaskItem($next);
+  var 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;
+  }
+  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 _tr2 = splitListItemWith(state.tr, slice, $next, false);
+        dispatch(_tr2);
+        return true;
+      } catch (_unused2) {
+        // 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 _tr3 = splitListItemWith(state.tr, slice, $splitPos, false);
+          dispatch(_tr3);
+          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 _taskContent = state.doc.slice(_$next.start(), _$next.end()).content;
-
-      // might be end of document after
-      var _slice = _taskContent.size ? paragraph.createChecked(undefined, _taskContent) : [];
-      dispatch(splitListItemWith(tr, _slice, _$next, false));
-      return true;
-    }
   }
   return false;
 };
@@ -422,7 +386,7 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
     if (result) {
       var blockTaskItemNode = result.blockTaskItemNode,
         hasParagraph = result.hasParagraph;
-      hasBlockTaskItem = fg('platform_editor_blocktaskitem_patch_3') && !!blockTaskItemNode;
+      hasBlockTaskItem = !!blockTaskItemNode;
       if (blockTaskItemNode) {
         var _$oldAfter$nodeAfter, _$posPreviousSibling$;
         // If the case there is a paragraph in the block task item we need to
@@ -468,9 +432,7 @@ 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,
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform_editor_blocktaskitem_patch_3') && hasBlockTaskItem ? 0 : 1, [{
+    tr = tr.split($from.pos, hasBlockTaskItem ? 0 : 1, [{
       type: $from.parent.type,
       attrs: {
         localId: uuid.generate()
@@ -537,17 +499,15 @@ var splitListItem = function splitListItem(state, dispatch) {
     paragraph = _state$schema$nodes5.paragraph;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
-      if (fg('platform_editor_blocktaskitem_patch_3')) {
-        // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
-        var nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
-        if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
-          if ($from.parent.type === taskItem) {
-            var nodeSize = $from.parent.nodeSize;
-            tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
-            tr.insert($from.pos, paragraph.createChecked());
-            dispatch(tr);
-            return true;
-          }
+      // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
+      var nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
+      if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
+        if ($from.parent.type === taskItem) {
+          var nodeSize = $from.parent.nodeSize;
+          tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
+          tr.insert($from.pos, paragraph.createChecked());
+          dispatch(tr);
+          return true;
         }
       }
       if (hasParentNodeOfType(listItem)(tr.selection)) {

package/dist/esm/tasksAndDecisionsPlugin.js

@@ -167,7 +167,7 @@ export var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref3) {
         node: decisionItemSpecWithFixedToDOM()
       }, {
         name: 'taskList',
-        node: expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) ? taskListWithFlexibleFirstChildStage0 : taskList
+        node: expValEquals('platform_editor_flexible_list_schema', 'isEnabled', true) ? taskListWithFlexibleFirstChildStage0 : taskList
       }, {
         name: 'taskItem',
         node: taskItemNodeSpec()

package/dist/esm/ui/Task/RequestToEditPopup.js

@@ -162,7 +162,7 @@ export var RequestToEditPopup = function RequestToEditPopup(_ref2) {
     }), /*#__PURE__*/React.createElement("div", {
       className: ax(["_19pku2gc _otyru2gc _18u0u2gc _2hwxu2gc _1e0c1o8l _1bsbyh40 _4t3iyh40 _bfhk16e3", "_2rko1rr0"])
     }), /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(Pressable
-    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) 
+    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     , {
       onClick: function onClick() {
         var _api$analytics2;

package/dist/esm/ui/Task/task-item-with-providers.js

@@ -114,7 +114,7 @@ var TaskItemWithProviders = /*#__PURE__*/function (_Component) {
         objectId = _ref.objectId;
       var userContext = objectId ? 'edit' : 'new';
       return /*#__PURE__*/React.createElement(FabricElementsAnalyticsContext
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) 
+      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       , {
         data: {
           userContext: userContext

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "11.3.0",
+	"version": "11.3.2",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/task-decision": "^19.3.0",
-		"@atlaskit/tmp-editor-statsig": "^44.1.0",
+		"@atlaskit/tmp-editor-statsig": "^45.0.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
@@ -104,9 +104,6 @@
 		"platform_editor_element_browser_analytic": {
 			"type": "boolean"
 		},
-		"platform_editor_blocktaskitem_patch_3": {
-			"type": "boolean"
-		},
 		"platform_editor_block_menu_v2_patch_3": {
 			"type": "boolean"
 		},