@atlaskit/adf-schema 19.2.1 → 19.3.1

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

@@ -10,12 +10,8 @@ export let 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 const customPanel = {
-  group: 'block',
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
+const getDefaultAttrs = () => {
+  let attrs = {
     panelType: {
       default: 'info'
     },
@@ -25,30 +21,54 @@ export const customPanel = {
     panelColor: {
       default: null
     }
-  },
-  parseDOM: [{
-    tag: 'div[data-panel-type]',
-    getAttrs: dom => ({
-      panelType: dom.getAttribute('data-panel-type'),
+  };
+  return attrs;
+};
+
+const getDomAttrs = nodeAttrs => {
+  let attrs = {
+    'data-panel-type': nodeAttrs.panelType,
+    'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-color': nodeAttrs.panelColor
+  };
+  return attrs;
+};
+
+const getParseDOMAttrs = (allowCustomPanel, dom) => {
+  let parseDOMAttrs = {
+    panelType: dom.getAttribute('data-panel-type')
+  };
+
+  if (allowCustomPanel) {
+    parseDOMAttrs = { ...parseDOMAttrs,
       panelIcon: dom.getAttribute('data-panel-icon'),
       panelColor: dom.getAttribute('data-panel-color')
-    })
-  }],
-
-  toDOM(node) {
-    const {
-      panelType,
-      panelIcon,
-      panelColor
-    } = node.attrs;
-    const attrs = {
-      'data-panel-type': panelType,
-      'data-panel-icon': panelIcon,
-      'data-panel-color': panelColor
     };
-    return ['div', attrs, ['div', {}, 0]];
+  } else {
+    parseDOMAttrs.panelType = parseDOMAttrs.panelType === PanelType.CUSTOM ? PanelType.INFO : parseDOMAttrs.panelType;
   }
 
+  return parseDOMAttrs;
+};
+
+export const customPanel = allowCustomPanel => {
+  const panelNodeSpec = {
+    group: 'block',
+    content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
+    marks: 'unsupportedMark unsupportedNodeAttribute',
+    attrs: getDefaultAttrs(),
+    parseDOM: [{
+      tag: 'div[data-panel-type]',
+      getAttrs: dom => getParseDOMAttrs(allowCustomPanel, dom)
+    }],
+
+    toDOM(node) {
+      const attrs = getDomAttrs(node.attrs);
+      return ['div', attrs, ['div', {}, 0]];
+    }
+
+  };
+  return panelNodeSpec;
 };
 export const panel = {
   group: 'block',

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/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/es2019/utils/url.js

@@ -3,10 +3,57 @@ const whitelistedURLPatterns = [/^https?:\/\//im, /^ftps?:\/\//im, /^\//im, /^ma
 export const isSafeUrl = url => {
   return whitelistedURLPatterns.some(p => p.test(url.trim()) === true);
 };
-const linkify = LinkifyIt();
+export const linkify = LinkifyIt();
 linkify.add('sourcetree:', 'http:');
+const tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
+const 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 const LINK_REGEXP = /(https?|ftp):\/\/[^\s]+/;
+export const linkifyMatch = text => {
+  const matches = [];
+
+  if (!LINK_REGEXP.test(text)) {
+    return matches;
+  }
+
+  let startpos = 0;
+  let substr;
+
+  while (substr = text.substr(startpos)) {
+    const link = (substr.match(LINK_REGEXP) || [''])[0];
+
+    if (link) {
+      const index = substr.search(LINK_REGEXP);
+      const start = index >= 0 ? index + startpos : index;
+      const 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) {
-  const match = str && linkify.match(str);
+  if (!str) {
+    return null;
+  }
+
+  let match = linkifyMatch(str);
+
+  if (!match.length) {
+    match = linkify.match(str);
+  }
+
   return match && match[0];
 }
 /**
@@ -15,5 +62,5 @@ export function getLinkMatch(str) {
 
 export function normalizeUrl(url) {
   const match = getLinkMatch(url);
-  return match && match.url || url;
+  return match && match.url || '';
 }

package/dist/es2019/version.json

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

package/dist/esm/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 { 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/esm/schema/create-schema.js

@@ -335,4 +335,6 @@ function isContentSupported(nodes, contentKey) {
   }
 
   return false;
-}
+}
+
+export var allowCustomPanel = true;

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

@@ -1,7 +1,7 @@
 import { customPanel } from './nodes/panel';
 import { layoutSectionWithSingleColumn } from './nodes/layout-section';
 import { dataConsumer } from './marks/data-consumer';
-import { createSchema } from './create-schema';
+import { allowCustomPanel, createSchema } from './create-schema';
 import { mediaSingleWithCaption } from './nodes';
 
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
@@ -20,7 +20,7 @@ export var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
 
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      panel: customPanel,
+      panel: customPanel(allowCustomPanel),
       mediaSingle: mediaSingleWithCaption,
       layoutSection: layoutSectionWithSingleColumn
     };

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/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/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,29 +27,54 @@ 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 customPanel = function customPanel(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]];
+    }
+  };
+  return panelNodeSpec;
 };
 export var panel = {
   group: 'block',