@atlaskit/editor-plugin-paste 3.1.4 → 3.1.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-paste
 
+## 3.1.5
+
+### Patch Changes
+
+- [#129464](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/129464)
+  [`d5aeeb5947ae5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d5aeeb5947ae5) -
+  Cleans up feature flag that fixes pasting action items in a list
+
 ## 3.1.4
 
 ### Patch Changes

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

@@ -371,7 +371,9 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
 
         // get editor-tables to handle pasting tables if it can
         // otherwise, just the replace the selection with the content
-        if ((0, _utils3.handlePaste)(view, null, slice)) {
+        if ((0, _utils3.handlePaste)(view, event, slice, {
+          pasteSource: (0, _util.getPasteSource)(event)
+        })) {
           (0, _analytics2.sendPasteAnalyticsEvent)(editorAnalyticsAPI)(view, event, slice, {
             type: _analytics.PasteTypes.richText
           });

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

@@ -135,9 +135,8 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
             nodeDepth: (0, _utils.getParentNodeDepth)(selection)
           };
           if (isMultiSelectTrackingEnabled) {
-            var _nodeTypes;
             newState = _objectSpread(_objectSpread({}, newState), {}, {
-              nodeTypes: (_nodeTypes = nodeTypes) !== null && _nodeTypes !== void 0 ? _nodeTypes : nodeName,
+              nodeTypes: nodeTypes !== null && nodeTypes !== void 0 ? nodeTypes : nodeName,
               hasSelectedMultipleNodes: hasSelectedMultipleNodes
             });
           }

package/dist/cjs/pm-plugins/util/edge-cases/index.js

@@ -12,7 +12,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _index = require("../index");
 var _lists = require("./lists");
 function insertSliceForLists(_ref) {
@@ -108,13 +107,7 @@ function insertSliceForTaskInsideList(_ref5) {
   //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
   var selectionBeforeReplace = tr.selection.from;
   tr.replaceSelection(new _model.Slice(_model.Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
-  if ((0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list')) {
-    var nextSelection = _state.Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
-    tr.setSelection(nextSelection);
-  } else {
-    updateSelectionAfterReplace({
-      tr: tr
-    });
-  }
+  var nextSelection = _state.Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+  tr.setSelection(nextSelection);
   tr.replaceSelection(slice);
 }

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

@@ -41,7 +41,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../../editor-commands/commands");
 var _pluginFactory = require("../plugin-factory");
@@ -266,22 +265,8 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
     var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    if ((0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list')) {
-      if (checkIfSelectionInNestedList(state)) {
-        return false;
-      }
-    } else {
-      var grandParentListNode = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
-      var selectionIsInNestedList = !!grandParentListNode;
-      var selectedListItemHasNestedList = false;
-      selectionParentListItemNode.node.content.forEach(function (child) {
-        if ((0, _utils.isListNode)(child)) {
-          selectedListItemHasNestedList = true;
-        }
-      });
-      if (selectedListItemHasNestedList || selectionIsInNestedList) {
-        return false;
-      }
+    if (checkIfSelectionInNestedList(state)) {
+      return false;
     }
 
     // Node after the insert position
@@ -1050,7 +1035,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if ((0, _utils.insideTableCell)(state) && (0, _utils.isInListItem)(state) && (0, _utils2.canInsert)(selection.$from, slice.content) && (0, _utils2.canInsert)(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
-      } else if (checkTaskListInList(state, slice) && (!(0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list') || !checkIfSelectionInNestedList(state))) {
+      } else if (checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
         (0, _edgeCases.insertSliceForTaskInsideList)({
           tr: tr,
           slice: slice
@@ -1059,7 +1044,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
         tr = (0, _utils2.safeInsert)(slice.content, tr.selection.$to.pos)(tr);
-        if (checkTaskListInList(state, slice) && (0, _platformFeatureFlags.fg)('platform_editor_fix_paste_action_item_in_list')) {
+        if (checkTaskListInList(state, slice)) {
           (0, _edgeCases.updateSelectionAfterReplace)({
             tr: tr
           });

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

@@ -345,7 +345,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // get editor-tables to handle pasting tables if it can
         // otherwise, just the replace the selection with the content
-        if (handlePasteTable(view, null, slice)) {
+        if (handlePasteTable(view, event, slice, {
+          pasteSource: getPasteSource(event)
+        })) {
           sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
             type: PasteTypes.richText
           });

package/dist/es2019/pm-plugins/util/edge-cases/index.js

@@ -3,7 +3,6 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../index';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
 export function insertSliceForLists({
@@ -111,13 +110,7 @@ export function insertSliceForTaskInsideList({
   //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
   const selectionBeforeReplace = tr.selection.from;
   tr.replaceSelection(new Slice(Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
-  if (fg('platform_editor_fix_paste_action_item_in_list')) {
-    const nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
-    tr.setSelection(nextSelection);
-  } else {
-    updateSelectionAfterReplace({
-      tr
-    });
-  }
+  const nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+  tr.setSelection(nextSelection);
   tr.replaceSelection(slice);
 }

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

@@ -10,7 +10,6 @@ import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/mo
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNode, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // TODO: ED-20519 - Needs Macro extraction
 
@@ -243,22 +242,8 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     const listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    if (fg('platform_editor_fix_paste_action_item_in_list')) {
-      if (checkIfSelectionInNestedList(state)) {
-        return false;
-      }
-    } else {
-      const grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
-      const selectionIsInNestedList = !!grandParentListNode;
-      let selectedListItemHasNestedList = false;
-      selectionParentListItemNode.node.content.forEach(child => {
-        if (isListNode(child)) {
-          selectedListItemHasNestedList = true;
-        }
-      });
-      if (selectedListItemHasNestedList || selectionIsInNestedList) {
-        return false;
-      }
+    if (checkIfSelectionInNestedList(state)) {
+      return false;
     }
 
     // Node after the insert position
@@ -1033,7 +1018,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
-      } else if (checkTaskListInList(state, slice) && (!fg('platform_editor_fix_paste_action_item_in_list') || !checkIfSelectionInNestedList(state))) {
+      } else if (checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
         insertSliceForTaskInsideList({
           tr,
           slice
@@ -1042,7 +1027,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
         tr = safeInsert(slice.content, tr.selection.$to.pos)(tr);
-        if (checkTaskListInList(state, slice) && fg('platform_editor_fix_paste_action_item_in_list')) {
+        if (checkTaskListInList(state, slice)) {
           updateSelectionAfterReplace({
             tr
           });

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

@@ -363,7 +363,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // get editor-tables to handle pasting tables if it can
         // otherwise, just the replace the selection with the content
-        if (handlePasteTable(view, null, slice)) {
+        if (handlePasteTable(view, event, slice, {
+          pasteSource: getPasteSource(event)
+        })) {
           sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
             type: PasteTypes.richText
           });

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

@@ -129,9 +129,8 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
             nodeDepth: getParentNodeDepth(selection)
           };
           if (isMultiSelectTrackingEnabled) {
-            var _nodeTypes;
             newState = _objectSpread(_objectSpread({}, newState), {}, {
-              nodeTypes: (_nodeTypes = nodeTypes) !== null && _nodeTypes !== void 0 ? _nodeTypes : nodeName,
+              nodeTypes: nodeTypes !== null && nodeTypes !== void 0 ? nodeTypes : nodeName,
               hasSelectedMultipleNodes: hasSelectedMultipleNodes
             });
           }

package/dist/esm/pm-plugins/util/edge-cases/index.js

@@ -3,7 +3,6 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isCursorSelectionAtTextStartOrEnd, isEmptyNode, isSelectionInsidePanel } from '../index';
 import { insertSliceAtNodeEdge, insertSliceInsideOfPanelNodeSelected, insertSliceIntoEmptyNode, insertSliceIntoRangeSelectionInsideList } from './lists';
 export function insertSliceForLists(_ref) {
@@ -99,13 +98,7 @@ export function insertSliceForTaskInsideList(_ref5) {
   //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
   var selectionBeforeReplace = tr.selection.from;
   tr.replaceSelection(new Slice(Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
-  if (fg('platform_editor_fix_paste_action_item_in_list')) {
-    var nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
-    tr.setSelection(nextSelection);
-  } else {
-    updateSelectionAfterReplace({
-      tr: tr
-    });
-  }
+  var nextSelection = Selection.near(tr.doc.resolve(selectionBeforeReplace + 1));
+  tr.setSelection(nextSelection);
   tr.replaceSelection(slice);
 }

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

@@ -18,7 +18,6 @@ import { Fragment, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/mo
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { canInsert, contains, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNode, hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // TODO: ED-20519 - Needs Macro extraction
 
@@ -240,22 +239,8 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    if (fg('platform_editor_fix_paste_action_item_in_list')) {
-      if (checkIfSelectionInNestedList(state)) {
-        return false;
-      }
-    } else {
-      var grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
-      var selectionIsInNestedList = !!grandParentListNode;
-      var selectedListItemHasNestedList = false;
-      selectionParentListItemNode.node.content.forEach(function (child) {
-        if (isListNode(child)) {
-          selectedListItemHasNestedList = true;
-        }
-      });
-      if (selectedListItemHasNestedList || selectionIsInNestedList) {
-        return false;
-      }
+    if (checkIfSelectionInNestedList(state)) {
+      return false;
     }
 
     // Node after the insert position
@@ -1024,7 +1009,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
-      } else if (checkTaskListInList(state, slice) && (!fg('platform_editor_fix_paste_action_item_in_list') || !checkIfSelectionInNestedList(state))) {
+      } else if (checkTaskListInList(state, slice) && !checkIfSelectionInNestedList(state)) {
         insertSliceForTaskInsideList({
           tr: tr,
           slice: slice
@@ -1033,7 +1018,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
         tr = safeInsert(slice.content, tr.selection.$to.pos)(tr);
-        if (checkTaskListInList(state, slice) && fg('platform_editor_fix_paste_action_item_in_list')) {
+        if (checkTaskListInList(state, slice)) {
           updateSelectionAfterReplace({
             tr: tr
           });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "3.1.4",
+	"version": "3.1.5",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,15 +32,15 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/code": "^16.0.0",
-		"@atlaskit/editor-common": "^102.10.0",
+		"@atlaskit/code": "^16.1.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-markdown-transformer": "^5.16.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-annotation": "^2.1.0",
 		"@atlaskit/editor-plugin-better-type-history": "^2.1.0",
-		"@atlaskit/editor-plugin-card": "^5.3.0",
+		"@atlaskit/editor-plugin-card": "^5.4.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
-		"@atlaskit/editor-plugin-list": "^4.1.0",
+		"@atlaskit/editor-plugin-list": "^4.2.0",
 		"@atlaskit/editor-plugin-media": "^2.3.0",
 		"@atlaskit/editor-plugin-mentions": "^4.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/media-client": "^32.0.0",
 		"@atlaskit/media-common": "^12.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.3.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
@@ -61,7 +61,7 @@
 		"@af/visual-regression": "^1.3.0",
 		"@atlaskit/editor-plugin-block-type": "^5.1.0",
 		"@atlaskit/editor-plugin-history": "^2.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.1.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.2.0",
 		"@atlaskit/ssr": "^0.4.0",
 		"@atlaskit/visual-regression": "^0.10.0",
 		"@testing-library/react": "^13.4.0",
@@ -123,9 +123,6 @@
 		"platform_editor_fix_captions_on_copy": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_paste_action_item_in_list": {
-			"type": "boolean"
-		},
 		"platform_editor_legacy_content_macro": {
 			"type": "boolean"
 		},