@atlaskit/adf-schema 44.1.0 → 44.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/index.js +24 -0
  3. package/dist/cjs/next-schema/generated/nodeTypes.js +77 -1
  4. package/dist/cjs/next-schema/groups/blockContentGroup.js +4 -2
  5. package/dist/cjs/next-schema/groups/blockGroup.js +4 -2
  6. package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js +4 -2
  7. package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js +2 -2
  8. package/dist/cjs/next-schema/nodes/extensionFrame.js +4 -2
  9. package/dist/cjs/next-schema/nodes/tableNodes.js +166 -0
  10. package/dist/cjs/schema/default-schema.js +5 -1
  11. package/dist/cjs/schema/index.js +24 -0
  12. package/dist/cjs/schema/nodes/index.js +24 -0
  13. package/dist/cjs/schema/nodes/tableNodes.js +52 -40
  14. package/dist/cjs/utils/editor-palette.js +4 -4
  15. package/dist/es2019/index.js +1 -1
  16. package/dist/es2019/next-schema/generated/nodeTypes.js +76 -0
  17. package/dist/es2019/next-schema/groups/blockContentGroup.js +4 -2
  18. package/dist/es2019/next-schema/groups/blockGroup.js +4 -2
  19. package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js +4 -2
  20. package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js +1 -1
  21. package/dist/es2019/next-schema/nodes/extensionFrame.js +4 -2
  22. package/dist/es2019/next-schema/nodes/tableNodes.js +160 -0
  23. package/dist/es2019/schema/default-schema.js +6 -2
  24. package/dist/es2019/schema/index.js +1 -1
  25. package/dist/es2019/schema/nodes/index.js +1 -1
  26. package/dist/es2019/schema/nodes/tableNodes.js +23 -14
  27. package/dist/es2019/utils/editor-palette.js +4 -4
  28. package/dist/esm/index.js +1 -1
  29. package/dist/esm/next-schema/generated/nodeTypes.js +76 -0
  30. package/dist/esm/next-schema/groups/blockContentGroup.js +4 -2
  31. package/dist/esm/next-schema/groups/blockGroup.js +4 -2
  32. package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js +4 -2
  33. package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js +1 -1
  34. package/dist/esm/next-schema/nodes/extensionFrame.js +4 -2
  35. package/dist/esm/next-schema/nodes/tableNodes.js +161 -0
  36. package/dist/esm/schema/default-schema.js +6 -2
  37. package/dist/esm/schema/index.js +1 -1
  38. package/dist/esm/schema/nodes/index.js +1 -1
  39. package/dist/esm/schema/nodes/tableNodes.js +52 -43
  40. package/dist/esm/utils/editor-palette.js +4 -4
  41. package/dist/types/index.d.ts +1 -1
  42. package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +3 -3
  43. package/dist/types/next-schema/generated/nodeTypes.d.ts +52 -4
  44. package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts +1 -55
  45. package/dist/types/next-schema/groups/tableCellContentPseudoGroup.d.ts +71 -0
  46. package/dist/types/next-schema/nodes/tableNodes.d.ts +2 -0
  47. package/dist/types/schema/index.d.ts +2 -2
  48. package/dist/types/schema/nodes/index.d.ts +2 -2
  49. package/dist/types/schema/nodes/tableNodes.d.ts +27 -0
  50. package/package.json +2 -2
  51. package/dist/cjs/next-schema/nodes/table.js +0 -53
  52. package/dist/cjs/next-schema/nodes/tableCell.js +0 -50
  53. package/dist/cjs/next-schema/nodes/tableHeader.js +0 -50
  54. package/dist/cjs/next-schema/nodes/tableRow.js +0 -26
  55. package/dist/es2019/next-schema/nodes/table.js +0 -47
  56. package/dist/es2019/next-schema/nodes/tableCell.js +0 -44
  57. package/dist/es2019/next-schema/nodes/tableHeader.js +0 -44
  58. package/dist/es2019/next-schema/nodes/tableRow.js +0 -20
  59. package/dist/esm/next-schema/nodes/table.js +0 -47
  60. package/dist/esm/next-schema/nodes/tableCell.js +0 -44
  61. package/dist/esm/next-schema/nodes/tableHeader.js +0 -44
  62. package/dist/esm/next-schema/nodes/tableRow.js +0 -20
  63. package/dist/types/next-schema/nodes/table.d.ts +0 -1
  64. package/dist/types/next-schema/nodes/tableCell.d.ts +0 -1
  65. package/dist/types/next-schema/nodes/tableHeader.d.ts +0 -1
  66. package/dist/types/next-schema/nodes/tableRow.d.ts +0 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/adf-schema
