@atlaskit/adf-schema 57.0.1 → 57.0.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/adf-schema
 
+## 57.0.2
+
+### Patch Changes
+
+- [`158de476cd932`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/158de476cd932) -
+  Table-in-panel: order the `panel_c1` variant ahead of the base `panel` in `doc`, `layoutColumn`
+  and `bodiedSyncBlock` content. The validator's repairing loop returns the first candidate that
+  reports valid, so with a repairing callback the less permissive base `panel` "succeeded" by
+  wrapping a nested `table` as `unsupportedBlock` and `panel_c1` was never reached. Ordering the
+  variant first replaces a candidate-probing workaround in the validator.
+
+  `panel_c1` is placed after `blockGroup` rather than first so that `block` remains the leading
+  alternative in the ProseMirror content expression, leaving `defaultType` and fill behaviour
+  unchanged; the ProseMirror content expressions for these three nodes do change order
+  mid-expression.
+
+  Also adds two stage-0 reference fixtures covering table-in-panel inside a synced block and
+  alongside mixed panel content.
+
+  Gated by `platform_editor_table_in_panel_patch_1`.
+
 ## 57.0.1
 
 ### Patch Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -21,7 +21,16 @@ var _rule = require("./nodes/rule");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _panel.panel.use('root_only'), _panel.panel.use('c1'), _panel.panel.use('c1_root_only'), _rule.rule.use('root_only'), _extension.extension.use('root_only'), _bodiedExtension.bodiedExtension.use('root_only'), _multiBodiedExtension.multiBodiedExtension.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup,
+  // `panel.use('c1')` must precede `blockContentGroup`, which contributes the bare `panel`
+  // name to the validator spec. The validator's repairing loop takes the FIRST candidate that
+  // reports valid, and with a repairing callback the less permissive base `panel` "succeeds"
+  // by wrapping a nested table as `unsupportedBlock`, so `panel_c1` is never reached.
+  // Safe because panel_c1's content is a strict superset of the base's (it only adds `table`).
+  // Deliberately placed AFTER `blockGroup` rather than first: `blockContentGroup` is ignored
+  // for `pm-spec`, so this keeps `block` the leading alternative in the PM content
+  // expression and leaves ProseMirror's defaultType/fill behaviour untouched.
+  _panel.panel.use('c1'), _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _panel.panel.use('root_only'), _panel.panel.use('c1_root_only'), _rule.rule.use('root_only'), _extension.extension.use('root_only'), _bodiedExtension.bodiedExtension.use('root_only'), _multiBodiedExtension.multiBodiedExtension.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -157,7 +157,7 @@ var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _createPMS
   isolating: true
 });
 var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | panel_c1 | rule | table | taskList | unsupportedBlock)+',
+  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | table | taskList | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {
@@ -331,7 +331,7 @@ var decisionList = exports.decisionList = (0, _createPMSpecFactory.createPMNodeS
   defining: true
 });
 var doc = exports.doc = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(block | codeBlock | panel | panel_c1 | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
+  content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
 });
 var embedCard = exports.embedCard = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
@@ -677,7 +677,7 @@ var inlineExtensionWithMarks = exports.inlineExtensionWithMarks = (0, _createPMS
   selectable: true
 });
 var layoutColumn = exports.layoutColumn = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(block | unsupportedBlock | panel_c1)+',
+  content: '(block | panel_c1 | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {
     width: {

package/dist/cjs/next-schema/nodes/bodiedSyncBlock.js

@@ -40,7 +40,10 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _adfSchemaGenerator.adfNode)
       default: ''
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList, _panel.panel, _panel.panel.use('c1'), _rule.rule, _tableNodes.table,
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList,
+  // panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
+  // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
+  _panel.panel.use('c1'), _panel.panel, _rule.rule, _tableNodes.table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   _tableNodes.table.use('with_nested_table'), _task.taskList, _unsupportedBlock.unsupportedBlock))]
 });

package/dist/cjs/next-schema/nodes/layoutColumn.js

