@atlaskit/editor-plugin-paste 1.12.4 → 1.12.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.12.5
+
+### Patch Changes
+
+- [#143700](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/143700)
+  [`9ef9b7e3bc1d7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9ef9b7e3bc1d7) -
+  [ux] [ED-24868] Paste gating for codeblock and media in quotes.
+- Updated dependencies
+
 ## 1.12.4
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -41,6 +41,7 @@ var _utils3 = require("@atlaskit/editor-tables/utils");
 var _commands = require("./commands");
 var _edgeCases = require("./edge-cases");
 var _lists = require("./edge-cases/lists");
+var _main = require("./pm-plugins/main");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _util = require("./util");
 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; } } }; }
@@ -905,10 +906,11 @@ function flattenNestedListInSlice(slice) {
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new _model.Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-function handleRichText(slice, queueCardsFromChangedTr) {
+function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes4 = state.schema.nodes,
+      blockquote = _state$schema$nodes4.blockquote,
       codeBlock = _state$schema$nodes4.codeBlock,
       heading = _state$schema$nodes4.heading,
       paragraph = _state$schema$nodes4.paragraph,
@@ -943,12 +945,25 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     var noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
     var panelParentOverCurrentSelection = (0, _utils2.findParentNodeOfType)(panel)(tr.selection);
     var isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
+    var sliceContainsCodeblockOrMedia = false;
+    var codeBlockAndMediaNodes = ['codeBlock', 'mediaSingle', 'mediaGroup'];
+    slice.content.forEach(function (child) {
+      if (codeBlockAndMediaNodes.includes(child.type.name)) {
+        sliceContainsCodeblockOrMedia = true;
+      }
+    });
+    var blockquoteNode = (0, _utils2.findParentNodeOfType)(blockquote)(tr.selection);
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       (0, _edgeCases.insertSliceForLists)({
         tr: tr,
         slice: slice,
         schema: schema
       });
+    } else if (
+    // If nesting media or codeblock in blockquote is not supported
+    // we want to insert slice after the blockquote.
+    (0, _main.isInsideBlockQuote)(state) && sliceContainsCodeblockOrMedia && !isNestingMediaOrCodeblockSupported && blockquoteNode) {
+      tr = (0, _utils2.safeInsert)(slice.content, blockquoteNode.start + blockquoteNode.node.nodeSize - 1)(tr);
     } else if (noNeedForSafeInsert) {
       var _firstChildOfSlice$ty2, _firstChildOfSlice$co, _firstChildOfSlice$co2;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co !== void 0 && _firstChildOfSlice$co.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {

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

@@ -314,11 +314,11 @@ var handleMarkdownWithAnalytics = exports.handleMarkdownWithAnalytics = function
     type: _analytics.PasteTypes.markdown
   }))((0, _handlers.handleMarkdown)(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 || (_pluginInjectionApi$c3 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.queueCardsFromChangedTr));
 };
-var handleRichTextWithAnalytics = exports.handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi) {
+var handleRichTextWithAnalytics = exports.handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported) {
   var _pluginInjectionApi$a4, _pluginInjectionApi$c4;
   return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: _analytics.PasteTypes.richText
-  }, pluginInjectionApi))((0, _handlers.handleRichText)(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr));
+  }, pluginInjectionApi))((0, _handlers.handleRichText)(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported));
 };
 var injectAnalyticsPayloadBeforeCommand = function injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI) {
   return function (createPayloadByTransaction) {

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

@@ -173,8 +173,11 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           /**
            * We want to return false for external copied image to allow
            * it to be uploaded by the client.
+           *
+           * Scenario where we are pasting an external image inside a block quote
+           * is skipped and handled in handleRichText
            */
-          if ((0, _util.htmlContainsSingleFile)(html)) {
+          if ((0, _util.htmlContainsSingleFile)(html) && !isInsideBlockQuote(view.state)) {
             return true;
           }
 
@@ -370,7 +373,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l, _pluginInjectionApi$f2;
           // 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)) {
@@ -447,7 +450,8 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           if ((0, _analytics2.handlePasteNonNestableBlockNodesIntoListWithAnalytics)(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          return (0, _analytics2.handleRichTextWithAnalytics)(view, event, slice, pluginInjectionApi)(state, dispatch);
+          var isNestingMediaOrCodeblockSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.sharedState.currentState()) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.nestMediaAndCodeblockInQuote) || (0, _platformFeatureFlags.fg)('editor_nest_media_and_codeblock_in_quotes_jira');
+          return (0, _analytics2.handleRichTextWithAnalytics)(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported)(state, dispatch);
         }
         return false;
       },

package/dist/es2019/handlers.js

@@ -14,6 +14,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
+import { isInsideBlockQuote } from './pm-plugins/main';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
 const insideExpand = state => {
@@ -880,10 +881,11 @@ export function flattenNestedListInSlice(slice) {
   const contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function handleRichText(slice, queueCardsFromChangedTr) {
+export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported) {
   return (state, dispatch) => {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     const {
+      blockquote,
       codeBlock,
       heading,
       paragraph,
@@ -921,12 +923,25 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     const noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
     let panelParentOverCurrentSelection = findParentNodeOfType(panel)(tr.selection);
     const isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
+    let sliceContainsCodeblockOrMedia = false;
+    const codeBlockAndMediaNodes = ['codeBlock', 'mediaSingle', 'mediaGroup'];
+    slice.content.forEach(child => {
+      if (codeBlockAndMediaNodes.includes(child.type.name)) {
+        sliceContainsCodeblockOrMedia = true;
+      }
+    });
+    const blockquoteNode = findParentNodeOfType(blockquote)(tr.selection);
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       insertSliceForLists({
         tr,
         slice,
         schema
       });
+    } else if (
+    // If nesting media or codeblock in blockquote is not supported
+    // we want to insert slice after the blockquote.
+    isInsideBlockQuote(state) && sliceContainsCodeblockOrMedia && !isNestingMediaOrCodeblockSupported && blockquoteNode) {
+      tr = safeInsert(slice.content, blockquoteNode.start + blockquoteNode.node.nodeSize - 1)(tr);
     } else if (noNeedForSafeInsert) {
       var _firstChildOfSlice$ty2, _firstChildOfSlice$co, _firstChildOfSlice$co2;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co !== void 0 && _firstChildOfSlice$co.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {

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

@@ -291,11 +291,11 @@ export const handleMarkdownWithAnalytics = (view, event, slice, pluginInjectionA
     type: PasteTypes.markdown
   }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c5 = pluginInjectionApi.card) === null || _pluginInjectionApi$c5 === void 0 ? void 0 : (_pluginInjectionApi$c6 = _pluginInjectionApi$c5.actions) === null || _pluginInjectionApi$c6 === void 0 ? void 0 : _pluginInjectionApi$c6.queueCardsFromChangedTr));
 };
-export const handleRichTextWithAnalytics = (view, event, slice, pluginInjectionApi) => {
+export const handleRichTextWithAnalytics = (view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported) => {
   var _pluginInjectionApi$a4, _pluginInjectionApi$c7, _pluginInjectionApi$c8;
   return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c7 = pluginInjectionApi.card) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : (_pluginInjectionApi$c8 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c8 === void 0 ? void 0 : _pluginInjectionApi$c8.queueCardsFromChangedTr));
+  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c7 = pluginInjectionApi.card) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : (_pluginInjectionApi$c8 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c8 === void 0 ? void 0 : _pluginInjectionApi$c8.queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported));
 };
 const injectAnalyticsPayloadBeforeCommand = editorAnalyticsAPI => createPayloadByTransaction => {
   return mainCommand => {

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

@@ -137,8 +137,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           /**
            * We want to return false for external copied image to allow
            * it to be uploaded by the client.
+           *
+           * Scenario where we are pasting an external image inside a block quote
+           * is skipped and handled in handleRichText
            */
-          if (htmlContainsSingleFile(html)) {
+          if (htmlContainsSingleFile(html) && !isInsideBlockQuote(view.state)) {
             return true;
           }
 
@@ -341,7 +344,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$f, _pluginInjectionApi$f2, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$f, _pluginInjectionApi$f2, _pluginInjectionApi$l, _pluginInjectionApi$f3, _pluginInjectionApi$f4;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -416,7 +419,8 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (handlePasteNonNestableBlockNodesIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);
+          const isNestingMediaOrCodeblockSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.sharedState.currentState()) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
+          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported)(state, dispatch);
         }
         return false;
       },

package/dist/esm/handlers.js

@@ -22,6 +22,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
+import { isInsideBlockQuote } from './pm-plugins/main';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
 var insideExpand = function insideExpand(state) {
@@ -881,10 +882,11 @@ export function flattenNestedListInSlice(slice) {
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function handleRichText(slice, queueCardsFromChangedTr) {
+export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported) {
   return function (state, dispatch) {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes4 = state.schema.nodes,
+      blockquote = _state$schema$nodes4.blockquote,
       codeBlock = _state$schema$nodes4.codeBlock,
       heading = _state$schema$nodes4.heading,
       paragraph = _state$schema$nodes4.paragraph,
@@ -919,12 +921,25 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     var noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
     var panelParentOverCurrentSelection = findParentNodeOfType(panel)(tr.selection);
     var isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
+    var sliceContainsCodeblockOrMedia = false;
+    var codeBlockAndMediaNodes = ['codeBlock', 'mediaSingle', 'mediaGroup'];
+    slice.content.forEach(function (child) {
+      if (codeBlockAndMediaNodes.includes(child.type.name)) {
+        sliceContainsCodeblockOrMedia = true;
+      }
+    });
+    var blockquoteNode = findParentNodeOfType(blockquote)(tr.selection);
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       insertSliceForLists({
         tr: tr,
         slice: slice,
         schema: schema
       });
+    } else if (
+    // If nesting media or codeblock in blockquote is not supported
+    // we want to insert slice after the blockquote.
+    isInsideBlockQuote(state) && sliceContainsCodeblockOrMedia && !isNestingMediaOrCodeblockSupported && blockquoteNode) {
+      tr = safeInsert(slice.content, blockquoteNode.start + blockquoteNode.node.nodeSize - 1)(tr);
     } else if (noNeedForSafeInsert) {
       var _firstChildOfSlice$ty2, _firstChildOfSlice$co, _firstChildOfSlice$co2;
       if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && firstChildOfSlice !== null && firstChildOfSlice !== void 0 && (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) !== null && _firstChildOfSlice$co !== void 0 && _firstChildOfSlice$co.type.name && ['bulletList', 'orderedList', 'mediaSingle'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {

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

@@ -302,11 +302,11 @@ export var handleMarkdownWithAnalytics = function handleMarkdownWithAnalytics(vi
     type: PasteTypes.markdown
   }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 || (_pluginInjectionApi$c3 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.queueCardsFromChangedTr));
 };
-export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi) {
+export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported) {
   var _pluginInjectionApi$a4, _pluginInjectionApi$c4;
   return injectAnalyticsPayloadBeforeCommand(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr));
+  }, pluginInjectionApi))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.card) === null || _pluginInjectionApi$c4 === void 0 || (_pluginInjectionApi$c4 = _pluginInjectionApi$c4.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, isNestingMediaOrCodeblockSupported));
 };
 var injectAnalyticsPayloadBeforeCommand = function injectAnalyticsPayloadBeforeCommand(editorAnalyticsAPI) {
   return function (createPayloadByTransaction) {

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

@@ -160,8 +160,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           /**
            * We want to return false for external copied image to allow
            * it to be uploaded by the client.
+           *
+           * Scenario where we are pasting an external image inside a block quote
+           * is skipped and handled in handleRichText
            */
-          if (htmlContainsSingleFile(html)) {
+          if (htmlContainsSingleFile(html) && !isInsideBlockQuote(view.state)) {
             return true;
           }
 
@@ -357,7 +360,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText || isNestedMarkdownTable) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$f, _pluginInjectionApi$l, _pluginInjectionApi$f2;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -434,7 +437,8 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (handlePasteNonNestableBlockNodesIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice)(state, dispatch)) {
             return true;
           }
-          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);
+          var isNestingMediaOrCodeblockSupported = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.featureFlags) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.sharedState.currentState()) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
+          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi, isNestingMediaOrCodeblockSupported)(state, dispatch);
         }
         return false;
       },

package/dist/types/handlers.d.ts

@@ -51,7 +51,7 @@ export declare function handleParagraphBlockMarks(state: EditorState, slice: Sli
  *     ┗━p -> "two"
  */
 export declare function flattenNestedListInSlice(slice: Slice): Slice;
-export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined): Command;
+export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, isNestingMediaOrCodeblockSupported?: boolean): Command;
 export declare function handlePasteIntoCaption(slice: Slice): Command;
 export declare const handleSelectedTable: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (slice: Slice) => Command;
 export declare function checkTaskListInList(state: EditorState, slice: Slice): boolean;

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

@@ -28,7 +28,7 @@ export declare const handleCodeBlockWithAnalytics: (editorAnalyticsAPI: EditorAn
 export declare const handleMediaSingleWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined) => Command;
 export declare const handlePastePreservingMarksWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handleMarkdownWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
-export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
+export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined, isNestingMediaOrCodeblockSupported: boolean) => 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, isNestingExpandsSupported: boolean) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;

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

@@ -51,7 +51,7 @@ export declare function handleParagraphBlockMarks(state: EditorState, slice: Sli
  *     ┗━p -> "two"
  */
 export declare function flattenNestedListInSlice(slice: Slice): Slice;
-export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined): Command;
+export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, isNestingMediaOrCodeblockSupported?: boolean): Command;
 export declare function handlePasteIntoCaption(slice: Slice): Command;
 export declare const handleSelectedTable: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (slice: Slice) => Command;
 export declare function checkTaskListInList(state: EditorState, slice: Slice): boolean;

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

@@ -28,7 +28,7 @@ export declare const handleCodeBlockWithAnalytics: (editorAnalyticsAPI: EditorAn
 export declare const handleMediaSingleWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined) => Command;
 export declare const handlePastePreservingMarksWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, type: PasteType, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
 export declare const handleMarkdownWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
-export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined) => Command;
+export declare const handleRichTextWithAnalytics: (view: EditorView, event: ClipboardEvent, slice: Slice, pluginInjectionApi: ExtractInjectionAPI<PastePlugin> | undefined, isNestingMediaOrCodeblockSupported: boolean) => 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, isNestingExpandsSupported: boolean) => (view: EditorView, event: ClipboardEvent, slice: Slice) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "1.12.4",
+	"version": "1.12.5",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^90.0.0",
+		"@atlaskit/editor-common": "^91.0.0",
 		"@atlaskit/editor-markdown-transformer": "^5.12.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "^1.19.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-plugin-card": "^3.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-list": "^3.8.0",
-		"@atlaskit/editor-plugin-media": "^1.31.0",
+		"@atlaskit/editor-plugin-media": "^1.32.0",
 		"@atlaskit/editor-plugin-mentions": "^2.6.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-tables": "^2.8.0",
@@ -120,6 +120,9 @@
 		},
 		"platform_editor_nest_nested_expand_in_expand_jira": {
 			"type": "boolean"
+		},
+		"editor_nest_media_and_codeblock_in_quotes_jira": {
+			"type": "boolean"
 		}
 	}
 }

package/.eslintrc.js

@@ -1,18 +0,0 @@
-module.exports = {
-	rules: {
-		'@typescript-eslint/no-duplicate-imports': 'error',
-		'@typescript-eslint/no-explicit-any': 'error',
-		'@typescript-eslint/ban-types': [
-			'error',
-			{
-				types: {
-					'React.FC':
-						'Please use types directly on props instead, and explicitly define children if required',
-					'React.FunctionalComponent':
-						'Please use types directly on props instead, and explicitly define children if required',
-				},
-				extendDefaults: false,
-			},
-		],
-	},
-};