@atlaskit/editor-plugin-paste 1.11.2 → 1.11.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.11.3
+
+### Patch Changes
+
+- [#135903](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/135903)
+  [`42636c7a806fb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/42636c7a806fb) -
+  [ux] [ED-24525] Fix paste for media nested in blockquotes from external editor. Before it was
+  missing quote on paste, now it includes the quote.
+- Updated dependencies
+
 ## 1.11.2
 
 ### Patch Changes

package/dist/cjs/edge-cases/index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertSliceForLists = insertSliceForLists;
-exports.insertSliceForListsInsideBlockquote = insertSliceForListsInsideBlockquote;
 exports.insertSliceForTaskInsideList = insertSliceForTaskInsideList;
+exports.insertSliceInsideBlockquote = insertSliceInsideBlockquote;
 exports.updateSelectionAfterReplace = updateSelectionAfterReplace;
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
@@ -67,7 +67,7 @@ function insertSliceForLists(_ref) {
   }
   tr.replaceSelection(slice);
 }
-function insertSliceForListsInsideBlockquote(_ref3) {
+function insertSliceInsideBlockquote(_ref3) {
   var tr = _ref3.tr,
     slice = _ref3.slice;
   //insert blockquote explicitly and set the selection in blockquote since replaceSelection will only insert the list

package/dist/cjs/handlers.js

@@ -295,7 +295,7 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
 
     // handle the insertion of the slice
     if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type.name) === 'blockquote' && (0, _utils2.contains)(slice.content.firstChild, state.schema.nodes.listItem)) {
-      (0, _edgeCases.insertSliceForListsInsideBlockquote)({
+      (0, _edgeCases.insertSliceInsideBlockquote)({
         tr: tr,
         slice: slice
       });
@@ -951,9 +951,9 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       });
     } 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'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {
-        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
-        (0, _edgeCases.insertSliceForListsInsideBlockquote)({
+      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)) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist or mediaSingle
+        (0, _edgeCases.insertSliceInsideBlockquote)({
           tr: tr,
           slice: slice
         });

package/dist/cjs/plugins/media.js

@@ -128,7 +128,7 @@ var transformSliceToMediaSingleWithNewExperience = exports.transformSliceToMedia
 var isElementInvisible = function isElementInvisible(element) {
   return element.style.opacity === '0' || element.style.display === 'none' || element.style.visibility === 'hidden';
 };
-var VALID_TAGS_CONTAINER = ['DIV', 'TD'];
+var VALID_TAGS_CONTAINER = ['DIV', 'TD', 'BLOCKQUOTE'];
 function canContainImage(element) {
   if (!element) {
     return false;

package/dist/es2019/edge-cases/index.js

@@ -63,7 +63,7 @@ export function insertSliceForLists({
   }
   tr.replaceSelection(slice);
 }
-export function insertSliceForListsInsideBlockquote({
+export function insertSliceInsideBlockquote({
   tr,
   slice
 }) {

package/dist/es2019/handlers.js

@@ -12,7 +12,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
-import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceForTaskInsideList } from './edge-cases';
+import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
@@ -274,7 +274,7 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
 
     // handle the insertion of the slice
     if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
-      insertSliceForListsInsideBlockquote({
+      insertSliceInsideBlockquote({
         tr,
         slice
       });
@@ -929,9 +929,9 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
     } 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'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {
-        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
-        insertSliceForListsInsideBlockquote({
+      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)) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist or mediaSingle
+        insertSliceInsideBlockquote({
           tr,
           slice
         });

package/dist/es2019/plugins/media.js

@@ -125,7 +125,7 @@ export const transformSliceToMediaSingleWithNewExperience = (slice, schema) => {
 const isElementInvisible = element => {
   return element.style.opacity === '0' || element.style.display === 'none' || element.style.visibility === 'hidden';
 };
-const VALID_TAGS_CONTAINER = ['DIV', 'TD'];
+const VALID_TAGS_CONTAINER = ['DIV', 'TD', 'BLOCKQUOTE'];
 function canContainImage(element) {
   if (!element) {
     return false;

package/dist/esm/edge-cases/index.js

@@ -58,7 +58,7 @@ export function insertSliceForLists(_ref) {
   }
   tr.replaceSelection(slice);
 }
-export function insertSliceForListsInsideBlockquote(_ref3) {
+export function insertSliceInsideBlockquote(_ref3) {
   var tr = _ref3.tr,
     slice = _ref3.slice;
   //insert blockquote explicitly and set the selection in blockquote since replaceSelection will only insert the list

package/dist/esm/handlers.js

@@ -20,7 +20,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
-import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceForTaskInsideList } from './edge-cases';
+import { insertSliceForLists, insertSliceForTaskInsideList, insertSliceInsideBlockquote } from './edge-cases';
 import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
@@ -271,7 +271,7 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
 
     // handle the insertion of the slice
     if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
-      insertSliceForListsInsideBlockquote({
+      insertSliceInsideBlockquote({
         tr: tr,
         slice: slice
       });
@@ -927,9 +927,9 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
     } 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'].includes(firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co2 = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co2 === void 0 ? void 0 : _firstChildOfSlice$co2.type.name)) {
-        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
-        insertSliceForListsInsideBlockquote({
+      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)) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist or mediaSingle
+        insertSliceInsideBlockquote({
           tr: tr,
           slice: slice
         });

package/dist/esm/plugins/media.js

@@ -120,7 +120,7 @@ export var transformSliceToMediaSingleWithNewExperience = function transformSlic
 var isElementInvisible = function isElementInvisible(element) {
   return element.style.opacity === '0' || element.style.display === 'none' || element.style.visibility === 'hidden';
 };
-var VALID_TAGS_CONTAINER = ['DIV', 'TD'];
+var VALID_TAGS_CONTAINER = ['DIV', 'TD', 'BLOCKQUOTE'];
 function canContainImage(element) {
   if (!element) {
     return false;

package/dist/types/edge-cases/index.d.ts

@@ -5,7 +5,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
     slice: PMSlice;
     schema: Schema;
 }): void | Transaction;
-export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
+export declare function insertSliceInsideBlockquote({ tr, slice, }: {
     tr: Transaction;
     slice: PMSlice;
 }): void;

package/dist/types-ts4.5/edge-cases/index.d.ts

@@ -5,7 +5,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
     slice: PMSlice;
     schema: Schema;
 }): void | Transaction;
-export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
+export declare function insertSliceInsideBlockquote({ tr, slice, }: {
     tr: Transaction;
     slice: PMSlice;
 }): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "1.11.2",
+	"version": "1.11.3",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -10,8 +10,6 @@
 	"atlassian": {
 		"team": "Editor: Lego",
 		"singleton": true,
-		"inPublicMirror": false,
-		"releaseModel": "continuous",
 		"runReact18": false
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
@@ -33,19 +31,19 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^88.2.0",
-		"@atlaskit/editor-markdown-transformer": "^5.11.0",
+		"@atlaskit/editor-common": "^88.7.0",
+		"@atlaskit/editor-markdown-transformer": "^5.12.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "^1.19.0",
 		"@atlaskit/editor-plugin-better-type-history": "^1.8.0",
-		"@atlaskit/editor-plugin-card": "^2.13.0",
+		"@atlaskit/editor-plugin-card": "^2.14.0",
 		"@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.5.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/media-client": "^27.5.0",
+		"@atlaskit/media-client": "^27.6.0",
 		"@atlaskit/media-common": "^11.4.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@babel/runtime": "^7.0.0",