@@ -35,6 +35,10 @@ var layoutColumn = exports.layoutColumn = (0, _adfSchemaGenerator.adfNode)('layo
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: layoutColumnAttributes,
-  // panel_c1 (table-in-panel) is also valid inside a layout column.
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _unsupportedBlock.unsupportedBlock, _panel.panel.use('c1')))]
+  // panel_c1 (table-in-panel) is also valid inside a layout column. It must come before
+  // `blockContentGroup`, which contributes the bare `panel` name: the validator's repairing loop
+  // takes the first valid candidate, and base `panel` "succeeds" by wrapping a nested table as
+  // `unsupportedBlock`. Kept after `blockGroup` so `block` stays the leading PM alternative.
+  // See the same note in full-schema.adf.ts.
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _panel.panel.use('c1'), _blockContentGroup.blockContentGroup, _unsupportedBlock.unsupportedBlock))]
 });

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -263,7 +263,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'panel_c1', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -528,7 +528,7 @@ var doc = exports.doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -975,7 +975,7 @@ var layoutColumn = exports.layoutColumn = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'panel_c1']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
       minItems: 1,
       type: 'array'
     },

package/dist/es2019/next-schema/full-schema.adf.js

@@ -15,7 +15,16 @@ import { rule } from './nodes/rule';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1'), panel.use('c1_root_only'), rule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
+  content: [$onePlus($or(blockGroup,
+  // `panel.use('c1')` must precede `blockContentGroup`, which contributes the bare `panel`
+  // name to the validator spec. The validator's repairing loop takes the FIRST candidate that
+  // reports valid, and with a repairing callback the less permissive base `panel` "succeeds"
+  // by wrapping a nested table as `unsupportedBlock`, so `panel_c1` is never reached.
+  // Safe because panel_c1's content is a strict superset of the base's (it only adds `table`).
+  // Deliberately placed AFTER `blockGroup` rather than first: `blockContentGroup` is ignored
+  // for `pm-spec`, so this keeps `block` the leading alternative in the PM content
+  // expression and leaves ProseMirror's defaultType/fill behaviour untouched.
+  panel.use('c1'), blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1_root_only'), rule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -151,7 +151,7 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedSyncBlock = createPMNodeSpecFactory({
-  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | panel_c1 | rule | table | taskList | unsupportedBlock)+',
+  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | table | taskList | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {
@@ -325,7 +325,7 @@ export const decisionList = createPMNodeSpecFactory({
   defining: true
 });
 export const doc = createPMNodeSpecFactory({
-  content: '(block | codeBlock | panel | panel_c1 | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
+  content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
 });
 export const embedCard = createPMNodeSpecFactory({
@@ -671,7 +671,7 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
   selectable: true
 });
 export const layoutColumn = createPMNodeSpecFactory({
-  content: '(block | unsupportedBlock | panel_c1)+',
+  content: '(block | panel_c1 | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {
     width: {

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

@@ -34,7 +34,10 @@ export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, panel.use('c1'), rule, table,
+  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList,
+  // panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
+  // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
+  panel.use('c1'), panel, rule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

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

@@ -29,6 +29,10 @@ export const layoutColumn = adfNode('layoutColumn').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: layoutColumnAttributes,
-  // panel_c1 (table-in-panel) is also valid inside a layout column.
-  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock, panel.use('c1')))]
+  // panel_c1 (table-in-panel) is also valid inside a layout column. It must come before
+  // `blockContentGroup`, which contributes the bare `panel` name: the validator's repairing loop
+  // takes the first valid candidate, and base `panel` "succeeds" by wrapping a nested table as
+  // `unsupportedBlock`. Kept after `blockGroup` so `block` stays the leading PM alternative.
+  // See the same note in full-schema.adf.ts.
+  content: [$onePlus($or(blockGroup, panel.use('c1'), blockContentGroup, unsupportedBlock))]
 });

package/dist/es2019/validator-schema/generated/validatorSpec.js

@@ -257,7 +257,7 @@ export const bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'panel_c1', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -522,7 +522,7 @@ export const doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -969,7 +969,7 @@ export const layoutColumn = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'panel_c1']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
       minItems: 1,
       type: 'array'
     },

package/dist/esm/next-schema/full-schema.adf.js

