@atlaskit/editor-plugin-paste 10.0.0 → 11.0.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/editor-plugin-paste
 
+## 11.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
+
+## 10.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
+
 ## 10.0.0
 
 ### Patch Changes

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

@@ -29,6 +29,7 @@ var _insm = require("@atlaskit/insm");
 var _mediaCommon = require("@atlaskit/media-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("../editor-actions/actions");
 var _commands = require("../editor-commands/commands");
@@ -44,6 +45,30 @@ var _tinyMCE = require("./util/tinyMCE");
 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
+function isListIntoListPaste(tr, state) {
+  var _state$schema$nodes = state.schema.nodes,
+    listItem = _state$schema$nodes.listItem,
+    bulletList = _state$schema$nodes.bulletList,
+    orderedList = _state$schema$nodes.orderedList;
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  var selectionInList = !!(0, _utils2.findParentNodeOfTypeClosestToPos)($from, [listItem]) || !!(0, _utils2.findParentNodeOfTypeClosestToPos)($to, [listItem]);
+  if (!selectionInList) {
+    return false;
+  }
+  return tr.steps.some(function (step) {
+    var _slice$content;
+    var slice = (0, _utils.extractSliceFromStep)(step);
+    var listExists = false;
+    slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
+      if (node.type === bulletList || node.type === orderedList) {
+        listExists = true;
+      }
+    });
+    return listExists;
+  });
+}
 var isInsideBlockQuote = exports.isInsideBlockQuote = function isInsideBlockQuote(state) {
   var blockquote = state.schema.nodes.blockquote;
   return (0, _utils2.hasParentNodeOfType)(blockquote)(state.selection);
@@ -282,17 +307,25 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // to split those repairing transactions in prosemirror-history when they're being added to the
           // "done" stack
           var isPastingTable = tr.steps.some(function (step) {
-            var _slice$content;
+            var _slice$content2;
             var slice = (0, _utils.extractSliceFromStep)(step);
             var tableExists = false;
-            slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
+            slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || _slice$content2.forEach(function (node) {
               if (node.type === state.schema.nodes.table) {
                 tableExists = true;
               }
             });
             return tableExists;
           });
-          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
+
+          // Don't add closeHistory if we're pasting a list into a list, as the list plugin will
+          // appendTransaction to normalise the list structure and we want to keep the paste and
+          // normalisation as one undo event. We also set a meta on the transaction so the list
+          // plugin's appendTransaction can cheaply detect this case without re-checking flags.
+          if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_schema', 'isEnabled', true) && isListIntoListPaste(tr, state)) {
+            tr = tr.setMeta('listPasteNormalisation', true);
+          }
+          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !tr.getMeta('listPasteNormalisation') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }
@@ -578,6 +611,12 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           slice = (0, _transforms.transformSingleColumnLayout)(slice, schema);
         }
         slice = (0, _transforms.transformSliceToRemoveMacroId)(slice, schema);
+        if ((0, _expValEquals.expValEquals)('platform_editor_flexible_list_schema', 'isEnabled', true) && !(0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+          // Prevent pasted externally-authored flexible list HTML from producing flexible list structures
+          // Only when schema support is enabled but indentation behaviour is not, meaning editor gracefully
+          // handles the structure, but ideally does not produce it
+          slice = (0, _transforms.transformSliceEnsureListItemParagraphFirst)(slice, schema);
+        }
         return slice;
       },
       transformPastedHTML: function transformPastedHTML(html) {

package/dist/cjs/pm-plugins/util/handlers.js

@@ -46,7 +46,6 @@ var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _commands = require("../../editor-commands/commands");
 var _pluginFactory = require("../plugin-factory");
 var _edgeCases = require("./edge-cases");
@@ -1110,7 +1109,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         slice: slice,
         schema: schema
       });
-    } else if (noNeedForSafeInsert && !((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_indentation', 'isEnabled', true) && checkTaskListInList(state, slice))) {
+    } else if (noNeedForSafeInsert && !((0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true) && checkTaskListInList(state, slice))) {
       var _firstChildOfSlice$ty3, _firstChildOfSlice$co2, _firstChildOfSlice$co3;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty3 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty3 === void 0 ? void 0 : _firstChildOfSlice$ty3.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co2 !== void 0 && _firstChildOfSlice$co2.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co3 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co3 === void 0 ? void 0 : _firstChildOfSlice$co3.type.name)) {
         // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist or mediaSingle

package/dist/cjs/ui/Flag.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.Flag = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _reactIntlNext = require("react-intl-next");
+var _reactIntl = require("react-intl");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _flag = _interopRequireWildcard(require("@atlaskit/flag"));
 var _statusError = _interopRequireDefault(require("@atlaskit/icon/core/status-error"));
@@ -29,7 +29,7 @@ var Flag = exports.Flag = function Flag(_ref) {
       };
     }),
     activeFlag = _useSharedPluginState.activeFlag;
