@atlaskit/editor-plugin-list 8.2.18 → 8.2.20

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-list
 
+## 8.2.20
+
+### Patch Changes
+
+- [`73a49fd4c204c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73a49fd4c204c) -
+  Cleanup FG platform_editor_new_list_decorations_logic
+- Updated dependencies
+
+## 8.2.19
+
+### Patch Changes
+
+- [`fa963aec58f3d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fa963aec58f3d) -
+  EDITOR-3064 Clean up feature gate platform_editor_split_list_item_for_gap_cursor
+- Updated dependencies
+
 ## 8.2.18
 
 ### Patch Changes

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

@@ -16,7 +16,6 @@ var _commands2 = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _conversions = require("../actions/conversions");
 var _wrapAndJoinLists = require("../actions/wrap-and-join-lists");
 var _transforms = require("../transforms");
@@ -39,9 +38,9 @@ var enterKeyCommand = exports.enterKeyCommand = function enterKeyCommand(editorA
           codeBlock = _state$schema$nodes.codeBlock;
 
         // the list item is the parent of the gap cursor
-        // while for text, list item is the grant parent of the text node
+        // while for text, list item is the grandparent of the text node
         var isGapCursorSelection = selection instanceof _selection.GapCursorSelection;
-        var wrapper = isGapCursorSelection && (0, _platformFeatureFlags.fg)('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node($from.depth - 1);
+        var wrapper = isGapCursorSelection ? $from.parent : $from.node($from.depth - 1);
         if (wrapper && wrapper.type === listItem) {
           /** Check if the wrapper has any visible content */
           var wrapperHasContent = (0, _utils.hasVisibleContent)(wrapper);
@@ -208,17 +207,16 @@ function splitListItem(itemType) {
       return false;
     }
 
-    // list item is the parent of the gap cursor instead of grant parent;
-    // rename grantParent to WrapperlistItem once we clean up platform_editor_split_list_item_for_gap_cursor
+    // list item is the parent of the gap cursor instead of grandparent
     var isGapCursorSelection = ref instanceof _selection.GapCursorSelection;
-    var grandParent = isGapCursorSelection && (0, _platformFeatureFlags.fg)('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node(-1);
-    if (grandParent.type !== itemType) {
+    var wrapperListItem = isGapCursorSelection ? $from.parent : $from.node(-1);
+    if (wrapperListItem.type !== itemType) {
       return false;
     }
     /** --> The following line changed from the original PM implementation to allow list additions with multiple paragraphs */
     if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    grandParent.content.content.length <= 1 && $from.parent.content.size === 0 && !(grandParent.content.size === 0)) {
+    wrapperListItem.content.content.length <= 1 && $from.parent.content.size === 0 && !(wrapperListItem.content.size === 0)) {
       // In an empty block. If this is a nested list, the wrapping
       // list item should be split. Otherwise, bail out and let next
       // command handle lifting.
@@ -245,38 +243,31 @@ function splitListItem(itemType) {
       }
       return true;
     }
-    var nextType = $to.pos === $from.end() ? grandParent.contentMatchAt(0).defaultType : null;
+    var nextType = $to.pos === $from.end() ? wrapperListItem.contentMatchAt(0).defaultType : null;
     var tr = state.tr.delete($from.pos, $to.pos);
     var types = nextType && [null, {
       type: nextType
     }];
-    if ((0, _platformFeatureFlags.fg)('platform_editor_split_list_item_for_gap_cursor')) {
-      if (dispatch) {
-        var _$from$nodeBefore;
-        if (ref instanceof _state.TextSelection) {
-          dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
-          return true;
-        }
-
-        // create new list item with empty paragraph when user click enter on gap cursor
-        if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
-          // For gap cursor selection , we can not split the list item directly
-          // We need to insert a new list item after the current list item to simulate the split behaviour
-          var _state$schema$nodes2 = state.schema.nodes,
-            listItem = _state$schema$nodes2.listItem,
-            paragraph = _state$schema$nodes2.paragraph;
-          var newListItem = listItem.createChecked({}, paragraph.createChecked());
-          dispatch(tr.insert($from.pos, newListItem).setSelection(_state.Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
-          return true;
-        }
-      }
-      return false;
-    } else {
-      if (dispatch) {
+    if (dispatch) {
+      var _$from$nodeBefore;
+      if (ref instanceof _state.TextSelection) {
         dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        return true;
+      }
+
+      // create new list item with empty paragraph when user clicks enter on gap cursor
+      if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
+        // For gap cursor selection, we cannot split the list item directly
+        // We need to insert a new list item after the current list item to simulate the split behaviour
+        var _state$schema$nodes2 = state.schema.nodes,
+          listItem = _state$schema$nodes2.listItem,
+          paragraph = _state$schema$nodes2.paragraph;
+        var newListItem = listItem.createChecked({}, paragraph.createChecked());
+        dispatch(tr.insert($from.pos, newListItem).setSelection(_state.Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
+        return true;
       }
-      return true;
     }
+    return false;
   };
 }
 var deletePreviousEmptyListItem = function deletePreviousEmptyListItem(state, dispatch) {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateListDecorations = exports.pluginKey = exports.getDecorations = exports.createPlugin = exports.computeListDecorations = void 0;
+exports.pluginKey = exports.getDecorations = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -13,7 +13,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _insm = require("@atlaskit/insm");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _selection2 = require("./utils/selection");
 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; }
@@ -27,79 +26,6 @@ var initialState = {
   orderedListDisabled: false,
   decorationSet: _view.DecorationSet.empty
 };
-var computeListDecorations = exports.computeListDecorations = function computeListDecorations(doc) {
-  var from = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var to = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : doc.content.size;
-  var decorations = [];
-
-  // this stack keeps track of each (nested) list to calculate the indentation level
-  var processedListsStack = [];
-  doc.nodesBetween(from, to, function (node, currentNodeStartPos) {
-    if (processedListsStack.length > 0) {
-      var isOutsideLastList = true;
-      while (isOutsideLastList && processedListsStack.length > 0) {
-        var lastList = processedListsStack[processedListsStack.length - 1];
-        var lastListEndPos = lastList.startPos + lastList.node.nodeSize;
-        isOutsideLastList = currentNodeStartPos >= lastListEndPos;
-        // once we finish iterating over each innermost list, pop the stack to
-        // decrease the indent level attribute accordingly
-        if (isOutsideLastList) {
-          processedListsStack.pop();
-        }
-      }
-    }
-    if ((0, _utils.isListNode)(node)) {
-      processedListsStack.push({
-        node: node,
-        startPos: currentNodeStartPos
-      });
-      var _from = currentNodeStartPos;
-      var _to = currentNodeStartPos + node.nodeSize;
-      var depth = processedListsStack.length;
-      decorations.push(_view.Decoration.node(_from, _to, {
-        'data-indent-level': "".concat(depth)
-      }));
-      if (node.type.name === 'orderedList') {
-        var _node$attrs;
-        // If a numbered list has item counters numbering >= 100, we'll need to add special
-        // spacing to account for the extra digit chars
-        var digitsSize = (0, _utils.getItemCounterDigitsSize)({
-          itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
-          order: node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
-        });
-        if (digitsSize && digitsSize > 1) {
-          decorations.push(_view.Decoration.node(_from, _to, {
-            style: (0, _styles.getOrderedListInlineStyles)(digitsSize, 'string')
-          }));
-        }
-      }
-    }
-  });
-  return decorations;
-};
-var updateListDecorations = exports.updateListDecorations = function updateListDecorations(decorationSet, tr) {
-  var nextDecorationSet = decorationSet.map(tr.mapping, tr.doc);
-  tr.mapping.maps.forEach(function (stepMap, index) {
-    stepMap.forEach(function (oldStart, oldEnd) {
-      var start = tr.mapping.slice(index).map(oldStart, -1);
-      var end = tr.mapping.slice(index).map(oldEnd);
-
-      // Remove decorations in this range
-      var decorationsToRemove = nextDecorationSet.find(start, end);
-      nextDecorationSet = nextDecorationSet.remove(decorationsToRemove);
-
-      // Recompute decorations for this range
-      // Expand the range by 1 on each side to catch adjacent list nodes
-      var from = Math.max(0, start - 1);
-      var to = Math.min(tr.doc.content.size, end + 1);
-      var decorationsToAdd = computeListDecorations(tr.doc, from, to);
-      nextDecorationSet = nextDecorationSet.add(tr.doc, decorationsToAdd);
-    });
-  });
-  return nextDecorationSet;
-};
-
-// delete getDecorations during platform_editor_new_list_decorations_logic experiment clean up
 var getDecorations = exports.getDecorations = function getDecorations(doc, state, featureFlags) {
   var decorations = [];
 
@@ -131,12 +57,12 @@ var getDecorations = exports.getDecorations = function getDecorations(doc, state
         'data-indent-level': "".concat(depth)
       }));
       if (node.type.name === 'orderedList') {
-        var _node$attrs2;
+        var _node$attrs;
         // If a numbered list has item counters numbering >= 100, we'll need to add special
         // spacing to account for the extra digit chars
         var digitsSize = (0, _utils.getItemCounterDigitsSize)({
           itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
-          order: node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.order
+          order: node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
         });
         if (digitsSize && digitsSize > 1) {
           decorations.push(_view.Decoration.node(from, to, {
@@ -199,15 +125,8 @@ var reducer = function reducer() {
 var createInitialState = function createInitialState(featureFlags, api) {
   return function (state) {
     var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
-    var getInitialDecorations = function getInitialDecorations() {
-      var _insm$session, _insm$session2;
-      (_insm$session = _insm.insm.session) === null || _insm$session === void 0 || _insm$session.startFeature('listDecorationsInit');
-      var decorations = computeListDecorations(state.doc);
-      (_insm$session2 = _insm.insm.session) === null || _insm$session2 === void 0 || _insm$session2.endFeature('listDecorationsInit');
-      return decorations;
-    };
     return _objectSpread(_objectSpread({}, isToolbarAIFCEnabled && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) ? getListState(state.doc, state.selection) : initialState), {}, {
-      decorationSet: (0, _expValEquals.expValEquals)('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? _view.DecorationSet.empty.add(state.doc, getInitialDecorations()) : getDecorations(state.doc, state, featureFlags)
+      decorationSet: getDecorations(state.doc, state, featureFlags)
     });
   };
 };
@@ -218,39 +137,13 @@ var createPlugin = exports.createPlugin = function createPlugin(eventDispatch, f
     }),
     getPluginState = _pluginFactory.getPluginState,
     createPluginState = _pluginFactory.createPluginState;
-  var pluginState = createPluginState(eventDispatch, createInitialState(featureFlags, api));
-  var pluginStateInit = function pluginStateInit(_, state) {
-    return createInitialState(featureFlags)(state);
-  };
-  var pluginStateApply = function pluginStateApply(tr, oldPluginState, _oldEditorState, _newEditorState) {
-    var nextPluginState = oldPluginState;
-    if (tr.docChanged) {
-      var _insm$session3, _insm$session4;
-      nextPluginState = handleSelectionChanged(tr, nextPluginState);
-      (_insm$session3 = _insm.insm.session) === null || _insm$session3 === void 0 || _insm$session3.startFeature('listDecorationUpdate');
-      var nextDecorationSet = updateListDecorations(nextPluginState.decorationSet, tr);
-      (_insm$session4 = _insm.insm.session) === null || _insm$session4 === void 0 || _insm$session4.endFeature('listDecorationUpdate');
-      nextPluginState = _objectSpread(_objectSpread({}, nextPluginState), {}, {
-        decorationSet: nextDecorationSet
-      });
-    } else if (tr.selectionSet) {
-      nextPluginState = handleSelectionChanged(tr, nextPluginState);
-    }
-    if (nextPluginState !== oldPluginState) {
-      eventDispatch(listPluginKey, nextPluginState);
-    }
-    return nextPluginState;
-  };
   return new _safePlugin.SafePlugin({
-    state: {
-      init: (0, _expValEquals.expValEquals)('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? pluginStateInit : pluginState.init,
-      apply: (0, _expValEquals.expValEquals)('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? pluginStateApply : pluginState.apply
-    },
+    state: createPluginState(eventDispatch, createInitialState(featureFlags, api)),
     key: listPluginKey,
     props: {
       decorations: function decorations(state) {
-        var _ref = (0, _expValEquals.expValEquals)('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? listPluginKey.getState(state) : getPluginState(state),
-          decorationSet = _ref.decorationSet;
+        var _getPluginState = getPluginState(state),
+          decorationSet = _getPluginState.decorationSet;
         return decorationSet;
       },
       handleClick: function handleClick(view, pos, event) {

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

@@ -8,7 +8,6 @@ import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { liftFollowingList, liftNodeSelectionList, liftTextSelectionList } from '../transforms';
@@ -32,9 +31,9 @@ export const enterKeyCommand = editorAnalyticsAPI => () => (state, dispatch) =>
     } = state.schema.nodes;
 
     // the list item is the parent of the gap cursor
-    // while for text, list item is the grant parent of the text node
+    // while for text, list item is the grandparent of the text node
     const isGapCursorSelection = selection instanceof GapCursorSelection;
-    const wrapper = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node($from.depth - 1);
+    const wrapper = isGapCursorSelection ? $from.parent : $from.node($from.depth - 1);
     if (wrapper && wrapper.type === listItem) {
       /** Check if the wrapper has any visible content */
       const wrapperHasContent = hasVisibleContent(wrapper);
@@ -191,17 +190,16 @@ function splitListItem(itemType) {
       return false;
     }
 
-    // list item is the parent of the gap cursor instead of grant parent;
-    // rename grantParent to WrapperlistItem once we clean up platform_editor_split_list_item_for_gap_cursor
+    // list item is the parent of the gap cursor instead of grandparent
     const isGapCursorSelection = ref instanceof GapCursorSelection;
-    const grandParent = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node(-1);
-    if (grandParent.type !== itemType) {
+    const wrapperListItem = isGapCursorSelection ? $from.parent : $from.node(-1);
+    if (wrapperListItem.type !== itemType) {
       return false;
     }
     /** --> The following line changed from the original PM implementation to allow list additions with multiple paragraphs */
     if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    grandParent.content.content.length <= 1 && $from.parent.content.size === 0 && !(grandParent.content.size === 0)) {
+    wrapperListItem.content.content.length <= 1 && $from.parent.content.size === 0 && !(wrapperListItem.content.size === 0)) {
       // In an empty block. If this is a nested list, the wrapping
       // list item should be split. Otherwise, bail out and let next
       // command handle lifting.
@@ -228,39 +226,32 @@ function splitListItem(itemType) {
       }
       return true;
     }
-    const nextType = $to.pos === $from.end() ? grandParent.contentMatchAt(0).defaultType : null;
+    const nextType = $to.pos === $from.end() ? wrapperListItem.contentMatchAt(0).defaultType : null;
     const tr = state.tr.delete($from.pos, $to.pos);
     const types = nextType && [null, {
       type: nextType
     }];
-    if (fg('platform_editor_split_list_item_for_gap_cursor')) {
-      if (dispatch) {
-        var _$from$nodeBefore;
-        if (ref instanceof TextSelection) {
-          dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
-          return true;
-        }
-
-        // create new list item with empty paragraph when user click enter on gap cursor
-        if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
-          // For gap cursor selection , we can not split the list item directly
-          // We need to insert a new list item after the current list item to simulate the split behaviour
-          const {
-            listItem,
-            paragraph
-          } = state.schema.nodes;
-          const newListItem = listItem.createChecked({}, paragraph.createChecked());
-          dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
-          return true;
-        }
-      }
-      return false;
-    } else {
-      if (dispatch) {
+    if (dispatch) {
+      var _$from$nodeBefore;
+      if (ref instanceof TextSelection) {
         dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        return true;
+      }
+
+      // create new list item with empty paragraph when user clicks enter on gap cursor
+      if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
+        // For gap cursor selection, we cannot split the list item directly
+        // We need to insert a new list item after the current list item to simulate the split behaviour
+        const {
+          listItem,
+          paragraph
+        } = state.schema.nodes;
+        const newListItem = listItem.createChecked({}, paragraph.createChecked());
+        dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
+        return true;
       }
-      return true;
     }
+    return false;
   };
 }
 const deletePreviousEmptyListItem = (state, dispatch) => {

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

@@ -5,7 +5,6 @@ import { getItemCounterDigitsSize, isListNode, pluginFactory } from '@atlaskit/e
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { insm } from '@atlaskit/insm';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isWrappingPossible } from './utils/selection';
 const listPluginKey = new PluginKey('listPlugin');
@@ -17,77 +16,6 @@ const initialState = {
   orderedListDisabled: false,
   decorationSet: DecorationSet.empty
 };
-export const computeListDecorations = (doc, from = 0, to = doc.content.size) => {
-  const decorations = [];
-
-  // this stack keeps track of each (nested) list to calculate the indentation level
-  const processedListsStack = [];
-  doc.nodesBetween(from, to, (node, currentNodeStartPos) => {
-    if (processedListsStack.length > 0) {
-      let isOutsideLastList = true;
-      while (isOutsideLastList && processedListsStack.length > 0) {
-        const lastList = processedListsStack[processedListsStack.length - 1];
-        const lastListEndPos = lastList.startPos + lastList.node.nodeSize;
-        isOutsideLastList = currentNodeStartPos >= lastListEndPos;
-        // once we finish iterating over each innermost list, pop the stack to
-        // decrease the indent level attribute accordingly
-        if (isOutsideLastList) {
-          processedListsStack.pop();
-        }
-      }
-    }
-    if (isListNode(node)) {
-      processedListsStack.push({
-        node,
-        startPos: currentNodeStartPos
-      });
-      const from = currentNodeStartPos;
-      const to = currentNodeStartPos + node.nodeSize;
-      const depth = processedListsStack.length;
-      decorations.push(Decoration.node(from, to, {
-        'data-indent-level': `${depth}`
-      }));
-      if (node.type.name === 'orderedList') {
-        var _node$attrs;
-        // If a numbered list has item counters numbering >= 100, we'll need to add special
-        // spacing to account for the extra digit chars
-        const digitsSize = getItemCounterDigitsSize({
-          itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
-          order: node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
-        });
-        if (digitsSize && digitsSize > 1) {
-          decorations.push(Decoration.node(from, to, {
-            style: getOrderedListInlineStyles(digitsSize, 'string')
-          }));
-        }
-      }
-    }
-  });
-  return decorations;
-};
-export const updateListDecorations = (decorationSet, tr) => {
-  let nextDecorationSet = decorationSet.map(tr.mapping, tr.doc);
-  tr.mapping.maps.forEach((stepMap, index) => {
-    stepMap.forEach((oldStart, oldEnd) => {
-      const start = tr.mapping.slice(index).map(oldStart, -1);
-      const end = tr.mapping.slice(index).map(oldEnd);
-
-      // Remove decorations in this range
-      const decorationsToRemove = nextDecorationSet.find(start, end);
-      nextDecorationSet = nextDecorationSet.remove(decorationsToRemove);
-
-      // Recompute decorations for this range
-      // Expand the range by 1 on each side to catch adjacent list nodes
-      const from = Math.max(0, start - 1);
-      const to = Math.min(tr.doc.content.size, end + 1);
-      const decorationsToAdd = computeListDecorations(tr.doc, from, to);
-      nextDecorationSet = nextDecorationSet.add(tr.doc, decorationsToAdd);
-    });
-  });
-  return nextDecorationSet;
-};
-
-// delete getDecorations during platform_editor_new_list_decorations_logic experiment clean up
 export const getDecorations = (doc, state, featureFlags) => {
   const decorations = [];
 
@@ -119,12 +47,12 @@ export const getDecorations = (doc, state, featureFlags) => {
         'data-indent-level': `${depth}`
       }));
       if (node.type.name === 'orderedList') {
-        var _node$attrs2;
+        var _node$attrs;
         // If a numbered list has item counters numbering >= 100, we'll need to add special
         // spacing to account for the extra digit chars
         const digitsSize = getItemCounterDigitsSize({
           itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
-          order: node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.order
+          order: node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
         });
         if (digitsSize && digitsSize > 1) {
           decorations.push(Decoration.node(from, to, {
@@ -186,18 +114,11 @@ const reducer = () => state => {
 };
 const createInitialState = (featureFlags, api) => state => {
   const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
-  const getInitialDecorations = () => {
-    var _insm$session, _insm$session2;
-    (_insm$session = insm.session) === null || _insm$session === void 0 ? void 0 : _insm$session.startFeature('listDecorationsInit');
-    const decorations = computeListDecorations(state.doc);
-    (_insm$session2 = insm.session) === null || _insm$session2 === void 0 ? void 0 : _insm$session2.endFeature('listDecorationsInit');
-    return decorations;
-  };
   return {
     // When plugin is initialised, editor state is defined with selection
     // hence returning the list state based on the selection to avoid list button in primary toolbar flickering during initial load
     ...(isToolbarAIFCEnabled && expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) ? getListState(state.doc, state.selection) : initialState),
-    decorationSet: expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? DecorationSet.empty.add(state.doc, getInitialDecorations()) : getDecorations(state.doc, state, featureFlags)
+    decorationSet: getDecorations(state.doc, state, featureFlags)
   };
 };
 export const createPlugin = (eventDispatch, featureFlags, api) => {
@@ -208,41 +129,14 @@ export const createPlugin = (eventDispatch, featureFlags, api) => {
     onDocChanged: handleDocChanged(featureFlags),
     onSelectionChanged: handleSelectionChanged
   });
-  const pluginState = createPluginState(eventDispatch, createInitialState(featureFlags, api));
-  const pluginStateInit = (_, state) => {
-    return createInitialState(featureFlags)(state);
-  };
-  const pluginStateApply = (tr, oldPluginState, _oldEditorState, _newEditorState) => {
-    let nextPluginState = oldPluginState;
-    if (tr.docChanged) {
-      var _insm$session3, _insm$session4;
-      nextPluginState = handleSelectionChanged(tr, nextPluginState);
-      (_insm$session3 = insm.session) === null || _insm$session3 === void 0 ? void 0 : _insm$session3.startFeature('listDecorationUpdate');
-      const nextDecorationSet = updateListDecorations(nextPluginState.decorationSet, tr);
-      (_insm$session4 = insm.session) === null || _insm$session4 === void 0 ? void 0 : _insm$session4.endFeature('listDecorationUpdate');
-      nextPluginState = {
-        ...nextPluginState,
-        decorationSet: nextDecorationSet
-      };
-    } else if (tr.selectionSet) {
-      nextPluginState = handleSelectionChanged(tr, nextPluginState);
-    }
-    if (nextPluginState !== oldPluginState) {
-      eventDispatch(listPluginKey, nextPluginState);
-    }
-    return nextPluginState;
-  };
   return new SafePlugin({
-    state: {
-      init: expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? pluginStateInit : pluginState.init,
-      apply: expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? pluginStateApply : pluginState.apply
-    },
+    state: createPluginState(eventDispatch, createInitialState(featureFlags, api)),
     key: listPluginKey,
     props: {
       decorations(state) {
         const {
           decorationSet
-        } = expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? listPluginKey.getState(state) : getPluginState(state);
+        } = getPluginState(state);
         return decorationSet;
       },
       handleClick: (view, pos, event) => {

package/dist/esm/pm-plugins/commands/index.js

@@ -11,7 +11,6 @@ import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { liftFollowingList, liftNodeSelectionList, liftTextSelectionList } from '../transforms';
@@ -32,9 +31,9 @@ export var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
           codeBlock = _state$schema$nodes.codeBlock;
 
         // the list item is the parent of the gap cursor
-        // while for text, list item is the grant parent of the text node
+        // while for text, list item is the grandparent of the text node
         var isGapCursorSelection = selection instanceof GapCursorSelection;
-        var wrapper = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node($from.depth - 1);
+        var wrapper = isGapCursorSelection ? $from.parent : $from.node($from.depth - 1);
         if (wrapper && wrapper.type === listItem) {
           /** Check if the wrapper has any visible content */
           var wrapperHasContent = hasVisibleContent(wrapper);
@@ -201,17 +200,16 @@ function splitListItem(itemType) {
       return false;
     }
 
-    // list item is the parent of the gap cursor instead of grant parent;
-    // rename grantParent to WrapperlistItem once we clean up platform_editor_split_list_item_for_gap_cursor
+    // list item is the parent of the gap cursor instead of grandparent
     var isGapCursorSelection = ref instanceof GapCursorSelection;
-    var grandParent = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node(-1);
-    if (grandParent.type !== itemType) {
+    var wrapperListItem = isGapCursorSelection ? $from.parent : $from.node(-1);
+    if (wrapperListItem.type !== itemType) {
       return false;
     }
     /** --> The following line changed from the original PM implementation to allow list additions with multiple paragraphs */
     if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    grandParent.content.content.length <= 1 && $from.parent.content.size === 0 && !(grandParent.content.size === 0)) {
+    wrapperListItem.content.content.length <= 1 && $from.parent.content.size === 0 && !(wrapperListItem.content.size === 0)) {
       // In an empty block. If this is a nested list, the wrapping
       // list item should be split. Otherwise, bail out and let next
       // command handle lifting.
@@ -238,38 +236,31 @@ function splitListItem(itemType) {
       }
       return true;
     }
-    var nextType = $to.pos === $from.end() ? grandParent.contentMatchAt(0).defaultType : null;
+    var nextType = $to.pos === $from.end() ? wrapperListItem.contentMatchAt(0).defaultType : null;
     var tr = state.tr.delete($from.pos, $to.pos);
     var types = nextType && [null, {
       type: nextType
     }];
-    if (fg('platform_editor_split_list_item_for_gap_cursor')) {
-      if (dispatch) {
-        var _$from$nodeBefore;
-        if (ref instanceof TextSelection) {
-          dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
-          return true;
-        }
-
-        // create new list item with empty paragraph when user click enter on gap cursor
-        if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
-          // For gap cursor selection , we can not split the list item directly
-          // We need to insert a new list item after the current list item to simulate the split behaviour
-          var _state$schema$nodes2 = state.schema.nodes,
-            listItem = _state$schema$nodes2.listItem,
-            paragraph = _state$schema$nodes2.paragraph;
-          var newListItem = listItem.createChecked({}, paragraph.createChecked());
-          dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
-          return true;
-        }
-      }
-      return false;
-    } else {
-      if (dispatch) {
+    if (dispatch) {
+      var _$from$nodeBefore;
+      if (ref instanceof TextSelection) {
         dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        return true;
+      }
+
+      // create new list item with empty paragraph when user clicks enter on gap cursor
+      if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
+        // For gap cursor selection, we cannot split the list item directly
+        // We need to insert a new list item after the current list item to simulate the split behaviour
+        var _state$schema$nodes2 = state.schema.nodes,
+          listItem = _state$schema$nodes2.listItem,
+          paragraph = _state$schema$nodes2.paragraph;
+        var newListItem = listItem.createChecked({}, paragraph.createChecked());
+        dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
+        return true;
       }
-      return true;
     }
+    return false;
   };
 }
 var deletePreviousEmptyListItem = function deletePreviousEmptyListItem(state, dispatch) {

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

@@ -8,7 +8,6 @@ import { getItemCounterDigitsSize, isListNode, pluginFactory } from '@atlaskit/e
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { insm } from '@atlaskit/insm';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isWrappingPossible } from './utils/selection';
 var listPluginKey = new PluginKey('listPlugin');
@@ -20,79 +19,6 @@ var initialState = {
   orderedListDisabled: false,
   decorationSet: DecorationSet.empty
 };
-export var computeListDecorations = function computeListDecorations(doc) {
-  var from = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var to = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : doc.content.size;
-  var decorations = [];
-
-  // this stack keeps track of each (nested) list to calculate the indentation level
-  var processedListsStack = [];
-  doc.nodesBetween(from, to, function (node, currentNodeStartPos) {
-    if (processedListsStack.length > 0) {
-      var isOutsideLastList = true;
-      while (isOutsideLastList && processedListsStack.length > 0) {
-        var lastList = processedListsStack[processedListsStack.length - 1];
-        var lastListEndPos = lastList.startPos + lastList.node.nodeSize;
-        isOutsideLastList = currentNodeStartPos >= lastListEndPos;
-        // once we finish iterating over each innermost list, pop the stack to
-        // decrease the indent level attribute accordingly
-        if (isOutsideLastList) {
-          processedListsStack.pop();
-        }
-      }
-    }
-    if (isListNode(node)) {
-      processedListsStack.push({
-        node: node,
-        startPos: currentNodeStartPos
-      });
-      var _from = currentNodeStartPos;
-      var _to = currentNodeStartPos + node.nodeSize;
-      var depth = processedListsStack.length;
-      decorations.push(Decoration.node(_from, _to, {
-        'data-indent-level': "".concat(depth)
-      }));
-      if (node.type.name === 'orderedList') {
-        var _node$attrs;
-        // If a numbered list has item counters numbering >= 100, we'll need to add special
-        // spacing to account for the extra digit chars
-        var digitsSize = getItemCounterDigitsSize({
-          itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
-          order: node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
-        });
-        if (digitsSize && digitsSize > 1) {
-          decorations.push(Decoration.node(_from, _to, {
-            style: getOrderedListInlineStyles(digitsSize, 'string')
-          }));
-        }
-      }
-    }
-  });
-  return decorations;
-};
-export var updateListDecorations = function updateListDecorations(decorationSet, tr) {
-  var nextDecorationSet = decorationSet.map(tr.mapping, tr.doc);
-  tr.mapping.maps.forEach(function (stepMap, index) {
-    stepMap.forEach(function (oldStart, oldEnd) {
-      var start = tr.mapping.slice(index).map(oldStart, -1);
-      var end = tr.mapping.slice(index).map(oldEnd);
-
-      // Remove decorations in this range
-      var decorationsToRemove = nextDecorationSet.find(start, end);
-      nextDecorationSet = nextDecorationSet.remove(decorationsToRemove);
-
-      // Recompute decorations for this range
-      // Expand the range by 1 on each side to catch adjacent list nodes
-      var from = Math.max(0, start - 1);
-      var to = Math.min(tr.doc.content.size, end + 1);
-      var decorationsToAdd = computeListDecorations(tr.doc, from, to);
-      nextDecorationSet = nextDecorationSet.add(tr.doc, decorationsToAdd);
-    });
-  });
-  return nextDecorationSet;
-};
-
-// delete getDecorations during platform_editor_new_list_decorations_logic experiment clean up
 export var getDecorations = function getDecorations(doc, state, featureFlags) {
   var decorations = [];
 
@@ -124,12 +50,12 @@ export var getDecorations = function getDecorations(doc, state, featureFlags) {
         'data-indent-level': "".concat(depth)
       }));
       if (node.type.name === 'orderedList') {
-        var _node$attrs2;
+        var _node$attrs;
         // If a numbered list has item counters numbering >= 100, we'll need to add special
         // spacing to account for the extra digit chars
         var digitsSize = getItemCounterDigitsSize({
           itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
-          order: node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.order
+          order: node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
         });
         if (digitsSize && digitsSize > 1) {
           decorations.push(Decoration.node(from, to, {
@@ -192,15 +118,8 @@ var reducer = function reducer() {
 var createInitialState = function createInitialState(featureFlags, api) {
   return function (state) {
     var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
-    var getInitialDecorations = function getInitialDecorations() {
-      var _insm$session, _insm$session2;
-      (_insm$session = insm.session) === null || _insm$session === void 0 || _insm$session.startFeature('listDecorationsInit');
-      var decorations = computeListDecorations(state.doc);
-      (_insm$session2 = insm.session) === null || _insm$session2 === void 0 || _insm$session2.endFeature('listDecorationsInit');
-      return decorations;
-    };
     return _objectSpread(_objectSpread({}, isToolbarAIFCEnabled && expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) ? getListState(state.doc, state.selection) : initialState), {}, {
-      decorationSet: expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? DecorationSet.empty.add(state.doc, getInitialDecorations()) : getDecorations(state.doc, state, featureFlags)
+      decorationSet: getDecorations(state.doc, state, featureFlags)
     });
   };
 };
@@ -211,39 +130,13 @@ export var createPlugin = function createPlugin(eventDispatch, featureFlags, api
     }),
     getPluginState = _pluginFactory.getPluginState,
     createPluginState = _pluginFactory.createPluginState;
-  var pluginState = createPluginState(eventDispatch, createInitialState(featureFlags, api));
-  var pluginStateInit = function pluginStateInit(_, state) {
-    return createInitialState(featureFlags)(state);
-  };
-  var pluginStateApply = function pluginStateApply(tr, oldPluginState, _oldEditorState, _newEditorState) {
-    var nextPluginState = oldPluginState;
-    if (tr.docChanged) {
-      var _insm$session3, _insm$session4;
-      nextPluginState = handleSelectionChanged(tr, nextPluginState);
-      (_insm$session3 = insm.session) === null || _insm$session3 === void 0 || _insm$session3.startFeature('listDecorationUpdate');
-      var nextDecorationSet = updateListDecorations(nextPluginState.decorationSet, tr);
-      (_insm$session4 = insm.session) === null || _insm$session4 === void 0 || _insm$session4.endFeature('listDecorationUpdate');
-      nextPluginState = _objectSpread(_objectSpread({}, nextPluginState), {}, {
-        decorationSet: nextDecorationSet
-      });
-    } else if (tr.selectionSet) {
-      nextPluginState = handleSelectionChanged(tr, nextPluginState);
-    }
-    if (nextPluginState !== oldPluginState) {
-      eventDispatch(listPluginKey, nextPluginState);
-    }
-    return nextPluginState;
-  };
   return new SafePlugin({
-    state: {
-      init: expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? pluginStateInit : pluginState.init,
-      apply: expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? pluginStateApply : pluginState.apply
-    },
+    state: createPluginState(eventDispatch, createInitialState(featureFlags, api)),
     key: listPluginKey,
     props: {
       decorations: function decorations(state) {
-        var _ref = expValEquals('platform_editor_new_list_decorations_logic', 'isEnabled', true) ? listPluginKey.getState(state) : getPluginState(state),
-          decorationSet = _ref.decorationSet;
+        var _getPluginState = getPluginState(state),
+          decorationSet = _getPluginState.decorationSet;
         return decorationSet;
       },
       handleClick: function handleClick(view, pos, event) {

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

@@ -3,12 +3,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
-import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ListPlugin } from '../listPluginType';
 import type { ListState } from '../types';
 export declare const pluginKey: PluginKey<ListState>;
-export declare const computeListDecorations: (doc: Node, from?: number, to?: number) => Decoration[];
-export declare const updateListDecorations: (decorationSet: DecorationSet, tr: ReadonlyTransaction) => DecorationSet;
 export declare const getDecorations: (doc: Node, state: EditorState, featureFlags: FeatureFlags) => DecorationSet;
 export declare const createPlugin: (eventDispatch: Dispatch, featureFlags: FeatureFlags, api?: ExtractInjectionAPI<ListPlugin>) => SafePlugin;

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

@@ -3,12 +3,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
-import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ListPlugin } from '../listPluginType';
 import type { ListState } from '../types';
 export declare const pluginKey: PluginKey<ListState>;
-export declare const computeListDecorations: (doc: Node, from?: number, to?: number) => Decoration[];
-export declare const updateListDecorations: (decorationSet: DecorationSet, tr: ReadonlyTransaction) => DecorationSet;
 export declare const getDecorations: (doc: Node, state: EditorState, featureFlags: FeatureFlags) => DecorationSet;
 export declare const createPlugin: (eventDispatch: Dispatch, featureFlags: FeatureFlags, api?: ExtractInjectionAPI<ListPlugin>) => SafePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "8.2.18",
+	"version": "8.2.20",
 	"description": "List plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,23 +27,22 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
+		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^5.1.0",
+		"@atlaskit/editor-plugin-block-menu": "^5.2.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/icon": "^29.0.0",
-		"@atlaskit/insm": "^0.2.0",
+		"@atlaskit/icon": "^29.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
-		"@atlaskit/tmp-editor-statsig": "^15.0.0",
+		"@atlaskit/tmp-editor-statsig": "^15.15.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.46.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -83,9 +82,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_split_list_item_for_gap_cursor": {
-			"type": "boolean"
-		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		}