@atlaskit/editor-plugin-paste 1.10.1 → 1.11.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.11.1
+
+### Patch Changes
+
+- [#130811](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130811)
+  [`541a703405a7d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/541a703405a7d) -
+  [ux] [ED-24431] Ability to paste an expand into another expand
+- Updated dependencies
+
+## 1.11.0
+
+### Minor Changes
+
+- [#133315](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133315)
+  [`5c94ca338de14`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5c94ca338de14) -
+  Updating mentions plugin config for handling deleted mentions and refactor
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.10.1
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -8,7 +8,7 @@ exports.checkTaskListInList = checkTaskListInList;
 exports.doesSelectionWhichStartsOrEndsInListContainEntireList = void 0;
 exports.flattenNestedListInSlice = flattenNestedListInSlice;
 exports.handleCodeBlock = handleCodeBlock;
-exports.handleExpandPasteInTable = handleExpandPasteInTable;
+exports.handleExpandPaste = handleExpandPaste;
 exports.handleMacroAutoConvert = handleMacroAutoConvert;
 exports.handleMarkdown = handleMarkdown;
 exports.handleMediaSingle = handleMediaSingle;
@@ -48,6 +48,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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; } // TODO: ED-20519 Needs Macro extraction
+var insideExpand = function insideExpand(state) {
+  var _state$schema$nodes = state.schema.nodes,
+    expand = _state$schema$nodes.expand,
+    nestedExpand = _state$schema$nodes.nestedExpand;
+  return (0, _utils2.hasParentNodeOfType)([expand, nestedExpand])(state.selection);
+};
+
 /** Helper type for single arg function */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -219,10 +226,10 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
       $to = selection.$to,
       from = selection.from,
       to = selection.to;
-    var _state$schema$nodes = state.schema.nodes,
-      orderedList = _state$schema$nodes.orderedList,
-      bulletList = _state$schema$nodes.bulletList,
-      listItem = _state$schema$nodes.listItem;
+    var _state$schema$nodes2 = state.schema.nodes,
+      orderedList = _state$schema$nodes2.orderedList,
+      bulletList = _state$schema$nodes2.bulletList,
+      listItem = _state$schema$nodes2.listItem;
 
     // Selected nodes
     var selectionParentListItemNode = (0, _utils2.findParentNodeOfType)(listItem)(selection);
@@ -660,7 +667,7 @@ function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
     };
   };
 }
-var checkExpand = function checkExpand(slice) {
+var hasTopLevelExpand = function hasTopLevelExpand(slice) {
   var hasExpand = false;
   slice.content.forEach(function (node) {
     if (node.type.name === 'expand' || node.type.name === 'nestedExpand') {
@@ -689,16 +696,18 @@ function handleTableContentPasteInBodiedExtension(slice) {
     return false;
   };
 }
-function handleExpandPasteInTable(slice) {
+function handleExpandPaste(slice, isNestingExpandsSupported) {
   return function (state, dispatch) {
-    // Do not handle expand if it's not being pasted into a table
-    // OR if it's nested within another node when being pasted into a table
-    if (!(0, _coreUtils.insideTable)(state) || !checkExpand(slice)) {
+    var isInsideNestableExpand = isNestingExpandsSupported && !!insideExpand(state);
+
+    // Do not handle expand if it's not being pasted into a table or expand
+    // OR if it's nested within another node when being pasted into a table/expand
+    if (!(0, _coreUtils.insideTable)(state) && !isInsideNestableExpand || !hasTopLevelExpand(slice)) {
       return false;
     }
-    var _state$schema$nodes2 = state.schema.nodes,
-      expand = _state$schema$nodes2.expand,
-      nestedExpand = _state$schema$nodes2.nestedExpand;
+    var _state$schema$nodes3 = state.schema.nodes,
+      expand = _state$schema$nodes3.expand,
+      nestedExpand = _state$schema$nodes3.nestedExpand;
     var tr = state.tr;
     var hasExpand = false;
     var newSlice = (0, _utils.mapSlice)(slice, function (maybeNode) {
@@ -899,11 +908,11 @@ function flattenNestedListInSlice(slice) {
 function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
-    var _state$schema$nodes3 = state.schema.nodes,
-      codeBlock = _state$schema$nodes3.codeBlock,
-      heading = _state$schema$nodes3.heading,
-      paragraph = _state$schema$nodes3.paragraph,
-      panel = _state$schema$nodes3.panel;
+    var _state$schema$nodes4 = state.schema.nodes,
+      codeBlock = _state$schema$nodes4.codeBlock,
+      heading = _state$schema$nodes4.heading,
+      paragraph = _state$schema$nodes4.paragraph,
+      panel = _state$schema$nodes4.panel;
     var selection = state.selection,
       schema = state.schema;
     var firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;

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

@@ -197,6 +197,7 @@ function createPasteAnalyticsPayloadBySelection(event, slice, pasteContext, plug
         mentionIds.push(node.attrs.id);
         mentionLocalIds.push(node.attrs.localId);
         mentionsInserted.push({
+          type: 'added',
           id: node.attrs.id,
           localId: node.attrs.localId
         });
@@ -337,12 +338,12 @@ var handlePasteNonNestableBlockNodesIntoListWithAnalytics = exports.handlePasteN
     }))((0, _handlers.handlePasteNonNestableBlockNodesIntoList)(slice));
   };
 };
-var handleExpandWithAnalytics = exports.handleExpandWithAnalytics = function handleExpandWithAnalytics(editorAnalyticsAPI) {
+var handleExpandWithAnalytics = exports.handleExpandWithAnalytics = function handleExpandWithAnalytics(editorAnalyticsAPI, isNestingExpandsSupported) {
   return function (view, event, slice) {
     return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
       type: _analytics.PasteTypes.richText,
       pasteSplitList: true
-    }))((0, _handlers.handleExpandPasteInTable)(slice));
+    }))((0, _handlers.handleExpandPaste)(slice, isNestingExpandsSupported));
   };
 };
 var handleSelectedTableWithAnalytics = exports.handleSelectedTableWithAnalytics = function handleSelectedTableWithAnalytics(editorAnalyticsAPI) {

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

@@ -27,6 +27,7 @@ var _editorMarkdownTransformer = require("@atlaskit/editor-markdown-transformer"
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../actions");
 var _commands = require("../commands");
 var _handlers = require("../handlers");
@@ -368,7 +369,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = (0, _utils.linkifyContent)(state.schema)(slice);
           if ((0, _analytics2.handlePasteLinkOnSelectedTextWithAnalytics)(editorAnalyticsAPI)(view, event, slice, _analytics.PasteTypes.richText)(state, dispatch)) {
@@ -425,7 +426,8 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             });
             slice = sliceCopy;
           }
-          if ((0, _analytics2.handleExpandWithAnalytics)(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
+          var isNestingExpandsSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f === void 0 || (_pluginInjectionApi$f = _pluginInjectionApi$f.sharedState.currentState()) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.nestedExpandInExpandEx) || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
+          if ((0, _analytics2.handleExpandWithAnalytics)(editorAnalyticsAPI, isNestingExpandsSupported)(view, event, slice)(state, dispatch)) {
             return true;
           }
           if (!(0, _coreUtils.insideTable)(state)) {

package/dist/es2019/handlers.js

@@ -16,6 +16,13 @@ import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceFo
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
+const insideExpand = state => {
+  const {
+    expand,
+    nestedExpand
+  } = state.schema.nodes;
+  return hasParentNodeOfType([expand, nestedExpand])(state.selection);
+};
 
 /** Helper type for single arg function */
 
@@ -642,7 +649,7 @@ export function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
     };
   };
 }
-const checkExpand = slice => {
+const hasTopLevelExpand = slice => {
   let hasExpand = false;
   slice.content.forEach(node => {
     if (node.type.name === 'expand' || node.type.name === 'nestedExpand') {
@@ -673,11 +680,13 @@ export function handleTableContentPasteInBodiedExtension(slice) {
     return false;
   };
 }
-export function handleExpandPasteInTable(slice) {
+export function handleExpandPaste(slice, isNestingExpandsSupported) {
   return (state, dispatch) => {
-    // Do not handle expand if it's not being pasted into a table
-    // OR if it's nested within another node when being pasted into a table
-    if (!insideTable(state) || !checkExpand(slice)) {
+    const isInsideNestableExpand = isNestingExpandsSupported && !!insideExpand(state);
+
+    // Do not handle expand if it's not being pasted into a table or expand
+    // OR if it's nested within another node when being pasted into a table/expand
+    if (!insideTable(state) && !isInsideNestableExpand || !hasTopLevelExpand(slice)) {
       return false;
     }
     const {

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

@@ -1,7 +1,7 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, PasteContents, PasteTypes } from '@atlaskit/editor-common/analytics';
 import { getLinkDomain, mapSlice } from '@atlaskit/editor-common/utils';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
-import { handleCodeBlock, handleExpandPasteInTable, handleMarkdown, handleMediaSingle, handlePasteAsPlainText, handlePasteIntoCaption, handlePasteIntoTaskOrDecisionOrPanel, handlePasteLinkOnSelectedText, handlePasteNonNestableBlockNodesIntoList, handlePastePanelOrDecisionContentIntoList, handlePastePreservingMarks, handleRichText, handleSelectedTable } from '../handlers';
+import { handleCodeBlock, handleExpandPaste, handleMarkdown, handleMediaSingle, handlePasteAsPlainText, handlePasteIntoCaption, handlePasteIntoTaskOrDecisionOrPanel, handlePasteLinkOnSelectedText, handlePasteNonNestableBlockNodesIntoList, handlePastePanelOrDecisionContentIntoList, handlePastePreservingMarks, handleRichText, handleSelectedTable } from '../handlers';
 import { getPasteSource } from '../util';
 const contentToPasteContent = {
   url: PasteContents.url,
@@ -192,6 +192,7 @@ function createPasteAnalyticsPayloadBySelection(event, slice, pasteContext, plug
         mentionIds.push(node.attrs.id);
         mentionLocalIds.push(node.attrs.localId);
         mentionsInserted.push({
+          type: 'added',
           id: node.attrs.id,
           localId: node.attrs.localId
         });
@@ -304,10 +305,10 @@ export const handlePasteNonNestableBlockNodesIntoListWithAnalytics = editorAnaly
   type: PasteTypes.richText,
   pasteSplitList: true
 }))(handlePasteNonNestableBlockNodesIntoList(slice));
-export const handleExpandWithAnalytics = editorAnalyticsAPI => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handleExpandWithAnalytics = (editorAnalyticsAPI, isNestingExpandsSupported) => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText,
   pasteSplitList: true
-}))(handleExpandPasteInTable(slice));
+}))(handleExpandPaste(slice, isNestingExpandsSupported));
 export const handleSelectedTableWithAnalytics = editorAnalyticsAPI => (view, event, slice) => injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText
 }))(handleSelectedTable(editorAnalyticsAPI)(slice));

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

@@ -11,6 +11,7 @@ import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes } from '../actions';
 import { splitParagraphs, upgradeTextToLists } from '../commands';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension } from '../handlers';
@@ -339,7 +340,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$f, _pluginInjectionApi$f2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -394,7 +395,8 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             });
             slice = sliceCopy;
           }
-          if (handleExpandWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
+          const isNestingExpandsSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f === void 0 ? void 0 : (_pluginInjectionApi$f2 = _pluginInjectionApi$f.sharedState.currentState()) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
+          if (handleExpandWithAnalytics(editorAnalyticsAPI, isNestingExpandsSupported)(view, event, slice)(state, dispatch)) {
             return true;
           }
           if (!insideTable(state)) {

package/dist/esm/handlers.js

@@ -24,6 +24,12 @@ import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceFo
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
+var insideExpand = function insideExpand(state) {
+  var _state$schema$nodes = state.schema.nodes,
+    expand = _state$schema$nodes.expand,
+    nestedExpand = _state$schema$nodes.nestedExpand;
+  return hasParentNodeOfType([expand, nestedExpand])(state.selection);
+};
 
 /** Helper type for single arg function */
 
@@ -196,10 +202,10 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
       $to = selection.$to,
       from = selection.from,
       to = selection.to;
-    var _state$schema$nodes = state.schema.nodes,
-      orderedList = _state$schema$nodes.orderedList,
-      bulletList = _state$schema$nodes.bulletList,
-      listItem = _state$schema$nodes.listItem;
+    var _state$schema$nodes2 = state.schema.nodes,
+      orderedList = _state$schema$nodes2.orderedList,
+      bulletList = _state$schema$nodes2.bulletList,
+      listItem = _state$schema$nodes2.listItem;
 
     // Selected nodes
     var selectionParentListItemNode = findParentNodeOfType(listItem)(selection);
@@ -637,7 +643,7 @@ export function handleMediaSingle(inputMethod, insertMediaAsMediaSingle) {
     };
   };
 }
-var checkExpand = function checkExpand(slice) {
+var hasTopLevelExpand = function hasTopLevelExpand(slice) {
   var hasExpand = false;
   slice.content.forEach(function (node) {
     if (node.type.name === 'expand' || node.type.name === 'nestedExpand') {
@@ -666,16 +672,18 @@ export function handleTableContentPasteInBodiedExtension(slice) {
     return false;
   };
 }
-export function handleExpandPasteInTable(slice) {
+export function handleExpandPaste(slice, isNestingExpandsSupported) {
   return function (state, dispatch) {
-    // Do not handle expand if it's not being pasted into a table
-    // OR if it's nested within another node when being pasted into a table
-    if (!insideTable(state) || !checkExpand(slice)) {
+    var isInsideNestableExpand = isNestingExpandsSupported && !!insideExpand(state);
+
+    // Do not handle expand if it's not being pasted into a table or expand
+    // OR if it's nested within another node when being pasted into a table/expand
+    if (!insideTable(state) && !isInsideNestableExpand || !hasTopLevelExpand(slice)) {
       return false;
     }
-    var _state$schema$nodes2 = state.schema.nodes,
-      expand = _state$schema$nodes2.expand,
-      nestedExpand = _state$schema$nodes2.nestedExpand;
+    var _state$schema$nodes3 = state.schema.nodes,
+      expand = _state$schema$nodes3.expand,
+      nestedExpand = _state$schema$nodes3.nestedExpand;
     var tr = state.tr;
     var hasExpand = false;
     var newSlice = mapSlice(slice, function (maybeNode) {
@@ -876,11 +884,11 @@ export function flattenNestedListInSlice(slice) {
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
-    var _state$schema$nodes3 = state.schema.nodes,
-      codeBlock = _state$schema$nodes3.codeBlock,
-      heading = _state$schema$nodes3.heading,
-      paragraph = _state$schema$nodes3.paragraph,
-      panel = _state$schema$nodes3.panel;
+    var _state$schema$nodes4 = state.schema.nodes,
+      codeBlock = _state$schema$nodes4.codeBlock,
+      heading = _state$schema$nodes4.heading,
+      paragraph = _state$schema$nodes4.paragraph,
+      panel = _state$schema$nodes4.panel;
     var selection = state.selection,
       schema = state.schema;
     var firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;

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

@@ -5,7 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, PasteContents, PasteTypes } from '@atlaskit/editor-common/analytics';
 import { getLinkDomain, mapSlice } from '@atlaskit/editor-common/utils';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
-import { handleCodeBlock, handleExpandPasteInTable, handleMarkdown, handleMediaSingle, handlePasteAsPlainText, handlePasteIntoCaption, handlePasteIntoTaskOrDecisionOrPanel, handlePasteLinkOnSelectedText, handlePasteNonNestableBlockNodesIntoList, handlePastePanelOrDecisionContentIntoList, handlePastePreservingMarks, handleRichText, handleSelectedTable } from '../handlers';
+import { handleCodeBlock, handleExpandPaste, handleMarkdown, handleMediaSingle, handlePasteAsPlainText, handlePasteIntoCaption, handlePasteIntoTaskOrDecisionOrPanel, handlePasteLinkOnSelectedText, handlePasteNonNestableBlockNodesIntoList, handlePastePanelOrDecisionContentIntoList, handlePastePreservingMarks, handleRichText, handleSelectedTable } from '../handlers';
 import { getPasteSource } from '../util';
 var contentToPasteContent = {
   url: PasteContents.url,
@@ -185,6 +185,7 @@ function createPasteAnalyticsPayloadBySelection(event, slice, pasteContext, plug
         mentionIds.push(node.attrs.id);
         mentionLocalIds.push(node.attrs.localId);
         mentionsInserted.push({
+          type: 'added',
           id: node.attrs.id,
           localId: node.attrs.localId
         });
@@ -325,12 +326,12 @@ export var handlePasteNonNestableBlockNodesIntoListWithAnalytics = function hand
     }))(handlePasteNonNestableBlockNodesIntoList(slice));
   };
 };
-export var handleExpandWithAnalytics = function handleExpandWithAnalytics(editorAnalyticsAPI) {
+export var handleExpandWithAnalytics = function handleExpandWithAnalytics(editorAnalyticsAPI, isNestingExpandsSupported) {
   return function (view, event, slice) {
     return injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI)(createPasteAnalyticsPayloadBySelection(event, slice, {
       type: PasteTypes.richText,
       pasteSplitList: true
-    }))(handleExpandPasteInTable(slice));
+    }))(handleExpandPaste(slice, isNestingExpandsSupported));
   };
 };
 export var handleSelectedTableWithAnalytics = function handleSelectedTableWithAnalytics(editorAnalyticsAPI) {

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

@@ -13,6 +13,7 @@ import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes } from '../actions';
 import { splitParagraphs, upgradeTextToLists } from '../commands';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension } from '../handlers';
@@ -355,7 +356,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -412,7 +413,8 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             });
             slice = sliceCopy;
           }
-          if (handleExpandWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
+          var isNestingExpandsSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f === void 0 || (_pluginInjectionApi$f = _pluginInjectionApi$f.sharedState.currentState()) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
+          if (handleExpandWithAnalytics(editorAnalyticsAPI, isNestingExpandsSupported)(view, event, slice)(state, dispatch)) {
             return true;
           }
           if (!insideTable(state)) {

package/dist/types/handlers.d.ts

@@ -20,7 +20,7 @@ export declare function handleMacroAutoConvert(text: string, slice: Slice, queue
 export declare function handleCodeBlock(text: string): Command;
 export declare function handleMediaSingle(inputMethod: InputMethodInsertMedia, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined): (slice: Slice) => Command;
 export declare function handleTableContentPasteInBodiedExtension(slice: Slice): Command;
-export declare function handleExpandPasteInTable(slice: Slice): Command;
+export declare function handleExpandPaste(slice: Slice, isNestingExpandsSupported?: boolean): Command;
 export declare function handleMarkdown(markdownSlice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, from?: number, to?: number): Command;
 export declare function handleParagraphBlockMarks(state: EditorState, slice: Slice): Slice;
 /**

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

@@ -31,7 +31,7 @@ export declare const handleMarkdownWithAnalytics: (view: EditorView, event: Clip
 export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handlePastePanelOrDecisionIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, findRootParentListNode: FindRootParentListNode | undefined) => Command;
 export declare const handlePasteNonNestableBlockNodesIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
-export declare const handleExpandWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
+export declare const handleExpandWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported: boolean) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
 export declare const handleSelectedTableWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
 export declare const handlePasteLinkOnSelectedTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType) => Command;
 export declare const createPasteMeasurePayload: ({ view, duration, content, distortedDuration, }: {

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

@@ -20,7 +20,7 @@ export declare function handleMacroAutoConvert(text: string, slice: Slice, queue
 export declare function handleCodeBlock(text: string): Command;
 export declare function handleMediaSingle(inputMethod: InputMethodInsertMedia, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined): (slice: Slice) => Command;
 export declare function handleTableContentPasteInBodiedExtension(slice: Slice): Command;
-export declare function handleExpandPasteInTable(slice: Slice): Command;
+export declare function handleExpandPaste(slice: Slice, isNestingExpandsSupported?: boolean): Command;
 export declare function handleMarkdown(markdownSlice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, from?: number, to?: number): Command;
 export declare function handleParagraphBlockMarks(state: EditorState, slice: Slice): Slice;
 /**

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

@@ -31,7 +31,7 @@ export declare const handleMarkdownWithAnalytics: (view: EditorView, event: Clip
 export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handlePastePanelOrDecisionIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, findRootParentListNode: FindRootParentListNode | undefined) => Command;
 export declare const handlePasteNonNestableBlockNodesIntoListWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
-export declare const handleExpandWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
+export declare const handleExpandWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported: boolean) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
 export declare const handleSelectedTableWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;
 export declare const handlePasteLinkOnSelectedTextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType) => Command;
 export declare const createPasteMeasurePayload: ({ view, duration, content, distortedDuration, }: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "1.10.1",
+	"version": "1.11.1",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^88.0.0",
+		"@atlaskit/editor-common": "^88.2.0",
 		"@atlaskit/editor-markdown-transformer": "^5.11.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "^1.19.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-list": "^3.8.0",
 		"@atlaskit/editor-plugin-media": "^1.29.0",
-		"@atlaskit/editor-plugin-mentions": "^2.4.0",
+		"@atlaskit/editor-plugin-mentions": "^2.5.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/media-client": "^27.5.0",
@@ -58,7 +58,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-schema": "^40.8.1",
-		"@atlaskit/editor-plugin-block-type": "^3.13.0",
+		"@atlaskit/editor-plugin-block-type": "^3.14.0",
 		"@atlaskit/editor-plugin-history": "^1.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.8.0",
 		"@atlaskit/ssr": "*",
@@ -118,6 +118,9 @@
 		},
 		"editor_inline_comments_paste_insert_nodes": {
 			"type": "boolean"
+		},
+		"platform_editor_nest_nested_expand_in_expand_jira": {
+			"type": "boolean"
 		}
 	}
 }