-  var _useIntl = (0, _reactIntlNext.useIntl)(),
+  var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   if (!activeFlag) {
     return;

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

@@ -9,16 +9,17 @@ import { isPastedFile as isPastedFileFromEvent, md } from '@atlaskit/editor-comm
 import { measureRender } from '@atlaskit/editor-common/performance/measure-render';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { SyncBlockRendererDataAttributeName } from '@atlaskit/editor-common/sync-block';
-import { transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, removeBreakoutFromRendererSyncBlockHTML } from '@atlaskit/editor-common/transforms';
+import { removeBreakoutFromRendererSyncBlockHTML, transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceEnsureListItemParagraphFirst, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId } from '@atlaskit/editor-common/transforms';
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { contains, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { insm } from '@atlaskit/insm';
 import { extractClientIdsFromHtml } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { PastePluginActionTypes } from '../editor-actions/actions';
 import { splitParagraphs, upgradeTextToLists } from '../editor-commands/commands';
@@ -28,9 +29,35 @@ import { createClipboardTextSerializer } from './create-clipboard-text-serialize
 import { createPluginState, pluginKey as stateKey } from './plugin-factory';
 import { escapeBackslashAndLinksExceptCodeBlock, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from './util';
 import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
-import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension, handlePasteExpand } from './util/handlers';
+import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { handleSyncBlocksPaste } from './util/sync-block';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
+function isListIntoListPaste(tr, state) {
+  const {
+    listItem,
+    bulletList,
+    orderedList
+  } = state.schema.nodes;
+  const {
+    $from,
+    $to
+  } = state.selection;
+  const selectionInList = !!findParentNodeOfTypeClosestToPos($from, [listItem]) || !!findParentNodeOfTypeClosestToPos($to, [listItem]);
+  if (!selectionInList) {
+    return false;
+  }
+  return tr.steps.some(step => {
+    var _slice$content;
+    const slice = extractSliceFromStep(step);
+    let listExists = false;
+    slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.forEach(node => {
+      if (node.type === bulletList || node.type === orderedList) {
+        listExists = true;
+      }
+    });
+    return listExists;
+  });
+}
 export const isInsideBlockQuote = state => {
   const {
     blockquote
@@ -244,17 +271,25 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // to split those repairing transactions in prosemirror-history when they're being added to the
           // "done" stack
           const isPastingTable = tr.steps.some(step => {
-            var _slice$content;
+            var _slice$content2;
             const slice = extractSliceFromStep(step);
             let tableExists = false;
-            slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.forEach(node => {
+            slice === null || slice === void 0 ? void 0 : (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.forEach(node => {
               if (node.type === state.schema.nodes.table) {
                 tableExists = true;
               }
             });
             return tableExists;
           });
-          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
+
+          // Don't add closeHistory if we're pasting a list into a list, as the list plugin will
+          // appendTransaction to normalise the list structure and we want to keep the paste and
+          // normalisation as one undo event. We also set a meta on the transaction so the list
+          // plugin's appendTransaction can cheaply detect this case without re-checking flags.
+          if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true) && isListIntoListPaste(tr, state)) {
+            tr = tr.setMeta('listPasteNormalisation', true);
+          }
+          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !tr.getMeta('listPasteNormalisation') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }
@@ -540,6 +575,12 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           slice = transformSingleColumnLayout(slice, schema);
         }
         slice = transformSliceToRemoveMacroId(slice, schema);
+        if (expValEquals('platform_editor_flexible_list_schema', 'isEnabled', true) && !expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+          // Prevent pasted externally-authored flexible list HTML from producing flexible list structures
+          // Only when schema support is enabled but indentation behaviour is not, meaning editor gracefully
+          // handles the structure, but ideally does not produce it
+          slice = transformSliceEnsureListItemParagraphFirst(slice, schema);
+        }
         return slice;
       },
       transformPastedHTML(html) {

package/dist/es2019/pm-plugins/util/handlers.js

@@ -15,7 +15,6 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { closeHistory } from '@atlaskit/prosemirror-history';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 // TODO: ED-20519 - Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from '../../editor-commands/commands';
@@ -1091,7 +1090,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         slice,
         schema
       });
-    } else if (noNeedForSafeInsert && !(expValEqualsNoExposure('platform_editor_flexible_list_indentation', 'isEnabled', true) && checkTaskListInList(state, slice))) {
+    } else if (noNeedForSafeInsert && !(expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) && checkTaskListInList(state, slice))) {
       var _firstChildOfSlice$ty3, _firstChildOfSlice$co2, _firstChildOfSlice$co3;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$ty3 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty3 === void 0 ? void 0 : _firstChildOfSlice$ty3.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co2 !== void 0 && _firstChildOfSlice$co2.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$co3 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co3 === void 0 ? void 0 : _firstChildOfSlice$co3.type.name)) {
         // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist or mediaSingle

package/dist/es2019/ui/Flag.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import AkFlag, { AutoDismissFlag, FlagGroup } from '@atlaskit/flag';
 import StatusErrorIcon from '@atlaskit/icon/core/status-error';

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

@@ -14,16 +14,17 @@ import { isPastedFile as isPastedFileFromEvent, md } from '@atlaskit/editor-comm
 import { measureRender } from '@atlaskit/editor-common/performance/measure-render';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { SyncBlockRendererDataAttributeName } from '@atlaskit/editor-common/sync-block';
-import { transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId, removeBreakoutFromRendererSyncBlockHTML } from '@atlaskit/editor-common/transforms';
+import { removeBreakoutFromRendererSyncBlockHTML, transformSingleColumnLayout, transformSingleLineCodeBlockToCodeMark, transformSliceEnsureListItemParagraphFirst, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId } from '@atlaskit/editor-common/transforms';
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { contains, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { insm } from '@atlaskit/insm';
 import { extractClientIdsFromHtml } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { PastePluginActionTypes } from '../editor-actions/actions';
 import { splitParagraphs, upgradeTextToLists } from '../editor-commands/commands';
@@ -33,9 +34,33 @@ import { createClipboardTextSerializer } from './create-clipboard-text-serialize
 import { createPluginState, pluginKey as stateKey } from './plugin-factory';
 import { escapeBackslashAndLinksExceptCodeBlock, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from './util';
 import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
-import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension, handlePasteExpand } from './util/handlers';
+import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { handleSyncBlocksPaste } from './util/sync-block';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
+function isListIntoListPaste(tr, state) {
+  var _state$schema$nodes = state.schema.nodes,
+    listItem = _state$schema$nodes.listItem,
+    bulletList = _state$schema$nodes.bulletList,
+    orderedList = _state$schema$nodes.orderedList;
+  var _state$selection = state.selection,
+    $from = _state$selection.$from,
+    $to = _state$selection.$to;
+  var selectionInList = !!findParentNodeOfTypeClosestToPos($from, [listItem]) || !!findParentNodeOfTypeClosestToPos($to, [listItem]);
+  if (!selectionInList) {
+    return false;
+  }
+  return tr.steps.some(function (step) {
+    var _slice$content;
+    var slice = extractSliceFromStep(step);
+    var listExists = false;
+    slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
+      if (node.type === bulletList || node.type === orderedList) {
+        listExists = true;
+      }
+    });
+    return listExists;
+  });
+}
 export var isInsideBlockQuote = function isInsideBlockQuote(state) {
   var blockquote = state.schema.nodes.blockquote;
   return hasParentNodeOfType(blockquote)(state.selection);
@@ -274,17 +299,25 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // to split those repairing transactions in prosemirror-history when they're being added to the
           // "done" stack
           var isPastingTable = tr.steps.some(function (step) {
-            var _slice$content;
+            var _slice$content2;
             var slice = extractSliceFromStep(step);
             var tableExists = false;
-            slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
+            slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || _slice$content2.forEach(function (node) {
               if (node.type === state.schema.nodes.table) {
                 tableExists = true;
               }
             });
             return tableExists;
           });
-          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
+
+          // Don't add closeHistory if we're pasting a list into a list, as the list plugin will
+          // appendTransaction to normalise the list structure and we want to keep the paste and
+          // normalisation as one undo event. We also set a meta on the transaction so the list
+          // plugin's appendTransaction can cheaply detect this case without re-checking flags.
+          if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true) && isListIntoListPaste(tr, state)) {
+            tr = tr.setMeta('listPasteNormalisation', true);
+          }
+          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !tr.getMeta('listPasteNormalisation') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }
@@ -570,6 +603,12 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           slice = transformSingleColumnLayout(slice, schema);
         }
         slice = transformSliceToRemoveMacroId(slice, schema);
