@atlaskit/editor-plugin-paste 2.0.16 → 2.0.18

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-paste
 
+## 2.0.18
+
+### Patch Changes
+
+- [#102971](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102971)
+  [`a87c6952a44b1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a87c6952a44b1) -
+  ED-25451 Support copy of media caption and fix range error when pasting a caption into another
+  caption
+- Updated dependencies
+
+## 2.0.17
+
+### Patch Changes
+
+- [#102478](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102478)
+  [`e14c5f9596217`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e14c5f9596217) -
+  Calling media trackMediaPaste command to enable the tracking of out of editor media paste to
+  enable deep copy when media copy scope is set to "editor"
+- Updated dependencies
+
 ## 2.0.16
 
 ### Patch Changes

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

@@ -282,6 +282,18 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if ((0, _analytics2.handlePasteAsPlainTextWithAnalytics)(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
         }
+        if ((0, _platformFeatureFlags.fg)('platform_editor_fix_captions_on_copy')) {
+          if ((0, _analytics2.handlePasteIntoCaptionWithAnalytics)(editorAnalyticsAPI)(view, event, slice, _analytics.PasteTypes.richText)(state, dispatch)) {
+            // Create a custom handler to avoid handling with handleRichText method
+            // As SafeInsert is used inside handleRichText which caused some bad UX like this:
+            // https://product-fabric.atlassian.net/browse/MEX-1520
+
+            // Converting caption to plain text needs to be handled before transformSliceForMedia
+            // as createChecked will fail when trying to create a mediaSingle node with a caption
+            // that is not plain text.
+            return true;
+          }
+        }
 
         // transform slices based on destination
         slice = (0, _media.transformSliceForMedia)(slice, schema)(state.selection);
@@ -445,12 +457,13 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           if (!(0, _coreUtils.insideTable)(state)) {
             slice = (0, _transforms.transformSliceNestedExpandToExpand)(slice, state.schema);
           }
-
-          // Create a custom handler to avoid handling with handleRichText method
-          // As SafeInsert is used inside handleRichText which caused some bad UX like this:
-          // https://product-fabric.atlassian.net/browse/MEX-1520
-          if ((0, _analytics2.handlePasteIntoCaptionWithAnalytics)(editorAnalyticsAPI)(view, event, slice, _analytics.PasteTypes.richText)(state, dispatch)) {
-            return true;
+          if (!(0, _platformFeatureFlags.fg)('platform_editor_fix_captions_on_copy')) {
+            if ((0, _analytics2.handlePasteIntoCaptionWithAnalytics)(editorAnalyticsAPI)(view, event, slice, _analytics.PasteTypes.richText)(state, dispatch)) {
+              // Create a custom handler to avoid handling with handleRichText method
+              // As SafeInsert is used inside handleRichText which caused some bad UX like this:
+              // https://product-fabric.atlassian.net/browse/MEX-1520
+              return true;
+            }
           }
           if ((0, _analytics2.handlePastePanelOrDecisionIntoListWithAnalytics)(editorAnalyticsAPI)(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$l = pluginInjectionApi.list) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.findRootParentListNode)(state, dispatch)) {
             return true;
@@ -475,7 +488,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         }
         slice = (0, _transforms.transformSingleLineCodeBlockToCodeMark)(slice, schema);
         slice = (0, _media.transformSliceToCorrectMediaWrapper)(slice, schema);
-        slice = (0, _media.transformSliceToMediaSingleWithNewExperience)(slice, schema);
+        slice = (0, _media.transformSliceToMediaSingleWithNewExperience)(slice, schema, pluginInjectionApi);
         slice = (0, _transforms.transformSliceToDecisionList)(slice, schema);
 
         // splitting linebreaks into paragraphs must happen before upgrading text to lists

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

@@ -83,7 +83,7 @@ var transformSliceToCorrectMediaWrapper = exports.transformSliceToCorrectMediaWr
  * Because width may not be available when transform, DEFAULT_IMAGE_WIDTH is used as a fallback
  *
  */
-var transformSliceToMediaSingleWithNewExperience = exports.transformSliceToMediaSingleWithNewExperience = function transformSliceToMediaSingleWithNewExperience(slice, schema) {
+var transformSliceToMediaSingleWithNewExperience = exports.transformSliceToMediaSingleWithNewExperience = function transformSliceToMediaSingleWithNewExperience(slice, schema, api) {
   var _schema$nodes3 = schema.nodes,
     mediaInline = _schema$nodes3.mediaInline,
     mediaSingle = _schema$nodes3.mediaSingle,
@@ -107,12 +107,16 @@ var transformSliceToMediaSingleWithNewExperience = exports.transformSliceToMedia
   return (0, _utils.mapSlice)(newSlice, function (node) {
     var __mediaTraceId = (0, _mediaCommon.getRandomHex)(8);
     if (node.type === media) {
+      var _api$media;
+      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$media = api.media) === null || _api$media === void 0 ? void 0 : _api$media.commands.trackMediaPaste(node.attrs));
       return media.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
         __external: node.attrs.type === 'external',
         __mediaTraceId: node.attrs.type === 'external' ? null : __mediaTraceId
       }), node.content, node.marks);
     }
     if (node.type.name === 'mediaInline') {
+      var _api$media2;
+      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$media2 = api.media) === null || _api$media2 === void 0 ? void 0 : _api$media2.commands.trackMediaPaste(node.attrs));
       return mediaInline.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
         __mediaTraceId: __mediaTraceId
       }), node.content, node.marks);

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

@@ -256,6 +256,18 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
         }
+        if (fg('platform_editor_fix_captions_on_copy')) {
+          if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+            // Create a custom handler to avoid handling with handleRichText method
+            // As SafeInsert is used inside handleRichText which caused some bad UX like this:
+            // https://product-fabric.atlassian.net/browse/MEX-1520
+
+            // Converting caption to plain text needs to be handled before transformSliceForMedia
+            // as createChecked will fail when trying to create a mediaSingle node with a caption
+            // that is not plain text.
+            return true;
+          }
+        }
 
         // transform slices based on destination
         slice = transformSliceForMedia(slice, schema)(state.selection);
@@ -419,12 +431,13 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (!insideTable(state)) {
             slice = transformSliceNestedExpandToExpand(slice, state.schema);
           }
-
-          // Create a custom handler to avoid handling with handleRichText method
-          // As SafeInsert is used inside handleRichText which caused some bad UX like this:
-          // https://product-fabric.atlassian.net/browse/MEX-1520
-          if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
-            return true;
+          if (!fg('platform_editor_fix_captions_on_copy')) {
+            if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+              // Create a custom handler to avoid handling with handleRichText method
+              // As SafeInsert is used inside handleRichText which caused some bad UX like this:
+              // https://product-fabric.atlassian.net/browse/MEX-1520
+              return true;
+            }
           }
           if (handlePastePanelOrDecisionIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$l = pluginInjectionApi.list) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.findRootParentListNode)(state, dispatch)) {
             return true;
@@ -449,7 +462,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
         slice = transformSingleLineCodeBlockToCodeMark(slice, schema);
         slice = transformSliceToCorrectMediaWrapper(slice, schema);
-        slice = transformSliceToMediaSingleWithNewExperience(slice, schema);
+        slice = transformSliceToMediaSingleWithNewExperience(slice, schema, pluginInjectionApi);
         slice = transformSliceToDecisionList(slice, schema);
 
         // splitting linebreaks into paragraphs must happen before upgrading text to lists

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

@@ -3,7 +3,6 @@ import { mapSlice, removeNestedEmptyEls, unwrap, walkUpTreeUntil } from '@atlask
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getRandomHex } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
-
 /**
  * Ensure correct layout in nested mode
  *
@@ -77,7 +76,7 @@ export const transformSliceToCorrectMediaWrapper = (slice, schema) => {
  * Because width may not be available when transform, DEFAULT_IMAGE_WIDTH is used as a fallback
  *
  */
-export const transformSliceToMediaSingleWithNewExperience = (slice, schema) => {
+export const transformSliceToMediaSingleWithNewExperience = (slice, schema, api) => {
   const {
     mediaInline,
     mediaSingle,
@@ -102,6 +101,8 @@ export const transformSliceToMediaSingleWithNewExperience = (slice, schema) => {
   return mapSlice(newSlice, node => {
     const __mediaTraceId = getRandomHex(8);
     if (node.type === media) {
+      var _api$media;
+      api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$media = api.media) === null || _api$media === void 0 ? void 0 : _api$media.commands.trackMediaPaste(node.attrs));
       return media.createChecked({
         ...node.attrs,
         __external: node.attrs.type === 'external',
@@ -109,6 +110,8 @@ export const transformSliceToMediaSingleWithNewExperience = (slice, schema) => {
       }, node.content, node.marks);
     }
     if (node.type.name === 'mediaInline') {
+      var _api$media2;
+      api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$media2 = api.media) === null || _api$media2 === void 0 ? void 0 : _api$media2.commands.trackMediaPaste(node.attrs));
       return mediaInline.createChecked({
         ...node.attrs,
         __mediaTraceId

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

@@ -274,6 +274,18 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (handlePasteAsPlainTextWithAnalytics(editorAnalyticsAPI)(view, event, plainTextPasteSlice)(state, dispatch, view)) {
           return true;
         }
+        if (fg('platform_editor_fix_captions_on_copy')) {
+          if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+            // Create a custom handler to avoid handling with handleRichText method
+            // As SafeInsert is used inside handleRichText which caused some bad UX like this:
+            // https://product-fabric.atlassian.net/browse/MEX-1520
+
+            // Converting caption to plain text needs to be handled before transformSliceForMedia
+            // as createChecked will fail when trying to create a mediaSingle node with a caption
+            // that is not plain text.
+            return true;
+          }
+        }
 
         // transform slices based on destination
         slice = transformSliceForMedia(slice, schema)(state.selection);
@@ -437,12 +449,13 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (!insideTable(state)) {
             slice = transformSliceNestedExpandToExpand(slice, state.schema);
           }
-
-          // Create a custom handler to avoid handling with handleRichText method
-          // As SafeInsert is used inside handleRichText which caused some bad UX like this:
-          // https://product-fabric.atlassian.net/browse/MEX-1520
-          if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
-            return true;
+          if (!fg('platform_editor_fix_captions_on_copy')) {
+            if (handlePasteIntoCaptionWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+              // Create a custom handler to avoid handling with handleRichText method
+              // As SafeInsert is used inside handleRichText which caused some bad UX like this:
+              // https://product-fabric.atlassian.net/browse/MEX-1520
+              return true;
+            }
           }
           if (handlePastePanelOrDecisionIntoListWithAnalytics(editorAnalyticsAPI)(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$l = pluginInjectionApi.list) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.findRootParentListNode)(state, dispatch)) {
             return true;
@@ -467,7 +480,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         }
         slice = transformSingleLineCodeBlockToCodeMark(slice, schema);
         slice = transformSliceToCorrectMediaWrapper(slice, schema);
-        slice = transformSliceToMediaSingleWithNewExperience(slice, schema);
+        slice = transformSliceToMediaSingleWithNewExperience(slice, schema, pluginInjectionApi);
         slice = transformSliceToDecisionList(slice, schema);
 
         // splitting linebreaks into paragraphs must happen before upgrading text to lists

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

@@ -6,7 +6,6 @@ import { mapSlice, removeNestedEmptyEls, unwrap, walkUpTreeUntil } from '@atlask
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getRandomHex } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
-
 /**
  * Ensure correct layout in nested mode
  *
@@ -75,7 +74,7 @@ export var transformSliceToCorrectMediaWrapper = function transformSliceToCorrec
  * Because width may not be available when transform, DEFAULT_IMAGE_WIDTH is used as a fallback
  *
  */
-export var transformSliceToMediaSingleWithNewExperience = function transformSliceToMediaSingleWithNewExperience(slice, schema) {
+export var transformSliceToMediaSingleWithNewExperience = function transformSliceToMediaSingleWithNewExperience(slice, schema, api) {
   var _schema$nodes3 = schema.nodes,
     mediaInline = _schema$nodes3.mediaInline,
     mediaSingle = _schema$nodes3.mediaSingle,
@@ -99,12 +98,16 @@ export var transformSliceToMediaSingleWithNewExperience = function transformSlic
   return mapSlice(newSlice, function (node) {
     var __mediaTraceId = getRandomHex(8);
     if (node.type === media) {
+      var _api$media;
+      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$media = api.media) === null || _api$media === void 0 ? void 0 : _api$media.commands.trackMediaPaste(node.attrs));
       return media.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
         __external: node.attrs.type === 'external',
         __mediaTraceId: node.attrs.type === 'external' ? null : __mediaTraceId
       }), node.content, node.marks);
     }
     if (node.type.name === 'mediaInline') {
+      var _api$media2;
+      api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$media2 = api.media) === null || _api$media2 === void 0 ? void 0 : _api$media2.commands.trackMediaPaste(node.attrs));
       return mediaInline.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
         __mediaTraceId: __mediaTraceId
       }), node.content, node.marks);

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

@@ -1,5 +1,7 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { PastePlugin } from '../pastePluginType';
 /**
  * Ensure correct layout in nested mode
  *
@@ -13,7 +15,7 @@ export declare const transformSliceToCorrectMediaWrapper: (slice: Slice, schema:
  * Because width may not be available when transform, DEFAULT_IMAGE_WIDTH is used as a fallback
  *
  */
-export declare const transformSliceToMediaSingleWithNewExperience: (slice: Slice, schema: Schema) => Slice;
+export declare const transformSliceToMediaSingleWithNewExperience: (slice: Slice, schema: Schema, api: ExtractInjectionAPI<PastePlugin> | undefined) => Slice;
 /**
  * Given a html string, we attempt to hoist any nested `<img>` tags,
  * not directly wrapped by a `<div>` as ProseMirror no-op's

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

@@ -1,5 +1,7 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { PastePlugin } from '../pastePluginType';
 /**
  * Ensure correct layout in nested mode
  *
@@ -13,7 +15,7 @@ export declare const transformSliceToCorrectMediaWrapper: (slice: Slice, schema:
  * Because width may not be available when transform, DEFAULT_IMAGE_WIDTH is used as a fallback
  *
  */
-export declare const transformSliceToMediaSingleWithNewExperience: (slice: Slice, schema: Schema) => Slice;
+export declare const transformSliceToMediaSingleWithNewExperience: (slice: Slice, schema: Schema, api: ExtractInjectionAPI<PastePlugin> | undefined) => Slice;
 /**
  * Given a html string, we attempt to hoist any nested `<img>` tags,
  * not directly wrapped by a `<div>` as ProseMirror no-op's

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.0.16",
+	"version": "2.0.18",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,8 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^99.1.0",
+		"@atlaskit/adf-schema": "^46.1.0",
+		"@atlaskit/editor-common": "^99.3.0",
 		"@atlaskit/editor-markdown-transformer": "^5.13.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-annotation": "^1.26.0",
@@ -40,13 +41,13 @@
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-list": "^3.9.0",
 		"@atlaskit/editor-plugin-media": "^1.44.0",
-		"@atlaskit/editor-plugin-mentions": "^2.11.0",
+		"@atlaskit/editor-plugin-mentions": "^2.13.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/media-client": "^29.0.0",
+		"@atlaskit/media-client": "^29.1.0",
 		"@atlaskit/media-common": "^11.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.34.0",
+		"@atlaskit/tmp-editor-statsig": "^2.37.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
@@ -57,7 +58,6 @@
 	},
 	"devDependencies": {
 		"@af/visual-regression": "*",
-		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/editor-plugin-block-type": "^4.1.0",
 		"@atlaskit/editor-plugin-history": "^1.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.11.0",
@@ -121,6 +121,9 @@
 		},
 		"platform_editor_advanced_layouts_post_fix_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_fix_captions_on_copy": {
+			"type": "boolean"
 		}
 	}
 }