@atlaskit/editor-plugin-paste 2.0.12 → 2.0.14

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-paste
 
+## 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
+
+- Updated dependencies
+
 ## 2.0.12
 
 ### 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/util/tinyMCE.js

@@ -126,6 +126,8 @@ var fillIncompleteRowWithEmptyCells = function fillIncompleteRowWithEmptyCells(d
  * headers exist.
  */
 var tryReconstructTableRows = exports.tryReconstructTableRows = function tryReconstructTableRows(doc) {
+  // Ignored via go/ees005
+  // eslint-disable-next-line prefer-const
   var _getTableElementsInfo = getTableElementsInfo(doc),
     cellCount = _getTableElementsInfo.cellCount,
     thCount = _getTableElementsInfo.thCount,

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

@@ -37,7 +37,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
   const editorAnalyticsAPI = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
   const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
   function getMarkdownSlice(text, openStart, openEnd) {
-    let textInput = escapeBackslashExceptCodeblock(text);
+    const textInput = escapeBackslashExceptCodeblock(text);
     const doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
     if (doc && doc.content) {
       return new Slice(doc.content, openStart, openEnd);
@@ -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/media.js

@@ -141,7 +141,7 @@ function canContainImage(element) {
  */
 export const unwrapNestedMediaElements = html => {
   const parser = new DOMParser();
-  let doc = parser.parseFromString(html, 'text/html');
+  const doc = parser.parseFromString(html, 'text/html');
   const wrapper = doc.body;
 
   // Remove Google Doc's wrapper <b> el

package/dist/es2019/pm-plugins/util/handlers.js

@@ -887,8 +887,8 @@ export function handleParagraphBlockMarks(state, slice) {
   // element around the paragraph node
   const grandparent = $from.node(Math.max(0, $from.depth - 1));
   const markTypesInSlice = getTopLevelMarkTypesInSlice(slice);
-  let forbiddenMarkTypes = [];
-  for (let markType of markTypesInSlice) {
+  const forbiddenMarkTypes = [];
+  for (const markType of markTypesInSlice) {
     if (!grandparent.type.allowsMarkType(markType)) {
       forbiddenMarkTypes.push(markType);
     }
@@ -993,7 +993,7 @@ export function handleRichText(slice, queueCardsFromChangedTr, isNestingMediaOrC
     const textNodes = [heading, paragraph];
     const selectionParent = selection.$to.node(selection.$to.depth - 1);
     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 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'];

package/dist/es2019/pm-plugins/util/tinyMCE.js

@@ -108,6 +108,8 @@ const fillIncompleteRowWithEmptyCells = (doc, thCount, cellCount) => {
  * headers exist.
  */
 export const tryReconstructTableRows = doc => {
+  // Ignored via go/ees005
+  // eslint-disable-next-line prefer-const
   let {
     cellCount,
     thCount,

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/util/tinyMCE.js

@@ -119,6 +119,8 @@ var fillIncompleteRowWithEmptyCells = function fillIncompleteRowWithEmptyCells(d
  * headers exist.
  */
 export var tryReconstructTableRows = function tryReconstructTableRows(doc) {
+  // Ignored via go/ees005
+  // eslint-disable-next-line prefer-const
   var _getTableElementsInfo = getTableElementsInfo(doc),
     cellCount = _getTableElementsInfo.cellCount,
     thCount = _getTableElementsInfo.thCount,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.0.12",
+	"version": "2.0.14",
 	"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": "^97.2.0",
+		"@atlaskit/editor-common": "^99.0.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.29.0",
+		"@atlaskit/tmp-editor-statsig": "^2.33.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
@@ -58,7 +58,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-plugin-block-type": "^4.0.0",
+		"@atlaskit/editor-plugin-block-type": "^4.1.0",
 		"@atlaskit/editor-plugin-history": "^1.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.11.0",
 		"@atlaskit/ssr": "*",