@atlaskit/adf-schema 44.1.0 → 44.2.0

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toJSONTableHeader = exports.toJSONTableCell = exports.tableWithCustomWidth = exports.tableToJSON = exports.tableStage0 = exports.tableRow = exports.tablePrefixSelector = exports.tableHeaderSelector = exports.tableHeader = exports.tableCellSelector = exports.tableCellContentWrapperSelector = exports.tableCellContentDomSelector = exports.tableCell = exports.tableBackgroundColorPalette = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.table = exports.setGlobalTheme = exports.getCellDomAttrs = exports.getCellAttrs = void 0;
+exports.toJSONTableHeader = exports.toJSONTableCell = exports.tableWithNestedTable = exports.tableWithCustomWidth = exports.tableToJSON = exports.tableStage0 = exports.tableRowWithNestedTable = exports.tableRow = exports.tablePrefixSelector = exports.tableHeaderWithNestedTable = exports.tableHeaderSelector = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCellSelector = exports.tableCellContentWrapperSelector = exports.tableCellContentDomSelector = exports.tableCell = exports.tableBackgroundColorPalette = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.table = exports.setGlobalTheme = exports.getCellDomAttrs = exports.getCellAttrs = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _editorPalette = require("../../utils/editor-palette");
@@ -211,40 +211,43 @@ var tableBackgroundColorNames = exports.tableBackgroundColorNames = new Map();
  * @name table_header_node
  */
 
-// TODO: Fix any, potential issue. ED-5048
-var createTableSpec = function createTableSpec() {
-  return (0, _nodeTypes.table)({
-    parseDOM: [{
-      tag: 'table',
-      getAttrs: function getAttrs(node) {
-        var _dom$parentElement;
-        var dom = node;
-        var breakoutWrapper = (_dom$parentElement = dom.parentElement) === null || _dom$parentElement === void 0 ? void 0 : _dom$parentElement.parentElement;
-        return {
-          isNumberColumnEnabled: dom.getAttribute('data-number-column') === 'true',
-          layout:
-          // copying from editor
-          dom.getAttribute('data-layout') || ( // copying from renderer
-          breakoutWrapper === null || breakoutWrapper === void 0 ? void 0 : breakoutWrapper.getAttribute('data-layout')) || 'default',
-          __autoSize: dom.getAttribute('data-autosize') === 'true',
-          localId: dom.getAttribute('data-table-local-id') || _uuid.uuid.generate(),
-          width: Number(dom.getAttribute('data-table-width')) || null,
-          displayMode: dom.getAttribute('data-table-display-mode') || null
-        };
-      }
-    }],
-    toDOM: function toDOM(node) {
-      var attrs = {
-        'data-number-column': node.attrs.isNumberColumnEnabled,
-        'data-layout': node.attrs.layout,
-        'data-autosize': node.attrs.__autoSize,
-        'data-table-local-id': node.attrs.localId,
-        'data-table-width': node.attrs.width,
-        'data-table-display-mode': node.attrs.displayMode
+// table nodes with nested tables support
+
+var tableNodeSpecOptions = {
+  parseDOM: [{
+    tag: 'table',
+    getAttrs: function getAttrs(node) {
+      var _dom$parentElement;
+      var dom = node;
+      var breakoutWrapper = (_dom$parentElement = dom.parentElement) === null || _dom$parentElement === void 0 ? void 0 : _dom$parentElement.parentElement;
+      return {
+        isNumberColumnEnabled: dom.getAttribute('data-number-column') === 'true',
+        layout:
+        // copying from editor
+        dom.getAttribute('data-layout') || ( // copying from renderer
+        breakoutWrapper === null || breakoutWrapper === void 0 ? void 0 : breakoutWrapper.getAttribute('data-layout')) || 'default',
+        __autoSize: dom.getAttribute('data-autosize') === 'true',
+        localId: dom.getAttribute('data-table-local-id') || _uuid.uuid.generate(),
+        width: Number(dom.getAttribute('data-table-width')) || null,
+        displayMode: dom.getAttribute('data-table-display-mode') || null
       };
-      return ['table', attrs, ['tbody', 0]];
     }
-  });
+  }],
+  toDOM: function toDOM(node) {
+    var attrs = {
+      'data-number-column': node.attrs.isNumberColumnEnabled,
+      'data-layout': node.attrs.layout,
+      'data-autosize': node.attrs.__autoSize,
+      'data-table-local-id': node.attrs.localId,
+      'data-table-width': node.attrs.width,
+      'data-table-display-mode': node.attrs.displayMode
+    };
+    return ['table', attrs, ['tbody', 0]];
+  }
+};
+// TODO: Fix any, potential issue. ED-5048
+var createTableSpec = function createTableSpec() {
+  return (0, _nodeTypes.table)(tableNodeSpecOptions);
 };
 
 // TODO: assuming breaking changes aren't allowed, so retaining both exports
@@ -265,14 +268,15 @@ var tableToJSON = exports.tableToJSON = function tableToJSON(node) {
     }, {})
   };
 };
