@atlaskit/editor-plugin-paste 2.0.13 → 2.0.15

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-paste
 
+## 2.0.15
+
+### Patch Changes
+
+- [#102045](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102045)
+  [`44f96aff22dd9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/44f96aff22dd9) -
+  [ED-26179] clean up platform_editor_elements_dnd_nested_table
+- Updated dependencies
+
+## 2.0.14
+
+### Patch Changes
+
+- [#102083](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102083)
+  [`7dfb89f8b8a19`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7dfb89f8b8a19) -
+  [ux] ED-26221 Changed order of paste handlers so that nested tables are handled before panels and
+  decisions. This prevents incorrect handling of nested tables when pasting a table into a panel
+  inside a table
+- Updated dependencies
+
 ## 2.0.13
 
 ### Patch Changes

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

@@ -328,6 +328,11 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
           slice.openStart = 1;
         }
+
+        // handle paste of nested tables to ensure nesting limits are respected
+        if ((0, _analytics2.handleNestedTablePasteWithAnalytics)(editorAnalyticsAPI, (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
+          return true;
+        }
         if ((0, _analytics2.handlePasteIntoTaskAndDecisionWithAnalytics)(view, event, slice, isPlainText ? _analytics.PasteTypes.plain : _analytics.PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
           return true;
         }
@@ -401,11 +406,6 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             return true;
           }
 
-          // handle paste of nested tables to ensure nesting limits are respected
-          if ((0, _analytics2.handleNestedTablePasteWithAnalytics)(editorAnalyticsAPI, (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
-            return true;
-          }
-
           // handle the case when copy content from a table cell inside bodied extension
           if ((0, _handlers.handleTableContentPasteInBodiedExtension)(slice)(state, dispatch)) {
             return true;

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
 var _pluginFactory = require("./plugin-factory");
 var _pluginKey = require("./plugin-key");
@@ -101,7 +100,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
         if (!resetState && (0, _utils.isInlineNode)(nodeName) && (0, _utils.isNestedInlineNode)(selection)) {
           resetState = true;
         }
-        if (!resetState && (0, _utils.isNestedInTable)(state) && (0, _experiments.editorExperiment)('table-nested-dnd', false)) {
+        if (!resetState && (0, _utils.isNestedInTable)(state)) {
           resetState = true;
         }
         if (resetState) {

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

@@ -302,6 +302,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
           slice.openStart = 1;
         }
+
+        // handle paste of nested tables to ensure nesting limits are respected
+        if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
+          return true;
+        }
         if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
           return true;
         }
@@ -377,11 +382,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return true;
           }
 
-          // handle paste of nested tables to ensure nesting limits are respected
-          if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
-            return true;
-          }
-
           // handle the case when copy content from a table cell inside bodied extension
           if (handleTableContentPasteInBodiedExtension(slice)(state, dispatch)) {
             return true;

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

@@ -1,6 +1,5 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { resetContentMoved, resetContentMovedTransform, updateContentMoved } from './commands';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
@@ -107,7 +106,7 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
         if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
           resetState = true;
         }
-        if (!resetState && isNestedInTable(state) && editorExperiment('table-nested-dnd', false)) {
+        if (!resetState && isNestedInTable(state)) {
           resetState = true;
         }
         if (resetState) {

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

@@ -320,6 +320,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
           slice.openStart = 1;
         }
+
+        // handle paste of nested tables to ensure nesting limits are respected
+        if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
+          return true;
+        }
         if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
           return true;
         }
@@ -393,11 +398,6 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return true;
           }
 
-          // handle paste of nested tables to ensure nesting limits are respected
-          if (handleNestedTablePasteWithAnalytics(editorAnalyticsAPI, fg('platform_editor_use_nested_table_pm_nodes'))(view, event, slice)(state, dispatch)) {
-            return true;
-          }
-
           // handle the case when copy content from a table cell inside bodied extension
           if (handleTableContentPasteInBodiedExtension(slice)(state, dispatch)) {
             return true;

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

@@ -1,6 +1,5 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { resetContentMoved, resetContentMovedTransform, updateContentMoved } from './commands';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
@@ -96,7 +95,7 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
         if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
           resetState = true;
         }
-        if (!resetState && isNestedInTable(state) && editorExperiment('table-nested-dnd', false)) {
+        if (!resetState && isNestedInTable(state)) {
           resetState = true;
         }
         if (resetState) {

package/dist/types/pastePluginType.d.ts

@@ -33,19 +33,20 @@ export type PastePluginOptions = {
     sanitizePrivateContent?: boolean;
     isFullPage?: boolean;
 };
+export type PastePluginDependencies = [
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<ListPlugin>,
+    BetterTypeHistoryPlugin,
+    OptionalPlugin<CardPlugin>,
+    OptionalPlugin<AnalyticsPlugin>,
+    OptionalPlugin<MediaPlugin>,
+    OptionalPlugin<ExtensionPlugin>,
+    OptionalPlugin<AnnotationPlugin>,
+    OptionalPlugin<MentionsPlugin>
+];
 export type PastePlugin = NextEditorPlugin<'paste', {
     pluginConfiguration: PastePluginOptions;
-    dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<ListPlugin>,
-        BetterTypeHistoryPlugin,
-        OptionalPlugin<CardPlugin>,
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<MediaPlugin>,
-        OptionalPlugin<ExtensionPlugin>,
-        OptionalPlugin<AnnotationPlugin>,
-        OptionalPlugin<MentionsPlugin>
-    ];
+    dependencies: PastePluginDependencies;
     sharedState: {
         lastContentPasted: LastContentPasted | null;
     };

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

@@ -33,19 +33,20 @@ export type PastePluginOptions = {
     sanitizePrivateContent?: boolean;
     isFullPage?: boolean;
 };
+export type PastePluginDependencies = [
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<ListPlugin>,
+    BetterTypeHistoryPlugin,
+    OptionalPlugin<CardPlugin>,
+    OptionalPlugin<AnalyticsPlugin>,
+    OptionalPlugin<MediaPlugin>,
+    OptionalPlugin<ExtensionPlugin>,
+    OptionalPlugin<AnnotationPlugin>,
+    OptionalPlugin<MentionsPlugin>
+];
 export type PastePlugin = NextEditorPlugin<'paste', {
     pluginConfiguration: PastePluginOptions;
-    dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<ListPlugin>,
-        BetterTypeHistoryPlugin,
-        OptionalPlugin<CardPlugin>,
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<MediaPlugin>,
-        OptionalPlugin<ExtensionPlugin>,
-        OptionalPlugin<AnnotationPlugin>,
-        OptionalPlugin<MentionsPlugin>
-    ];
+    dependencies: PastePluginDependencies;
     sharedState: {
         lastContentPasted: LastContentPasted | null;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.0.13",
+	"version": "2.0.15",
 	"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": "^98.0.0",
+		"@atlaskit/editor-common": "^99.1.0",
 		"@atlaskit/editor-markdown-transformer": "^5.13.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-annotation": "^1.26.0",
@@ -39,14 +39,14 @@
 		"@atlaskit/editor-plugin-card": "^4.5.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-list": "^3.9.0",
-		"@atlaskit/editor-plugin-media": "^1.43.0",
-		"@atlaskit/editor-plugin-mentions": "^2.10.0",
+		"@atlaskit/editor-plugin-media": "^1.44.0",
+		"@atlaskit/editor-plugin-mentions": "^2.11.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/media-client": "^29.0.0",
 		"@atlaskit/media-common": "^11.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.31.0",
+		"@atlaskit/tmp-editor-statsig": "^2.34.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"