@atlaskit/adf-schema 19.2.3 → 20.0.0

package/dist/esm/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/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';
 
@@ -26,32 +25,6 @@ var getLinkAttrs = function getLinkAttrs(attribute) {
   };
 };
 
-var getLinkAttrsWithCheck = function getLinkAttrsWithCheck(attribute) {
-  return function (domNode) {
-    var dom = domNode;
-    var hasTextOnlyChildren = Array.from(dom.childNodes).every(function (node) {
-      return node.nodeType === Node.TEXT_NODE || node.nodeName === 'SPAN';
-    });
-
-    if (hasTextOnlyChildren) {
-      var href = dom.getAttribute(attribute) || '';
-      var 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 var link = {
   excludes: "".concat(LINK, " ").concat(COLOR),
   // ED-5844 No multiple links in media node
@@ -69,39 +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: '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: 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/marks/unsupported-mark.js

@@ -2,6 +2,7 @@ export var unsupportedMark = {
   toDOM: function toDOM() {
     return ['span'];
   },
+  excludes: '',
   attrs: {
     originalValue: {}
   }

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

@@ -4,7 +4,7 @@ var createBodiedExtensionNodeSpec = function createBodiedExtensionNodeSpec() {
   var 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/esm/schema/nodes/caption.js

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

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

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

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

@@ -28,6 +28,10 @@ export var 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]',

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

@@ -20,7 +20,7 @@ function getExpandAttrs(domNode) {
 export var expand = {
   inline: false,
   group: 'block',
-  marks: 'link dataConsumer unsupportedMark unsupportedNodeAttribute',
+  marks: 'link dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   isolating: true,
   selectable: true,

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

@@ -15,7 +15,7 @@ export { emoji } from './emoji';
 export { image } from './image';
 export { mention, toJSON as mentionToJSON } from './mention';
 export { listItem } from './list-item';
-export { panel, customPanel, PanelType } from './panel';
+export { panel, PanelType } from './panel';
 export { text } from './text';
 export { default as unknownBlock } from './unknown-block';
 export { caption } from './caption';

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

@@ -4,7 +4,7 @@
 export var layoutColumn = {
   content: '(block|unsupportedBlock)+',
   isolating: true,
-  marks: 'link alignment indentation dataConsumer unsupportedMark unsupportedNodeAttribute',
+  marks: 'link alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   attrs: {
     width: {

package/dist/esm/schema/nodes/media-single.js

@@ -23,7 +23,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 /**
  * @name mediaSingle_caption_node
- * @stage 0
  */
 export var defaultAttrs = {
   width: {
@@ -69,6 +68,7 @@ export var mediaSingle = {
   }
 };
 export var mediaSingleWithCaption = _objectSpread(_objectSpread({}, mediaSingle), {}, {
+  atom: false,
   content: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*'
 });
 export var toJSON = function toJSON(node) {

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

@@ -1,3 +1,9 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+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; }
+
 export var PanelType;
 
 (function (PanelType) {
@@ -10,12 +16,8 @@ export var PanelType;
   PanelType["CUSTOM"] = "custom";
 })(PanelType || (PanelType = {}));
 
-//TODO: ED-10445 rename to panel and merge with the other panel node spec, after emoji panels moved to full schema
-export var customPanel = {
-  group: 'block',
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
+var getDefaultAttrs = function getDefaultAttrs() {
+  var attrs = {
     panelType: {
       default: 'info'
     },
@@ -25,52 +27,52 @@ export var customPanel = {
     panelColor: {
       default: null
     }
-  },
-  parseDOM: [{
-    tag: 'div[data-panel-type]',
-    getAttrs: function getAttrs(dom) {
-      return {
-        panelType: dom.getAttribute('data-panel-type'),
-        panelIcon: dom.getAttribute('data-panel-icon'),
-        panelColor: dom.getAttribute('data-panel-color')
-      };
-    }
-  }],
-  toDOM: function toDOM(node) {
-    var _node$attrs = node.attrs,
-        panelType = _node$attrs.panelType,
-        panelIcon = _node$attrs.panelIcon,
-        panelColor = _node$attrs.panelColor;
-    var attrs = {
-      'data-panel-type': panelType,
-      'data-panel-icon': panelIcon,
-      'data-panel-color': panelColor
-    };
-    return ['div', attrs, ['div', {}, 0]];
+  };
+  return attrs;
+};
+
+var getDomAttrs = function getDomAttrs(nodeAttrs) {
+  var attrs = {
+    'data-panel-type': nodeAttrs.panelType,
+    'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-color': nodeAttrs.panelColor
+  };
+  return attrs;
+};
+
+var getParseDOMAttrs = function getParseDOMAttrs(allowCustomPanel, dom) {
+  var parseDOMAttrs = {
+    panelType: dom.getAttribute('data-panel-type')
+  };
+
+  if (allowCustomPanel) {
+    parseDOMAttrs = _objectSpread(_objectSpread({}, parseDOMAttrs), {}, {
+      panelIcon: dom.getAttribute('data-panel-icon'),
+      panelColor: dom.getAttribute('data-panel-color')
+    });
+  } else {
+    parseDOMAttrs.panelType = parseDOMAttrs.panelType === PanelType.CUSTOM ? PanelType.INFO : parseDOMAttrs.panelType;
   }
+
+  return parseDOMAttrs;
 };
-export var panel = {
-  group: 'block',
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    panelType: {
-      default: 'info'
-    }
-  },
-  parseDOM: [{
-    tag: 'div[data-panel-type]',
-    getAttrs: function getAttrs(dom) {
-      return {
-        panelType: dom.getAttribute('data-panel-type')
-      };
+
+export var panel = function panel(allowCustomPanel) {
+  var panelNodeSpec = {
+    group: 'block',
+    content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
+    marks: 'unsupportedMark unsupportedNodeAttribute',
+    attrs: getDefaultAttrs(),
+    parseDOM: [{
+      tag: 'div[data-panel-type]',
+      getAttrs: function getAttrs(dom) {
+        return getParseDOMAttrs(allowCustomPanel, dom);
+      }
+    }],
+    toDOM: function toDOM(node) {
+      var attrs = getDomAttrs(node.attrs);
+      return ['div', attrs, ['div', {}, 0]];
     }
-  }],
-  toDOM: function toDOM(node) {
-    var panelType = node.attrs.panelType;
-    var attrs = {
-      'data-panel-type': panelType
-    };
-    return ['div', attrs, ['div', {}, 0]];
-  }
+  };
+  return panelNodeSpec;
 };

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

@@ -1,35 +1,177 @@
-/**
- * @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,
   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/esm/schema/nodes/tableNodes.js

@@ -107,7 +107,7 @@ var createTableSpec = function createTableSpec() {
   var tableNodeSpec = {
     content: 'tableRow+',
     attrs: attrs,
-    marks: 'unsupportedMark unsupportedNodeAttribute',
+    marks: 'fragment unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
     selectable: false,
@@ -189,7 +189,7 @@ export 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
   {
@@ -222,7 +222,7 @@ export 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/esm/utils/index.js

@@ -1,4 +1,4 @@
 export { acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, getEmojiAcName } from './confluence/emoji';
 export { generateUuid, uuid } from './uuid';
 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, hexToRgb, hexToRgba, isHex, isRgb, normalizeHexColor, rgbToHex } from './colors';
-export { getLinkMatch, isSafeUrl, normalizeUrl } from './url';
+export { getLinkMatch, isSafeUrl, normalizeUrl, linkify, linkifyMatch } from './url';

package/dist/esm/utils/url.js

@@ -1,14 +1,67 @@
 import LinkifyIt from '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];
 export 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);
   });
 };
-var linkify = LinkifyIt();
+export var linkify = LinkifyIt();
 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);
+export var LINK_REGEXP = /(https?|ftp):\/\/[^\s]+/;
+export 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;
+};
 export 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];
 }
 /**
@@ -17,5 +70,5 @@ export function getLinkMatch(str) {
 
 export function normalizeUrl(url) {
   var match = getLinkMatch(url);
-  return match && match.url || url;
+  return match && match.url || '';
 }

package/dist/esm/version.json

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