-var tableRow = exports.tableRow = (0, _nodeTypes.tableRow)({
+var tableRowNodeSpecOptions = {
   parseDOM: [{
     tag: 'tr'
   }],
   toDOM: function toDOM() {
     return ['tr', 0];
   }
-});
+};
+var tableRow = exports.tableRow = (0, _nodeTypes.tableRow)(tableRowNodeSpecOptions);
 var cellAttrs = {
   colspan: {
     default: 1
@@ -287,7 +291,7 @@ var cellAttrs = {
     default: null
   }
 };
-var tableCell = exports.tableCell = (0, _nodeTypes.tableCell)({
+var tableCellNodeSpecOptions = {
   parseDOM: [
   // Ignore number cell copied from renderer
   {
@@ -302,7 +306,8 @@ var tableCell = exports.tableCell = (0, _nodeTypes.tableCell)({
   toDOM: function toDOM(node) {
     return ['td', getCellDomAttrs(node), 0];
   }
-});
+};
+var tableCell = exports.tableCell = (0, _nodeTypes.tableCell)(tableCellNodeSpecOptions);
 var toJSONTableCell = exports.toJSONTableCell = function toJSONTableCell(node) {
   return {
     attrs: Object.keys(node.attrs).reduce(function (obj, key) {
@@ -313,7 +318,7 @@ var toJSONTableCell = exports.toJSONTableCell = function toJSONTableCell(node) {
     }, {})
   };
 };
-var tableHeader = exports.tableHeader = (0, _nodeTypes.tableHeader)({
+var tableHeaderNodeSpecOptions = {
   parseDOM: [{
     tag: 'th',
     getAttrs: function getAttrs(dom) {
@@ -325,5 +330,12 @@ var tableHeader = exports.tableHeader = (0, _nodeTypes.tableHeader)({
   toDOM: function toDOM(node) {
     return ['th', getCellDomAttrs(node), 0];
   }
-});
-var toJSONTableHeader = exports.toJSONTableHeader = toJSONTableCell;
+};
+var tableHeader = exports.tableHeader = (0, _nodeTypes.tableHeader)(tableHeaderNodeSpecOptions);
+var toJSONTableHeader = exports.toJSONTableHeader = toJSONTableCell;
+
+// table nodes with nested table support
+var tableWithNestedTable = exports.tableWithNestedTable = (0, _nodeTypes.tableWithNestedTable)(tableNodeSpecOptions);
+var tableRowWithNestedTable = exports.tableRowWithNestedTable = (0, _nodeTypes.tableRowWithNestedTable)(tableRowNodeSpecOptions);
+var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _nodeTypes.tableCellWithNestedTable)(tableCellNodeSpecOptions);
+var tableHeaderWithNestedTable = exports.tableHeaderWithNestedTable = (0, _nodeTypes.tableHeaderWithNestedTable)(tableHeaderNodeSpecOptions);

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, 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, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, 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, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, 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, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } 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, getDarkModeLCHColor } from './utils';
 
 // ADF createPMSpecFactory

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -1030,6 +1030,34 @@ export const table = createPMNodeSpecFactory({
   isolating: true,
   tableRole: 'table'
 });
+export const tableWithNestedTable = createPMNodeSpecFactory({
+  content: 'tableRow+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  group: 'block',
+  attrs: {
+    displayMode: {
+      default: null
+    },
+    isNumberColumnEnabled: {
+      default: false
+    },
+    layout: {
+      default: 'default'
+    },
+    localId: {
+      default: ''
+    },
+    width: {
+      default: null
+    },
+    __autoSize: {
+      default: false
+    }
+  },
+  selectable: true,
+  isolating: true,
+  tableRole: 'table'
+});
 export const tableCell = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
@@ -1051,6 +1079,27 @@ export const tableCell = createPMNodeSpecFactory({
   isolating: true,
   tableRole: 'cell'
 });
+export const tableCellWithNestedTable = createPMNodeSpecFactory({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
+  marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  attrs: {
+    colspan: {
+      default: 1
+    },
+    rowspan: {
+      default: 1
+    },
+    colwidth: {
+      default: null
+    },
+    background: {
+      default: null
+    }
+  },
+  selectable: false,
+  isolating: true,
+  tableRole: 'cell'
+});
 export const tableHeader = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
   marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
@@ -1072,12 +1121,39 @@ export const tableHeader = createPMNodeSpecFactory({
   isolating: true,
   tableRole: 'header_cell'
 });
+export const tableHeaderWithNestedTable = createPMNodeSpecFactory({
+  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
+  marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  attrs: {
+    colspan: {
+      default: 1
+    },
+    rowspan: {
+      default: 1
+    },
+    colwidth: {
+      default: null
+    },
+    background: {
+      default: null
+    }
+  },
+  selectable: false,
+  isolating: true,
+  tableRole: 'header_cell'
+});
 export const tableRow = createPMNodeSpecFactory({
   content: '(tableCell | tableHeader)+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   tableRole: 'row'
 });
+export const tableRowWithNestedTable = createPMNodeSpecFactory({
+  content: '(tableCell | tableHeader)+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  selectable: false,
+  tableRole: 'row'
+});
 export const taskItem = createPMNodeSpecFactory({
   content: 'inline*',
   marks: '_',

package/dist/es2019/next-schema/groups/blockContentGroup.js

@@ -15,7 +15,7 @@ import { mediaSingle } from '../nodes/mediaSingle';
 import { panel } from '../nodes/panel';
 import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
-import { table } from '../nodes/table';
+import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
@@ -32,6 +32,8 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base heading
  * - no base expand
  */
-export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table, expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table,
+// @ts-expect-error - types don't deal well with circular references for the variant
+table.use('with_nested_table'), expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

package/dist/es2019/next-schema/groups/blockGroup.js

@@ -15,10 +15,12 @@ import { mediaSingle } from '../nodes/mediaSingle';
 import { panel } from '../nodes/panel';
 import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
-import { table } from '../nodes/table';
+import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('with_nested_blockquote'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('with_nested_blockquote'), table,
+// @ts-expect-error - types don't deal well with circular references for the variant
+table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException
   // Block group in PM doesn't match ADF
   ignore: ['validator-spec']

package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js

@@ -12,13 +12,15 @@ import { mediaSingle } from '../nodes/mediaSingle';
 import { panel } from '../nodes/panel';
 import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
-import { table } from '../nodes/table';
+import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export const nonNestableBlockContent = [paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table, blockCard, embedCard, extension.use('with_marks'), unsupportedBlock];
+export const nonNestableBlockContent = [paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
+// @ts-expect-error - types don't deal well with circular references for the variant
+table.use('with_nested_table'), blockCard, embedCard, extension.use('with_marks'), unsupportedBlock];
 
 /**
  * @DSLCompatibilityException

package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js

@@ -15,7 +15,7 @@ import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

package/dist/es2019/next-schema/nodes/extensionFrame.js

@@ -17,7 +17,7 @@ import { mediaSingle } from './mediaSingle';
 import { panel } from './panel';
 import { paragraph } from './paragraph';
 import { rule } from './rule';
-import { table } from './table';
+import { table } from './tableNodes';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
 export const extensionFrame = adfNode('extensionFrame').define({
@@ -30,7 +30,9 @@ export const extensionFrame = adfNode('extensionFrame').define({
   // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
-  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],
+  content: [$onePlus($or(paragraph.use('with_no_marks'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
+  // @ts-expect-error - types don't deal well with circular references for the variant
+  table.use('with_nested_table'), extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.allowUnsupportedBlock': {

package/dist/es2019/next-schema/nodes/tableNodes.js

@@ -0,0 +1,160 @@
+import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { fragment } from '../marks/fragment';
+import { unsupportedMark } from '../marks/unsupportedMark';
+import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { tableCellContentPseudoGroup, tableCellContentNodes, tableHeaderContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
+import { tableCellContent } from './tableCellContent';
+import { nestedExpand } from './nestedExpand';
+import { unsupportedBlock } from './unsupportedBlock';
+
+// Declare early to allow for circular references within the file
+const table = adfNode('table');
+const tableCell = adfNode('tableCell').define({
+  isolating: true,
+  selectable: false,
+  tableRole: 'cell',
+  marks: [unsupportedMark, unsupportedNodeAttribute],
+  attrs: {
+    colspan: {
+      type: 'number',
+      default: 1,
+      optional: true
+    },
+    rowspan: {
+      type: 'number',
+      default: 1,
+      optional: true
+    },
+    colwidth: {
+      type: 'array',
+      items: {
+        type: 'number'
+      },
+      default: null,
+      optional: true
+    },
+    background: {
+      type: 'string',
+      default: null,
+      optional: true
+    }
+  },
+  content: [tableCellContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableCell validator spec',
+        value: ['content']
+      }
+    }
+  }
+}).variant('with_nested_table', {
+  content: [$onePlus($or(...tableCellContentNodes, unsupportedBlock, table))],
+  ignore: ['json-schema', 'validator-spec']
+});
+const tableHeader = adfNode('tableHeader').define({
+  isolating: true,
+  selectable: false,
+  tableRole: 'header_cell',
+  marks: [unsupportedMark, unsupportedNodeAttribute],
+  attrs: {
+    colspan: {
+      type: 'number',
+      default: 1,
+      optional: true
+    },
+    rowspan: {
+      type: 'number',
+      default: 1,
+      optional: true
+    },
+    colwidth: {
+      type: 'array',
+      items: {
+        type: 'number'
+      },
+      default: null,
+      optional: true
+    },
+    background: {
+      type: 'string',
+      default: null,
+      optional: true
+    }
+  },
+  content: [tableHeaderContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
+}).variant('with_nested_table', {
+  content: [$onePlus($or(...tableCellContentNodes, nestedExpand, table))],
+  ignore: ['json-schema', 'validator-spec']
+});
+const tableRow = adfNode('tableRow').define({
+  selectable: false,
+  marks: [unsupportedMark, unsupportedNodeAttribute],
+  content: [$onePlus($or(tableCell, tableHeader, tableCellContent))],
+  tableRole: 'row',
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.minItems': {
+        reason: '@DSLCompatibilityException - required for tableRow validator spec',
+        remove: true
+      }
+    }
+  }
+}).variant('with_nested_table', {
+  content: [$onePlus($or(tableCell.use('with_nested_table'), tableHeader.use('with_nested_table')))],
+  ignore: ['json-schema', 'validator-spec']
+});
+table.define({
+  isolating: true,
+  selectable: true,
+  tableRole: 'table',
+  marks: [fragment, unsupportedMark, unsupportedNodeAttribute],
+  attrs: {
+    displayMode: {
+      type: 'enum',
+      values: ['default', 'fixed'],
+      default: null,
+      optional: true
+    },
+    isNumberColumnEnabled: {
+      type: 'boolean',
+      default: false,
+      optional: true
+    },
+    layout: {
+      type: 'enum',
+      values: ['wide', 'full-width', 'center', 'align-end', 'align-start', 'default'],
+      default: 'default',
+      optional: true
+    },
+    localId: {
+      type: 'string',
+      minLength: 1,
+      default: '',
+      optional: true
+    },
+    width: {
+      type: 'number',
+      default: null,
+      optional: true
+    },
+    __autoSize: {
+      type: 'boolean',
+      default: false,
+      optional: true
+    }
+  },
+  content: [$onePlus($or(tableRow))]
+}).variant('with_nested_table', {
+  content: [$onePlus($or(tableRow.use('with_nested_table')))],
+  ignore: ['json-schema', 'validator-spec']
+});
+export { table };

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0, panelWithBlockquoteStage0 } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0, panelWithBlockquoteStage0, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -21,7 +21,11 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
       expand: expandWithNestedExpand,
       blockquote: blockquoteWithNestedCodeblockOrMedia,
       listItem: listItemWithDecisionStage0,
-      panel: panelWithBlockquoteStage0(true)
+      panel: panelWithBlockquoteStage0(true),
+      table: tableWithNestedTable,
+      tableRow: tableRowWithNestedTable,
+      tableCell: tableCellWithNestedTable,
+      tableHeader: tableHeaderWithNestedTable
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/es2019/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
+export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } 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, backgroundColor, backgroundColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

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

@@ -23,7 +23,7 @@ export { media, copyPrivateAttributes as copyPrivateMediaAttributes, toJSON as m
 export { mediaGroup } from './media-group';
 export { mediaInline } from './media-inline';
 export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON } from './media-single';
-export { table, tableStage0, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector } from './tableNodes';
+export { table, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, tableStage0, 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';
 export { taskList, taskListSelector } from './task-list';

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

@@ -2,10 +2,7 @@ import { hexToEditorBackgroundPaletteRawValue } from '../../utils/editor-palette
 import { B100, B50, B75, G200, G50, G75, hexToRgba, isHex, isRgb, N0, N20, N60, N800, P100, P50, P75, R100, R50, R75, rgbToHex, T100, T50, T75, Y200, Y50, Y75 } from '../../utils/colors';
 import { uuid } from '../../utils/uuid';
 import { getDarkModeLCHColor } from '../../utils/lch-color-inversion';
-import { table as tableFactory } from '../../next-schema/generated/nodeTypes';
-import { tableCell as tableCellFactory } from '../../next-schema/generated/nodeTypes';
-import { tableHeader as tableHeaderFactory } from '../../next-schema/generated/nodeTypes';
-import { tableRow as tableRowFactory } from '../../next-schema/generated/nodeTypes';
+import { table as tableFactory, tableWithNestedTable as tableWithNestedTableFactory, tableRow as tableRowFactory, tableRowWithNestedTable as tableRowWithNestedTableFactory, tableHeader as tableHeaderFactory, tableHeaderWithNestedTable as tableHeaderWithNestedTableFactory, tableCell as tableCellFactory, tableCellWithNestedTable as tableCellWithNestedTableFactory } from '../../next-schema/generated/nodeTypes';
 export const tablePrefixSelector = 'pm-table';
 export const tableCellSelector = `${tablePrefixSelector}-cell-content-wrap`;
 export const tableHeaderSelector = `${tablePrefixSelector}-header-content-wrap`;
@@ -201,8 +198,9 @@ export const tableBackgroundColorNames = new Map();
  * @name table_header_node
  */
 
-// TODO: Fix any, potential issue. ED-5048
-const createTableSpec = () => tableFactory({
+// table nodes with nested tables support
+
+const tableNodeSpecOptions = {
   parseDOM: [{
     tag: 'table',
     getAttrs: node => {
@@ -233,7 +231,9 @@ const createTableSpec = () => tableFactory({
     };
     return ['table', attrs, ['tbody', 0]];
   }
-});
+};
+// TODO: Fix any, potential issue. ED-5048
+const createTableSpec = () => tableFactory(tableNodeSpecOptions);
 
 // TODO: assuming breaking changes aren't allowed, so retaining both exports
 /** Includes table width attribute */
@@ -250,14 +250,15 @@ export const tableToJSON = node => ({
     };
   }, {})
 });
-export const tableRow = tableRowFactory({
+const tableRowNodeSpecOptions = {
   parseDOM: [{
     tag: 'tr'
   }],
   toDOM() {
     return ['tr', 0];
   }
-});
+};
+export const tableRow = tableRowFactory(tableRowNodeSpecOptions);
 const cellAttrs = {
   colspan: {
     default: 1
@@ -272,7 +273,7 @@ const cellAttrs = {
     default: null
   }
 };
-export const tableCell = tableCellFactory({
+const tableCellNodeSpecOptions = {
   parseDOM: [
   // Ignore number cell copied from renderer
   {
@@ -283,7 +284,8 @@ export const tableCell = tableCellFactory({
     getAttrs: dom => getCellAttrs(dom)
   }],
   toDOM: node => ['td', getCellDomAttrs(node), 0]
-});
+};
+export const tableCell = tableCellFactory(tableCellNodeSpecOptions);
 export const toJSONTableCell = node => ({
   attrs: Object.keys(node.attrs).reduce((obj, key) => {
     if (cellAttrs[key].default !== node.attrs[key]) {
@@ -292,7 +294,7 @@ export const toJSONTableCell = node => ({
     return obj;
   }, {})
 });
-export const tableHeader = tableHeaderFactory({
+const tableHeaderNodeSpecOptions = {
   parseDOM: [{
     tag: 'th',
     getAttrs: dom => getCellAttrs(dom, {
@@ -300,5 +302,12 @@ export const tableHeader = tableHeaderFactory({
     })
   }],
   toDOM: node => ['th', getCellDomAttrs(node), 0]
-});
-export const toJSONTableHeader = toJSONTableCell;
+};
+export const tableHeader = tableHeaderFactory(tableHeaderNodeSpecOptions);
+export const toJSONTableHeader = toJSONTableCell;
+
+// table nodes with nested table support
+export const tableWithNestedTable = tableWithNestedTableFactory(tableNodeSpecOptions);
+export const tableRowWithNestedTable = tableRowWithNestedTableFactory(tableRowNodeSpecOptions);
+export const tableCellWithNestedTable = tableCellWithNestedTableFactory(tableCellNodeSpecOptions);
+export const tableHeaderWithNestedTable = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptions);