@atlaskit/adf-schema 25.10.1 → 26.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 26.0.0
+
+### Major Changes
+
+- [`68ef7e6146c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/68ef7e6146c) - [ADF change] added widthType attribute to mediaSingle node, to support fixed width media node.
+
 ## 25.10.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -711,6 +711,18 @@ Object.defineProperty(exports, "mediaSingle", {
     return _schema.mediaSingle;
   }
 });
+Object.defineProperty(exports, "mediaSingleFull", {
+  enumerable: true,
+  get: function get() {
+    return _schema.mediaSingleFull;
+  }
+});
+Object.defineProperty(exports, "mediaSingleSpec", {
+  enumerable: true,
+  get: function get() {
+    return _schema.mediaSingleSpec;
+  }
+});
 Object.defineProperty(exports, "mediaSingleToJSON", {
   enumerable: true,
   get: function get() {
@@ -723,6 +735,12 @@ Object.defineProperty(exports, "mediaSingleWithCaption", {
     return _schema.mediaSingleWithCaption;
   }
 });
+Object.defineProperty(exports, "mediaSingleWithWidthType", {
+  enumerable: true,
+  get: function get() {
+    return _schema.mediaSingleWithWidthType;
+  }
+});
 Object.defineProperty(exports, "mediaToJSON", {
   enumerable: true,
   get: function get() {

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

@@ -26,7 +26,8 @@ var getSchemaBasedOnStage = (0, _memoizeOne.default)(function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: _nodes.layoutSectionWithSingleColumn,
-      table: _nodes.tableWithCustomWidth
+      table: _nodes.tableWithCustomWidth,
+      mediaSingle: _nodes.mediaSingleFull
     };
     defaultSchemaConfig.customMarkSpecs = {
       border: _marks.border

package/dist/cjs/schema/index.js

@@ -369,6 +369,18 @@ Object.defineProperty(exports, "mediaSingle", {
     return _nodes.mediaSingle;
   }
 });
+Object.defineProperty(exports, "mediaSingleFull", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.mediaSingleFull;
+  }
+});
+Object.defineProperty(exports, "mediaSingleSpec", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.mediaSingleSpec;
+  }
+});
 Object.defineProperty(exports, "mediaSingleToJSON", {
   enumerable: true,
   get: function get() {
@@ -381,6 +393,12 @@ Object.defineProperty(exports, "mediaSingleWithCaption", {
     return _nodes.mediaSingleWithCaption;
   }
 });
+Object.defineProperty(exports, "mediaSingleWithWidthType", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.mediaSingleWithWidthType;
+  }
+});
 Object.defineProperty(exports, "mediaToJSON", {
   enumerable: true,
   get: function get() {

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

@@ -232,6 +232,18 @@ Object.defineProperty(exports, "mediaSingle", {
     return _mediaSingle.mediaSingle;
   }
 });
+Object.defineProperty(exports, "mediaSingleFull", {
+  enumerable: true,
+  get: function get() {
+    return _mediaSingle.mediaSingleFull;
+  }
+});
+Object.defineProperty(exports, "mediaSingleSpec", {
+  enumerable: true,
+  get: function get() {
+    return _mediaSingle.mediaSingleSpec;
+  }
+});
 Object.defineProperty(exports, "mediaSingleToJSON", {
   enumerable: true,
   get: function get() {
@@ -244,6 +256,12 @@ Object.defineProperty(exports, "mediaSingleWithCaption", {
     return _mediaSingle.mediaSingleWithCaption;
   }
 });
+Object.defineProperty(exports, "mediaSingleWithWidthType", {
+  enumerable: true,
+  get: function get() {
+    return _mediaSingle.mediaSingleWithWidthType;
+  }
+});
 Object.defineProperty(exports, "mediaToJSON", {
   enumerable: true,
   get: function get() {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toJSON = exports.mediaSingleWithCaption = exports.mediaSingle = exports.defaultAttrs = void 0;
+exports.toJSON = exports.mediaSingleWithWidthType = exports.mediaSingleWithCaption = exports.mediaSingleSpec = exports.mediaSingleFull = exports.mediaSingle = exports.defaultAttrs = 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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -39,24 +39,29 @@ var defaultAttrs = {
   }
 };
 exports.defaultAttrs = defaultAttrs;
-var mediaSingle = {
-  inline: false,
-  group: 'block',
-  selectable: true,
-  atom: true,
-  content: 'media|unsupportedBlock+|media unsupportedBlock+',
-  attrs: defaultAttrs,
-  marks: 'unsupportedMark unsupportedNodeAttribute border link',
-  parseDOM: [{
-    tag: 'div[data-node-type="mediaSingle"]',
-    getAttrs: function getAttrs(dom) {
-      return {
-        layout: dom.getAttribute('data-layout') || 'center',
-        width: Number(dom.getAttribute('data-width')) || null
-      };
+var mediaSingleSpec = function mediaSingleSpec(_ref) {
+  var _ref$withCaption = _ref.withCaption,
+    withCaption = _ref$withCaption === void 0 ? false : _ref$withCaption,
+    _ref$withExtendedWidt = _ref.withExtendedWidthTypes,
+    withExtendedWidthTypes = _ref$withExtendedWidt === void 0 ? false : _ref$withExtendedWidt;
+  var content = withCaption ? 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*' : 'media|unsupportedBlock+|media unsupportedBlock+';
+  var atom = !withCaption;
+  var getAttrs = function getAttrs(dom) {
+    var domAttrs = {
+      layout: dom.getAttribute('data-layout') || 'center',
+      width: Number(dom.getAttribute('data-width')) || null
+    };
+    if (withExtendedWidthTypes) {
+      var widthType = dom.getAttribute('data-width-type');
+      if (widthType) {
+        return _objectSpread(_objectSpread({}, domAttrs), {}, {
+          widthType: widthType
+        });
+      }
     }
-  }],
-  toDOM: function toDOM(node) {
+    return domAttrs;
+  };
+  var getAttrsFromNode = function getAttrsFromNode(node) {
     var _node$attrs = node.attrs,
       layout = _node$attrs.layout,
       width = _node$attrs.width;
@@ -68,15 +73,56 @@ var mediaSingle = {
     if (width) {
       attrs['data-width'] = isFinite(width) && Math.floor(width) === width ? width : width.toFixed(2);
     }
-    return ['div', attrs, 0];
-  }
+    if (withExtendedWidthTypes && node.attrs.widthType) {
+      var widthType = node.attrs.widthType;
+      return _objectSpread(_objectSpread({}, attrs), {}, {
+        'data-width-type': widthType || 'percentage'
+      });
+    }
+    return attrs;
+  };
+  return {
+    inline: false,
+    group: 'block',
+    selectable: true,
+    atom: atom,
+    content: content,
+    attrs: withExtendedWidthTypes ? _objectSpread(_objectSpread({}, defaultAttrs), {}, {
+      widthType: {
+        default: null
+      }
+    }) : defaultAttrs,
+    marks: 'unsupportedMark unsupportedNodeAttribute border link',
+    parseDOM: [{
+      tag: 'div[data-node-type="mediaSingle"]',
+      getAttrs: getAttrs
+    }],
+    toDOM: function toDOM(node) {
+      return ['div', getAttrsFromNode(node), 0];
+    }
+  };
 };
+exports.mediaSingleSpec = mediaSingleSpec;
+var mediaSingle = mediaSingleSpec({
+  withCaption: false,
+  withExtendedWidthTypes: false
+});
 exports.mediaSingle = mediaSingle;
-var mediaSingleWithCaption = _objectSpread(_objectSpread({}, mediaSingle), {}, {
-  atom: false,
-  content: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*'
+var mediaSingleWithCaption = mediaSingleSpec({
+  withCaption: true,
+  withExtendedWidthTypes: false
 });
 exports.mediaSingleWithCaption = mediaSingleWithCaption;
+var mediaSingleWithWidthType = mediaSingleSpec({
+  withCaption: false,
+  withExtendedWidthTypes: true
+});
+exports.mediaSingleWithWidthType = mediaSingleWithWidthType;
+var mediaSingleFull = mediaSingleSpec({
+  withCaption: true,
+  withExtendedWidthTypes: true
+});
+exports.mediaSingleFull = mediaSingleFull;
 var toJSON = function toJSON(node) {
   return {
     attrs: Object.keys(node.attrs).reduce(function (obj, key) {

package/dist/cjs/version.json

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

package/dist/es2019/index.js

@@ -1,3 +1,3 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette } 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, fragment, border } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, 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';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleWithCaption, mediaGroup, 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) {
     return {};

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
+import { mediaSingleFull, layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
 import { border } from './marks';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
@@ -17,7 +17,8 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      table: tableWithCustomWidth
+      table: tableWithCustomWidth,
+      mediaSingle: mediaSingleFull
     };
     defaultSchemaConfig.customMarkSpecs = {
       border

package/dist/es2019/schema/index.js

@@ -1,4 +1,4 @@
-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, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
+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, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, 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, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

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

@@ -22,7 +22,7 @@ export { caption } from './caption';
 export { media, copyPrivateAttributes as copyPrivateMediaAttributes, toJSON as mediaToJSON } from './media';
 export { mediaGroup } from './media-group';
 export { mediaInline } from './media-inline';
-export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON } from './media-single';
+export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON } from './media-single';
 export { table, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector } from './tableNodes';
 export { decisionList, decisionListSelector } from './decision-list';
 export { decisionItem } from './decision-item';

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

@@ -28,22 +28,29 @@ export const defaultAttrs = {
     default: 'center'
   }
 };
-export const mediaSingle = {
-  inline: false,
-  group: 'block',
-  selectable: true,
-  atom: true,
-  content: 'media|unsupportedBlock+|media unsupportedBlock+',
-  attrs: defaultAttrs,
-  marks: 'unsupportedMark unsupportedNodeAttribute border link',
-  parseDOM: [{
-    tag: 'div[data-node-type="mediaSingle"]',
-    getAttrs: dom => ({
+export const mediaSingleSpec = ({
+  withCaption = false,
+  withExtendedWidthTypes = false
+}) => {
+  const content = withCaption ? 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*' : 'media|unsupportedBlock+|media unsupportedBlock+';
+  const atom = !withCaption;
+  const getAttrs = dom => {
+    const domAttrs = {
       layout: dom.getAttribute('data-layout') || 'center',
       width: Number(dom.getAttribute('data-width')) || null
-    })
-  }],
-  toDOM(node) {
+    };
+    if (withExtendedWidthTypes) {
+      const widthType = dom.getAttribute('data-width-type');
+      if (widthType) {
+        return {
+          ...domAttrs,
+          widthType
+        };
+      }
+    }
+    return domAttrs;
+  };
+  const getAttrsFromNode = node => {
     const {
       layout,
       width
@@ -56,14 +63,55 @@ export const mediaSingle = {
     if (width) {
       attrs['data-width'] = isFinite(width) && Math.floor(width) === width ? width : width.toFixed(2);
     }
-    return ['div', attrs, 0];
-  }
-};
-export const mediaSingleWithCaption = {
-  ...mediaSingle,
-  atom: false,
-  content: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*'
+    if (withExtendedWidthTypes && node.attrs.widthType) {
+      const {
+        widthType
+      } = node.attrs;
+      return {
+        ...attrs,
+        'data-width-type': widthType || 'percentage'
+      };
+    }
+    return attrs;
+  };
+  return {
+    inline: false,
+    group: 'block',
+    selectable: true,
+    atom,
+    content,
+    attrs: withExtendedWidthTypes ? {
+      ...defaultAttrs,
+      widthType: {
+        default: null
+      }
+    } : defaultAttrs,
+    marks: 'unsupportedMark unsupportedNodeAttribute border link',
+    parseDOM: [{
+      tag: 'div[data-node-type="mediaSingle"]',
+      getAttrs
+    }],
+    toDOM(node) {
+      return ['div', getAttrsFromNode(node), 0];
+    }
+  };
 };
+export const mediaSingle = mediaSingleSpec({
+  withCaption: false,
+  withExtendedWidthTypes: false
+});
+export const mediaSingleWithCaption = mediaSingleSpec({
+  withCaption: true,
+  withExtendedWidthTypes: false
+});
+export const mediaSingleWithWidthType = mediaSingleSpec({
+  withCaption: false,
+  withExtendedWidthTypes: true
+});
+export const mediaSingleFull = mediaSingleSpec({
+  withCaption: true,
+  withExtendedWidthTypes: true
+});
 export const toJSON = node => ({
   attrs: Object.keys(node.attrs).reduce((obj, key) => {
     if (node.attrs[key] !== null) {

package/dist/es2019/version.json

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

package/dist/esm/index.js

@@ -1,3 +1,3 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette } 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/esm/schema/create-schema.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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, fragment, border } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, 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';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleWithCaption, mediaGroup, 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) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!config) {

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
+import { mediaSingleFull, layoutSectionWithSingleColumn, tableWithCustomWidth } from './nodes';
 import { border } from './marks';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
@@ -18,7 +18,8 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      table: tableWithCustomWidth
+      table: tableWithCustomWidth,
+      mediaSingle: mediaSingleFull
     };
     defaultSchemaConfig.customMarkSpecs = {
       border: border

package/dist/esm/schema/index.js

@@ -1,4 +1,4 @@
-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, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
+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, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, 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, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

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

@@ -22,7 +22,7 @@ export { caption } from './caption';
 export { media, copyPrivateAttributes as copyPrivateMediaAttributes, toJSON as mediaToJSON } from './media';
 export { mediaGroup } from './media-group';
 export { mediaInline } from './media-inline';
-export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON } from './media-single';
+export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON } from './media-single';
 export { table, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector } from './tableNodes';
 export { decisionList, decisionListSelector } from './decision-list';
 export { decisionItem } from './decision-item';

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

@@ -31,24 +31,29 @@ export var defaultAttrs = {
     default: 'center'
   }
 };
-export var mediaSingle = {
-  inline: false,
-  group: 'block',
-  selectable: true,
-  atom: true,
-  content: 'media|unsupportedBlock+|media unsupportedBlock+',
-  attrs: defaultAttrs,
-  marks: 'unsupportedMark unsupportedNodeAttribute border link',
-  parseDOM: [{
-    tag: 'div[data-node-type="mediaSingle"]',
-    getAttrs: function getAttrs(dom) {
-      return {
-        layout: dom.getAttribute('data-layout') || 'center',
-        width: Number(dom.getAttribute('data-width')) || null
-      };
+export var mediaSingleSpec = function mediaSingleSpec(_ref) {
+  var _ref$withCaption = _ref.withCaption,
+    withCaption = _ref$withCaption === void 0 ? false : _ref$withCaption,
+    _ref$withExtendedWidt = _ref.withExtendedWidthTypes,
+    withExtendedWidthTypes = _ref$withExtendedWidt === void 0 ? false : _ref$withExtendedWidt;
+  var content = withCaption ? 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*' : 'media|unsupportedBlock+|media unsupportedBlock+';
+  var atom = !withCaption;
+  var getAttrs = function getAttrs(dom) {
+    var domAttrs = {
+      layout: dom.getAttribute('data-layout') || 'center',
+      width: Number(dom.getAttribute('data-width')) || null
+    };
+    if (withExtendedWidthTypes) {
+      var widthType = dom.getAttribute('data-width-type');
+      if (widthType) {
+        return _objectSpread(_objectSpread({}, domAttrs), {}, {
+          widthType: widthType
+        });
+      }
     }
-  }],
-  toDOM: function toDOM(node) {
+    return domAttrs;
+  };
+  var getAttrsFromNode = function getAttrsFromNode(node) {
     var _node$attrs = node.attrs,
       layout = _node$attrs.layout,
       width = _node$attrs.width;
@@ -60,12 +65,50 @@ export var mediaSingle = {
     if (width) {
       attrs['data-width'] = isFinite(width) && Math.floor(width) === width ? width : width.toFixed(2);
     }
-    return ['div', attrs, 0];
-  }
+    if (withExtendedWidthTypes && node.attrs.widthType) {
+      var widthType = node.attrs.widthType;
+      return _objectSpread(_objectSpread({}, attrs), {}, {
+        'data-width-type': widthType || 'percentage'
+      });
+    }
+    return attrs;
+  };
+  return {
+    inline: false,
+    group: 'block',
+    selectable: true,
+    atom: atom,
+    content: content,
+    attrs: withExtendedWidthTypes ? _objectSpread(_objectSpread({}, defaultAttrs), {}, {
+      widthType: {
+        default: null
+      }
+    }) : defaultAttrs,
+    marks: 'unsupportedMark unsupportedNodeAttribute border link',
+    parseDOM: [{
+      tag: 'div[data-node-type="mediaSingle"]',
+      getAttrs: getAttrs
+    }],
+    toDOM: function toDOM(node) {
+      return ['div', getAttrsFromNode(node), 0];
+    }
+  };
 };
-export var mediaSingleWithCaption = _objectSpread(_objectSpread({}, mediaSingle), {}, {
-  atom: false,
-  content: 'media|unsupportedBlock+|media (caption|unsupportedBlock) unsupportedBlock*'
+export var mediaSingle = mediaSingleSpec({
+  withCaption: false,
+  withExtendedWidthTypes: false
+});
+export var mediaSingleWithCaption = mediaSingleSpec({
+  withCaption: true,
+  withExtendedWidthTypes: false
+});
+export var mediaSingleWithWidthType = mediaSingleSpec({
+  withCaption: false,
+  withExtendedWidthTypes: true
+});
+export var mediaSingleFull = mediaSingleSpec({
+  withCaption: true,
+  withExtendedWidthTypes: true
 });
 export var toJSON = function toJSON(node) {
   return {

package/dist/esm/version.json

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

package/dist/json-schema/v1/stage-0.json

@@ -1301,28 +1301,68 @@
           ]
         },
         "attrs": {
-          "type": "object",
-          "properties": {
-            "width": {
-              "type": "number",
-              "minimum": 0,
-              "maximum": 100
-            },
-            "layout": {
-              "enum": [
-                "wide",
-                "full-width",
-                "center",
-                "wrap-right",
-                "wrap-left",
-                "align-end",
-                "align-start"
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "widthType": {
+                  "enum": [
+                    "percentage"
+                  ]
+                },
+                "width": {
+                  "type": "number",
+                  "minimum": 0,
+                  "maximum": 100
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "additionalProperties": false,
+              "required": [
+                "layout"
               ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "width": {
+                  "type": "number",
+                  "minimum": 0
+                },
+                "widthType": {
+                  "enum": [
+                    "pixel"
+                  ]
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "required": [
+                "width",
+                "widthType",
+                "layout"
+              ],
+              "additionalProperties": false
             }
-          },
-          "additionalProperties": false,
-          "required": [
-            "layout"
           ]
         },
         "marks": {

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, 
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette, } from './schema';
-export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, 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, BorderMarkAttributes, BorderMarkDefinition, } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette, } from './schema';
+export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, 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, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, } 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';
 export type { Match, NameToEmoji } from './utils';

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

@@ -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, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
-export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, 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, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, RichMediaLayout, CellDomAttrs, } from './nodes';
+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, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
+export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, 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, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, 
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, } from './marks';

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

@@ -41,7 +41,7 @@ export { mediaGroup } from './media-group';
 export { mediaInline } from './media-inline';
 export type { MediaInlineAttributes, MediaInlineDefinition, } from './media-inline';
 export type { MediaGroupDefinition } from './media-group';
-export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON, } from './media-single';
+export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON, } from './media-single';
 export type { MediaSingleDefinition } from './media-single';
 export { table, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector, } from './tableNodes';
 export type { TableAttributes, CellAttributes, Layout as TableLayout, TableDefinition, TableCell as TableCellDefinition, TableHeader as TableHeaderDefinition, TableRow as TableRowDefinition, CellDomAttrs, } from './tableNodes';
@@ -90,4 +90,4 @@ export type { NestedExpandContent } from './nested-expand';
 export type { Layout as ExtensionLayout } from './types/extensions';
 export { embedCard } from './embed-card';
 export type { EmbedCardDefinition, EmbedCardAttributes } from './embed-card';
-export type { RichMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';
+export type { RichMediaAttributes, ExtendedMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';

package/dist/types/schema/nodes/media-single.d.ts

@@ -1,7 +1,7 @@
-import { NodeSpec, Node } from 'prosemirror-model';
+import { NodeSpec, Node as PMNode } from 'prosemirror-model';
 import { MediaDefinition as Media } from './media';
 import { LinkDefinition } from '../marks/link';
-import { RichMediaAttributes } from './types/rich-media-common';
+import { ExtendedMediaAttributes } from './types/rich-media-common';
 import { CaptionDefinition as Caption } from './caption';
 export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithCaptionDefinition;
 /**
@@ -10,7 +10,7 @@ export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithC
  */
 export interface MediaSingleBaseDefinition {
     type: 'mediaSingle';
-    attrs?: RichMediaAttributes;
+    attrs?: ExtendedMediaAttributes;
     marks?: Array<LinkDefinition>;
 }
 /**
@@ -51,8 +51,14 @@ export declare const defaultAttrs: {
         default: string;
     };
 };
+export declare const mediaSingleSpec: ({ withCaption, withExtendedWidthTypes, }: {
+    withCaption?: boolean | undefined;
+    withExtendedWidthTypes?: boolean | undefined;
+}) => NodeSpec;
 export declare const mediaSingle: NodeSpec;
 export declare const mediaSingleWithCaption: NodeSpec;
-export declare const toJSON: (node: Node) => {
+export declare const mediaSingleWithWidthType: NodeSpec;
+export declare const mediaSingleFull: NodeSpec;
+export declare const toJSON: (node: PMNode) => {
     attrs: any;
 };

package/dist/types/schema/nodes/types/rich-media-common.d.ts

@@ -11,3 +11,24 @@ export interface OptionalRichMediaAttributes {
     width?: number;
     layout?: Layout;
 }
+interface DefaultMediaAttributes extends RichMediaAttributes {
+    /**
+     * @stage 0
+     * @description optional widthType attribute for media with percentage layout
+     */
+    widthType?: 'percentage';
+}
+/**
+ * @stage 0
+ * @description The widthType attribute is used to support fixed with media single
+ */
+interface FixedLayoutMediaAttributes {
+    /**
+     * @minimum 0
+     */
+    width: number;
+    widthType: 'pixel';
+    layout: Layout;
+}
+export type ExtendedMediaAttributes = DefaultMediaAttributes | FixedLayoutMediaAttributes;
+export {};

package/dist/types-ts4.5/index.d.ts

@@ -1,6 +1,6 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, 
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette, } from './schema';
-export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, 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, BorderMarkAttributes, BorderMarkDefinition, } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableWithCustomWidth, 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, border, borderColorPalette, } from './schema';
+export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, 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, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, } 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';
 export type { Match, NameToEmoji } from './utils';

package/dist/types-ts4.5/schema/index.d.ts

@@ -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, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
-export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, 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, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, RichMediaLayout, CellDomAttrs, } from './nodes';
+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, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
+export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, 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, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, 
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, } from './marks';

package/dist/types-ts4.5/schema/nodes/index.d.ts

@@ -41,7 +41,7 @@ export { mediaGroup } from './media-group';
 export { mediaInline } from './media-inline';
 export type { MediaInlineAttributes, MediaInlineDefinition, } from './media-inline';
 export type { MediaGroupDefinition } from './media-group';
-export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON, } from './media-single';
+export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON, } from './media-single';
 export type { MediaSingleDefinition } from './media-single';
 export { table, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector, } from './tableNodes';
 export type { TableAttributes, CellAttributes, Layout as TableLayout, TableDefinition, TableCell as TableCellDefinition, TableHeader as TableHeaderDefinition, TableRow as TableRowDefinition, CellDomAttrs, } from './tableNodes';
@@ -90,4 +90,4 @@ export type { NestedExpandContent } from './nested-expand';
 export type { Layout as ExtensionLayout } from './types/extensions';
 export { embedCard } from './embed-card';
 export type { EmbedCardDefinition, EmbedCardAttributes } from './embed-card';
-export type { RichMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';
+export type { RichMediaAttributes, ExtendedMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';

package/dist/types-ts4.5/schema/nodes/media-single.d.ts

@@ -1,7 +1,7 @@
-import { NodeSpec, Node } from 'prosemirror-model';
+import { NodeSpec, Node as PMNode } from 'prosemirror-model';
 import { MediaDefinition as Media } from './media';
 import { LinkDefinition } from '../marks/link';
-import { RichMediaAttributes } from './types/rich-media-common';
+import { ExtendedMediaAttributes } from './types/rich-media-common';
 import { CaptionDefinition as Caption } from './caption';
 export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithCaptionDefinition;
 /**
@@ -10,7 +10,7 @@ export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithC
  */
 export interface MediaSingleBaseDefinition {
     type: 'mediaSingle';
-    attrs?: RichMediaAttributes;
+    attrs?: ExtendedMediaAttributes;
     marks?: Array<LinkDefinition>;
 }
 /**
@@ -54,8 +54,14 @@ export declare const defaultAttrs: {
         default: string;
     };
 };
+export declare const mediaSingleSpec: ({ withCaption, withExtendedWidthTypes, }: {
+    withCaption?: boolean | undefined;
+    withExtendedWidthTypes?: boolean | undefined;
+}) => NodeSpec;
 export declare const mediaSingle: NodeSpec;
 export declare const mediaSingleWithCaption: NodeSpec;
-export declare const toJSON: (node: Node) => {
+export declare const mediaSingleWithWidthType: NodeSpec;
+export declare const mediaSingleFull: NodeSpec;
+export declare const toJSON: (node: PMNode) => {
     attrs: any;
 };

package/dist/types-ts4.5/schema/nodes/types/rich-media-common.d.ts

@@ -11,3 +11,24 @@ export interface OptionalRichMediaAttributes {
     width?: number;
     layout?: Layout;
 }
+interface DefaultMediaAttributes extends RichMediaAttributes {
+    /**
+     * @stage 0
+     * @description optional widthType attribute for media with percentage layout
+     */
+    widthType?: 'percentage';
+}
+/**
+ * @stage 0
+ * @description The widthType attribute is used to support fixed with media single
+ */
+interface FixedLayoutMediaAttributes {
+    /**
+     * @minimum 0
+     */
+    width: number;
+    widthType: 'pixel';
+    layout: Layout;
+}
+export type ExtendedMediaAttributes = DefaultMediaAttributes | FixedLayoutMediaAttributes;
+export {};

package/json-schema/v1/stage-0.json

@@ -1301,28 +1301,68 @@
           ]
         },
         "attrs": {
-          "type": "object",
-          "properties": {
-            "width": {
-              "type": "number",
-              "minimum": 0,
-              "maximum": 100
-            },
-            "layout": {
-              "enum": [
-                "wide",
-                "full-width",
-                "center",
-                "wrap-right",
-                "wrap-left",
-                "align-end",
-                "align-start"
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "widthType": {
+                  "enum": [
+                    "percentage"
+                  ]
+                },
+                "width": {
+                  "type": "number",
+                  "minimum": 0,
+                  "maximum": 100
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "additionalProperties": false,
+              "required": [
+                "layout"
               ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "width": {
+                  "type": "number",
+                  "minimum": 0
+                },
+                "widthType": {
+                  "enum": [
+                    "pixel"
+                  ]
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "required": [
+                "width",
+                "widthType",
+                "layout"
+              ],
+              "additionalProperties": false
             }
-          },
-          "additionalProperties": false,
-          "required": [
-            "layout"
           ]
         },
         "marks": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "25.10.1",
+  "version": "26.0.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -58,7 +58,7 @@
     "prosemirror-transform": "1.3.2"
   },
   "devDependencies": {
-    "@atlaskit/editor-test-helpers": "^18.7.0",
+    "@atlaskit/editor-test-helpers": "^18.8.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@types/linkify-it": "^2.0.4",
     "@types/prosemirror-history": "^1.0.1",

package/report.api.md

@@ -495,6 +495,11 @@ export interface DecisionListDefinition {
 // @public (undocumented)
 export const decisionListSelector: string;
 
+// @public (undocumented)
+interface DefaultMediaAttributes extends RichMediaAttributes {
+  widthType?: 'percentage';
+}
+
 // @public (undocumented)
 export const doc: NodeSpec;
 
@@ -596,6 +601,11 @@ export const expandToJSON: (node: Node_2) => {
 type ExpandWithBreakoutDefinition = ExpandBaseDefinition &
   MarksObject<BreakoutMarkDefinition>;
 
+// @public (undocumented)
+export type ExtendedMediaAttributes =
+  | DefaultMediaAttributes
+  | FixedLayoutMediaAttributes;
+
 // @public (undocumented)
 export const extension: NodeSpec;
 
@@ -648,6 +658,16 @@ export interface ExternalMediaAttributes {
   width?: number;
 }
 
+// @public
+interface FixedLayoutMediaAttributes {
+  // (undocumented)
+  layout: RichMediaLayout;
+  // (undocumented)
+  width: number;
+  // (undocumented)
+  widthType: 'pixel';
+}
+
 // @public (undocumented)
 export const fragment: MarkSpec;
 
@@ -1114,7 +1134,7 @@ export const mediaSingle: NodeSpec;
 // @public
 interface MediaSingleBaseDefinition {
   // (undocumented)
-  attrs?: RichMediaAttributes;
+  attrs?: ExtendedMediaAttributes;
   // (undocumented)
   marks?: Array<LinkDefinition>;
   // (undocumented)
@@ -1126,6 +1146,9 @@ export type MediaSingleDefinition =
   | MediaSingleFullDefinition
   | MediaSingleWithCaptionDefinition;
 
+// @public (undocumented)
+export const mediaSingleFull: NodeSpec;
+
 // @public
 interface MediaSingleFullContent {
   content: Array<MediaDefinition>;
@@ -1135,6 +1158,15 @@ interface MediaSingleFullContent {
 type MediaSingleFullDefinition = MediaSingleBaseDefinition &
   MediaSingleFullContent;
 
+// @public (undocumented)
+export const mediaSingleSpec: ({
+  withCaption,
+  withExtendedWidthTypes,
+}: {
+  withCaption?: boolean | undefined;
+  withExtendedWidthTypes?: boolean | undefined;
+}) => NodeSpec;
+
 // @public (undocumented)
 export const mediaSingleToJSON: (node: Node_2) => {
   attrs: any;
@@ -1147,6 +1179,9 @@ export const mediaSingleWithCaption: NodeSpec;
 type MediaSingleWithCaptionDefinition = MediaSingleBaseDefinition &
   MediaCaptionContent;
 
+// @public (undocumented)
+export const mediaSingleWithWidthType: NodeSpec;
+
 // @public (undocumented)
 export const mediaToJSON: (node: Node_2) => {
   attrs: Record<string, any>;

package/tmp/api-report-tmp.d.ts

@@ -441,6 +441,11 @@ export interface DecisionListDefinition {
 // @public (undocumented)
 export const decisionListSelector: string;
 
+// @public (undocumented)
+interface DefaultMediaAttributes extends RichMediaAttributes {
+    widthType?: 'percentage';
+}
+
 // @public (undocumented)
 export const doc: NodeSpec;
 
@@ -535,6 +540,9 @@ export const expandToJSON: (node: Node_2) => {
 // @public
 type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
 
+// @public (undocumented)
+export type ExtendedMediaAttributes = DefaultMediaAttributes | FixedLayoutMediaAttributes;
+
 // @public (undocumented)
 export const extension: NodeSpec;
 
@@ -586,6 +594,16 @@ export interface ExternalMediaAttributes {
     width?: number;
 }
 
+// @public
+interface FixedLayoutMediaAttributes {
+    // (undocumented)
+    layout: RichMediaLayout;
+    // (undocumented)
+    width: number;
+    // (undocumented)
+    widthType: 'pixel';
+}
+
 // @public (undocumented)
 export const fragment: MarkSpec;
 
@@ -1011,7 +1029,7 @@ export const mediaSingle: NodeSpec;
 // @public
 interface MediaSingleBaseDefinition {
     // (undocumented)
-    attrs?: RichMediaAttributes;
+    attrs?: ExtendedMediaAttributes;
     // (undocumented)
     marks?: Array<LinkDefinition>;
     // (undocumented)
@@ -1021,6 +1039,9 @@ interface MediaSingleBaseDefinition {
 // @public (undocumented)
 export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithCaptionDefinition;
 
+// @public (undocumented)
+export const mediaSingleFull: NodeSpec;
+
 // @public
 interface MediaSingleFullContent {
     content: Array<MediaDefinition>;
@@ -1029,6 +1050,12 @@ interface MediaSingleFullContent {
 // @public
 type MediaSingleFullDefinition = MediaSingleBaseDefinition & MediaSingleFullContent;
 
+// @public (undocumented)
+export const mediaSingleSpec: ({ withCaption, withExtendedWidthTypes, }: {
+    withCaption?: boolean | undefined;
+    withExtendedWidthTypes?: boolean | undefined;
+}) => NodeSpec;
+
 // @public (undocumented)
 export const mediaSingleToJSON: (node: Node_2) => {
     attrs: any;
@@ -1040,6 +1067,9 @@ export const mediaSingleWithCaption: NodeSpec;
 // @public
 type MediaSingleWithCaptionDefinition = MediaSingleBaseDefinition & MediaCaptionContent;
 
+// @public (undocumented)
+export const mediaSingleWithWidthType: NodeSpec;
+
 // @public (undocumented)
 export const mediaToJSON: (node: Node_2) => {
     attrs: Record<string, any>;