@atlaskit/adf-schema 19.2.0 → 19.2.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/adf-schema
 
+## 19.2.3
+
+### Patch Changes
+
+- [`a80f50a843c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a80f50a843c) - [HOT-97158] Fix paste link heading issue
+
+## 19.2.2
+
+### Patch Changes
+
+- [`b85e7ce12cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b85e7ce12cd) - Internal upgrade of memoize-one to 6.0.0
+
+## 19.2.1
+
+### Patch Changes
+
+- [`a55dbcb3ecd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a55dbcb3ecd) - [ED-13882] Fix layout section ProseMirror Schema content
+
 ## 19.2.0
 
 ### Minor Changes

package/dist/cjs/schema/marks/link.js

@@ -9,8 +9,6 @@ exports.toJSON = exports.link = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _prosemirrorModel = require("prosemirror-model");
-
 var _groups = require("../groups");
 
 var _url = require("../../utils/url");
@@ -54,36 +52,14 @@ var link = {
     contentElement: function contentElement(node) {
       var clone = node.cloneNode(true);
       clone.removeAttribute('data-block-link');
+      clone.setAttribute('data-skip-paste', 'true');
       var wrapper = document.createElement('div');
       wrapper.appendChild(clone);
       return wrapper;
     }
   }, {
     tag: 'a[href]',
-    context: 'paragraph/|heading/|mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
-  }, {
-    /**
-     * When links aren't wrapped in a paragraph and due to
-     * the odd nature of how our schema is set up, prosemirror will
-     * add the link to the paragraph node itself where it should be on
-     * the text node, this satisfies our schema because link is allowed
-     * in many places (e.g. listitem)
-     * This change comes through via prosemirror-model@1.9.1
-     */
-    tag: 'a[href]',
-    getAttrs: getLinkAttrs('href'),
-    getContent: function getContent(node, schema) {
-      if (node instanceof HTMLAnchorElement) {
-        var href = node.getAttribute('href');
-        var text = node.innerText;
-        return _prosemirrorModel.Fragment.from(schema.nodes.paragraph.createChecked(undefined, schema.text(text, [schema.marks.link.create({
-          href: href
-        })])));
-      }
-
-      return _prosemirrorModel.Fragment.empty;
-    }
   }],
   toDOM: function toDOM(node, isInline) {
     var attrs = Object.keys(node.attrs).reduce(function (attrs, key) {

package/dist/cjs/schema/nodes/layout-section.js

@@ -22,7 +22,7 @@ exports.layoutSectionWithSingleColumn = exports.layoutSection = void 0;
  * @name layoutSection_with_single_column_node
  */
 var layoutSection = {
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{
@@ -41,7 +41,7 @@ var layoutSection = {
 };
 exports.layoutSection = layoutSection;
 var layoutSectionWithSingleColumn = {
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{

package/dist/cjs/schema/nodes/paragraph.js

@@ -5,30 +5,109 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.paragraph = void 0;
 
-/**
- * @name paragraph_node
- */
-
-/**
- * @name paragraph_with_no_marks_node
- */
-
-/**
- * NOTE: Need this because TS is too smart and inline everything.
- * So we need to give them separate identity.
- * Probably there's a way to solve it but that will need time and exploration.
- * // http://bit.ly/2raXFX5
- * type T1 = X | Y
- * type T2 = A | T1 | B // T2 = A | X | Y | B
- */
-
-/**
- * @name paragraph_with_alignment_node
- */
-
-/**
- * @name paragraph_with_indentation_node
- */
+var _prosemirrorModel = require("prosemirror-model");
+
+var _url = require("../../utils/url");
+
+var getLinkContent = function getLinkContent(node, schema) {
+  if (!(node instanceof HTMLAnchorElement)) {
+    return _prosemirrorModel.Fragment.empty;
+  }
+
+  var href = node.getAttribute('href') || '';
+  var text = node.innerText;
+
+  if (!text || text.length === 0) {
+    return _prosemirrorModel.Fragment.empty;
+  }
+
+  var marks = (0, _url.isSafeUrl)(href) ? [schema.marks.link.create({
+    href: href
+  })] : [];
+  var textNode = schema.text(text, marks);
+  return _prosemirrorModel.Fragment.from(textNode);
+};
+
+var blockTags = {
+  address: true,
+  article: true,
+  aside: true,
+  blockquote: true,
+  canvas: true,
+  dd: true,
+  div: true,
+  dl: true,
+  fieldset: true,
+  figcaption: true,
+  figure: true,
+  footer: true,
+  form: true,
+  h1: true,
+  h2: true,
+  h3: true,
+  h4: true,
+  h5: true,
+  h6: true,
+  header: true,
+  hgroup: true,
+  hr: true,
+  li: true,
+  noscript: true,
+  ol: true,
+  output: true,
+  p: true,
+  pre: true,
+  section: true,
+  table: true,
+  tfoot: true,
+  ul: true
+};
+
+var isListItemNode = function isListItemNode(node) {
+  return Boolean(node && node.nodeName.toLowerCase() === 'li');
+};
+
+var isTextNode = function isTextNode(node) {
+  return Boolean(node && node.nodeType === Node.TEXT_NODE);
+};
+
+var isImageNode = function isImageNode(node) {
+  return Boolean(node && node.nodeName.toLowerCase() === 'img');
+};
+
+var hasInlineImage = function hasInlineImage(node) {
+  if (!node) {
+    return false;
+  }
+
+  return Array.from(node.childNodes).some(function (child) {
+    var isImage = isImageNode(child);
+
+    if (!isImage && child.childNodes) {
+      return Array.from(node.childNodes).some(function (node) {
+        return hasInlineImage(node);
+      });
+    }
+
+    return isImage;
+  });
+};
+
+var hasWhiteSpacePre = function hasWhiteSpacePre(node) {
+  return Boolean(node instanceof HTMLElement && node.style.whiteSpace === 'pre');
+};
+
+var hasFontFamilyMonospace = function hasFontFamilyMonospace(node) {
+  return Boolean(node instanceof HTMLElement && node.style.fontFamily.includes('monospace'));
+};
+
+var isBlockLevelNode = function isBlockLevelNode(node) {
+  return Boolean(node && blockTags.hasOwnProperty(node.nodeName.toLowerCase()));
+};
+
+var NOT_INTERNAL_LINKS = [':not([data-inline-card])', ':not([data-block-card])', ':not([data-block-link])', ':not([data-skip-paste])'].join('');
+var ANCHOR_LINK = "a[href]".concat(NOT_INTERNAL_LINKS);
+var NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-pm-slice])', ':not([data-mark-type])'].join('');
 var pDOM = ['p', 0];
 var paragraph = {
   selectable: false,
@@ -37,6 +116,70 @@ var paragraph = {
   marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer',
   parseDOM: [{
     tag: 'p'
+  }, {
+    tag: "div".concat(NOT_INTERNAL_ELEMENTS, ", li:not([data-pm-slice])"),
+    priority: 100,
+    getAttrs: function getAttrs(node) {
+      if (!(node instanceof Node)) {
+        return false;
+      }
+
+      var isCodeBlock = hasWhiteSpacePre(node) || hasFontFamilyMonospace(node);
+
+      if (isCodeBlock || !node.hasChildNodes()) {
+        return false;
+      }
+
+      var hasInlineChildren = Array.from(node.childNodes).every(function (child) {
+        return !isBlockLevelNode(child) && // IMG is considered block for mediaSingle
+        !isImageNode(child);
+      });
+
+      if (!hasInlineChildren) {
+        return false;
+      }
+
+      if ( // We can skip this rule for pure list items
+      isListItemNode(node) && Array.from(node.childNodes).every(isTextNode)) {
+        return false;
+      }
+
+      return null;
+    }
+  }, {
+    tag: ":not(span) + ".concat(ANCHOR_LINK),
+    priority: 100,
+    getContent: getLinkContent
+  }, {
+    tag: ":not(span) > ".concat(ANCHOR_LINK, ":first-child"),
+    getAttrs: function getAttrs(node) {
+      if (!(node instanceof Node)) {
+        return false;
+      }
+
+      if (isBlockLevelNode(node.firstChild)) {
+        return null;
+      }
+
+      if (hasInlineImage(node)) {
+        return false;
+      }
+
+      var isNextSiblingValid = node.nextSibling === null || node.nextSibling instanceof Text && (node.nextSibling.textContent || '').trim().length === 0;
+
+      if (isNextSiblingValid) {
+        return null;
+      } // This rule should not match when there is any sibling after the anchor
+
+
+      if (!isBlockLevelNode(node.nextSibling)) {
+        return false;
+      }
+
+      return null;
+    },
+    priority: 100,
+    getContent: getLinkContent
   }],
   toDOM: function toDOM() {
     return pDOM;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "19.2.0",
+	"version": "19.2.4",
 	"sideEffects": false
 }

package/dist/es2019/schema/marks/link.js

@@ -1,4 +1,3 @@
-import { Fragment } from 'prosemirror-model';
 import { LINK, COLOR } from '../groups';
 import { isSafeUrl, normalizeUrl } from '../../utils/url';
 
@@ -35,36 +34,14 @@ export const link = {
     contentElement: node => {
       const clone = node.cloneNode(true);
       clone.removeAttribute('data-block-link');
+      clone.setAttribute('data-skip-paste', 'true');
       const wrapper = document.createElement('div');
       wrapper.appendChild(clone);
       return wrapper;
     }
   }, {
     tag: 'a[href]',
-    context: 'paragraph/|heading/|mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
-  }, {
-    /**
-     * When links aren't wrapped in a paragraph and due to
-     * the odd nature of how our schema is set up, prosemirror will
-     * add the link to the paragraph node itself where it should be on
-     * the text node, this satisfies our schema because link is allowed
-     * in many places (e.g. listitem)
-     * This change comes through via prosemirror-model@1.9.1
-     */
-    tag: 'a[href]',
-    getAttrs: getLinkAttrs('href'),
-    getContent: (node, schema) => {
-      if (node instanceof HTMLAnchorElement) {
-        const href = node.getAttribute('href');
-        const text = node.innerText;
-        return Fragment.from(schema.nodes.paragraph.createChecked(undefined, schema.text(text, [schema.marks.link.create({
-          href
-        })])));
-      }
-
-      return Fragment.empty;
-    }
   }],
 
   toDOM(node, isInline) {

package/dist/es2019/schema/nodes/layout-section.js

@@ -15,7 +15,7 @@
  * @name layoutSection_with_single_column_node
  */
 export const layoutSection = {
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{
@@ -35,7 +35,7 @@ export const layoutSection = {
 
 };
 export const layoutSectionWithSingleColumn = {
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{

package/dist/es2019/schema/nodes/paragraph.js

@@ -1,27 +1,103 @@
-/**
- * @name paragraph_node
- */
-
-/**
- * @name paragraph_with_no_marks_node
- */
-
-/**
- * NOTE: Need this because TS is too smart and inline everything.
- * So we need to give them separate identity.
- * Probably there's a way to solve it but that will need time and exploration.
- * // http://bit.ly/2raXFX5
- * type T1 = X | Y
- * type T2 = A | T1 | B // T2 = A | X | Y | B
- */
-
-/**
- * @name paragraph_with_alignment_node
- */
-
-/**
- * @name paragraph_with_indentation_node
- */
+import { Fragment } from 'prosemirror-model';
+import { isSafeUrl } from '../../utils/url';
+
+const getLinkContent = (node, schema) => {
+  if (!(node instanceof HTMLAnchorElement)) {
+    return Fragment.empty;
+  }
+
+  const href = node.getAttribute('href') || '';
+  const text = node.innerText;
+
+  if (!text || text.length === 0) {
+    return Fragment.empty;
+  }
+
+  const marks = isSafeUrl(href) ? [schema.marks.link.create({
+    href
+  })] : [];
+  const textNode = schema.text(text, marks);
+  return Fragment.from(textNode);
+};
+
+const blockTags = {
+  address: true,
+  article: true,
+  aside: true,
+  blockquote: true,
+  canvas: true,
+  dd: true,
+  div: true,
+  dl: true,
+  fieldset: true,
+  figcaption: true,
+  figure: true,
+  footer: true,
+  form: true,
+  h1: true,
+  h2: true,
+  h3: true,
+  h4: true,
+  h5: true,
+  h6: true,
+  header: true,
+  hgroup: true,
+  hr: true,
+  li: true,
+  noscript: true,
+  ol: true,
+  output: true,
+  p: true,
+  pre: true,
+  section: true,
+  table: true,
+  tfoot: true,
+  ul: true
+};
+
+const isListItemNode = node => {
+  return Boolean(node && node.nodeName.toLowerCase() === 'li');
+};
+
+const isTextNode = node => {
+  return Boolean(node && node.nodeType === Node.TEXT_NODE);
+};
+
+const isImageNode = node => {
+  return Boolean(node && node.nodeName.toLowerCase() === 'img');
+};
+
+const hasInlineImage = node => {
+  if (!node) {
+    return false;
+  }
+
+  return Array.from(node.childNodes).some(child => {
+    const isImage = isImageNode(child);
+
+    if (!isImage && child.childNodes) {
+      return Array.from(node.childNodes).some(node => hasInlineImage(node));
+    }
+
+    return isImage;
+  });
+};
+
+const hasWhiteSpacePre = node => {
+  return Boolean(node instanceof HTMLElement && node.style.whiteSpace === 'pre');
+};
+
+const hasFontFamilyMonospace = node => {
+  return Boolean(node instanceof HTMLElement && node.style.fontFamily.includes('monospace'));
+};
+
+const isBlockLevelNode = node => {
+  return Boolean(node && blockTags.hasOwnProperty(node.nodeName.toLowerCase()));
+};
+
+const NOT_INTERNAL_LINKS = [':not([data-inline-card])', ':not([data-block-card])', ':not([data-block-link])', ':not([data-skip-paste])'].join('');
+const ANCHOR_LINK = `a[href]${NOT_INTERNAL_LINKS}`;
+const NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-pm-slice])', ':not([data-mark-type])'].join('');
 const pDOM = ['p', 0];
 export const paragraph = {
   selectable: false,
@@ -30,6 +106,68 @@ export const paragraph = {
   marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer',
   parseDOM: [{
     tag: 'p'
+  }, {
+    tag: `div${NOT_INTERNAL_ELEMENTS}, li:not([data-pm-slice])`,
+    priority: 100,
+    getAttrs: node => {
+      if (!(node instanceof Node)) {
+        return false;
+      }
+
+      const isCodeBlock = hasWhiteSpacePre(node) || hasFontFamilyMonospace(node);
+
+      if (isCodeBlock || !node.hasChildNodes()) {
+        return false;
+      }
+
+      const hasInlineChildren = Array.from(node.childNodes).every(child => !isBlockLevelNode(child) && // IMG is considered block for mediaSingle
+      !isImageNode(child));
+
+      if (!hasInlineChildren) {
+        return false;
+      }
+
+      if ( // We can skip this rule for pure list items
+      isListItemNode(node) && Array.from(node.childNodes).every(isTextNode)) {
+        return false;
+      }
+
+      return null;
+    }
+  }, {
+    tag: `:not(span) + ${ANCHOR_LINK}`,
+    priority: 100,
+    getContent: getLinkContent
+  }, {
+    tag: `:not(span) > ${ANCHOR_LINK}:first-child`,
+    getAttrs: node => {
+      if (!(node instanceof Node)) {
+        return false;
+      }
+
+      if (isBlockLevelNode(node.firstChild)) {
+        return null;
+      }
+
+      if (hasInlineImage(node)) {
+        return false;
+      }
+
+      const isNextSiblingValid = node.nextSibling === null || node.nextSibling instanceof Text && (node.nextSibling.textContent || '').trim().length === 0;
+
+      if (isNextSiblingValid) {
+        return null;
+      } // This rule should not match when there is any sibling after the anchor
+
+
+      if (!isBlockLevelNode(node.nextSibling)) {
+        return false;
+      }
+
+      return null;
+    },
+    priority: 100,
+    getContent: getLinkContent
   }],
 
   toDOM() {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "19.2.0",
+	"version": "19.2.4",
 	"sideEffects": false
 }

package/dist/esm/schema/marks/link.js

@@ -4,7 +4,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-import { Fragment } from 'prosemirror-model';
 import { LINK, COLOR } from '../groups';
 import { isSafeUrl, normalizeUrl } from '../../utils/url';
 
@@ -43,36 +42,14 @@ export var link = {
     contentElement: function contentElement(node) {
       var clone = node.cloneNode(true);
       clone.removeAttribute('data-block-link');
+      clone.setAttribute('data-skip-paste', 'true');
       var wrapper = document.createElement('div');
       wrapper.appendChild(clone);
       return wrapper;
     }
   }, {
     tag: 'a[href]',
-    context: 'paragraph/|heading/|mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
-  }, {
-    /**
-     * When links aren't wrapped in a paragraph and due to
-     * the odd nature of how our schema is set up, prosemirror will
-     * add the link to the paragraph node itself where it should be on
-     * the text node, this satisfies our schema because link is allowed
-     * in many places (e.g. listitem)
-     * This change comes through via prosemirror-model@1.9.1
-     */
-    tag: 'a[href]',
-    getAttrs: getLinkAttrs('href'),
-    getContent: function getContent(node, schema) {
-      if (node instanceof HTMLAnchorElement) {
-        var href = node.getAttribute('href');
-        var text = node.innerText;
-        return Fragment.from(schema.nodes.paragraph.createChecked(undefined, schema.text(text, [schema.marks.link.create({
-          href: href
-        })])));
-      }
-
-      return Fragment.empty;
-    }
   }],
   toDOM: function toDOM(node, isInline) {
     var attrs = Object.keys(node.attrs).reduce(function (attrs, key) {

package/dist/esm/schema/nodes/layout-section.js

@@ -15,7 +15,7 @@
  * @name layoutSection_with_single_column_node
  */
 export var layoutSection = {
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{
@@ -33,7 +33,7 @@ export var layoutSection = {
   }
 };
 export var layoutSectionWithSingleColumn = {
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{

package/dist/esm/schema/nodes/paragraph.js

@@ -1,27 +1,105 @@
-/**
- * @name paragraph_node
- */
-
-/**
- * @name paragraph_with_no_marks_node
- */
-
-/**
- * NOTE: Need this because TS is too smart and inline everything.
- * So we need to give them separate identity.
- * Probably there's a way to solve it but that will need time and exploration.
- * // http://bit.ly/2raXFX5
- * type T1 = X | Y
- * type T2 = A | T1 | B // T2 = A | X | Y | B
- */
-
-/**
- * @name paragraph_with_alignment_node
- */
-
-/**
- * @name paragraph_with_indentation_node
- */
+import { Fragment } from 'prosemirror-model';
+import { isSafeUrl } from '../../utils/url';
+
+var getLinkContent = function getLinkContent(node, schema) {
+  if (!(node instanceof HTMLAnchorElement)) {
+    return Fragment.empty;
+  }
+
+  var href = node.getAttribute('href') || '';
+  var text = node.innerText;
+
+  if (!text || text.length === 0) {
+    return Fragment.empty;
+  }
+
+  var marks = isSafeUrl(href) ? [schema.marks.link.create({
+    href: href
+  })] : [];
+  var textNode = schema.text(text, marks);
+  return Fragment.from(textNode);
+};
+
+var blockTags = {
+  address: true,
+  article: true,
+  aside: true,
+  blockquote: true,
+  canvas: true,
+  dd: true,
+  div: true,
+  dl: true,
+  fieldset: true,
+  figcaption: true,
+  figure: true,
+  footer: true,
+  form: true,
+  h1: true,
+  h2: true,
+  h3: true,
+  h4: true,
+  h5: true,
+  h6: true,
+  header: true,
+  hgroup: true,
+  hr: true,
+  li: true,
+  noscript: true,
+  ol: true,
+  output: true,
+  p: true,
+  pre: true,
+  section: true,
+  table: true,
+  tfoot: true,
+  ul: true
+};
+
+var isListItemNode = function isListItemNode(node) {
+  return Boolean(node && node.nodeName.toLowerCase() === 'li');
+};
+
+var isTextNode = function isTextNode(node) {
+  return Boolean(node && node.nodeType === Node.TEXT_NODE);
+};
+
+var isImageNode = function isImageNode(node) {
+  return Boolean(node && node.nodeName.toLowerCase() === 'img');
+};
+
+var hasInlineImage = function hasInlineImage(node) {
+  if (!node) {
+    return false;
+  }
+
+  return Array.from(node.childNodes).some(function (child) {
+    var isImage = isImageNode(child);
+
+    if (!isImage && child.childNodes) {
+      return Array.from(node.childNodes).some(function (node) {
+        return hasInlineImage(node);
+      });
+    }
+
+    return isImage;
+  });
+};
+
+var hasWhiteSpacePre = function hasWhiteSpacePre(node) {
+  return Boolean(node instanceof HTMLElement && node.style.whiteSpace === 'pre');
+};
+
+var hasFontFamilyMonospace = function hasFontFamilyMonospace(node) {
+  return Boolean(node instanceof HTMLElement && node.style.fontFamily.includes('monospace'));
+};
+
+var isBlockLevelNode = function isBlockLevelNode(node) {
+  return Boolean(node && blockTags.hasOwnProperty(node.nodeName.toLowerCase()));
+};
+
+var NOT_INTERNAL_LINKS = [':not([data-inline-card])', ':not([data-block-card])', ':not([data-block-link])', ':not([data-skip-paste])'].join('');
+var ANCHOR_LINK = "a[href]".concat(NOT_INTERNAL_LINKS);
+var NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-pm-slice])', ':not([data-mark-type])'].join('');
 var pDOM = ['p', 0];
 export var paragraph = {
   selectable: false,
@@ -30,6 +108,70 @@ export var paragraph = {
   marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer',
   parseDOM: [{
     tag: 'p'
+  }, {
+    tag: "div".concat(NOT_INTERNAL_ELEMENTS, ", li:not([data-pm-slice])"),
+    priority: 100,
+    getAttrs: function getAttrs(node) {
+      if (!(node instanceof Node)) {
+        return false;
+      }
+
+      var isCodeBlock = hasWhiteSpacePre(node) || hasFontFamilyMonospace(node);
+
+      if (isCodeBlock || !node.hasChildNodes()) {
+        return false;
+      }
+
+      var hasInlineChildren = Array.from(node.childNodes).every(function (child) {
+        return !isBlockLevelNode(child) && // IMG is considered block for mediaSingle
+        !isImageNode(child);
+      });
+
+      if (!hasInlineChildren) {
+        return false;
+      }
+
+      if ( // We can skip this rule for pure list items
+      isListItemNode(node) && Array.from(node.childNodes).every(isTextNode)) {
+        return false;
+      }
+
+      return null;
+    }
+  }, {
+    tag: ":not(span) + ".concat(ANCHOR_LINK),
+    priority: 100,
+    getContent: getLinkContent
+  }, {
+    tag: ":not(span) > ".concat(ANCHOR_LINK, ":first-child"),
+    getAttrs: function getAttrs(node) {
+      if (!(node instanceof Node)) {
+        return false;
+      }
+
+      if (isBlockLevelNode(node.firstChild)) {
+        return null;
+      }
+
+      if (hasInlineImage(node)) {
+        return false;
+      }
+
+      var isNextSiblingValid = node.nextSibling === null || node.nextSibling instanceof Text && (node.nextSibling.textContent || '').trim().length === 0;
+
+      if (isNextSiblingValid) {
+        return null;
+      } // This rule should not match when there is any sibling after the anchor
+
+
+      if (!isBlockLevelNode(node.nextSibling)) {
+        return false;
+      }
+
+      return null;
+    },
+    priority: 100,
+    getContent: getLinkContent
   }],
   toDOM: function toDOM() {
     return pDOM;

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "19.2.0",
+	"version": "19.2.4",
 	"sideEffects": false
 }

package/dist/types/schema/nodes/layout-section.d.ts

@@ -19,7 +19,7 @@ export declare type LayoutSectionFullDefinition = LayoutSectionBaseDefinition &
     type: 'layoutSection';
     marks?: Array<BreakoutMarkDefinition>;
     /**
-     * @minItems 1
+     * @minItems 2
      * @maxItems 3
      * @allowUnsupportedBlock true
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "19.2.0",
+  "version": "19.2.4",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
     "@types/prosemirror-state": "^1.2.0",
     "css-color-names": "0.0.4",
     "linkify-it": "^2.0.3",
-    "memoize-one": "^5.1.0",
+    "memoize-one": "^6.0.0",
     "prosemirror-model": "1.11.0",
     "prosemirror-transform": "1.2.8"
   },