@atlaskit/adf-schema 19.2.3 → 19.3.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/adf-schema
 
+## 19.3.0
+
+### Minor Changes
+
+- [`93da0afefce`](https://bitbucket.org/atlassian/atlassian-frontend/commits/93da0afefce) - CETI-78 Change panel nodeSpec to handle paste when feature flag is off
+- [`971845eac0d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/971845eac0d) - CETI-96 Added new rule to emoji to solve the duplicate icon issue when we copy from renderer
+- [`e856b56fd31`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e856b56fd31) - ED-13669 reuse same links normalization method in plugin and adf schema
+
 ## 19.2.3
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -1059,6 +1059,18 @@ Object.defineProperty(exports, "isSafeUrl", {
     return _utils.isSafeUrl;
   }
 });
+Object.defineProperty(exports, "linkify", {
+  enumerable: true,
+  get: function get() {
+    return _utils.linkify;
+  }
+});
+Object.defineProperty(exports, "linkifyMatch", {
+  enumerable: true,
+  get: function get() {
+    return _utils.linkifyMatch;
+  }
+});
 Object.defineProperty(exports, "normalizeHexColor", {
   enumerable: true,
   get: function get() {

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createSchema = createSchema;
 exports.sanitizeNodes = sanitizeNodes;
 exports.sanitizeNodeSpecContent = sanitizeNodeSpecContent;
+exports.allowCustomPanel = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -351,4 +352,7 @@ function isContentSupported(nodes, contentKey) {
   }
 
   return false;
-}
+}
+
+var allowCustomPanel = true;
+exports.allowCustomPanel = allowCustomPanel;

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

@@ -33,7 +33,7 @@ var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
 
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      panel: _panel.customPanel,
+      panel: (0, _panel.customPanel)(_createSchema.allowCustomPanel),
       mediaSingle: _nodes.mediaSingleWithCaption,
       layoutSection: _layoutSection.layoutSectionWithSingleColumn
     };

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

@@ -32,6 +32,10 @@ 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/cjs/schema/nodes/panel.js

@@ -1,9 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.panel = exports.customPanel = exports.PanelType = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@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) { (0, _defineProperty2.default)(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; }
+
 var PanelType;
 exports.PanelType = PanelType;
 
@@ -17,12 +26,8 @@ exports.PanelType = PanelType;
   PanelType["CUSTOM"] = "custom";
 })(PanelType || (exports.PanelType = PanelType = {}));
 
-//TODO: ED-10445 rename to panel and merge with the other panel node spec, after emoji panels moved to full schema
-var customPanel = {
-  group: 'block',
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
+var getDefaultAttrs = function getDefaultAttrs() {
+  var attrs = {
     panelType: {
       default: 'info'
     },
@@ -32,30 +37,56 @@ 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;
 };
+
+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;
+};
+
 exports.customPanel = customPanel;
 var panel = {
   group: 'block',

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,7 +7,7 @@ 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"));
 
@@ -21,10 +21,62 @@ var isSafeUrl = function isSafeUrl(url) {
 
 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 +86,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": "19.3.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 { 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

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

package/dist/es2019/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';
 
 const getDefaultSchemaConfig = () => {
@@ -19,7 +19,7 @@ export const getSchemaBasedOnStage = (stage = 'final') => {
 
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      panel: customPanel,
+      panel: customPanel(allowCustomPanel),
       mediaSingle: mediaSingleWithCaption,
       layoutSection: layoutSectionWithSingleColumn
     };

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]',

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/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.3",
+	"version": "19.3.0",
 	"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/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',

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

@@ -5,10 +5,57 @@ export var isSafeUrl = function isSafeUrl(url) {
     return p.test(url.trim()) === true;
   });
 };
-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 +64,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": "19.3.0",
 	"sideEffects": false
 }

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 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 type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, } 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';
 export type { Match, NameToEmoji } from './utils';

package/dist/types/schema/create-schema.d.ts

@@ -29,3 +29,4 @@ export interface SchemaCustomNodeSpecs {
 export interface SchemaCustomMarkSpecs {
     [name: string]: MarkSpec;
 }
+export declare const allowCustomPanel: boolean;

package/dist/types/schema/nodes/panel.d.ts

@@ -42,5 +42,5 @@ export interface PanelDefinition {
 export interface DOMAttributes {
     [propName: string]: string;
 }
-export declare const customPanel: NodeSpec;
+export declare const customPanel: (allowCustomPanel: boolean) => NodeSpec;
 export declare const panel: NodeSpec;

package/dist/types/utils/index.d.ts

@@ -2,5 +2,5 @@ export { acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, getEmojiAcName, } fr
 export type { NameToEmoji } 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';
 export type { Match } from './url';

package/dist/types/utils/url.d.ts

@@ -1,3 +1,4 @@
+import LinkifyIt from 'linkify-it';
 export declare const isSafeUrl: (url: string) => boolean;
 export interface Match {
     schema: any;
@@ -7,9 +8,13 @@ export interface Match {
     text: string;
     url: string;
     length?: number;
+    input?: string;
 }
-export declare function getLinkMatch(str: string): '' | Match | null;
+export declare const linkify: LinkifyIt.LinkifyIt;
+export declare const LINK_REGEXP: RegExp;
+export declare const linkifyMatch: (text: string) => Match[];
+export declare function getLinkMatch(str?: string): Match | null;
 /**
  * Adds protocol to url if needed.
  */
-export declare function normalizeUrl(url: string): string;
+export declare function normalizeUrl(url?: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "19.2.3",
+  "version": "19.3.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@atlaskit/editor-json-transformer": "^8.6.0",
-    "@atlaskit/editor-test-helpers": "^15.4.0",
+    "@atlaskit/editor-test-helpers": "^15.5.0",
     "@atlaskit/json-schema-generator": "^3.1.0",
     "@atlassian/adf-sample": "^1.0.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",