@atlaskit/editor-core 187.18.0 → 187.18.1

package/dist/esm/plugins/paste/commands.js

@@ -1,6 +1,11 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { createCommand } from './pm-plugins/plugin-factory';
 import { PastePluginActionTypes as ActionTypes } from './actions';
-
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { isListNode, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
 /**
  * Use this to register macro link positions during a paste operation, that you
  * want to track in a document over time, through any document changes.
@@ -28,4 +33,216 @@ export var stopTrackingPastedMacroPositions = function stopTrackingPastedMacroPo
       pastedMacroPositionKeys: pastedMacroPositionKeys
     };
   });
+};
+
+// matchers for text lists
+var bullets = /^\s*[\*\-\u2022](\s+|\s+$)/;
+var numbers = /^\s*\d[\.\)](\s+|$)/;
+var getListType = function getListType(node, schema) {
+  if (!node.text) {
+    return null;
+  }
+  var _schema$nodes = schema.nodes,
+    bulletList = _schema$nodes.bulletList,
+    orderedList = _schema$nodes.orderedList;
+  return [{
+    node: bulletList,
+    matcher: bullets
+  }, {
+    node: orderedList,
+    matcher: numbers
+  }].reduce(function (lastMatch, listType) {
+    if (lastMatch) {
+      return lastMatch;
+    }
+    var match = node.text.match(listType.matcher);
+    return match ? [listType.node, match[0].length] : lastMatch;
+  }, null);
+};
+var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
+  var _schema$nodes2 = schema.nodes,
+    hardBreak = _schema$nodes2.hardBreak,
+    bulletList = _schema$nodes2.bulletList,
+    orderedList = _schema$nodes2.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 _listMatch = _slicedToArray(listMatch, 2),
+      nodeType = _listMatch[0],
+      length = _listMatch[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) {
+      return extractListFromParagraph(node, parent, schema);
+    }
+    return node;
+  });
+};
+export var splitParagraphs = function splitParagraphs(slice, schema) {
+  // exclude Text nodes with a code mark, since we transform those later
+  // into a codeblock
+  var hasCodeMark = false;
+  slice.content.forEach(function (child) {
+    hasCodeMark = hasCodeMark || child.marks.some(function (mark) {
+      return mark.type === schema.marks.code;
+    });
+  });
+
+  // slice might just be a raw text string
+  if (schema.nodes.paragraph.validContent(slice.content) && !hasCodeMark) {
+    var replSlice = splitIntoParagraphs({
+      fragment: slice.content,
+      schema: schema
+    });
+    return new Slice(replSlice, slice.openStart + 1, slice.openEnd + 1);
+  }
+  return mapSlice(slice, function (node) {
+    if (node.type === schema.nodes.paragraph) {
+      return splitIntoParagraphs({
+        fragment: node.content,
+        blockMarks: node.marks,
+        schema: schema
+      });
+    }
+    return node;
+  });
+};
+
+/**
+ * Walks the slice, creating paragraphs that were previously separated by hardbreaks.
+ * Returns the original paragraph node (as a fragment), or a fragment containing multiple nodes.
+ */
+export var splitIntoParagraphs = function splitIntoParagraphs(_ref) {
+  var fragment = _ref.fragment,
+    _ref$blockMarks = _ref.blockMarks,
+    blockMarks = _ref$blockMarks === void 0 ? [] : _ref$blockMarks,
+    schema = _ref.schema;
+  var paragraphs = [];
+  var curChildren = [];
+  var lastNode = null;
+  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) {
+      paragraphs.push(node);
+      return;
+    }
+    // ED-14725 Fixed the issue that it make duplicated line
+    // when pasting <br /> from google docs.
+    if (i === 0 && node.type === hardBreak) {
+      paragraphs.push(paragraph.createChecked(undefined, curChildren, _toConsumableArray(blockMarks)));
+      lastNode = node;
+      return;
+    } else if (lastNode && lastNode.type === hardBreak && node.type === hardBreak) {
+      // double hardbreak
+
+      // backtrack a little; remove the trailing hardbreak we added last loop
+      curChildren.pop();
+
+      // create a new paragraph
+      paragraphs.push(paragraph.createChecked(undefined, curChildren, _toConsumableArray(blockMarks)));
+      curChildren = [];
+      return;
+    }
+
+    // add to this paragraph
+    curChildren.push(node);
+    lastNode = node;
+  });
+  if (curChildren.length) {
+    paragraphs.push(paragraph.createChecked(undefined, curChildren, _toConsumableArray(blockMarks)));
+  }
+  return Fragment.from(paragraphs.length ? paragraphs : [paragraph.createAndFill(undefined, undefined, _toConsumableArray(blockMarks))]);
 };

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

