@atlaskit/adf-schema 19.3.1 → 20.0.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/adf-schema
 
+## 20.0.0
+
+### Major Changes
+
+- [`3a2a5e14fdc`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3a2a5e14fdc) - As we are moving to full schema, merged the customPanel nodeSpec with panel nodeSpec
+- [`8f0577e0eb1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8f0577e0eb1) - [ux] Promoted captions to full schema and better support of wikimarkup, email and slack renderer
+
+### Minor Changes
+
+- [`65a541166fe`](https://bitbucket.org/atlassian/atlassian-frontend/commits/65a541166fe) - ED-13766 fix pm node spec for media single with caption
+- [`83154234335`](https://bitbucket.org/atlassian/atlassian-frontend/commits/83154234335) - ED-13522 Add safe URL check to ADF validator (smart cards now show as unsupported content if the check fails)
+- [`8bbb96540ea`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8bbb96540ea) - Add "fragment" mark to stage0 ADF schema
+
+### Patch Changes
+
+- [`c6feed82071`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c6feed82071) - ED-11632: Bump prosemirror packages;
+
+  - prosmirror-commands 1.1.4 -> 1.1.11,
+  - prosemirror-model 1.11.0 -> 1.14.3,
+  - prosemirror-state 1.3.3 -> 1.3.4,
+  - prosemirror-transform 1.2.8 -> 1.3.2,
+  - prosemirror-view 1.15.4 + 1.18.8 -> 1.20.2.
+
+- [`297d113d54b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/297d113d54b) - Unskip backwrd compat test and fix mistakes
+- Updated dependencies
+
 ## 19.3.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -255,6 +255,18 @@ Object.defineProperty(exports, "extension", {
     return _schema.extension;
   }
 });
