@atlaskit/editor-core 183.0.8 → 183.0.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 183.0.9
+
+### Patch Changes
+
+- [`333fa827c25`](https://bitbucket.org/atlassian/atlassian-frontend/commits/333fa827c25) - ED-15646: Fix paste behaviour for markdown which contains headings inside list items. List items with headings will now be retained.
+
 ## 183.0.8
 
 ### Patch Changes

package/dist/cjs/plugins/paste/md-plugins/ignore-list-heading-md-plugin.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+/*
+ * ED-15646
+ * Headings in list items are not supported in our schema.
+ * As the markdown transformer is used by the paste plugin,
+ * certain pastes will strip invalid lines as
+ * prosemirror-markdown cannot conform to the schema
+ */
+
+function handleHeadingOpen(state, token, acc, index) {
+  var _state$tokens;
+  var isInListItem = ((_state$tokens = state.tokens[index - 1]) === null || _state$tokens === void 0 ? void 0 : _state$tokens.type) === 'list_item_open';
+  if (isInListItem) {
+    acc.push(new state.Token('paragraph_open', 'p', 1));
+  } else {
+    acc.push(token);
+  }
+}
+function handleHeadingClose(state, token, acc, index) {
+  var _state$tokens2;
+  var isInListItem = ((_state$tokens2 = state.tokens[index + 1]) === null || _state$tokens2 === void 0 ? void 0 : _state$tokens2.type) === 'list_item_close';
+  if (isInListItem) {
+    acc.push(new state.Token('paragraph_close', 'p', -1));
+  } else {
+    acc.push(token);
+  }
+}
+function _default(md) {
+  md.core.ruler.after('inline', 'ignore-list-heading-md-plugin', function (state) {
+    state.tokens = state.tokens.reduce(function (acc, token, index) {
+      var type = token.type;
+      if (type === 'heading_open') {
+        handleHeadingOpen(state, token, acc, index);
+      } else if (type === 'heading_close') {
+        handleHeadingClose(state, token, acc, index);
+      } else {
+        acc.push(token);
+      }
+      return acc;
+    }, []);
+  });
+}

package/dist/cjs/plugins/paste/{linkify-md-plugin.js → md-plugins/linkify-md-plugin.js}

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _linkifyIt = _interopRequireDefault(require("linkify-it"));
-var _utils = require("../hyperlink/utils");
+var _utils = require("../../hyperlink/utils");
 // File has been copied to packages/editor/editor-plugin-ai/src/provider/markdown-transformer/md/linkify-md-plugin.ts
 // If changes are made to this file, please make the same update in the linked file.
 

package/dist/cjs/plugins/paste/md.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.md = void 0;
 var _markdownIt = _interopRequireDefault(require("markdown-it"));
-var _linkifyMdPlugin = _interopRequireDefault(require("./linkify-md-plugin"));
-var _newlineMdPlugin = _interopRequireDefault(require("./newline-md-plugin"));
-var _paragraphMdPlugin = _interopRequireDefault(require("./paragraph-md-plugin"));
+var _linkifyMdPlugin = _interopRequireDefault(require("./md-plugins/linkify-md-plugin"));
+var _newlineMdPlugin = _interopRequireDefault(require("./md-plugins/newline-md-plugin"));
+var _paragraphMdPlugin = _interopRequireDefault(require("./md-plugins/paragraph-md-plugin"));
+var _ignoreListHeadingMdPlugin = _interopRequireDefault(require("./md-plugins/ignore-list-heading-md-plugin"));
 // File has been copied to packages/editor/editor-plugin-ai/src/provider/markdown-transformer/md/index.ts
 // If changes are made to this file, please make the same update in the linked file.
 
@@ -26,4 +27,5 @@ md.use(_paragraphMdPlugin.default);
 // enable modified version of linkify plugin
 // @see https://product-fabric.atlassian.net/browse/ED-3097
 md.use(_linkifyMdPlugin.default);
-md.use(_newlineMdPlugin.default);
+md.use(_newlineMdPlugin.default);
+md.use(_ignoreListHeadingMdPlugin.default);

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "183.0.8";
+var version = "183.0.9";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/plugins/paste/md-plugins/ignore-list-heading-md-plugin.js

@@ -0,0 +1,43 @@
+/*
+ * ED-15646
+ * Headings in list items are not supported in our schema.
+ * As the markdown transformer is used by the paste plugin,
+ * certain pastes will strip invalid lines as
+ * prosemirror-markdown cannot conform to the schema
+ */
+
+function handleHeadingOpen(state, token, acc, index) {
+  var _state$tokens;
+  const isInListItem = ((_state$tokens = state.tokens[index - 1]) === null || _state$tokens === void 0 ? void 0 : _state$tokens.type) === 'list_item_open';
+  if (isInListItem) {
+    acc.push(new state.Token('paragraph_open', 'p', 1));
+  } else {
+    acc.push(token);
+  }
+}
+function handleHeadingClose(state, token, acc, index) {
+  var _state$tokens2;
+  const isInListItem = ((_state$tokens2 = state.tokens[index + 1]) === null || _state$tokens2 === void 0 ? void 0 : _state$tokens2.type) === 'list_item_close';
+  if (isInListItem) {
+    acc.push(new state.Token('paragraph_close', 'p', -1));
+  } else {
+    acc.push(token);
+  }
+}
+export default function (md) {
+  md.core.ruler.after('inline', 'ignore-list-heading-md-plugin', function (state) {
+    state.tokens = state.tokens.reduce((acc, token, index) => {
+      const {
+        type
+      } = token;
+      if (type === 'heading_open') {
+        handleHeadingOpen(state, token, acc, index);
+      } else if (type === 'heading_close') {
+        handleHeadingClose(state, token, acc, index);
+      } else {
+        acc.push(token);
+      }
+      return acc;
+    }, []);
+  });
+}

package/dist/es2019/plugins/paste/{linkify-md-plugin.js → md-plugins/linkify-md-plugin.js}

@@ -3,7 +3,7 @@
 
 import { linkifyMatch } from '@atlaskit/adf-schema';
 import LinkifyIt from 'linkify-it';
-import { findFilepaths, isLinkInMatches } from '../hyperlink/utils';
+import { findFilepaths, isLinkInMatches } from '../../hyperlink/utils';
 
 // modified version of the original Linkify plugin
 // https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js

package/dist/es2019/plugins/paste/md.js

@@ -2,9 +2,10 @@
 // If changes are made to this file, please make the same update in the linked file.
 
 import MarkdownIt from 'markdown-it';
-import linkify from './linkify-md-plugin';
-import newline from './newline-md-plugin';
-import paragraph from './paragraph-md-plugin';
+import linkify from './md-plugins/linkify-md-plugin';
+import newline from './md-plugins/newline-md-plugin';
+import paragraph from './md-plugins/paragraph-md-plugin';
+import ignoreListHeading from './md-plugins/ignore-list-heading-md-plugin';
 export const md = MarkdownIt('zero', {
   html: false
 });
@@ -18,4 +19,5 @@ md.use(paragraph);
 // enable modified version of linkify plugin
 // @see https://product-fabric.atlassian.net/browse/ED-3097
 md.use(linkify);
-md.use(newline);
+md.use(newline);
+md.use(ignoreListHeading);

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "183.0.8";
+export const version = "183.0.9";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/plugins/paste/md-plugins/ignore-list-heading-md-plugin.js

@@ -0,0 +1,41 @@
+/*
+ * ED-15646
+ * Headings in list items are not supported in our schema.
+ * As the markdown transformer is used by the paste plugin,
+ * certain pastes will strip invalid lines as
+ * prosemirror-markdown cannot conform to the schema
+ */
+
+function handleHeadingOpen(state, token, acc, index) {
+  var _state$tokens;
+  var isInListItem = ((_state$tokens = state.tokens[index - 1]) === null || _state$tokens === void 0 ? void 0 : _state$tokens.type) === 'list_item_open';
+  if (isInListItem) {
+    acc.push(new state.Token('paragraph_open', 'p', 1));
+  } else {
+    acc.push(token);
+  }
+}
+function handleHeadingClose(state, token, acc, index) {
+  var _state$tokens2;
+  var isInListItem = ((_state$tokens2 = state.tokens[index + 1]) === null || _state$tokens2 === void 0 ? void 0 : _state$tokens2.type) === 'list_item_close';
+  if (isInListItem) {
+    acc.push(new state.Token('paragraph_close', 'p', -1));
+  } else {
+    acc.push(token);
+  }
+}
+export default function (md) {
+  md.core.ruler.after('inline', 'ignore-list-heading-md-plugin', function (state) {
+    state.tokens = state.tokens.reduce(function (acc, token, index) {
+      var type = token.type;
+      if (type === 'heading_open') {
+        handleHeadingOpen(state, token, acc, index);
+      } else if (type === 'heading_close') {
+        handleHeadingClose(state, token, acc, index);
+      } else {
+        acc.push(token);
+      }
+      return acc;
+    }, []);
+  });
+}

package/dist/esm/plugins/paste/{linkify-md-plugin.js → md-plugins/linkify-md-plugin.js}

@@ -3,7 +3,7 @@
 
 import { linkifyMatch } from '@atlaskit/adf-schema';
 import LinkifyIt from 'linkify-it';
-import { findFilepaths, isLinkInMatches } from '../hyperlink/utils';
+import { findFilepaths, isLinkInMatches } from '../../hyperlink/utils';
 
 // modified version of the original Linkify plugin
 // https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js

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

@@ -2,9 +2,10 @@
 // If changes are made to this file, please make the same update in the linked file.
 
 import MarkdownIt from 'markdown-it';
-import linkify from './linkify-md-plugin';
-import newline from './newline-md-plugin';
-import paragraph from './paragraph-md-plugin';
+import linkify from './md-plugins/linkify-md-plugin';
+import newline from './md-plugins/newline-md-plugin';
+import paragraph from './md-plugins/paragraph-md-plugin';
+import ignoreListHeading from './md-plugins/ignore-list-heading-md-plugin';
 export var md = MarkdownIt('zero', {
   html: false
 });
@@ -18,4 +19,5 @@ md.use(paragraph);
 // enable modified version of linkify plugin
 // @see https://product-fabric.atlassian.net/browse/ED-3097
 md.use(linkify);
-md.use(newline);
+md.use(newline);
+md.use(ignoreListHeading);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "183.0.8";
+export var version = "183.0.9";
 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": "183.0.8",
+	"version": "183.0.9",
 	"sideEffects": false
 }

package/dist/types/plugins/paste/md-plugins/ignore-list-heading-md-plugin.d.ts

@@ -0,0 +1,2 @@
+import type MarkdownIt from 'markdown-it';
+export default function (md: MarkdownIt): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "183.0.8",
+  "version": "183.0.9",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -178,9 +178,9 @@
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
-    "@atlassian/link-picker-atlassian-plugin": "^30.0.0",
-    "@atlassian/link-picker-plugins": "^20.0.0",
-    "@atlassian/search-provider": "2.4.1",
+    "@atlassian/link-picker-atlassian-plugin": "^30.1.0",
+    "@atlassian/link-picker-plugins": "^20.1.0",
+    "@atlassian/search-provider": "2.4.2",
     "@atlassian/ufo": "^0.2.0",
     "@emotion/jest": "^11.8.0",
     "@storybook/addon-knobs": "^5.3.18",