@@ -19,7 +19,7 @@ import { ACTION, analyticsPluginKey, INPUT_METHOD, PasteTypes } from '../../anal
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
 import { measureRender } from '@atlaskit/editor-common/utils';
 import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
-import { upgradeTextToLists, splitParagraphs } from '../../list/transforms';
+import { upgradeTextToLists, splitParagraphs } from '../commands';
 import { md } from '@atlaskit/editor-common/paste';
 import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
 import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';

package/dist/esm/plugins/toolbar-lists-indentation/ui/Toolbar.js

@@ -7,7 +7,7 @@ import IndentIcon from '@atlaskit/icon/glyph/editor/indent';
 import OutdentIcon from '@atlaskit/icon/glyph/editor/outdent';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, indent as toggleIndentKeymap, outdent as toggleOutdentKeymap, ToolTipContent, tooltip } from '../../../keymaps';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../ui/ToolbarButton';
-import { messages } from '../../list/messages';
+import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { messages as indentationMessages } from '../../indentation/messages';
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';

package/dist/esm/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -10,7 +10,7 @@ import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/ed
 import ToolbarButton from '../../../ui/ToolbarButton';
 import { expandIconWrapperStyle, shortcutStyle } from '../../../ui/styles';
 import { wrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
-import { messages as listMessages } from '../../list/messages';
+import { listMessages } from '@atlaskit/editor-common/messages';
 import { messages as indentationMessages } from '../../indentation/messages';
 export function ToolbarDropdown(props) {
   var _useIntl = useIntl(),

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.18.0";
+export var version = "187.18.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.18.0",
+	"version": "187.18.1",
 	"sideEffects": false
 }

package/dist/types/plugins/list/transforms.d.ts

@@ -1,17 +1,4 @@
-import type { Schema, Mark } from '@atlaskit/editor-prosemirror/model';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare function liftFollowingList(from: number, to: number, rootListDepth: number, tr: Transaction): Transaction;
 export declare function liftNodeSelectionList(selection: Selection, tr: Transaction): Transaction;
 export declare function liftTextSelectionList(selection: Selection, tr: Transaction): Transaction;
-/**
- * Walks the slice, creating paragraphs that were previously separated by hardbreaks.
- * Returns the original paragraph node (as a fragment), or a fragment containing multiple nodes.
- */
-export declare const splitIntoParagraphs: ({ fragment, blockMarks, schema, }: {
-    fragment: Fragment;
-    blockMarks?: readonly Mark[] | undefined;
-    schema: Schema;
-}) => Fragment;
-export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
-export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;

package/dist/types/plugins/paste/commands.d.ts

@@ -1,3 +1,6 @@
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Mark } from '@atlaskit/editor-prosemirror/model';
 /**
  * Use this to register macro link positions during a paste operation, that you
  * want to track in a document over time, through any document changes.
@@ -14,3 +17,14 @@ export declare const startTrackingPastedMacroPositions: (pastedMacroPositions: {
     [key: string]: number;
 }) => import("@atlaskit/editor-common/types").Command;
 export declare const stopTrackingPastedMacroPositions: (pastedMacroPositionKeys: string[]) => import("@atlaskit/editor-common/types").Command;
+export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;
+export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
+/**
+ * Walks the slice, creating paragraphs that were previously separated by hardbreaks.
+ * Returns the original paragraph node (as a fragment), or a fragment containing multiple nodes.
+ */
+export declare const splitIntoParagraphs: ({ fragment, blockMarks, schema, }: {
+    fragment: Fragment;
+    blockMarks?: readonly Mark[] | undefined;
+    schema: Schema;
+}) => Fragment;

