@atlaskit/editor-plugin-list 11.0.0 → 12.0.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/editor-plugin-list
 
+## 12.0.0
+
+### Major Changes
+
+- [`901c87a57486e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/901c87a57486e) -
+  Removed `react-intl-next` alias and replaced all usages with `react-intl` directly.
+
+  What changed: The `react-intl-next` npm alias (which resolved to `react-intl@^5`) has been
+  removed. All imports now reference `react-intl` directly, and `peerDependencies` have been updated
+  to `"^5.25.1 || ^6.0.0 || ^7.0.0"`.
+
+  How consumer should update their code: Ensure `react-intl` is installed at a version satisfying
+  `^5.25.1 || ^6.0.0 || ^7.0.0`. If your application was using `react-intl-next` as an npm alias, it
+  can be safely removed. Replace any remaining `react-intl-next` imports with `react-intl`.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.0.1
+
+### Patch Changes
+
+- [`bae5d569f660c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bae5d569f660c) -
+  Prevent flexible list creation when platform_editor_flexible_list_schema is on but
+  platform_editor_flexible_list_indentation is off. Slice normalisation in paste pipeline.
+  appendTransaction normaliser in list plugin.
+
+  Paste plugin detects list-into-list paste and sets a transaction meta to skip closeHistory,
+  keeping the paste and normalisation appendTransaction as a single undo step.
+
+- Updated dependencies
+
 ## 11.0.0
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands/indent-list.js

@@ -11,7 +11,7 @@ var _lists = require("@atlaskit/editor-common/lists");
 var _preset = require("@atlaskit/editor-common/preset");
 var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _types = require("../../types");
 var _indentListItemsSelected = require("../actions/indent-list-items-selected");
 var _moveSelectedListItems = require("../actions/move-selected-list-items");
