@atlaskit/adf-schema 19.3.1 → 20.1.1

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

@@ -107,13 +107,13 @@ var isBlockLevelNode = function isBlockLevelNode(node) {
 
 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 NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-task-local-id])', ':not([data-task-state])', ':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'
   }, {

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toJSONTableHeader = exports.tableHeader = exports.toJSONTableCell = exports.tableCell = exports.tableRow = exports.tableToJSON = exports.table = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.tableBackgroundColorPalette = exports.getCellDomAttrs = exports.getCellAttrs = exports.tableCellContentDomSelector = exports.tableCellContentWrapperSelector = exports.tableHeaderSelector = exports.tableCellSelector = exports.tablePrefixSelector = void 0;
+exports.toJSONTableHeader = exports.toJSONTableCell = exports.tableToJSON = exports.tableRow = exports.tablePrefixSelector = exports.tableHeaderSelector = exports.tableHeader = exports.tableCellSelector = exports.tableCellContentWrapperSelector = exports.tableCellContentDomSelector = exports.tableCell = exports.tableBackgroundColorPalette = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.table = exports.getCellDomAttrs = exports.getCellAttrs = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -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/schema/nodes/task-list.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.taskList = exports.taskListSelector = void 0;
+exports.taskListSelector = exports.taskList = void 0;
 
 var _uuid = require("../../utils/uuid");
 

package/dist/cjs/steps/analytics.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AnalyticsStep = exports.analyticsInvertStepType = exports.analyticsStepType = void 0;
+exports.analyticsStepType = exports.analyticsInvertStepType = exports.AnalyticsStep = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 

package/dist/cjs/steps/table/sort-column.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TableSortStep = exports.tableSortingStepType = void 0;
+exports.tableSortingStepType = exports.TableSortStep = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 

package/dist/cjs/steps/table/utils/cell-step.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.applyCellStep = applyCellStep;
+exports.createCellStep = createCellStep;
 exports.getMapFromCellStep = getMapFromCellStep;
 exports.invertCellStep = invertCellStep;
-exports.createCellStep = createCellStep;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 

package/dist/cjs/steps/table/utils/table-map.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getCellIndex = void 0;
 exports.hasMergedColumns = hasMergedColumns;
 exports.hasMergedRows = hasMergedRows;
-exports.isRootRow = isRootRow;
 exports.isRootCol = isRootCol;
-exports.getCellIndex = void 0;
+exports.isRootRow = isRootRow;
 
 var getCellIndex = function getCellIndex(map, row, col) {
   return row * map.width + col;

package/dist/cjs/steps/type-ahead.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InsertTypeAheadStep = exports.InsertTypeAheadStages = exports.insertTypeAheadStepType = void 0;
+exports.insertTypeAheadStepType = exports.InsertTypeAheadStep = exports.InsertTypeAheadStages = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 

package/dist/cjs/steps.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "TableSortOrder", {
+Object.defineProperty(exports, "AddColumnStep", {
   enumerable: true,
   get: function get() {
-    return _constants.SortOrder;
+    return _addColumn.AddColumnStep;
   }
 });
-Object.defineProperty(exports, "TableSortStep", {
+Object.defineProperty(exports, "AnalyticsStep", {
   enumerable: true,
   get: function get() {
-    return _sortColumn.TableSortStep;
+    return _analytics.AnalyticsStep;
   }
 });
 Object.defineProperty(exports, "InsertTypeAheadStages", {
@@ -27,22 +27,22 @@ Object.defineProperty(exports, "InsertTypeAheadStep", {
     return _typeAhead.InsertTypeAheadStep;
   }
 });
-Object.defineProperty(exports, "AddColumnStep", {
+Object.defineProperty(exports, "SetAttrsStep", {
   enumerable: true,
   get: function get() {
-    return _addColumn.AddColumnStep;
+    return _setAttrs.SetAttrsStep;
   }
 });
-Object.defineProperty(exports, "SetAttrsStep", {
+Object.defineProperty(exports, "TableSortOrder", {
   enumerable: true,
   get: function get() {
-    return _setAttrs.SetAttrsStep;
+    return _constants.SortOrder;
   }
 });
-Object.defineProperty(exports, "AnalyticsStep", {
+Object.defineProperty(exports, "TableSortStep", {
   enumerable: true,
   get: function get() {
-    return _analytics.AnalyticsStep;
+    return _sortColumn.TableSortStep;
   }
 });
 

package/dist/cjs/utils/colors.js

@@ -7,13 +7,13 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeHexColor = normalizeHexColor;
+exports.Y75 = exports.Y500 = exports.Y50 = exports.Y400 = exports.Y200 = exports.T75 = exports.T500 = exports.T50 = exports.T300 = exports.T100 = exports.R75 = exports.R500 = exports.R50 = exports.R400 = exports.R300 = exports.R100 = exports.P75 = exports.P500 = exports.P50 = exports.P400 = exports.P300 = exports.P100 = exports.N90 = exports.N800 = exports.N80 = exports.N60 = exports.N500 = exports.N50 = exports.N40 = exports.N300 = exports.N30 = exports.N200 = exports.N20 = exports.N0 = exports.G75 = exports.G500 = exports.G50 = exports.G400 = exports.G300 = exports.G200 = exports.B75 = exports.B500 = exports.B50 = exports.B400 = exports.B100 = void 0;
 exports.hexToRgb = hexToRgb;
 exports.hexToRgba = hexToRgba;
-exports.rgbToHex = rgbToHex;
-exports.isRgb = isRgb;
 exports.isHex = isHex;
-exports.T500 = exports.T300 = exports.T100 = exports.T75 = exports.T50 = exports.P500 = exports.P400 = exports.P300 = exports.P100 = exports.P75 = exports.P50 = exports.N800 = exports.N500 = exports.N300 = exports.N200 = exports.N90 = exports.N80 = exports.N60 = exports.N50 = exports.N40 = exports.N30 = exports.N20 = exports.N0 = exports.B500 = exports.B400 = exports.B100 = exports.B75 = exports.B50 = exports.G500 = exports.G400 = exports.G300 = exports.G200 = exports.G75 = exports.G50 = exports.Y500 = exports.Y400 = exports.Y200 = exports.Y75 = exports.Y50 = exports.R500 = exports.R400 = exports.R300 = exports.R100 = exports.R75 = exports.R50 = void 0;
+exports.isRgb = isRgb;
+exports.normalizeHexColor = normalizeHexColor;
+exports.rgbToHex = rgbToHex;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 

package/dist/cjs/utils/confluence/emoji.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.acNameToEmoji = acNameToEmoji;
-exports.emojiIdToAcName = emojiIdToAcName;
 exports.acShortcutToEmoji = acShortcutToEmoji;
+exports.emojiIdToAcName = emojiIdToAcName;
 exports.getEmojiAcName = getEmojiAcName;
 // Default emoji id for Confluence glyphs that has no match to Fabric Emoji
 var DEFAULT_EMOJI_ID = '2b50'; // Default ac:name for emoticons as a fallback is `blue-star`

package/dist/cjs/utils/extensions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getExtensionAttrs = exports.isValidLayout = void 0;
+exports.isValidLayout = exports.getExtensionAttrs = void 0;
 
 var isValidLayout = function isValidLayout(name) {
   return !!name && ['default', 'wide', 'full-width'].includes(name);

package/dist/cjs/utils/index.js

@@ -3,42 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "acNameToEmoji", {
-  enumerable: true,
-  get: function get() {
-    return _emoji.acNameToEmoji;
-  }
-});
-Object.defineProperty(exports, "acShortcutToEmoji", {
-  enumerable: true,
-  get: function get() {
-    return _emoji.acShortcutToEmoji;
-  }
-});
-Object.defineProperty(exports, "emojiIdToAcName", {
-  enumerable: true,
-  get: function get() {
-    return _emoji.emojiIdToAcName;
-  }
-});
-Object.defineProperty(exports, "getEmojiAcName", {
-  enumerable: true,
-  get: function get() {
-    return _emoji.getEmojiAcName;
-  }
-});
-Object.defineProperty(exports, "generateUuid", {
-  enumerable: true,
-  get: function get() {
-    return _uuid.generateUuid;
-  }
-});
-Object.defineProperty(exports, "uuid", {
-  enumerable: true,
-  get: function get() {
-    return _uuid.uuid;
-  }
-});
 Object.defineProperty(exports, "B100", {
   enumerable: true,
   get: function get() {
@@ -309,6 +273,42 @@ Object.defineProperty(exports, "Y75", {
     return _colors.Y75;
   }
 });
+Object.defineProperty(exports, "acNameToEmoji", {
+  enumerable: true,
+  get: function get() {
+    return _emoji.acNameToEmoji;
+  }
+});
+Object.defineProperty(exports, "acShortcutToEmoji", {
+  enumerable: true,
+  get: function get() {
+    return _emoji.acShortcutToEmoji;
+  }
+});
+Object.defineProperty(exports, "emojiIdToAcName", {
+  enumerable: true,
+  get: function get() {
+    return _emoji.emojiIdToAcName;
+  }
+});
+Object.defineProperty(exports, "generateUuid", {
+  enumerable: true,
+  get: function get() {
+    return _uuid.generateUuid;
+  }
+});
+Object.defineProperty(exports, "getEmojiAcName", {
+  enumerable: true,
+  get: function get() {
+    return _emoji.getEmojiAcName;
+  }
+});
+Object.defineProperty(exports, "getLinkMatch", {
+  enumerable: true,
+  get: function get() {
+    return _url.getLinkMatch;
+  }
+});
 Object.defineProperty(exports, "hexToRgb", {
   enumerable: true,
   get: function get() {
@@ -333,28 +333,28 @@ Object.defineProperty(exports, "isRgb", {
     return _colors.isRgb;
   }
 });
-Object.defineProperty(exports, "normalizeHexColor", {
+Object.defineProperty(exports, "isSafeUrl", {
   enumerable: true,
   get: function get() {
-    return _colors.normalizeHexColor;
+    return _url.isSafeUrl;
   }
 });
-Object.defineProperty(exports, "rgbToHex", {
+Object.defineProperty(exports, "linkify", {
   enumerable: true,
   get: function get() {
-    return _colors.rgbToHex;
+    return _url.linkify;
   }
 });
-Object.defineProperty(exports, "getLinkMatch", {
+Object.defineProperty(exports, "linkifyMatch", {
   enumerable: true,
   get: function get() {
-    return _url.getLinkMatch;
+    return _url.linkifyMatch;
   }
 });
-Object.defineProperty(exports, "isSafeUrl", {
+Object.defineProperty(exports, "normalizeHexColor", {
   enumerable: true,
   get: function get() {
-    return _url.isSafeUrl;
+    return _colors.normalizeHexColor;
   }
 });
 Object.defineProperty(exports, "normalizeUrl", {
@@ -363,16 +363,16 @@ Object.defineProperty(exports, "normalizeUrl", {
     return _url.normalizeUrl;
   }
 });
-Object.defineProperty(exports, "linkify", {
+Object.defineProperty(exports, "rgbToHex", {
   enumerable: true,
   get: function get() {
-    return _url.linkify;
+    return _colors.rgbToHex;
   }
 });
-Object.defineProperty(exports, "linkifyMatch", {
+Object.defineProperty(exports, "uuid", {
   enumerable: true,
   get: function get() {
-    return _url.linkifyMatch;
+    return _uuid.uuid;
   }
 });
 

package/dist/cjs/utils/url.js

@@ -5,17 +5,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.LINK_REGEXP = void 0;
 exports.getLinkMatch = getLinkMatch;
+exports.linkifyMatch = exports.linkify = exports.isSafeUrl = void 0;
 exports.normalizeUrl = normalizeUrl;
-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);
   });
 };
 

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "19.3.1",
+	"version": "20.1.1",
 	"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 { 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

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 { allowCustomPanel, createSchema } from './create-schema';
-import { mediaSingleWithCaption } from './nodes';
+import { layoutSectionWithSingleColumn } from './nodes';
+import { dataConsumer, fragment } from './marks';
+import { createSchema } from './create-schema';
 
 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(allowCustomPanel),
-      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,4 @@
-import { LINK, COLOR } from '../groups';
+import { LINK } from '../groups';
 import { isSafeUrl, normalizeUrl } from '../../utils/url';
 
 const getLinkAttrs = attribute => domNode => {
@@ -18,7 +18,7 @@ const getLinkAttrs = attribute => domNode => {
 };
 
 export const link = {
-  excludes: `${LINK} ${COLOR}`,
+  excludes: `${LINK}`,
   // ED-5844 No multiple links in media node
   group: LINK,
   attrs: {
@@ -64,6 +64,7 @@ export const link = {
     }
 
     return ['a', { ...attrs,
+      ['data-block-link']: 'true',
       class: 'blockLink'
     }, 0];
   }

package/dist/es2019/schema/marks/text-color.js

@@ -52,6 +52,18 @@ export const textColor = {
       } // else handle other colour formats
 
 
+      return hexColor && (colorPalette.has(hexColor) || colorPaletteExtended.has(hexColor)) ? {
+        color: hexColor
+      } : false;
+    }
+  }, {
+    tag: '.fabric-text-color-mark',
+    getAttrs: maybeElement => {
+      if (!(maybeElement instanceof HTMLElement)) {
+        return false;
+      }
+
+      const hexColor = maybeElement.dataset.textCustomColor;
       return hexColor && (colorPalette.has(hexColor) || colorPaletteExtended.has(hexColor)) ? {
         color: hexColor
       } : false;
@@ -60,7 +72,9 @@ export const textColor = {
 
   toDOM(mark) {
     return ['span', {
-      style: `color: ${mark.attrs.color}`
+      class: 'fabric-text-color-mark',
+      style: `--custom-text-color: ${mark.attrs.color}`,
+      ['data-text-custom-color']: mark.attrs.color
     }];
   }
 

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,