@atlaskit/adf-schema 19.2.3 → 20.0.0

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

@@ -5,38 +5,181 @@ 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,
   content: 'inline*',
   group: 'block',
-  marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer',
+  marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   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/schema/nodes/tableNodes.js

@@ -135,7 +135,7 @@ var createTableSpec = function createTableSpec() {
   var tableNodeSpec = {
     content: 'tableRow+',
     attrs: attrs,
-    marks: 'unsupportedMark unsupportedNodeAttribute',
+    marks: 'fragment unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
     selectable: false,
@@ -221,7 +221,7 @@ var tableCell = {
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle |  mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   attrs: cellAttrs,
   tableRole: 'cell',
-  marks: 'link alignment dataConsumer unsupportedMark unsupportedNodeAttribute',
+  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [// Ignore number cell copied from renderer
   {
@@ -258,7 +258,7 @@ var tableHeader = {
   attrs: cellAttrs,
   tableRole: 'header_cell',
   isolating: true,
-  marks: 'link alignment dataConsumer unsupportedMark unsupportedNodeAttribute',
+  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   parseDOM: [{
     tag: 'th',
     getAttrs: function getAttrs(dom) {

package/dist/cjs/utils/index.js

@@ -363,6 +363,18 @@ Object.defineProperty(exports, "normalizeUrl", {
     return _url.normalizeUrl;
   }
 });
+Object.defineProperty(exports, "linkify", {
+  enumerable: true,
+  get: function get() {
+    return _url.linkify;
+  }
+});
+Object.defineProperty(exports, "linkifyMatch", {
+  enumerable: true,
+  get: function get() {
+    return _url.linkifyMatch;
+  }
+});
 
 var _emoji = require("./confluence/emoji");
 

package/dist/cjs/utils/url.js

@@ -7,24 +7,82 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getLinkMatch = getLinkMatch;
 exports.normalizeUrl = normalizeUrl;
-exports.isSafeUrl = void 0;
+exports.linkifyMatch = exports.LINK_REGEXP = exports.linkify = exports.isSafeUrl = void 0;
 
 var _linkifyIt = _interopRequireDefault(require("linkify-it"));
 
 var whitelistedURLPatterns = [/^https?:\/\//im, /^ftps?:\/\//im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:/im, /^facetime:/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^#/im];
 
 var isSafeUrl = function isSafeUrl(url) {
+  var urlTrimmed = url.trim();
+
+  if (urlTrimmed.length === 0) {
+    return true;
+  }
+
   return whitelistedURLPatterns.some(function (p) {
-    return p.test(url.trim()) === true;
+    return p.test(urlTrimmed);
   });
 };
 
 exports.isSafeUrl = isSafeUrl;
 var linkify = (0, _linkifyIt.default)();
+exports.linkify = linkify;
 linkify.add('sourcetree:', 'http:');
+var tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
+var tlds2Char = 'a[cdefgilmnoqrtuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrtuvwxyz]|n[acefgilopruz]|om|p[aefghkmnrtw]|qa|r[eosuw]|s[abcdegijklmnrtuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
+tlds.push(tlds2Char);
+linkify.tlds(tlds, false);
+var LINK_REGEXP = /(https?|ftp):\/\/[^\s]+/;
+exports.LINK_REGEXP = LINK_REGEXP;
+
+var linkifyMatch = function linkifyMatch(text) {
+  var matches = [];
+
+  if (!LINK_REGEXP.test(text)) {
+    return matches;
+  }
+
+  var startpos = 0;
+  var substr;
+
+  while (substr = text.substr(startpos)) {
+    var link = (substr.match(LINK_REGEXP) || [''])[0];
+
+    if (link) {
+      var index = substr.search(LINK_REGEXP);
+      var start = index >= 0 ? index + startpos : index;
+      var end = start + link.length;
+      matches.push({
+        index: start,
+        lastIndex: end,
+        raw: link,
+        url: link,
+        text: link,
+        schema: ''
+      });
+      startpos += end;
+    } else {
+      break;
+    }
+  }
+
+  return matches;
+};
+
+exports.linkifyMatch = linkifyMatch;
 
 function getLinkMatch(str) {
-  var match = str && linkify.match(str);
+  if (!str) {
+    return null;
+  }
+
+  var match = linkifyMatch(str);
+
+  if (!match.length) {
+    match = linkify.match(str);
+  }
+
   return match && match[0];
 }
 /**
@@ -34,5 +92,5 @@ function getLinkMatch(str) {
 
 function normalizeUrl(url) {
   var match = getLinkMatch(url);
-  return match && match.url || url;
+  return match && match.url || '';
 }

package/dist/cjs/version.json

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

package/dist/es2019/index.js

@@ -1,2 +1,2 @@
-export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './schema';
-export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, normalizeHexColor, normalizeUrl, rgbToHex, uuid } from './utils';
+export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './schema';
+export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid } from './utils';

package/dist/es2019/schema/create-schema.js

@@ -1,7 +1,7 @@
 import { Schema } from 'prosemirror-model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
-import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedList, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaGroup, mediaSingle, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment } from './marks';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedList, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaGroup, mediaSingleWithCaption, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
@@ -83,7 +83,7 @@ const nodesInOrder = [{
   spec: codeBlock
 }, {
   name: 'panel',
-  spec: panel
+  spec: panel(true)
 }, {
   name: 'rule',
   spec: rule
@@ -104,7 +104,7 @@ const nodesInOrder = [{
   spec: mediaGroup
 }, {
   name: 'mediaSingle',
-  spec: mediaSingle
+  spec: mediaSingleWithCaption
 }, {
   name: 'mediaInline',
   spec: mediaInline
@@ -238,6 +238,9 @@ const marksInOrder = [{
 }, {
   name: 'dataConsumer',
   spec: dataConsumer
+}, {
+  name: 'fragment',
+  spec: fragment
 }, {
   name: 'indentation',
   spec: indentation
@@ -322,4 +325,6 @@ function isContentSupported(nodes, contentKey) {
   }
 
   return false;
-}
+}
+
+export const allowCustomPanel = true;

package/dist/es2019/schema/default-schema.js

@@ -1,12 +1,10 @@
-import { customPanel } from './nodes/panel';
-import { layoutSectionWithSingleColumn } from './nodes/layout-section';
-import { dataConsumer } from './marks/data-consumer';
+import { layoutSectionWithSingleColumn } from './nodes';
+import { dataConsumer, fragment } from './marks';
 import { createSchema } from './create-schema';
-import { mediaSingleWithCaption } from './nodes';
 
 const getDefaultSchemaConfig = () => {
   let defaultSchemaConfig = {
-    nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'rule', 'image', 'mention', 'media', 'mediaGroup', 'mediaSingle', 'mediaInline', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'hardBreak', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'decisionList', 'decisionItem', 'taskList', 'taskItem', 'unknownBlock', 'date', 'status', 'placeholder', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard', 'unsupportedBlock', 'unsupportedInline'],
+    nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'rule', 'image', 'caption', 'mention', 'media', 'mediaGroup', 'mediaSingle', 'mediaInline', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'hardBreak', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'decisionList', 'decisionItem', 'taskList', 'taskItem', 'unknownBlock', 'date', 'status', 'placeholder', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard', 'unsupportedBlock', 'unsupportedInline'],
     marks: ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'code', 'textColor', 'confluenceInlineComment', 'breakout', 'alignment', 'indentation', 'annotation', 'unsupportedMark', 'unsupportedNodeAttribute', 'typeAheadQuery' // https://product-fabric.atlassian.net/browse/ED-10214,
     ]
   };
@@ -15,18 +13,16 @@ const getDefaultSchemaConfig = () => {
 
 export const defaultSchemaConfig = getDefaultSchemaConfig();
 export const getSchemaBasedOnStage = (stage = 'final') => {
-  const defaultSchemaConfig = getDefaultSchemaConfig(); // TODO: ED-10445 remove stage0 check after panels with emoji are on full schema AND image captions are on full schema
+  const defaultSchemaConfig = getDefaultSchemaConfig();
 
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      panel: customPanel,
-      mediaSingle: mediaSingleWithCaption,
       layoutSection: layoutSectionWithSingleColumn
     };
     defaultSchemaConfig.customMarkSpecs = {
-      dataConsumer: dataConsumer
+      dataConsumer: dataConsumer,
+      fragment
     };
-    defaultSchemaConfig.nodes.push('caption');
     defaultSchemaConfig.nodes.push('mediaInline');
   }
 

package/dist/es2019/schema/index.js

@@ -1,5 +1,5 @@
-export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
-export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
+export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
+export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
 export { sanitizeNodes, createSchema } from './create-schema';

package/dist/es2019/schema/jira-schema.js

@@ -37,7 +37,7 @@ export default function makeSchema(config) {
   }
 
   if (config.allowMedia) {
-    nodes.push('mediaGroup', 'mediaSingle', 'media');
+    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption');
   }
 
   if (config.allowTextColor) {

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

@@ -0,0 +1,59 @@
+import { isDOMElement } from '../../utils/parseDOM';
+
+const parseFragment = maybeValue => {
+  var _maybeValue$getAttrib;
+
+  if (!isDOMElement(maybeValue)) {
+    return false;
+  }
+
+  const name = (_maybeValue$getAttrib = maybeValue.getAttribute('data-name')) !== null && _maybeValue$getAttrib !== void 0 ? _maybeValue$getAttrib : undefined;
+  const localId = maybeValue.getAttribute('data-localId');
+
+  if (!localId) {
+    return false;
+  }
+
+  return {
+    localId,
+    name
+  };
+};
+
+export const fragment = {
+  inclusive: false,
+  excludes: '',
+  attrs: {
+    localId: {
+      default: ''
+    },
+    name: {
+      default: null
+    }
+  },
+  parseDOM: [{
+    tag: '[data-mark-type="fragment"]',
+    getAttrs: maybeValue => parseFragment(maybeValue)
+  }],
+
+  toDOM(mark, inline) {
+    const wrapperStyle = inline ? 'span' : 'div';
+    return [wrapperStyle, {
+      'data-mark-type': 'fragment',
+      'data-name': mark.attrs.name,
+      'data-localId': mark.attrs.localId
+    }];
+  }
+
+};
+export const toJSON = mark => {
+  return {
+    type: mark.type.name,
+    attrs: {
+      localId: mark.attrs.localId,
+      ...(mark.attrs.name ? {
+        name: mark.attrs.name
+      } : {})
+    }
+  };
+};

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

@@ -14,4 +14,5 @@ export { indentation } from './indentation';
 export { annotation, AnnotationMarkStates, buildDataAttributes as buildAnnotationMarkDataAttributes, AnnotationTypes } from './annotation';
 export { unsupportedMark } from './unsupported-mark';
 export { unsupportedNodeAttribute } from './unsupported-node-attributes';
-export { dataConsumer, toJSON as dataConsumerToJSON } from './data-consumer';
+export { dataConsumer, toJSON as dataConsumerToJSON } from './data-consumer';
+export { fragment, toJSON as fragmentToJSON } from './fragment';

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';
 
@@ -18,28 +17,6 @@ const getLinkAttrs = attribute => domNode => {
   return attrs;
 };
 
-const getLinkAttrsWithCheck = attribute => domNode => {
-  const dom = domNode;
-  const hasTextOnlyChildren = Array.from(dom.childNodes).every(node => node.nodeType === Node.TEXT_NODE || node.nodeName === 'SPAN');
-
-  if (hasTextOnlyChildren) {
-    const href = dom.getAttribute(attribute) || '';
-    const attrs = {
-      __confluenceMetadata: dom.hasAttribute('__confluenceMetadata') ? JSON.parse(dom.getAttribute('__confluenceMetadata') || '') : undefined
-    };
-
-    if (isSafeUrl(href)) {
-      attrs.href = normalizeUrl(href);
-    } else {
-      return false;
-    }
-
-    return attrs;
-  }
-
-  return false;
-};
-
 export const link = {
   excludes: `${LINK} ${COLOR}`,
   // ED-5844 No multiple links in media node
@@ -57,39 +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: 'mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
-  }, {
-    tag: 'a[href]',
-    getAttrs: getLinkAttrsWithCheck('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: getLinkAttrsWithCheck('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/marks/unsupported-mark.js

@@ -3,6 +3,7 @@ export const unsupportedMark = {
     return ['span'];
   },
 
+  excludes: '',
   attrs: {
     originalValue: {}
   }

package/dist/es2019/schema/nodes/bodied-extension.js

@@ -4,7 +4,7 @@ const createBodiedExtensionNodeSpec = () => {
   const nodeSpec = {
     inline: false,
     group: 'block',
-    marks: 'link dataConsumer',
+    marks: 'link dataConsumer fragment',
     content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | extension | unsupportedBlock | embedCard)+',
     defining: true,
     selectable: true,

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

@@ -1,5 +1,4 @@
 /**
- * @stage 0
  * @name caption_node
  */
 export const caption = {

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

@@ -3,5 +3,5 @@
  */
 export const doc = {
   content: '(block|layoutSection)+',
-  marks: 'alignment breakout dataConsumer indentation link unsupportedMark unsupportedNodeAttribute'
+  marks: 'alignment breakout dataConsumer fragment indentation link unsupportedMark unsupportedNodeAttribute'
 };

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

@@ -28,6 +28,10 @@ export const emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
+  }, // Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon',
+    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',