@@ -61,7 +61,7 @@ var indentList = exports.indentList = function indentList(editorAnalyticsAPI) {
       (0, _prosemirrorHistory.closeHistory)(tr);
 
       // Route to new or original implementation based on feature flag
-      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+      if ((0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
         return handleIndentListItems(tr, editorAnalyticsAPI, inputMethod);
       }
       var firstListItemSelectedAttributes = (0, _lists.getListItemAttributes)($from);

package/dist/cjs/pm-plugins/commands/outdent-list.js

@@ -11,7 +11,7 @@ var _lists = require("@atlaskit/editor-common/lists");
 var _preset = require("@atlaskit/editor-common/preset");
 var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _moveSelectedListItems = require("../actions/move-selected-list-items");
 var _outdentListItemsSelected = require("../actions/outdent-list-items-selected");
 var _analytics2 = require("../utils/analytics");
@@ -79,7 +79,7 @@ var outdentList = exports.outdentList = function outdentList(editorAnalyticsAPI)
       (0, _prosemirrorHistory.closeHistory)(tr);
 
       // Route to new or original implementation based on feature flag
-      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+      if ((0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
         return handleOutdentListItems(tr, editorAnalyticsAPI, inputMethod);
       }
       var actionSubjectId = (0, _utils.isBulletList)(parentListNode.node) ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;

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

@@ -13,6 +13,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _transforms = require("./transforms");
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -139,6 +140,25 @@ var createPlugin = exports.createPlugin = function createPlugin(eventDispatch, f
   return new _safePlugin.SafePlugin({
     state: createPluginState(eventDispatch, createInitialState(featureFlags, api)),
     key: listPluginKey,
+    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      // The paste plugin sets 'listPasteNormalisation' on the transaction when it detects
+      // a list is being pasted into a list (and the flexible list schema flag is on).
+      // We use this meta to cheaply trigger normalisation without re-checking flags.
+      if (transactions.some(function (t) {
+        return t.getMeta('listPasteNormalisation');
+      })) {
+        var tr = (0, _transforms.applyListNormalisationFixes)({
+          tr: newState.tr,
+          transactions: transactions,
+          doc: newState.doc,
+          schema: newState.schema
+        });
+        if (tr.docChanged) {
+          return tr;
+        }
+      }
+      return null;
+    },
     props: {
       decorations: function decorations(state) {
         var _getPluginState = getPluginState(state),
@@ -158,7 +178,8 @@ var createPlugin = exports.createPlugin = function createPlugin(eventDispatch, f
           if ((nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) === listItem && (nodeAtPos === null || nodeAtPos === void 0 || (_nodeAtPos$firstChild = nodeAtPos.firstChild) === null || _nodeAtPos$firstChild === void 0 ? void 0 : _nodeAtPos$firstChild.type) === codeBlock) {
             var _document;
             var bufferPx = 50;
-            var isCodeBlockNextToListMarker = Boolean((_document = document) === null || _document === void 0 || (_document = _document.elementFromPoint(event.clientX + (_styles.listItemCounterPadding + bufferPx), event.clientY)) === null || _document === void 0 ? void 0 : _document.closest(".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER)));
+            var isCodeBlockNextToListMarker = Boolean( // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
+            (_document = document) === null || _document === void 0 || (_document = _document.elementFromPoint(event.clientX + (_styles.listItemCounterPadding + bufferPx), event.clientY)) === null || _document === void 0 ? void 0 : _document.closest(".".concat(_styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER)));
             if (isCodeBlockNextToListMarker) {
               // +1 needed to put cursor inside li
               // otherwise gap cursor markup will be injected as immediate child of ul resulting in invalid html

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

@@ -1,15 +1,25 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.applyListNormalisationFixes = applyListNormalisationFixes;
 exports.liftFollowingList = liftFollowingList;
 exports.liftNodeSelectionList = liftNodeSelectionList;
 exports.liftTextSelectionList = liftTextSelectionList;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _utils = require("@atlaskit/editor-common/utils");
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _indentation = require("./utils/indentation");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function liftListItem(selection, tr) {
   var $from = selection.$from,
     $to = selection.$to;
@@ -96,4 +106,156 @@ function liftTextSelectionList(selection, tr) {
     }
   }
   return tr;
+}
+
+/**
+ * Finds the top-level list nodes (bulletList/orderedList) that contain the positions
+ * affected by the given transactions. Returns a map of list node position → list node,
+ * so callers can scan only the affected subtrees rather than the entire document.
+ */
+function getAffectedListsFromTransactions(transactions, doc, schema) {
+  var _schema$nodes = schema.nodes,
+    bulletList = _schema$nodes.bulletList,
+    orderedList = _schema$nodes.orderedList;
+  var listTypes = [bulletList, orderedList].filter(Boolean);
+  if (listTypes.length === 0) {
+    return new Map();
+  }
+  var result = new Map();
+  var _iterator = _createForOfIteratorHelper(transactions),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var tr = _step.value;
+      var _iterator2 = _createForOfIteratorHelper(tr.steps),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var step = _step2.value;
+          // ReplaceStep and ReplaceAroundStep both have from/to — other step types are skipped.
+          if (!(step instanceof _transform.ReplaceStep) && !(step instanceof _transform.ReplaceAroundStep)) {
+            continue;
+          }
+          // Check both the start and end of each changed range, mapped to post-paste positions.
+          for (var _i = 0, _arr = [step.from, step.to]; _i < _arr.length; _i++) {
+            var rawPos = _arr[_i];
+            var mappedPos = Math.min(tr.mapping.map(rawPos), doc.content.size - 1);
+            var $pos = doc.resolve(mappedPos);
+            var ancestor = (0, _utils2.findParentNodeOfTypeClosestToPos)($pos, listTypes);
+            if (ancestor) {
+              result.set(ancestor.pos, ancestor.node);
+            }
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return result;
+}
+/**
+ * Applies list normalisation fixes to the given transaction for all affected list subtrees.
+ * Processes nodes in reverse document order so that position offsets from insertions/joins
+ * do not affect earlier positions.
+ *
+ * When platform_editor_flexible_list_indentation is off: inserts an empty paragraph before any listItem whose
+ * first child is a list node, and merges adjacent same-type list nodes within a listItem.
+ * When platform_editor_flexible_list_indentation is on: only merges adjacent same-type list nodes.
+ */
+function applyListNormalisationFixes(_ref) {
+  var tr = _ref.tr,
+    transactions = _ref.transactions,
+    doc = _ref.doc,
+    schema = _ref.schema;
+  var affectedLists = getAffectedListsFromTransactions(transactions, doc, schema);
+  if (affectedLists.size === 0) {
+    return tr;
+  }
+  var _schema$nodes2 = schema.nodes,
+    listItem = _schema$nodes2.listItem,
+    paragraph = _schema$nodes2.paragraph;
+  if (!listItem) {
+    return tr;
+  }
+
+  // Process lists in reverse position order so fixes at higher positions
+  // don't shift the positions of fixes at lower positions.
+  var sortedEntries = (0, _toConsumableArray2.default)(affectedLists.entries()).sort(function (_ref2, _ref3) {
+    var _ref4 = (0, _slicedToArray2.default)(_ref2, 1),
+      posA = _ref4[0];
+    var _ref5 = (0, _slicedToArray2.default)(_ref3, 1),
+      posB = _ref5[0];
+    return posB - posA;
+  });
+  var _iterator3 = _createForOfIteratorHelper(sortedEntries),
+    _step3;
+  try {
+    var _loop = function _loop() {
+      var _step3$value = (0, _slicedToArray2.default)(_step3.value, 2),
+        listPos = _step3$value[0],
+        listNode = _step3$value[1];
+      // Collect listItem positions in document order, then process in reverse so that
+      // fixes at higher positions don't shift positions of fixes at lower positions.
+      var listItemPositions = [];
+      listNode.descendants(function (node, offsetPos) {
+        if (node.type === listItem) {
+          listItemPositions.push(listPos + 1 + offsetPos);
+          return false; // Don't descend — inner listItems are handled via their own ancestor list
+        }
+        return true;
+      });
+      for (var i = listItemPositions.length - 1; i >= 0; i--) {
+        var mappedPos = tr.mapping.map(listItemPositions[i]);
+        var node = tr.doc.nodeAt(mappedPos);
+        if (!node || node.type !== listItem) {
+          continue;
+        }
+
+        // Merge adjacent same-type list nodes (highest boundary first within the listItem).
+        for (var j = node.childCount - 1; j > 0; j--) {
+          var child = node.child(j);
+          var prevChild = node.child(j - 1);
+          if ((0, _utils.isListNode)(child) && child.type === prevChild.type) {
+            var offset = 1; // +1 for listItem opening token
+            for (var k = 0; k < j; k++) {
+              offset += node.child(k).nodeSize;
+            }
+            try {
+              tr.join(mappedPos + offset);
+            } catch (e) {
+              // join may fail if position is invalid after earlier transforms — skip
+              // eslint-disable-next-line no-console
+              console.warn('[editor-plugin-list] applyListNormalisationFixes: unexpected join failure', e);
+            }
+          }
+        }
+
+        // Insert empty paragraph before list-first listItems when _indentation is off.
+        if (paragraph && !(0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+          var currentNode = tr.doc.nodeAt(mappedPos);
+          if (currentNode && currentNode.firstChild && currentNode.firstChild.type !== paragraph) {
+            var emptyParagraph = paragraph.createAndFill();
+            if (emptyParagraph) {
+              tr.insert(mappedPos + 1, emptyParagraph);
+            }
+          }
+        }
+      }
+    };
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return tr;
 }

package/dist/cjs/ui/BulletedListBlockMenuItem.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createBulletedListBlockMenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
@@ -14,7 +14,7 @@ var _listBulleted = _interopRequireDefault(require("@atlaskit/icon/core/list-bul
 var NODE_NAME = 'bulletList';
 var BulletedListBlockMenuItem = function BulletedListBlockMenuItem(_ref) {
   var api = _ref.api;
-  var _useIntl = (0, _reactIntlNext.useIntl)(),
+  var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var handleClick = function handleClick(event) {
     var triggeredFrom = event.nativeEvent instanceof KeyboardEvent || event.nativeEvent.detail === 0 ? _analytics.INPUT_METHOD.KEYBOARD : _analytics.INPUT_METHOD.MOUSE;

package/dist/cjs/ui/NumberedListBlockMenuItem.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createNumberedListBlockMenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
@@ -14,7 +14,7 @@ var _listNumbered = _interopRequireDefault(require("@atlaskit/icon/core/list-num
 var NODE_NAME = 'orderedList';
 var NumberedListBlockMenuItem = function NumberedListBlockMenuItem(_ref) {
   var api = _ref.api;
-  var _useIntl = (0, _reactIntlNext.useIntl)(),
+  var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var handleClick = function handleClick(event) {
     var triggeredFrom = event.nativeEvent instanceof KeyboardEvent || event.nativeEvent.detail === 0 ? _analytics.INPUT_METHOD.KEYBOARD : _analytics.INPUT_METHOD.MOUSE;

package/dist/es2019/pm-plugins/commands/indent-list.js

@@ -3,7 +3,7 @@ import { getCommonListAnalyticsAttributes, getListItemAttributes, hasValidListIn
 import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/prosemirror-history';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MAX_NESTED_LIST_INDENTATION } from '../../types';
 import { indentListItemsSelected as indentListAction } from '../actions/indent-list-items-selected';
 import { moveSelectedListItems } from '../actions/move-selected-list-items';
@@ -59,7 +59,7 @@ export const indentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEYB
     closeHistory(tr);
 
     // Route to new or original implementation based on feature flag
-    if (expValEqualsNoExposure('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+    if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
       return handleIndentListItems(tr, editorAnalyticsAPI, inputMethod);
     }
     const firstListItemSelectedAttributes = getListItemAttributes($from);

package/dist/es2019/pm-plugins/commands/outdent-list.js

@@ -3,7 +3,7 @@ import { getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists'
 import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/prosemirror-history';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { moveSelectedListItems } from '../actions/move-selected-list-items';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
 import { getRestartListsAttributes } from '../utils/analytics';
@@ -77,7 +77,7 @@ export const outdentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEY
     closeHistory(tr);
 
     // Route to new or original implementation based on feature flag
-    if (expValEqualsNoExposure('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+    if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
       return handleOutdentListItems(tr, editorAnalyticsAPI, inputMethod);
     }
     const actionSubjectId = isBulletList(parentListNode.node) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;

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

@@ -5,6 +5,7 @@ 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 { applyListNormalisationFixes } from './transforms';
 import { isWrappingPossible } from './utils/selection';
 const listPluginKey = new PluginKey('listPlugin');
 export const pluginKey = listPluginKey;
@@ -131,6 +132,23 @@ export const createPlugin = (eventDispatch, featureFlags, api) => {
   return new SafePlugin({
     state: createPluginState(eventDispatch, createInitialState(featureFlags, api)),
     key: listPluginKey,
+    appendTransaction(transactions, _oldState, newState) {
+      // The paste plugin sets 'listPasteNormalisation' on the transaction when it detects
+      // a list is being pasted into a list (and the flexible list schema flag is on).
+      // We use this meta to cheaply trigger normalisation without re-checking flags.
+      if (transactions.some(t => t.getMeta('listPasteNormalisation'))) {
+        const tr = applyListNormalisationFixes({
+          tr: newState.tr,
+          transactions,
+          doc: newState.doc,
+          schema: newState.schema
+        });
+        if (tr.docChanged) {
+          return tr;
+        }
+      }
+      return null;
+    },
     props: {
       decorations(state) {
         const {
@@ -154,7 +172,8 @@ export const createPlugin = (eventDispatch, featureFlags, api) => {
           if ((nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) === listItem && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : (_nodeAtPos$firstChild = nodeAtPos.firstChild) === null || _nodeAtPos$firstChild === void 0 ? void 0 : _nodeAtPos$firstChild.type) === codeBlock) {
             var _document, _document$elementFrom;
             const bufferPx = 50;
-            const isCodeBlockNextToListMarker = Boolean((_document = document) === null || _document === void 0 ? void 0 : (_document$elementFrom = _document.elementFromPoint(event.clientX + (listItemCounterPadding + bufferPx), event.clientY)) === null || _document$elementFrom === void 0 ? void 0 : _document$elementFrom.closest(`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER}`));
+            const isCodeBlockNextToListMarker = Boolean( // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
+            (_document = document) === null || _document === void 0 ? void 0 : (_document$elementFrom = _document.elementFromPoint(event.clientX + (listItemCounterPadding + bufferPx), event.clientY)) === null || _document$elementFrom === void 0 ? void 0 : _document$elementFrom.closest(`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER}`));
             if (isCodeBlockNextToListMarker) {
               // +1 needed to put cursor inside li
               // otherwise gap cursor markup will be injected as immediate child of ul resulting in invalid html

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

@@ -1,6 +1,9 @@
+import { isListNode } from '@atlaskit/editor-common/utils';
 import { Fragment, NodeRange, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { liftTarget, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
+import { liftTarget, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getListLiftTarget } from './utils/indentation';
 function liftListItem(selection, tr) {
   const {
@@ -98,4 +101,120 @@ export function liftTextSelectionList(selection, tr) {
     }
   }
   return tr;
+}
+
+/**
+ * Finds the top-level list nodes (bulletList/orderedList) that contain the positions
+ * affected by the given transactions. Returns a map of list node position → list node,
+ * so callers can scan only the affected subtrees rather than the entire document.
+ */
+function getAffectedListsFromTransactions(transactions, doc, schema) {
+  const {
+    bulletList,
+    orderedList
+  } = schema.nodes;
+  const listTypes = [bulletList, orderedList].filter(Boolean);
+  if (listTypes.length === 0) {
+    return new Map();
+  }
+  const result = new Map();
+  for (const tr of transactions) {
+    for (const step of tr.steps) {
+      // ReplaceStep and ReplaceAroundStep both have from/to — other step types are skipped.
+      if (!(step instanceof ReplaceStep) && !(step instanceof ReplaceAroundStep)) {
+        continue;
+      }
+      // Check both the start and end of each changed range, mapped to post-paste positions.
+      for (const rawPos of [step.from, step.to]) {
+        const mappedPos = Math.min(tr.mapping.map(rawPos), doc.content.size - 1);
+        const $pos = doc.resolve(mappedPos);
+        const ancestor = findParentNodeOfTypeClosestToPos($pos, listTypes);
+        if (ancestor) {
+          result.set(ancestor.pos, ancestor.node);
+        }
+      }
+    }
+  }
+  return result;
+}
+/**
+ * Applies list normalisation fixes to the given transaction for all affected list subtrees.
+ * Processes nodes in reverse document order so that position offsets from insertions/joins
+ * do not affect earlier positions.
+ *
+ * When platform_editor_flexible_list_indentation is off: inserts an empty paragraph before any listItem whose
+ * first child is a list node, and merges adjacent same-type list nodes within a listItem.
+ * When platform_editor_flexible_list_indentation is on: only merges adjacent same-type list nodes.
+ */
+export function applyListNormalisationFixes({
+  tr,
+  transactions,
+  doc,
+  schema
+}) {
+  const affectedLists = getAffectedListsFromTransactions(transactions, doc, schema);
+  if (affectedLists.size === 0) {
+    return tr;
+  }
+  const {
+    listItem,
+    paragraph
+  } = schema.nodes;
+  if (!listItem) {
+    return tr;
+  }
+
+  // Process lists in reverse position order so fixes at higher positions
+  // don't shift the positions of fixes at lower positions.
+  const sortedEntries = [...affectedLists.entries()].sort(([posA], [posB]) => posB - posA);
+  for (const [listPos, listNode] of sortedEntries) {
+    // Collect listItem positions in document order, then process in reverse so that
+    // fixes at higher positions don't shift positions of fixes at lower positions.
+    const listItemPositions = [];
+    listNode.descendants((node, offsetPos) => {
+      if (node.type === listItem) {
+        listItemPositions.push(listPos + 1 + offsetPos);
+        return false; // Don't descend — inner listItems are handled via their own ancestor list
+      }
+      return true;
+    });
+    for (let i = listItemPositions.length - 1; i >= 0; i--) {
+      const mappedPos = tr.mapping.map(listItemPositions[i]);
+      const node = tr.doc.nodeAt(mappedPos);
+      if (!node || node.type !== listItem) {
+        continue;
+      }
+
+      // Merge adjacent same-type list nodes (highest boundary first within the listItem).
+      for (let j = node.childCount - 1; j > 0; j--) {
+        const child = node.child(j);
+        const prevChild = node.child(j - 1);
+        if (isListNode(child) && child.type === prevChild.type) {
+          let offset = 1; // +1 for listItem opening token
+          for (let k = 0; k < j; k++) {
+            offset += node.child(k).nodeSize;
+          }
+          try {
+            tr.join(mappedPos + offset);
+          } catch (e) {
+            // join may fail if position is invalid after earlier transforms — skip
+            // eslint-disable-next-line no-console
+            console.warn('[editor-plugin-list] applyListNormalisationFixes: unexpected join failure', e);
+          }
+        }
+      }
+
+      // Insert empty paragraph before list-first listItems when _indentation is off.
+      if (paragraph && !expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+        const currentNode = tr.doc.nodeAt(mappedPos);
+        if (currentNode && currentNode.firstChild && currentNode.firstChild.type !== paragraph) {
+          const emptyParagraph = paragraph.createAndFill();
+          if (emptyParagraph) {
+            tr.insert(mappedPos + 1, emptyParagraph);
+          }
+        }
+      }
+    }
+  }
+  return tr;
 }

package/dist/es2019/ui/BulletedListBlockMenuItem.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { listMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';

package/dist/es2019/ui/NumberedListBlockMenuItem.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { listMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';

package/dist/esm/pm-plugins/commands/indent-list.js

@@ -6,7 +6,7 @@ import { getCommonListAnalyticsAttributes, getListItemAttributes, hasValidListIn
 import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/prosemirror-history';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MAX_NESTED_LIST_INDENTATION } from '../../types';
 import { indentListItemsSelected as indentListAction } from '../actions/indent-list-items-selected';
 import { moveSelectedListItems } from '../actions/move-selected-list-items';
@@ -54,7 +54,7 @@ export var indentList = function indentList(editorAnalyticsAPI) {
       closeHistory(tr);
 
       // Route to new or original implementation based on feature flag
-      if (expValEqualsNoExposure('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+      if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
         return handleIndentListItems(tr, editorAnalyticsAPI, inputMethod);
       }
       var firstListItemSelectedAttributes = getListItemAttributes($from);

package/dist/esm/pm-plugins/commands/outdent-list.js

@@ -6,7 +6,7 @@ import { getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists'
 import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/prosemirror-history';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { moveSelectedListItems } from '../actions/move-selected-list-items';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
 import { getRestartListsAttributes } from '../utils/analytics';
@@ -72,7 +72,7 @@ export var outdentList = function outdentList(editorAnalyticsAPI) {
       closeHistory(tr);
 
       // Route to new or original implementation based on feature flag
-      if (expValEqualsNoExposure('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+      if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
         return handleOutdentListItems(tr, editorAnalyticsAPI, inputMethod);
       }
       var actionSubjectId = isBulletList(parentListNode.node) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;

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

@@ -8,6 +8,7 @@ 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 { applyListNormalisationFixes } from './transforms';
 import { isWrappingPossible } from './utils/selection';
 var listPluginKey = new PluginKey('listPlugin');
 export var pluginKey = listPluginKey;
@@ -132,6 +133,25 @@ export var createPlugin = function createPlugin(eventDispatch, featureFlags, api
   return new SafePlugin({
     state: createPluginState(eventDispatch, createInitialState(featureFlags, api)),
     key: listPluginKey,
+    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      // The paste plugin sets 'listPasteNormalisation' on the transaction when it detects
+      // a list is being pasted into a list (and the flexible list schema flag is on).
+      // We use this meta to cheaply trigger normalisation without re-checking flags.
+      if (transactions.some(function (t) {
+        return t.getMeta('listPasteNormalisation');
+      })) {
+        var tr = applyListNormalisationFixes({
+          tr: newState.tr,
+          transactions: transactions,
+          doc: newState.doc,
+          schema: newState.schema
+        });
+        if (tr.docChanged) {
+          return tr;
+        }
+      }
+      return null;
+    },
     props: {
       decorations: function decorations(state) {
         var _getPluginState = getPluginState(state),
@@ -151,7 +171,8 @@ export var createPlugin = function createPlugin(eventDispatch, featureFlags, api
           if ((nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) === listItem && (nodeAtPos === null || nodeAtPos === void 0 || (_nodeAtPos$firstChild = nodeAtPos.firstChild) === null || _nodeAtPos$firstChild === void 0 ? void 0 : _nodeAtPos$firstChild.type) === codeBlock) {
             var _document;
             var bufferPx = 50;
-            var isCodeBlockNextToListMarker = Boolean((_document = document) === null || _document === void 0 || (_document = _document.elementFromPoint(event.clientX + (listItemCounterPadding + bufferPx), event.clientY)) === null || _document === void 0 ? void 0 : _document.closest(".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER)));
+            var isCodeBlockNextToListMarker = Boolean( // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
+            (_document = document) === null || _document === void 0 || (_document = _document.elementFromPoint(event.clientX + (listItemCounterPadding + bufferPx), event.clientY)) === null || _document === void 0 ? void 0 : _document.closest(".".concat(CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER)));
             if (isCodeBlockNextToListMarker) {
               // +1 needed to put cursor inside li
               // otherwise gap cursor markup will be injected as immediate child of ul resulting in invalid html

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

@@ -1,6 +1,14 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { isListNode } from '@atlaskit/editor-common/utils';
 import { Fragment, NodeRange, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { liftTarget, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
+import { liftTarget, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getListLiftTarget } from './utils/indentation';
 function liftListItem(selection, tr) {
   var $from = selection.$from,
@@ -88,4 +96,156 @@ export function liftTextSelectionList(selection, tr) {
     }
   }
   return tr;
+}
+
+/**
+ * Finds the top-level list nodes (bulletList/orderedList) that contain the positions
+ * affected by the given transactions. Returns a map of list node position → list node,
+ * so callers can scan only the affected subtrees rather than the entire document.
+ */
+function getAffectedListsFromTransactions(transactions, doc, schema) {
+  var _schema$nodes = schema.nodes,
+    bulletList = _schema$nodes.bulletList,
+    orderedList = _schema$nodes.orderedList;
+  var listTypes = [bulletList, orderedList].filter(Boolean);
+  if (listTypes.length === 0) {
+    return new Map();
+  }
+  var result = new Map();
+  var _iterator = _createForOfIteratorHelper(transactions),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var tr = _step.value;
+      var _iterator2 = _createForOfIteratorHelper(tr.steps),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var step = _step2.value;
+          // ReplaceStep and ReplaceAroundStep both have from/to — other step types are skipped.
+          if (!(step instanceof ReplaceStep) && !(step instanceof ReplaceAroundStep)) {
+            continue;
+          }
+          // Check both the start and end of each changed range, mapped to post-paste positions.
+          for (var _i = 0, _arr = [step.from, step.to]; _i < _arr.length; _i++) {
+            var rawPos = _arr[_i];
+            var mappedPos = Math.min(tr.mapping.map(rawPos), doc.content.size - 1);
+            var $pos = doc.resolve(mappedPos);
+            var ancestor = findParentNodeOfTypeClosestToPos($pos, listTypes);
+            if (ancestor) {
+              result.set(ancestor.pos, ancestor.node);
+            }
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return result;
+}
+/**
+ * Applies list normalisation fixes to the given transaction for all affected list subtrees.
+ * Processes nodes in reverse document order so that position offsets from insertions/joins
+ * do not affect earlier positions.
+ *
+ * When platform_editor_flexible_list_indentation is off: inserts an empty paragraph before any listItem whose
+ * first child is a list node, and merges adjacent same-type list nodes within a listItem.
+ * When platform_editor_flexible_list_indentation is on: only merges adjacent same-type list nodes.
+ */
+export function applyListNormalisationFixes(_ref) {
+  var tr = _ref.tr,
+    transactions = _ref.transactions,
+    doc = _ref.doc,
+    schema = _ref.schema;
+  var affectedLists = getAffectedListsFromTransactions(transactions, doc, schema);
+  if (affectedLists.size === 0) {
+    return tr;
+  }
+  var _schema$nodes2 = schema.nodes,
+    listItem = _schema$nodes2.listItem,
+    paragraph = _schema$nodes2.paragraph;
+  if (!listItem) {
+    return tr;
+  }
+
+  // Process lists in reverse position order so fixes at higher positions
+  // don't shift the positions of fixes at lower positions.
+  var sortedEntries = _toConsumableArray(affectedLists.entries()).sort(function (_ref2, _ref3) {
+    var _ref4 = _slicedToArray(_ref2, 1),
+      posA = _ref4[0];
+    var _ref5 = _slicedToArray(_ref3, 1),
+      posB = _ref5[0];
+    return posB - posA;
+  });
+  var _iterator3 = _createForOfIteratorHelper(sortedEntries),
+    _step3;
+  try {
+    var _loop = function _loop() {
+      var _step3$value = _slicedToArray(_step3.value, 2),
+        listPos = _step3$value[0],
+        listNode = _step3$value[1];
+      // Collect listItem positions in document order, then process in reverse so that
+      // fixes at higher positions don't shift positions of fixes at lower positions.
+      var listItemPositions = [];
+      listNode.descendants(function (node, offsetPos) {
+        if (node.type === listItem) {
+          listItemPositions.push(listPos + 1 + offsetPos);
+          return false; // Don't descend — inner listItems are handled via their own ancestor list
+        }
+        return true;
+      });
+      for (var i = listItemPositions.length - 1; i >= 0; i--) {
+        var mappedPos = tr.mapping.map(listItemPositions[i]);
+        var node = tr.doc.nodeAt(mappedPos);
+        if (!node || node.type !== listItem) {
+          continue;
+        }
+
+        // Merge adjacent same-type list nodes (highest boundary first within the listItem).
+        for (var j = node.childCount - 1; j > 0; j--) {
+          var child = node.child(j);
+          var prevChild = node.child(j - 1);
+          if (isListNode(child) && child.type === prevChild.type) {
+            var offset = 1; // +1 for listItem opening token
+            for (var k = 0; k < j; k++) {
+              offset += node.child(k).nodeSize;
+            }
+            try {
+              tr.join(mappedPos + offset);
+            } catch (e) {
+              // join may fail if position is invalid after earlier transforms — skip
+              // eslint-disable-next-line no-console
+              console.warn('[editor-plugin-list] applyListNormalisationFixes: unexpected join failure', e);
+            }
+          }
+        }
+
+        // Insert empty paragraph before list-first listItems when _indentation is off.
+        if (paragraph && !expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+          var currentNode = tr.doc.nodeAt(mappedPos);
+          if (currentNode && currentNode.firstChild && currentNode.firstChild.type !== paragraph) {
+            var emptyParagraph = paragraph.createAndFill();
+            if (emptyParagraph) {
+              tr.insert(mappedPos + 1, emptyParagraph);
+            }
+          }
+        }
+      }
+    };
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return tr;
 }

package/dist/esm/ui/BulletedListBlockMenuItem.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { listMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';

package/dist/esm/ui/NumberedListBlockMenuItem.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { listMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';

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

@@ -2,8 +2,8 @@ import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 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 } from '@atlaskit/editor-prosemirror/state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ListPlugin } from '../listPluginType';
 import type { ListState } from '../types';

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

@@ -1,4 +1,22 @@
+import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function liftFollowingList(from: number, to: number, rootListDepth: number, tr: Transaction): Transaction;
 export declare function liftNodeSelectionList(selection: Selection, tr: Transaction): Transaction;
 export declare function liftTextSelectionList(selection: Selection, tr: Transaction): Transaction;
+interface ApplyListNormalisationFixesOptions {
+    doc: Node;
+    schema: Schema;
+    tr: Transaction;
+    transactions: readonly Transaction[];
+}
+/**
+ * Applies list normalisation fixes to the given transaction for all affected list subtrees.
+ * Processes nodes in reverse document order so that position offsets from insertions/joins
+ * do not affect earlier positions.
+ *
+ * When platform_editor_flexible_list_indentation is off: inserts an empty paragraph before any listItem whose
+ * first child is a list node, and merges adjacent same-type list nodes within a listItem.
+ * When platform_editor_flexible_list_indentation is on: only merges adjacent same-type list nodes.
+ */
+export declare function applyListNormalisationFixes({ tr, transactions, doc, schema, }: ApplyListNormalisationFixesOptions): Transaction;
+export {};

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

@@ -2,8 +2,8 @@ import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 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 } from '@atlaskit/editor-prosemirror/state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ListPlugin } from '../listPluginType';
 import type { ListState } from '../types';

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

@@ -1,4 +1,22 @@
+import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function liftFollowingList(from: number, to: number, rootListDepth: number, tr: Transaction): Transaction;
 export declare function liftNodeSelectionList(selection: Selection, tr: Transaction): Transaction;
 export declare function liftTextSelectionList(selection: Selection, tr: Transaction): Transaction;
+interface ApplyListNormalisationFixesOptions {
+    doc: Node;
+    schema: Schema;
+    tr: Transaction;
+    transactions: readonly Transaction[];
+}
+/**
+ * Applies list normalisation fixes to the given transaction for all affected list subtrees.
+ * Processes nodes in reverse document order so that position offsets from insertions/joins
+ * do not affect earlier positions.
+ *
+ * When platform_editor_flexible_list_indentation is off: inserts an empty paragraph before any listItem whose
+ * first child is a list node, and merges adjacent same-type list nodes within a listItem.
+ * When platform_editor_flexible_list_indentation is on: only merges adjacent same-type list nodes.
+ */
+export declare function applyListNormalisationFixes({ tr, transactions, doc, schema, }: ApplyListNormalisationFixesOptions): Transaction;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "11.0.0",
+	"version": "12.0.0",
 	"description": "List plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,12 +28,12 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^52.5.0",
-		"@atlaskit/editor-plugin-analytics": "^9.0.0",
-		"@atlaskit/editor-plugin-block-menu": "^8.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^8.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^6.0.0",
+		"@atlaskit/editor-plugin-analytics": "^10.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^9.0.0",
+		"@atlaskit/editor-plugin-feature-flags": "^9.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^7.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
-		"@atlaskit/editor-toolbar": "^0.20.0",
+		"@atlaskit/editor-toolbar": "^1.0.0",
 		"@atlaskit/icon": "^34.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
@@ -42,9 +42,9 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^113.0.0",
+		"@atlaskit/editor-common": "^114.0.0",
 		"react": "^18.2.0",
-		"react-intl-next": "npm:react-intl@^5.18.1"
+		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {
@@ -93,5 +93,8 @@
 		"no-unused-dependencies": {
 			"checkDevDependencies": true
 		}
+	},
+	"devDependencies": {
+		"react-intl": "^6.6.2"
 	}
 }

package/report.api.md

@@ -109,7 +109,7 @@ type ToggleOrderedList = (inputMethod: InputMethod) => EditorCommand;
 ```json
 {
 	"react": "^16.8.0",
-	"react-intl-next": "npm:react-intl@^5.18.1"
+	"react-intl": "npm:react-intl@^5.18.1"
 }
 ```