@atlaskit/editor-plugin-paste 1.5.4 → 1.5.6

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.5.6
+
+### Patch Changes
+
+- [#121483](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/121483)
+  [`b73c87fcb17dd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b73c87fcb17dd) -
+  [ED-22946] Cleanup feature flag extractListFromParagraphV2
+
+## 1.5.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.5.4
 
 ### Patch Changes

package/dist/cjs/commands.js

@@ -4,14 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.upgradeTextToLists = exports.stopTrackingPastedMacroPositions = exports.startTrackingPastedMacroPositions = exports.splitParagraphs = exports.splitIntoParagraphs = exports._extractListFromParagraphV2 = exports._contentSplitByHardBreaks = void 0;
+exports.upgradeTextToLists = exports.stopTrackingPastedMacroPositions = exports.startTrackingPastedMacroPositions = exports.splitParagraphs = exports.splitIntoParagraphs = exports.extractListFromParagraph = exports._contentSplitByHardBreaks = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("./actions");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 /**
@@ -92,7 +91,7 @@ var _contentSplitByHardBreaks = exports._contentSplitByHardBreaks = function _co
   wrapperContent.push(nextContent);
   return wrapperContent;
 };
-var _extractListFromParagraphV2 = exports._extractListFromParagraphV2 = function _extractListFromParagraphV2(node, parent, schema) {
+var extractListFromParagraph = exports.extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
   var content = (0, _utils.mapChildren)(node.content, function (node) {
     return node;
   });
@@ -148,7 +147,7 @@ var _extractListFromParagraphV2 = exports._extractListFromParagraphV2 = function
     [schema.text(startingText, firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : firstNonHardBreakNode.marks)].concat((0, _toConsumableArray2.default)(chunksWithoutLeadingHardBreaks.slice(1))) : chunksWithoutLeadingHardBreaks.slice(1);
 
     // convert to list
-    var listItemNode = listItem.createAndFill(undefined, paragraph.createChecked(undefined, restOfChunk));
+    var listItemNode = listItem === null || listItem === void 0 ? void 0 : listItem.createAndFill(undefined, paragraph.createChecked(undefined, restOfChunk));
     if (!listItemNode) {
       paragraphParts.push(line);
       continue;
@@ -201,115 +200,12 @@ var _extractListFromParagraphV2 = exports._extractListFromParagraphV2 = function
   var fragment = joinedListsTr ? joinedListsTr.doc.content : _model.Fragment.from(result);
   return fragment;
 };
-var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
-  var _schema$nodes3 = schema.nodes,
-    hardBreak = _schema$nodes3.hardBreak,
-    bulletList = _schema$nodes3.bulletList,
-    orderedList = _schema$nodes3.orderedList;
-  var content = (0, _utils.mapChildren)(node.content, function (node) {
-    return node;
-  });
-  var listTypes = [bulletList, orderedList];
-
-  // wrap each line into a listItem and a containing list
-  var listified = content.map(function (child, index) {
-    var listMatch = getListType(child, schema);
-    var prevChild = index > 0 && content[index - 1];
-
-    // only extract list when preceded by a hardbreak
-    if (prevChild && prevChild.type !== hardBreak) {
-      return child;
-    }
-    if (!listMatch || !child.text) {
-      return child;
-    }
-    var _listMatch3 = (0, _slicedToArray2.default)(listMatch, 2),
-      nodeType = _listMatch3[0],
-      length = _listMatch3[1];
-
-    // convert to list item
-    var newText = child.text.substr(length);
-    var listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, newText.length ? schema.text(newText) : undefined));
-    if (!listItemNode) {
-      return child;
-    }
-    var newList = nodeType.createChecked(undefined, [listItemNode]);
-    // Check whether our new list is valid content in our current structure,
-    // otherwise dont convert.
-    if (parent && !parent.type.validContent(_model.Fragment.from(newList))) {
-      return child;
-    }
-    return newList;
-  }).filter(function (child, idx, arr) {
-    // remove hardBreaks that have a list node on either side
-
-    // wasn't hardBreak, leave as-is
-    if (child.type !== hardBreak) {
-      return child;
-    }
-    if (idx > 0 && listTypes.indexOf(arr[idx - 1].type) > -1) {
-      // list node on the left
-      return null;
-    }
-    if (idx < arr.length - 1 && listTypes.indexOf(arr[idx + 1].type) > -1) {
-      // list node on the right
-      return null;
-    }
-    return child;
-  });
-
-  // try to join
-  var mockState = _state.EditorState.create({
-    schema: schema
-  });
-  var joinedListsTr;
-  var mockDispatch = function mockDispatch(tr) {
-    joinedListsTr = tr;
-  };
-  (0, _commands.autoJoin)(function (state, dispatch) {
-    if (!dispatch) {
-      return false;
-    }
-
-    // Return false to prevent replaceWith from wrapping the text node in a paragraph
-    // paragraph since that will be done later. If it's done here, it will fail
-    // the paragraph.validContent check.
-    // Dont return false if there are lists, as they arent validContent for paragraphs
-    // and will result in hanging textNodes
-    var containsList = listified.some(function (node) {
-      return node.type === bulletList || node.type === orderedList;
-    });
-    if (listified.some(function (node) {
-      return node.isText;
-    }) && !containsList) {
-      return false;
-    }
-    dispatch(state.tr.replaceWith(0, 2, listified));
-    return true;
-  }, function (before, after) {
-    return (0, _utils.isListNode)(before) && (0, _utils.isListNode)(after);
-  })(mockState, mockDispatch);
-  var fragment = joinedListsTr ? joinedListsTr.doc.content : _model.Fragment.from(listified);
-
-  // try to re-wrap fragment in paragraph (which is the original node we unwrapped)
-  var paragraph = schema.nodes.paragraph;
-  if (paragraph.validContent(fragment)) {
-    return _model.Fragment.from(paragraph.create(node.attrs, fragment, node.marks));
-  }
-
-  // fragment now contains other nodes, get Prosemirror to wrap with ContentMatch later
-  return fragment;
-};
 
 // above will wrap everything in paragraphs for us
 var upgradeTextToLists = exports.upgradeTextToLists = function upgradeTextToLists(slice, schema) {
   return (0, _utils.mapSlice)(slice, function (node, parent) {
     if (node.type === schema.nodes.paragraph) {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.extractlistfromparagraphv2')) {
-        return _extractListFromParagraphV2(node, parent, schema);
-      } else {
-        return extractListFromParagraph(node, parent, schema);
-      }
+      return extractListFromParagraph(node, parent, schema);
     }
     return node;
   });
@@ -356,9 +252,9 @@ var splitIntoParagraphs = exports.splitIntoParagraphs = function splitIntoParagr
   var paragraphs = [];
   var curChildren = [];
   var lastNode = null;
-  var _schema$nodes4 = schema.nodes,
-    hardBreak = _schema$nodes4.hardBreak,
-    paragraph = _schema$nodes4.paragraph;
+  var _schema$nodes3 = schema.nodes,
+    hardBreak = _schema$nodes3.hardBreak,
+    paragraph = _schema$nodes3.paragraph;
   fragment.forEach(function (node, i) {
     var isNodeValidContentForParagraph = schema.nodes.paragraph.validContent(_model.Fragment.from(node));
     if (!isNodeValidContentForParagraph) {

package/dist/es2019/commands.js

@@ -2,7 +2,6 @@ import { isListNode, mapChildren, mapSlice } from '@atlaskit/editor-common/utils
 import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes as ActionTypes } from './actions';
 import { createCommand } from './pm-plugins/plugin-factory';
 
@@ -81,7 +80,7 @@ export const _contentSplitByHardBreaks = (content, schema) => {
   wrapperContent.push(nextContent);
   return wrapperContent;
 };
-export const _extractListFromParagraphV2 = (node, parent, schema) => {
+export const extractListFromParagraph = (node, parent, schema) => {
   const content = mapChildren(node.content, node => node);
   const linesSplitByHardbreaks = _contentSplitByHardBreaks(content, schema);
   const {
@@ -130,7 +129,7 @@ export const _extractListFromParagraphV2 = (node, parent, schema) => {
     [schema.text(startingText, firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : firstNonHardBreakNode.marks), ...chunksWithoutLeadingHardBreaks.slice(1)] : chunksWithoutLeadingHardBreaks.slice(1);
 
     // convert to list
-    const listItemNode = listItem.createAndFill(undefined, paragraph.createChecked(undefined, restOfChunk));
+    const listItemNode = listItem === null || listItem === void 0 ? void 0 : listItem.createAndFill(undefined, paragraph.createChecked(undefined, restOfChunk));
     if (!listItemNode) {
       paragraphParts.push(line);
       continue;
@@ -177,108 +176,12 @@ export const _extractListFromParagraphV2 = (node, parent, schema) => {
   const fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(result);
   return fragment;
 };
-const extractListFromParagraph = (node, parent, schema) => {
-  const {
-    hardBreak,
-    bulletList,
-    orderedList
-  } = schema.nodes;
-  const content = mapChildren(node.content, node => node);
-  const listTypes = [bulletList, orderedList];
-
-  // wrap each line into a listItem and a containing list
-  const listified = content.map((child, index) => {
-    const listMatch = getListType(child, schema);
-    const prevChild = index > 0 && content[index - 1];
-
-    // only extract list when preceded by a hardbreak
-    if (prevChild && prevChild.type !== hardBreak) {
-      return child;
-    }
-    if (!listMatch || !child.text) {
-      return child;
-    }
-    const [nodeType, length] = listMatch;
-
-    // convert to list item
-    const newText = child.text.substr(length);
-    const listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, newText.length ? schema.text(newText) : undefined));
-    if (!listItemNode) {
-      return child;
-    }
-    const newList = nodeType.createChecked(undefined, [listItemNode]);
-    // Check whether our new list is valid content in our current structure,
-    // otherwise dont convert.
-    if (parent && !parent.type.validContent(Fragment.from(newList))) {
-      return child;
-    }
-    return newList;
-  }).filter((child, idx, arr) => {
-    // remove hardBreaks that have a list node on either side
-
-    // wasn't hardBreak, leave as-is
-    if (child.type !== hardBreak) {
-      return child;
-    }
-    if (idx > 0 && listTypes.indexOf(arr[idx - 1].type) > -1) {
-      // list node on the left
-      return null;
-    }
-    if (idx < arr.length - 1 && listTypes.indexOf(arr[idx + 1].type) > -1) {
-      // list node on the right
-      return null;
-    }
-    return child;
-  });
-
-  // try to join
-  const mockState = EditorState.create({
-    schema
-  });
-  let joinedListsTr;
-  const mockDispatch = tr => {
-    joinedListsTr = tr;
-  };
-  autoJoin((state, dispatch) => {
-    if (!dispatch) {
-      return false;
-    }
-
-    // Return false to prevent replaceWith from wrapping the text node in a paragraph
-    // paragraph since that will be done later. If it's done here, it will fail
-    // the paragraph.validContent check.
-    // Dont return false if there are lists, as they arent validContent for paragraphs
-    // and will result in hanging textNodes
-    const containsList = listified.some(node => node.type === bulletList || node.type === orderedList);
-    if (listified.some(node => node.isText) && !containsList) {
-      return false;
-    }
-    dispatch(state.tr.replaceWith(0, 2, listified));
-    return true;
-  }, (before, after) => isListNode(before) && isListNode(after))(mockState, mockDispatch);
-  const fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(listified);
-
-  // try to re-wrap fragment in paragraph (which is the original node we unwrapped)
-  const {
-    paragraph
-  } = schema.nodes;
-  if (paragraph.validContent(fragment)) {
-    return Fragment.from(paragraph.create(node.attrs, fragment, node.marks));
-  }
-
-  // fragment now contains other nodes, get Prosemirror to wrap with ContentMatch later
-  return fragment;
-};
 
 // above will wrap everything in paragraphs for us
 export const upgradeTextToLists = (slice, schema) => {
   return mapSlice(slice, (node, parent) => {
     if (node.type === schema.nodes.paragraph) {
-      if (getBooleanFF('platform.editor.extractlistfromparagraphv2')) {
-        return _extractListFromParagraphV2(node, parent, schema);
-      } else {
-        return extractListFromParagraph(node, parent, schema);
-      }
+      return extractListFromParagraph(node, parent, schema);
     }
     return node;
   });

package/dist/esm/commands.js

@@ -4,7 +4,6 @@ import { isListNode, mapChildren, mapSlice } from '@atlaskit/editor-common/utils
 import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes as ActionTypes } from './actions';
 import { createCommand } from './pm-plugins/plugin-factory';
 
@@ -86,7 +85,7 @@ export var _contentSplitByHardBreaks = function _contentSplitByHardBreaks(conten
   wrapperContent.push(nextContent);
   return wrapperContent;
 };
-export var _extractListFromParagraphV2 = function _extractListFromParagraphV2(node, parent, schema) {
+export var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
   var content = mapChildren(node.content, function (node) {
     return node;
   });
@@ -142,7 +141,7 @@ export var _extractListFromParagraphV2 = function _extractListFromParagraphV2(no
     [schema.text(startingText, firstNonHardBreakNode === null || firstNonHardBreakNode === void 0 ? void 0 : firstNonHardBreakNode.marks)].concat(_toConsumableArray(chunksWithoutLeadingHardBreaks.slice(1))) : chunksWithoutLeadingHardBreaks.slice(1);
 
     // convert to list
-    var listItemNode = listItem.createAndFill(undefined, paragraph.createChecked(undefined, restOfChunk));
+    var listItemNode = listItem === null || listItem === void 0 ? void 0 : listItem.createAndFill(undefined, paragraph.createChecked(undefined, restOfChunk));
     if (!listItemNode) {
       paragraphParts.push(line);
       continue;
@@ -195,115 +194,12 @@ export var _extractListFromParagraphV2 = function _extractListFromParagraphV2(no
   var fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(result);
   return fragment;
 };
-var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
-  var _schema$nodes3 = schema.nodes,
-    hardBreak = _schema$nodes3.hardBreak,
-    bulletList = _schema$nodes3.bulletList,
-    orderedList = _schema$nodes3.orderedList;
-  var content = mapChildren(node.content, function (node) {
-    return node;
-  });
-  var listTypes = [bulletList, orderedList];
-
-  // wrap each line into a listItem and a containing list
-  var listified = content.map(function (child, index) {
-    var listMatch = getListType(child, schema);
-    var prevChild = index > 0 && content[index - 1];
-
-    // only extract list when preceded by a hardbreak
-    if (prevChild && prevChild.type !== hardBreak) {
-      return child;
-    }
-    if (!listMatch || !child.text) {
-      return child;
-    }
-    var _listMatch3 = _slicedToArray(listMatch, 2),
-      nodeType = _listMatch3[0],
-      length = _listMatch3[1];
-
-    // convert to list item
-    var newText = child.text.substr(length);
-    var listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, newText.length ? schema.text(newText) : undefined));
-    if (!listItemNode) {
-      return child;
-    }
-    var newList = nodeType.createChecked(undefined, [listItemNode]);
-    // Check whether our new list is valid content in our current structure,
-    // otherwise dont convert.
-    if (parent && !parent.type.validContent(Fragment.from(newList))) {
-      return child;
-    }
-    return newList;
-  }).filter(function (child, idx, arr) {
-    // remove hardBreaks that have a list node on either side
-
-    // wasn't hardBreak, leave as-is
-    if (child.type !== hardBreak) {
-      return child;
-    }
-    if (idx > 0 && listTypes.indexOf(arr[idx - 1].type) > -1) {
-      // list node on the left
-      return null;
-    }
-    if (idx < arr.length - 1 && listTypes.indexOf(arr[idx + 1].type) > -1) {
-      // list node on the right
-      return null;
-    }
-    return child;
-  });
-
-  // try to join
-  var mockState = EditorState.create({
-    schema: schema
-  });
-  var joinedListsTr;
-  var mockDispatch = function mockDispatch(tr) {
-    joinedListsTr = tr;
-  };
-  autoJoin(function (state, dispatch) {
-    if (!dispatch) {
-      return false;
-    }
-
-    // Return false to prevent replaceWith from wrapping the text node in a paragraph
-    // paragraph since that will be done later. If it's done here, it will fail
-    // the paragraph.validContent check.
-    // Dont return false if there are lists, as they arent validContent for paragraphs
-    // and will result in hanging textNodes
-    var containsList = listified.some(function (node) {
-      return node.type === bulletList || node.type === orderedList;
-    });
-    if (listified.some(function (node) {
-      return node.isText;
-    }) && !containsList) {
-      return false;
-    }
-    dispatch(state.tr.replaceWith(0, 2, listified));
-    return true;
-  }, function (before, after) {
-    return isListNode(before) && isListNode(after);
-  })(mockState, mockDispatch);
-  var fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(listified);
-
-  // try to re-wrap fragment in paragraph (which is the original node we unwrapped)
-  var paragraph = schema.nodes.paragraph;
-  if (paragraph.validContent(fragment)) {
-    return Fragment.from(paragraph.create(node.attrs, fragment, node.marks));
-  }
-
-  // fragment now contains other nodes, get Prosemirror to wrap with ContentMatch later
-  return fragment;
-};
 
 // above will wrap everything in paragraphs for us
 export var upgradeTextToLists = function upgradeTextToLists(slice, schema) {
   return mapSlice(slice, function (node, parent) {
     if (node.type === schema.nodes.paragraph) {
-      if (getBooleanFF('platform.editor.extractlistfromparagraphv2')) {
-        return _extractListFromParagraphV2(node, parent, schema);
-      } else {
-        return extractListFromParagraph(node, parent, schema);
-      }
+      return extractListFromParagraph(node, parent, schema);
     }
     return node;
   });
@@ -350,9 +246,9 @@ export var splitIntoParagraphs = function splitIntoParagraphs(_ref) {
   var paragraphs = [];
   var curChildren = [];
   var lastNode = null;
-  var _schema$nodes4 = schema.nodes,
-    hardBreak = _schema$nodes4.hardBreak,
-    paragraph = _schema$nodes4.paragraph;
+  var _schema$nodes3 = schema.nodes,
+    hardBreak = _schema$nodes3.hardBreak,
+    paragraph = _schema$nodes3.paragraph;
   fragment.forEach(function (node, i) {
     var isNodeValidContentForParagraph = schema.nodes.paragraph.validContent(Fragment.from(node));
     if (!isNodeValidContentForParagraph) {

package/dist/types/commands.d.ts

@@ -17,7 +17,7 @@ export declare const startTrackingPastedMacroPositions: (pastedMacroPositions: {
 }) => import("@atlaskit/editor-common/types").Command;
 export declare const stopTrackingPastedMacroPositions: (pastedMacroPositionKeys: string[]) => import("@atlaskit/editor-common/types").Command;
 export declare const _contentSplitByHardBreaks: (content: Array<Node>, schema: Schema) => Array<Node>[];
-export declare const _extractListFromParagraphV2: (node: Node, parent: Node | null, schema: Schema) => Fragment;
+export declare const extractListFromParagraph: (node: Node, parent: Node | null, schema: Schema) => Fragment;
 export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;
 export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
 /**

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

@@ -17,7 +17,7 @@ export declare const startTrackingPastedMacroPositions: (pastedMacroPositions: {
 }) => import("@atlaskit/editor-common/types").Command;
 export declare const stopTrackingPastedMacroPositions: (pastedMacroPositionKeys: string[]) => import("@atlaskit/editor-common/types").Command;
 export declare const _contentSplitByHardBreaks: (content: Array<Node>, schema: Schema) => Array<Node>[];
-export declare const _extractListFromParagraphV2: (node: Node, parent: Node | null, schema: Schema) => Fragment;
+export declare const extractListFromParagraph: (node: Node, parent: Node | null, schema: Schema) => Fragment;
 export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;
 export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "1.5.4",
+	"version": "1.5.6",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^85.0.0",
+		"@atlaskit/editor-common": "^86.2.0",
 		"@atlaskit/editor-markdown-transformer": "^5.8.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-annotation": "^1.15.0",
@@ -128,9 +128,6 @@
 		"platform.editor.multi-bodied-extension_0rygg": {
 			"type": "boolean"
 		},
-		"platform.editor.extractlistfromparagraphv2": {
-			"type": "boolean"
-		},
 		"platform.editor.preserve-whitespace-clipboard-text-serialization": {
 			"type": "boolean"
 		}