@@ -15,7 +15,16 @@ import { rule } from './nodes/rule';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1'), panel.use('c1_root_only'), rule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
+  content: [$onePlus($or(blockGroup,
+  // `panel.use('c1')` must precede `blockContentGroup`, which contributes the bare `panel`
+  // name to the validator spec. The validator's repairing loop takes the FIRST candidate that
+  // reports valid, and with a repairing callback the less permissive base `panel` "succeeds"
+  // by wrapping a nested table as `unsupportedBlock`, so `panel_c1` is never reached.
+  // Safe because panel_c1's content is a strict superset of the base's (it only adds `table`).
+  // Deliberately placed AFTER `blockGroup` rather than first: `blockContentGroup` is ignored
+  // for `pm-spec`, so this keeps `block` the leading alternative in the PM content
+  // expression and leaves ProseMirror's defaultType/fill behaviour untouched.
+  panel.use('c1'), blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1_root_only'), rule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -151,7 +151,7 @@ export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export var bodiedSyncBlock = createPMNodeSpecFactory({
-  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | panel_c1 | rule | table | taskList | unsupportedBlock)+',
+  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | table | taskList | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {
@@ -325,7 +325,7 @@ export var decisionList = createPMNodeSpecFactory({
   defining: true
 });
 export var doc = createPMNodeSpecFactory({
-  content: '(block | codeBlock | panel | panel_c1 | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
+  content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
 });
 export var embedCard = createPMNodeSpecFactory({
@@ -671,7 +671,7 @@ export var inlineExtensionWithMarks = createPMNodeSpecFactory({
   selectable: true
 });
 export var layoutColumn = createPMNodeSpecFactory({
-  content: '(block | unsupportedBlock | panel_c1)+',
+  content: '(block | panel_c1 | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {
     width: {

package/dist/esm/next-schema/nodes/bodiedSyncBlock.js

@@ -34,7 +34,10 @@ export var bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, panel.use('c1'), rule, table,
+  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList,
+  // panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
+  // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
+  panel.use('c1'), panel, rule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

package/dist/esm/next-schema/nodes/layoutColumn.js

@@ -29,6 +29,10 @@ export var layoutColumn = adfNode('layoutColumn').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: layoutColumnAttributes,
-  // panel_c1 (table-in-panel) is also valid inside a layout column.
-  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock, panel.use('c1')))]
+  // panel_c1 (table-in-panel) is also valid inside a layout column. It must come before
+  // `blockContentGroup`, which contributes the bare `panel` name: the validator's repairing loop
+  // takes the first valid candidate, and base `panel` "succeeds" by wrapping a nested table as
+  // `unsupportedBlock`. Kept after `blockGroup` so `block` stays the leading PM alternative.
+  // See the same note in full-schema.adf.ts.
+  content: [$onePlus($or(blockGroup, panel.use('c1'), blockContentGroup, unsupportedBlock))]
 });

package/dist/esm/validator-schema/generated/validatorSpec.js

@@ -257,7 +257,7 @@ export var bodiedSyncBlock = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'panel_c1', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       type: 'array'
     },
@@ -522,7 +522,7 @@ export var doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -969,7 +969,7 @@ export var layoutColumn = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'panel_c1']],
+      items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
       minItems: 1,
       type: 'array'
     },

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

@@ -545,10 +545,10 @@
                 "$ref": "#/definitions/orderedList_node"
               },
               {
-                "$ref": "#/definitions/panel_node"
+                "$ref": "#/definitions/panel_c1_node"
               },
               {
-                "$ref": "#/definitions/panel_c1_node"
+                "$ref": "#/definitions/panel_node"
               },
               {
                 "$ref": "#/definitions/rule_node"
@@ -1809,10 +1809,10 @@
           "items": {
             "anyOf": [
               {
-                "$ref": "#/definitions/block_content"
+                "$ref": "#/definitions/panel_c1_node"
               },
               {
-                "$ref": "#/definitions/panel_c1_node"
+                "$ref": "#/definitions/block_content"
               }
             ]
           },

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

@@ -545,10 +545,10 @@
                 "$ref": "#/definitions/orderedList_node"
               },
               {
-                "$ref": "#/definitions/panel_node"
+                "$ref": "#/definitions/panel_c1_node"
               },
               {
-                "$ref": "#/definitions/panel_c1_node"
+                "$ref": "#/definitions/panel_node"
               },
               {
                 "$ref": "#/definitions/rule_node"
@@ -1809,10 +1809,10 @@
           "items": {
             "anyOf": [
               {
-                "$ref": "#/definitions/block_content"
+                "$ref": "#/definitions/panel_c1_node"
               },
               {
-                "$ref": "#/definitions/panel_c1_node"
+                "$ref": "#/definitions/block_content"
               }
             ]
           },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "57.0.1",
+	"version": "57.0.2",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -40,7 +40,7 @@
 		"@atlaskit/adf-schema-generator": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^148.0.0",
+		"@atlaskit/tmp-editor-statsig": "^148.1.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^5.0.2",