2
2
 
3
+ ## 44.2.1
4
+
5
+ ### Patch Changes
6
+
7
+ - b9a2f17: Made hex color tolerant to nulls
8
+
9
+ ## 44.2.0
10
+
11
+ ### Minor Changes
12
+
13
+ - 20b1f98: [ED-25393] This change creates new variants for the table, tableRow, tableCell and tableHeader nodes such that we can nest tables one level deep. This change is not making any changes to any existing nodes.
14
+
3
15
  ## 44.1.0
4
16
 
5
17
  ### Minor Changes
package/dist/cjs/index.js CHANGED
@@ -981,6 +981,12 @@ Object.defineProperty(exports, "tableCellSelector", {
981
981
  return _schema.tableCellSelector;
982
982
  }
983
983
  });
984
+ Object.defineProperty(exports, "tableCellWithNestedTable", {
985
+ enumerable: true,
986
+ get: function get() {
987
+ return _schema.tableCellWithNestedTable;
988
+ }
989
+ });
984
990
  Object.defineProperty(exports, "tableHeader", {
985
991
  enumerable: true,
986
992
  get: function get() {
@@ -993,6 +999,12 @@ Object.defineProperty(exports, "tableHeaderSelector", {
993
999
  return _schema.tableHeaderSelector;
994
1000
  }
995
1001
  });
1002
+ Object.defineProperty(exports, "tableHeaderWithNestedTable", {
1003
+ enumerable: true,
1004
+ get: function get() {
1005
+ return _schema.tableHeaderWithNestedTable;
1006
+ }
1007
+ });
996
1008
  Object.defineProperty(exports, "tablePrefixSelector", {
997
1009
  enumerable: true,
998
1010
  get: function get() {
@@ -1005,6 +1017,12 @@ Object.defineProperty(exports, "tableRow", {
1005
1017
  return _schema.tableRow;
1006
1018
  }
1007
1019
  });
1020
+ Object.defineProperty(exports, "tableRowWithNestedTable", {
1021
+ enumerable: true,
1022
+ get: function get() {
1023
+ return _schema.tableRowWithNestedTable;
1024
+ }
1025
+ });
1008
1026
  Object.defineProperty(exports, "tableStage0", {
1009
1027
  enumerable: true,
1010
1028
  get: function get() {
@@ -1023,6 +1041,12 @@ Object.defineProperty(exports, "tableWithCustomWidth", {
1023
1041
  return _schema.tableWithCustomWidth;
1024
1042
  }
1025
1043
  });
1044
+ Object.defineProperty(exports, "tableWithNestedTable", {
1045
+ enumerable: true,
1046
+ get: function get() {
1047
+ return _schema.tableWithNestedTable;
1048
+ }
1049
+ });
1026
1050
  Object.defineProperty(exports, "taskItem", {
1027
1051
  enumerable: true,
1028
1052
  get: function get() {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
6
+ exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
7
7
  var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
8
8
  /**
9
9
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -1036,6 +1036,34 @@ var table = exports.table = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1036
1036
  isolating: true,
1037
1037
  tableRole: 'table'
1038
1038
  });
1039
+ var tableWithNestedTable = exports.tableWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1040
+ content: 'tableRow+',
1041
+ marks: 'unsupportedMark unsupportedNodeAttribute',
1042
+ group: 'block',
1043
+ attrs: {
1044
+ displayMode: {
1045
+ default: null
1046
+ },
1047
+ isNumberColumnEnabled: {
1048
+ default: false
1049
+ },
1050
+ layout: {
1051
+ default: 'default'
1052
+ },
1053
+ localId: {
1054
+ default: ''
1055
+ },
1056
+ width: {
1057
+ default: null
1058
+ },
1059
+ __autoSize: {
1060
+ default: false
1061
+ }
1062
+ },
1063
+ selectable: true,
1064
+ isolating: true,
1065
+ tableRole: 'table'
1066
+ });
1039
1067
  var tableCell = exports.tableCell = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1040
1068
  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
1041
1069
  marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
@@ -1057,6 +1085,27 @@ var tableCell = exports.tableCell = (0, _createPMSpecFactory.createPMNodeSpecFac
1057
1085
  isolating: true,
1058
1086
  tableRole: 'cell'
1059
1087
  });
1088
+ var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1089
+ content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
1090
+ marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
1091
+ attrs: {
1092
+ colspan: {
1093
+ default: 1
1094
+ },
1095
+ rowspan: {
1096
+ default: 1
1097
+ },
1098
+ colwidth: {
1099
+ default: null
1100
+ },
1101
+ background: {
1102
+ default: null
1103
+ }
1104
+ },
1105
+ selectable: false,
1106
+ isolating: true,
1107
+ tableRole: 'cell'
1108
+ });
1060
1109
  var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1061
1110
  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
1062
1111
  marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
@@ -1078,12 +1127,39 @@ var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.createPMNodeSpe
1078
1127
  isolating: true,
1079
1128
  tableRole: 'header_cell'
1080
1129
  });
1130
+ var tableHeaderWithNestedTable = exports.tableHeaderWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1131
+ content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
1132
+ marks: 'alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
1133
+ attrs: {
1134
+ colspan: {
1135
+ default: 1
1136
+ },
1137
+ rowspan: {
1138
+ default: 1
1139
+ },
1140
+ colwidth: {
1141
+ default: null
1142
+ },
1143
+ background: {
1144
+ default: null
1145
+ }
1146
+ },
1147
+ selectable: false,
1148
+ isolating: true,
1149
+ tableRole: 'header_cell'
1150
+ });
1081
1151
  var tableRow = exports.tableRow = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1082
1152
  content: '(tableCell | tableHeader)+',
1083
1153
  marks: 'unsupportedMark unsupportedNodeAttribute',
1084
1154
  selectable: false,
1085
1155
  tableRole: 'row'
1086
1156
  });
1157
+ var tableRowWithNestedTable = exports.tableRowWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1158
+ content: '(tableCell | tableHeader)+',
1159
+ marks: 'unsupportedMark unsupportedNodeAttribute',
1160
+ selectable: false,
1161
+ tableRole: 'row'
1162
+ });
1087
1163
  var taskItem = exports.taskItem = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
1088
1164
  content: 'inline*',
1089
1165
  marks: '_',
@@ -21,7 +21,7 @@ var _mediaSingle = require("../nodes/mediaSingle");
21
21
  var _panel = require("../nodes/panel");
22
22
  var _paragraph = require("../nodes/paragraph");
23
23
  var _rule = require("../nodes/rule");
24
- var _table = require("../nodes/table");
24
+ var _tableNodes = require("../nodes/tableNodes");
25
25
  var _task = require("../nodes/task");
26
26
  var _unsupportedBlock = require("../nodes/unsupportedBlock");
27
27
  /**
@@ -37,6 +37,8 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
37
37
  * - no base heading
38
38
  * - no base expand
39
39
  */
40
- var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _panel.panel.use('with_nested_blockquote'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table, _expand.expand.use('without_nested_expand'), _expand.expand.use('with_no_mark'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
40
+ var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _panel.panel.use('with_nested_blockquote'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
41
+ // @ts-expect-error - types don't deal well with circular references for the variant
42
+ _tableNodes.table.use('with_nested_table'), _expand.expand.use('without_nested_expand'), _expand.expand.use('with_no_mark'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
41
43
  ignore: ['pm-spec', 'json-schema']
42
44
  });
@@ -21,10 +21,12 @@ var _mediaSingle = require("../nodes/mediaSingle");
21
21
  var _panel = require("../nodes/panel");
22
22
  var _paragraph = require("../nodes/paragraph");
23
23
  var _rule = require("../nodes/rule");
24
- var _table = require("../nodes/table");
24
+ var _tableNodes = require("../nodes/tableNodes");
25
25
  var _task = require("../nodes/task");
26
26
  var _unsupportedBlock = require("../nodes/unsupportedBlock");
27
- var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('with_nested_blockquote'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
27
+ var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('with_nested_blockquote'), _tableNodes.table,
28
+ // @ts-expect-error - types don't deal well with circular references for the variant
29
+ _tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
28
30
  // @DSLCompatibilityException
29
31
  // Block group in PM doesn't match ADF
30
32
  ignore: ['validator-spec']
@@ -18,12 +18,14 @@ var _mediaSingle = require("../nodes/mediaSingle");
18
18
  var _panel = require("../nodes/panel");
19
19
  var _paragraph = require("../nodes/paragraph");
20
20
  var _rule = require("../nodes/rule");
21
- var _table = require("../nodes/table");
21
+ var _tableNodes = require("../nodes/tableNodes");
22
22
  var _task = require("../nodes/task");
23
23
  var _unsupportedBlock = require("../nodes/unsupportedBlock");
24
24
  // Not an actual group, but a collection of nodes that can't be nested inside each other
25
25
  // TODO: make it an actual group
26
- var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _table.table, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _unsupportedBlock.unsupportedBlock];
26
+ var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
27
+ // @ts-expect-error - types don't deal well with circular references for the variant
28
+ _tableNodes.table.use('with_nested_table'), _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _unsupportedBlock.unsupportedBlock];
27
29
 
28
30
  /**
29
31
  * @DSLCompatibilityException
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.tableHeaderContentPseudoGroup = exports.tableCellContentPseudoGroup = void 0;
6
+ exports.tableHeaderContentPseudoGroup = exports.tableCellContentPseudoGroup = exports.tableCellContentNodes = void 0;
7
7
  var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
8
8
  var _blockCard = require("../nodes/blockCard");
9
9
  var _blockquote = require("../nodes/blockquote");
@@ -21,7 +21,7 @@ var _paragraph = require("../nodes/paragraph");
21
21
  var _rule = require("../nodes/rule");
22
22
  var _task = require("../nodes/task");
23
23
  var _unsupportedBlock = require("../nodes/unsupportedBlock");
24
- var tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
24
+ var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
25
25
 
26
26
  // This is not an actual group, but a collection of nodes
27
27
  // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it
@@ -23,7 +23,7 @@ var _mediaSingle = require("./mediaSingle");
23
23
  var _panel = require("./panel");
24
24
  var _paragraph = require("./paragraph");
25
25
  var _rule = require("./rule");
26
- var _table = require("./table");
26
+ var _tableNodes = require("./tableNodes");
27
27
  var _task = require("./task");
28
28
  var _unsupportedBlock = require("./unsupportedBlock");
29
29
  var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('extensionFrame').define({
@@ -36,7 +36,9 @@ var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('
36
36
  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
37
37
  marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
38
38
  attrs: {},
39
- content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _table.table, _extension.extension.use('with_marks'), _bodiedExtension.bodiedExtension.use('with_marks'), _unsupportedBlock.unsupportedBlock, _blockCard.blockCard, _embedCard.embedCard))],
39
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
40
+ // @ts-expect-error - types don't deal well with circular references for the variant
41
+ _tableNodes.table.use('with_nested_table'), _extension.extension.use('with_marks'), _bodiedExtension.bodiedExtension.use('with_marks'), _unsupportedBlock.unsupportedBlock, _blockCard.blockCard, _embedCard.embedCard))],
40
42
  DANGEROUS_MANUAL_OVERRIDE: {
41
43
  'validator-spec': {
42
44
  'props.content.allowUnsupportedBlock': {
@@ -0,0 +1,166 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.table = void 0;
8
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
+ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
10
+ var _fragment = require("../marks/fragment");
11
+ var _unsupportedMark = require("../marks/unsupportedMark");
12
+ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
13
+ var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGroup");
14
+ var _tableCellContent = require("./tableCellContent");
15
+ var _nestedExpand = require("./nestedExpand");
16
+ var _unsupportedBlock = require("./unsupportedBlock");
17
+ // Declare early to allow for circular references within the file
18
+ var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table');
19
+ var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
20
+ isolating: true,
21
+ selectable: false,
22
+ tableRole: 'cell',
23
+ marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
24
+ attrs: {
25
+ colspan: {
26
+ type: 'number',
27
+ default: 1,
28
+ optional: true
29
+ },
30
+ rowspan: {
31
+ type: 'number',
32
+ default: 1,
33
+ optional: true
34
+ },
35
+ colwidth: {
36
+ type: 'array',
37
+ items: {
38
+ type: 'number'
39
+ },
40
+ default: null,
41
+ optional: true
42
+ },
43
+ background: {
44
+ type: 'string',
45
+ default: null,
46
+ optional: true
47
+ }
48
+ },
49
+ content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup],
50
+ DANGEROUS_MANUAL_OVERRIDE: {
51
+ 'validator-spec': {
52
+ required: {
53
+ reason: '@DSLCompatibilityException - required for tableCell validator spec',
54
+ value: ['content']
55
+ }
56
+ }
57
+ }
58
+ }).variant('with_nested_table', {
59
+ content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_unsupportedBlock.unsupportedBlock, table])))],
60
+ ignore: ['json-schema', 'validator-spec']
61
+ });
62
+ var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
63
+ isolating: true,
64
+ selectable: false,
65
+ tableRole: 'header_cell',
66
+ marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
67
+ attrs: {
68
+ colspan: {
69
+ type: 'number',
70
+ default: 1,
71
+ optional: true
72
+ },
73
+ rowspan: {
74
+ type: 'number',
75
+ default: 1,
76
+ optional: true
77
+ },
78
+ colwidth: {
79
+ type: 'array',
80
+ items: {
81
+ type: 'number'
82
+ },
83
+ default: null,
84
+ optional: true
85
+ },
86
+ background: {
87
+ type: 'string',
88
+ default: null,
89
+ optional: true
90
+ }
91
+ },
92
+ content: [_tableCellContentPseudoGroup.tableHeaderContentPseudoGroup],
93
+ DANGEROUS_MANUAL_OVERRIDE: {
94
+ 'validator-spec': {
95
+ required: {
96
+ reason: '@DSLCompatibilityException - required for tableHeader validator spec',
97
+ value: ['content']
98
+ }
99
+ }
100
+ }
101
+ }).variant('with_nested_table', {
102
+ content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_nestedExpand.nestedExpand, table])))],
103
+ ignore: ['json-schema', 'validator-spec']
104
+ });
105
+ var tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
106
+ selectable: false,
107
+ marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
108
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableCell, tableHeader, _tableCellContent.tableCellContent))],
109
+ tableRole: 'row',
110
+ DANGEROUS_MANUAL_OVERRIDE: {
111
+ 'validator-spec': {
112
+ 'props.content.minItems': {
113
+ reason: '@DSLCompatibilityException - required for tableRow validator spec',
114
+ remove: true
115
+ }
116
+ }
117
+ }
118
+ }).variant('with_nested_table', {
119
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableCell.use('with_nested_table'), tableHeader.use('with_nested_table')))],
120
+ ignore: ['json-schema', 'validator-spec']
121
+ });
122
+ table.define({
123
+ isolating: true,
124
+ selectable: true,
125
+ tableRole: 'table',
126
+ marks: [_fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
127
+ attrs: {
128
+ displayMode: {
129
+ type: 'enum',
130
+ values: ['default', 'fixed'],
131
+ default: null,
132
+ optional: true
133
+ },
134
+ isNumberColumnEnabled: {
135
+ type: 'boolean',
136
+ default: false,
137
+ optional: true
138
+ },
139
+ layout: {
140
+ type: 'enum',
141
+ values: ['wide', 'full-width', 'center', 'align-end', 'align-start', 'default'],
142
+ default: 'default',
143
+ optional: true
144
+ },
145
+ localId: {
146
+ type: 'string',
147
+ minLength: 1,
148
+ default: '',
149
+ optional: true
150
+ },
151
+ width: {
152
+ type: 'number',
153
+ default: null,
154
+ optional: true
155
+ },
156
+ __autoSize: {
157
+ type: 'boolean',
158
+ default: false,
159
+ optional: true
160
+ }
161
+ },
162
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableRow))]
163
+ }).variant('with_nested_table', {
164
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(tableRow.use('with_nested_table')))],
165
+ ignore: ['json-schema', 'validator-spec']
166
+ });
@@ -29,7 +29,11 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
29
29
  expand: _nodes.expandWithNestedExpand,
30
30
  blockquote: _nodes.blockquoteWithNestedCodeblockOrMedia,
31
31
  listItem: _nodes.listItemWithDecisionStage0,
32
- panel: (0, _nodes.panelWithBlockquoteStage0)(true)
32
+ panel: (0, _nodes.panelWithBlockquoteStage0)(true),
33
+ table: _nodes.tableWithNestedTable,
34
+ tableRow: _nodes.tableRowWithNestedTable,
35
+ tableCell: _nodes.tableCellWithNestedTable,
36
+ tableHeader: _nodes.tableHeaderWithNestedTable
33
37
  };
34
38
  }
35
39
  return (0, _createSchema.createSchema)(defaultSchemaConfig);
@@ -615,6 +615,12 @@ Object.defineProperty(exports, "tableCellSelector", {
615
615
  return _nodes.tableCellSelector;
616
616
  }
617
617
  });
618
+ Object.defineProperty(exports, "tableCellWithNestedTable", {
619
+ enumerable: true,
620
+ get: function get() {
621
+ return _nodes.tableCellWithNestedTable;
622
+ }
623
+ });
618
624
  Object.defineProperty(exports, "tableHeader", {
619
625
  enumerable: true,
620
626
  get: function get() {
@@ -627,6 +633,12 @@ Object.defineProperty(exports, "tableHeaderSelector", {
627
633
  return _nodes.tableHeaderSelector;
628
634
  }
629
635
  });
636
+ Object.defineProperty(exports, "tableHeaderWithNestedTable", {
637
+ enumerable: true,
638
+ get: function get() {
639
+ return _nodes.tableHeaderWithNestedTable;
640
+ }
641
+ });
630
642
  Object.defineProperty(exports, "tablePrefixSelector", {
631
643
  enumerable: true,
632
644
  get: function get() {
@@ -639,6 +651,12 @@ Object.defineProperty(exports, "tableRow", {
639
651
  return _nodes.tableRow;
640
652
  }
641
653
  });
654
+ Object.defineProperty(exports, "tableRowWithNestedTable", {
655
+ enumerable: true,
656
+ get: function get() {
657
+ return _nodes.tableRowWithNestedTable;
658
+ }
659
+ });
642
660
  Object.defineProperty(exports, "tableStage0", {
643
661
  enumerable: true,
644
662
  get: function get() {
@@ -657,6 +675,12 @@ Object.defineProperty(exports, "tableWithCustomWidth", {
657
675
  return _nodes.tableWithCustomWidth;
658
676
  }
659
677
  });
678
+ Object.defineProperty(exports, "tableWithNestedTable", {
679
+ enumerable: true,
680
+ get: function get() {
681
+ return _nodes.tableWithNestedTable;
682
+ }
683
+ });
660
684
  Object.defineProperty(exports, "taskItem", {
661
685
  enumerable: true,
662
686
  get: function get() {
@@ -430,6 +430,12 @@ Object.defineProperty(exports, "tableCellSelector", {
430
430
  return _tableNodes.tableCellSelector;
431
431
  }
432
432
  });
433
+ Object.defineProperty(exports, "tableCellWithNestedTable", {
434
+ enumerable: true,
435
+ get: function get() {
436
+ return _tableNodes.tableCellWithNestedTable;
437
+ }
438
+ });
433
439
  Object.defineProperty(exports, "tableHeader", {
434
440
  enumerable: true,
435
441
  get: function get() {
@@ -442,6 +448,12 @@ Object.defineProperty(exports, "tableHeaderSelector", {
442
448
  return _tableNodes.tableHeaderSelector;
443
449
  }
444
450
  });
451
+ Object.defineProperty(exports, "tableHeaderWithNestedTable", {
452
+ enumerable: true,
453
+ get: function get() {
454
+ return _tableNodes.tableHeaderWithNestedTable;
455
+ }
456
+ });
445
457
  Object.defineProperty(exports, "tablePrefixSelector", {
446
458
  enumerable: true,
447
459
  get: function get() {
@@ -454,6 +466,12 @@ Object.defineProperty(exports, "tableRow", {
454
466
  return _tableNodes.tableRow;
455
467
  }
456
468
  });
469
+ Object.defineProperty(exports, "tableRowWithNestedTable", {
470
+ enumerable: true,
471
+ get: function get() {
472
+ return _tableNodes.tableRowWithNestedTable;
473
+ }
474
+ });
457
475
  Object.defineProperty(exports, "tableStage0", {
458
476
  enumerable: true,
459
477
  get: function get() {
@@ -472,6 +490,12 @@ Object.defineProperty(exports, "tableWithCustomWidth", {
472
490
  return _tableNodes.tableWithCustomWidth;
473
491
  }
474
492
  });
493
+ Object.defineProperty(exports, "tableWithNestedTable", {
494
+ enumerable: true,
495
+ get: function get() {
496
+ return _tableNodes.tableWithNestedTable;
497
+ }
498
+ });
475
499
  Object.defineProperty(exports, "taskItem", {
476
500
  enumerable: true,
477
501
  get: function get() {