+        if (expValEquals('platform_editor_flexible_list_schema', 'isEnabled', true) && !expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+          // Prevent pasted externally-authored flexible list HTML from producing flexible list structures
+          // Only when schema support is enabled but indentation behaviour is not, meaning editor gracefully
+          // handles the structure, but ideally does not produce it
+          slice = transformSliceEnsureListItemParagraphFirst(slice, schema);
+        }
         return slice;
       },
       transformPastedHTML: function transformPastedHTML(html) {

package/dist/esm/pm-plugins/util/handlers.js

@@ -23,7 +23,6 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { closeHistory } from '@atlaskit/prosemirror-history';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 // TODO: ED-20519 - Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from '../../editor-commands/commands';
@@ -1083,7 +1082,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         slice: slice,
         schema: schema
       });
-    } else if (noNeedForSafeInsert && !(expValEqualsNoExposure('platform_editor_flexible_list_indentation', 'isEnabled', true) && checkTaskListInList(state, slice))) {
+    } else if (noNeedForSafeInsert && !(expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true) && checkTaskListInList(state, slice))) {
       var _firstChildOfSlice$ty3, _firstChildOfSlice$co2, _firstChildOfSlice$co3;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty3 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty3 === void 0 ? void 0 : _firstChildOfSlice$ty3.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co2 !== void 0 && _firstChildOfSlice$co2.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co3 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co3 === void 0 ? void 0 : _firstChildOfSlice$co3.type.name)) {
         // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist or mediaSingle

package/dist/esm/ui/Flag.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 import React from 'react';
-import { useIntl } from 'react-intl-next';
+import { useIntl } from 'react-intl';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import AkFlag, { AutoDismissFlag, FlagGroup } from '@atlaskit/flag';
 import StatusErrorIcon from '@atlaskit/icon/core/status-error';

package/dist/types/pastePluginType.d.ts

@@ -1,4 +1,4 @@
-import type { MessageDescriptor } from 'react-intl-next';
+import type { MessageDescriptor } from 'react-intl';
 import type { PasteSource } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { NextEditorPlugin, OptionalPlugin, PasteWarningOptions } from '@atlaskit/editor-common/types';

package/dist/types/pm-plugins/create-clipboard-text-serializer.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 /**
  * Returns a plain text serialization of a given slice. This is used for populating the plain text

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

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';

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

@@ -1,4 +1,4 @@
-import type { MessageDescriptor } from 'react-intl-next';
+import type { MessageDescriptor } from 'react-intl';
 import type { PasteSource } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { NextEditorPlugin, OptionalPlugin, PasteWarningOptions } from '@atlaskit/editor-common/types';

package/dist/types-ts4.5/pm-plugins/create-clipboard-text-serializer.d.ts

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 /**
  * Returns a plain text serialization of a given slice. This is used for populating the plain text

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

@@ -1,4 +1,4 @@
-import type { IntlShape } from 'react-intl-next';
+import type { IntlShape } from 'react-intl';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "10.0.0",
+	"version": "11.0.0",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,15 +30,15 @@
 		"@atlaskit/adf-schema": "^52.5.0",
 		"@atlaskit/code": "^17.4.0",
 		"@atlaskit/editor-markdown-transformer": "^5.20.0",
-		"@atlaskit/editor-plugin-analytics": "^9.0.0",
-		"@atlaskit/editor-plugin-annotation": "^9.0.0",
-		"@atlaskit/editor-plugin-better-type-history": "^9.0.0",
-		"@atlaskit/editor-plugin-card": "^15.0.0",
-		"@atlaskit/editor-plugin-expand": "^10.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^8.0.0",
-		"@atlaskit/editor-plugin-list": "^11.0.0",
-		"@atlaskit/editor-plugin-media": "^11.0.0",
-		"@atlaskit/editor-plugin-mentions": "^11.0.0",
+		"@atlaskit/editor-plugin-analytics": "^10.0.0",
+		"@atlaskit/editor-plugin-annotation": "^10.0.0",
+		"@atlaskit/editor-plugin-better-type-history": "^10.0.0",
+		"@atlaskit/editor-plugin-card": "^16.0.0",
+		"@atlaskit/editor-plugin-expand": "^11.0.0",
+		"@atlaskit/editor-plugin-feature-flags": "^9.0.0",
+		"@atlaskit/editor-plugin-list": "^12.0.0",
+		"@atlaskit/editor-plugin-media": "^12.0.0",
+		"@atlaskit/editor-plugin-mentions": "^12.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/flag": "^17.9.0",
@@ -52,16 +52,17 @@
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
-		"react-intl-next": "npm:react-intl@^5.18.1",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^113.0.0",
+		"@atlaskit/editor-common": "^114.0.0",
 		"react": "^18.2.0",
-		"react-dom": "^18.2.0"
+		"react-dom": "^18.2.0",
+		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
 	"devDependencies": {
 		"@testing-library/react": "^16.3.0",
+		"react-intl": "^6.6.2",
 		"wait-for-expect": "^1.2.0"
 	},
 	"techstack": {