+Object.defineProperty(exports, "fragment", {
+  enumerable: true,
+  get: function get() {
+    return _schema.fragment;
+  }
+});
+Object.defineProperty(exports, "fragmentToJSON", {
+  enumerable: true,
+  get: function get() {
+    return _schema.fragmentToJSON;
+  }
+});
 Object.defineProperty(exports, "getSchemaBasedOnStage", {
   enumerable: true,
   get: function get() {
@@ -477,12 +489,6 @@ Object.defineProperty(exports, "panel", {
     return _schema.panel;
   }
 });
-Object.defineProperty(exports, "customPanel", {
-  enumerable: true,
-  get: function get() {
-    return _schema.customPanel;
-  }
-});
 Object.defineProperty(exports, "paragraph", {
   enumerable: true,
   get: function get() {

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

@@ -108,7 +108,7 @@ var nodesInOrder = [{
   spec: _nodes.codeBlock
 }, {
   name: 'panel',
-  spec: _nodes.panel
+  spec: (0, _nodes.panel)(true)
 }, {
   name: 'rule',
   spec: _nodes.rule
@@ -129,7 +129,7 @@ var nodesInOrder = [{
   spec: _nodes.mediaGroup
 }, {
   name: 'mediaSingle',
-  spec: _nodes.mediaSingle
+  spec: _nodes.mediaSingleWithCaption
 }, {
   name: 'mediaInline',
   spec: _nodes.mediaInline
@@ -263,6 +263,9 @@ var marksInOrder = [{
 }, {
   name: 'dataConsumer',
   spec: _marks.dataConsumer
+}, {
+  name: 'fragment',
+  spec: _marks.fragment
 }, {
   name: 'indentation',
   spec: _marks.indentation

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

@@ -5,19 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultSchema = exports.getSchemaBasedOnStage = exports.defaultSchemaConfig = void 0;
 
-var _panel = require("./nodes/panel");
-
-var _layoutSection = require("./nodes/layout-section");
+var _nodes = require("./nodes");
 
-var _dataConsumer = require("./marks/data-consumer");
+var _marks = require("./marks");
 
 var _createSchema = require("./create-schema");
 
-var _nodes = require("./nodes");
-
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var 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,
     ]
   };
@@ -29,18 +25,16 @@ exports.defaultSchemaConfig = defaultSchemaConfig;
 
 var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
   var stage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'final';
-  var defaultSchemaConfig = getDefaultSchemaConfig(); // TODO: ED-10445 remove stage0 check after panels with emoji are on full schema AND image captions are on full schema
+  var defaultSchemaConfig = getDefaultSchemaConfig();
 
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      panel: (0, _panel.customPanel)(_createSchema.allowCustomPanel),
-      mediaSingle: _nodes.mediaSingleWithCaption,
-      layoutSection: _layoutSection.layoutSectionWithSingleColumn
+      layoutSection: _nodes.layoutSectionWithSingleColumn
     };
     defaultSchemaConfig.customMarkSpecs = {
-      dataConsumer: _dataConsumer.dataConsumer
+      dataConsumer: _marks.dataConsumer,
+      fragment: _marks.fragment
     };
-    defaultSchemaConfig.nodes.push('caption');
     defaultSchemaConfig.nodes.push('mediaInline');
   }
 

package/dist/cjs/schema/index.js

@@ -275,12 +275,6 @@ Object.defineProperty(exports, "panel", {
     return _nodes.panel;
   }
 });
-Object.defineProperty(exports, "customPanel", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.customPanel;
-  }
-});
 Object.defineProperty(exports, "paragraph", {
   enumerable: true,
   get: function get() {
@@ -521,6 +515,18 @@ Object.defineProperty(exports, "em", {
     return _marks.em;
   }
 });
+Object.defineProperty(exports, "fragment", {
+  enumerable: true,
+  get: function get() {
+    return _marks.fragment;
+  }
+});
+Object.defineProperty(exports, "fragmentToJSON", {
+  enumerable: true,
+  get: function get() {
+    return _marks.fragmentToJSON;
+  }
+});
 Object.defineProperty(exports, "indentation", {
   enumerable: true,
   get: function get() {

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

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

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

@@ -0,0 +1,77 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toJSON = exports.fragment = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _parseDOM = require("../../utils/parseDOM");
+
+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 parseFragment = function parseFragment(maybeValue) {
+  var _maybeValue$getAttrib;
+
+  if (!(0, _parseDOM.isDOMElement)(maybeValue)) {
+    return false;
+  }
+
+  var name = (_maybeValue$getAttrib = maybeValue.getAttribute('data-name')) !== null && _maybeValue$getAttrib !== void 0 ? _maybeValue$getAttrib : undefined;
+  var localId = maybeValue.getAttribute('data-localId');
+
+  if (!localId) {
+    return false;
+  }
+
+  return {
+    localId: localId,
+    name: name
+  };
+};
+
+var fragment = {
+  inclusive: false,
+  excludes: '',
+  attrs: {
+    localId: {
+      default: ''
+    },
+    name: {
+      default: null
+    }
+  },
+  parseDOM: [{
+    tag: '[data-mark-type="fragment"]',
+    getAttrs: function getAttrs(maybeValue) {
+      return parseFragment(maybeValue);
+    }
+  }],
+  toDOM: function toDOM(mark, inline) {
+    var wrapperStyle = inline ? 'span' : 'div';
+    return [wrapperStyle, {
+      'data-mark-type': 'fragment',
+      'data-name': mark.attrs.name,
+      'data-localId': mark.attrs.localId
+    }];
+  }
+};
+exports.fragment = fragment;
+
+var toJSON = function toJSON(mark) {
+  return {
+    type: mark.type.name,
+    attrs: _objectSpread({
+      localId: mark.attrs.localId
+    }, mark.attrs.name ? {
+      name: mark.attrs.name
+    } : {})
+  };
+};
+
+exports.toJSON = toJSON;

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

@@ -153,6 +153,18 @@ Object.defineProperty(exports, "dataConsumerToJSON", {
     return _dataConsumer.toJSON;
   }
 });
+Object.defineProperty(exports, "fragment", {
+  enumerable: true,
+  get: function get() {
+    return _fragment.fragment;
+  }
+});
+Object.defineProperty(exports, "fragmentToJSON", {
+  enumerable: true,
+  get: function get() {
+    return _fragment.toJSON;
+  }
+});
 
 var _em = require("./em");
 
@@ -186,4 +198,6 @@ var _unsupportedMark = require("./unsupported-mark");
 
 var _unsupportedNodeAttributes = require("./unsupported-node-attributes");
 
-var _dataConsumer = require("./data-consumer");
+var _dataConsumer = require("./data-consumer");
+
+var _fragment = require("./fragment");

package/dist/cjs/schema/marks/unsupported-mark.js

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

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

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

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.caption = void 0;
 
 /**
- * @stage 0
  * @name caption_node
  */
 var caption = {

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

@@ -10,6 +10,6 @@ exports.doc = void 0;
  */
 var doc = {
   content: '(block|layoutSection)+',
-  marks: 'alignment breakout dataConsumer indentation link unsupportedMark unsupportedNodeAttribute'
+  marks: 'alignment breakout dataConsumer fragment indentation link unsupportedMark unsupportedNodeAttribute'
 };
 exports.doc = doc;

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

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

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

@@ -143,12 +143,6 @@ Object.defineProperty(exports, "panel", {
     return _panel.panel;
   }
 });
-Object.defineProperty(exports, "customPanel", {
-  enumerable: true,
-  get: function get() {
-    return _panel.customPanel;
-  }
-});
 Object.defineProperty(exports, "PanelType", {
   enumerable: true,
   get: function get() {

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

@@ -11,7 +11,7 @@ exports.layoutColumn = void 0;
 var layoutColumn = {
   content: '(block|unsupportedBlock)+',
   isolating: true,
-  marks: 'link alignment indentation dataConsumer unsupportedMark unsupportedNodeAttribute',
+  marks: 'link alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   attrs: {
     width: {

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

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

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.panel = exports.customPanel = exports.PanelType = void 0;
+exports.panel = exports.PanelType = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -67,7 +67,7 @@ var getParseDOMAttrs = function getParseDOMAttrs(allowCustomPanel, dom) {
   return parseDOMAttrs;
 };
 
-var customPanel = function customPanel(allowCustomPanel) {
+var panel = function panel(allowCustomPanel) {
   var panelNodeSpec = {
     group: 'block',
     content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
@@ -87,30 +87,4 @@ var customPanel = function customPanel(allowCustomPanel) {
   return panelNodeSpec;
 };
 
-exports.customPanel = customPanel;
-var panel = {
-  group: 'block',
-  content: '(paragraph | heading | bulletList | orderedList | blockCard | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    panelType: {
-      default: 'info'
-    }
-  },
-  parseDOM: [{
-    tag: 'div[data-panel-type]',
-    getAttrs: function getAttrs(dom) {
-      return {
-        panelType: dom.getAttribute('data-panel-type')
-      };
-    }
-  }],
-  toDOM: function toDOM(node) {
-    var panelType = node.attrs.panelType;
-    var attrs = {
-      'data-panel-type': panelType
-    };
-    return ['div', attrs, ['div', {}, 0]];
-  }
-};
 exports.panel = panel;

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

@@ -113,7 +113,7 @@ 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

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

package/dist/cjs/utils/url.js

@@ -14,8 +14,14 @@ 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.0.0",
 	"sideEffects": false
 }

package/dist/es2019/index.js

@@ -1,2 +1,2 @@
-export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './schema';
+export { 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) {