package/dist/types/plugins/paste/index.d.ts

@@ -3,6 +3,7 @@ import type { CardOptions } from '@atlaskit/editor-common/card';
 import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import type { cardPlugin } from '@atlaskit/editor-plugin-card';
 import type betterTypeHistoryPlugin from '../better-type-history';
+import type listPlugin from '../list';
 export type PastePluginOptions = {
     cardOptions?: CardOptions;
     sanitizePrivateContent?: boolean;
@@ -11,6 +12,7 @@ declare const pastePlugin: NextEditorPlugin<'paste', {
     pluginConfiguration: PastePluginOptions;
     dependencies: [
         typeof featureFlagsPlugin,
+        OptionalPlugin<typeof listPlugin>,
         typeof betterTypeHistoryPlugin,
         OptionalPlugin<typeof cardPlugin>
     ];

package/dist/types-ts4.5/plugins/list/transforms.d.ts

@@ -1,17 +1,4 @@
-import type { Schema, Mark } from '@atlaskit/editor-prosemirror/model';
-import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare function liftFollowingList(from: number, to: number, rootListDepth: number, tr: Transaction): Transaction;
 export declare function liftNodeSelectionList(selection: Selection, tr: Transaction): Transaction;
 export declare function liftTextSelectionList(selection: Selection, tr: Transaction): Transaction;
-/**
- * Walks the slice, creating paragraphs that were previously separated by hardbreaks.
- * Returns the original paragraph node (as a fragment), or a fragment containing multiple nodes.
- */
-export declare const splitIntoParagraphs: ({ fragment, blockMarks, schema, }: {
-    fragment: Fragment;
-    blockMarks?: readonly Mark[] | undefined;
-    schema: Schema;
-}) => Fragment;
-export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
-export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;

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

@@ -1,3 +1,6 @@
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Mark } from '@atlaskit/editor-prosemirror/model';
 /**
  * Use this to register macro link positions during a paste operation, that you
  * want to track in a document over time, through any document changes.
@@ -14,3 +17,14 @@ export declare const startTrackingPastedMacroPositions: (pastedMacroPositions: {
     [key: string]: number;
 }) => import("@atlaskit/editor-common/types").Command;
 export declare const stopTrackingPastedMacroPositions: (pastedMacroPositionKeys: string[]) => import("@atlaskit/editor-common/types").Command;
+export declare const upgradeTextToLists: (slice: Slice, schema: Schema) => Slice;
+export declare const splitParagraphs: (slice: Slice, schema: Schema) => Slice;
+/**
+ * Walks the slice, creating paragraphs that were previously separated by hardbreaks.
+ * Returns the original paragraph node (as a fragment), or a fragment containing multiple nodes.
+ */
+export declare const splitIntoParagraphs: ({ fragment, blockMarks, schema, }: {
+    fragment: Fragment;
+    blockMarks?: readonly Mark[] | undefined;
+    schema: Schema;
+}) => Fragment;

package/dist/types-ts4.5/plugins/paste/index.d.ts

@@ -3,6 +3,7 @@ import type { CardOptions } from '@atlaskit/editor-common/card';
 import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import type { cardPlugin } from '@atlaskit/editor-plugin-card';
 import type betterTypeHistoryPlugin from '../better-type-history';
+import type listPlugin from '../list';
 export type PastePluginOptions = {
     cardOptions?: CardOptions;
     sanitizePrivateContent?: boolean;
@@ -11,6 +12,7 @@ declare const pastePlugin: NextEditorPlugin<'paste', {
     pluginConfiguration: PastePluginOptions;
     dependencies: [
         typeof featureFlagsPlugin,
+        OptionalPlugin<typeof listPlugin>,
         typeof betterTypeHistoryPlugin,
         OptionalPlugin<typeof cardPlugin>
     ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.18.0",
+  "version": "187.18.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
     "@atlaskit/code": "^14.6.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^12.7.0",
-    "@atlaskit/editor-common": "^74.42.0",
+    "@atlaskit/editor-common": "^74.43.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-palette": "1.5.1",