@atlaskit/adf-schema 55.2.0 → 56.0.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/adf-schema
 
+## 56.0.0
+
+### Major Changes
+
+- [`377a4234587d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/377a4234587d1) -
+  Promote `tableCell` and `tableHeader` `valign` attribute from stage-0 to the full ADF schema, and
+  remove the now-redundant stage-0 node-spec selection in the table plugin.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 55.2.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 55.2.0
 
 ### Minor Changes

package/dist/cjs/entry-points/schema-next-nodeTypes.js

@@ -420,7 +420,7 @@ Object.defineProperty(exports, "tableCell", {
 Object.defineProperty(exports, "tableCellStage0", {
   enumerable: true,
   get: function get() {
-    return _nodeTypes.tableCellStage0;
+    return _nodeTypes.tableCell;
   }
 });
 Object.defineProperty(exports, "tableCellWithNestedTable", {
@@ -432,7 +432,7 @@ Object.defineProperty(exports, "tableCellWithNestedTable", {
 Object.defineProperty(exports, "tableCellWithNestedTableStage0", {
   enumerable: true,
   get: function get() {
-    return _nodeTypes.tableCellWithNestedTableStage0;
+    return _nodeTypes.tableCellWithNestedTable;
   }
 });
 Object.defineProperty(exports, "tableHeader", {
@@ -444,7 +444,7 @@ Object.defineProperty(exports, "tableHeader", {
 Object.defineProperty(exports, "tableHeaderStage0", {
   enumerable: true,
   get: function get() {
-    return _nodeTypes.tableHeaderStage0;
+    return _nodeTypes.tableHeader;
   }
 });
 Object.defineProperty(exports, "tableHeaderWithNestedTable", {
@@ -456,7 +456,7 @@ Object.defineProperty(exports, "tableHeaderWithNestedTable", {
 Object.defineProperty(exports, "tableHeaderWithNestedTableStage0", {
   enumerable: true,
   get: function get() {
-    return _nodeTypes.tableHeaderWithNestedTableStage0;
+    return _nodeTypes.tableHeaderWithNestedTable;
   }
 });
 Object.defineProperty(exports, "tableRow", {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTableStage0 = exports.tableHeaderWithNestedTable = exports.tableHeaderStage0 = exports.tableHeader = exports.tableCellWithNestedTableStage0 = exports.tableCellWithNestedTable = exports.tableCellStage0 = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelC1 = 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.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.expandRootOnly = 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.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = 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.syncBlock = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelC1 = 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.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.expandRootOnly = 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.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -1216,30 +1216,6 @@ var tableWithNestedTable = exports.tableWithNestedTable = (0, _createPMSpecFacto
   tableRole: 'table'
 });
 var tableCell = exports.tableCell = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'cell'
-});
-var tableCellStage0 = exports.tableCellStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1267,30 +1243,6 @@ var tableCellStage0 = exports.tableCellStage0 = (0, _createPMSpecFactory.createP
   tableRole: 'cell'
 });
 var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'cell'
-});
-var tableCellWithNestedTableStage0 = exports.tableCellWithNestedTableStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1318,30 +1270,6 @@ var tableCellWithNestedTableStage0 = exports.tableCellWithNestedTableStage0 = (0
   tableRole: 'cell'
 });
 var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'header_cell'
-});
-var tableHeaderStage0 = exports.tableHeaderStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1369,30 +1297,6 @@ var tableHeaderStage0 = exports.tableHeaderStage0 = (0, _createPMSpecFactory.cre
   tableRole: 'header_cell'
 });
 var tableHeaderWithNestedTable = exports.tableHeaderWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'header_cell'
-});
-var tableHeaderWithNestedTableStage0 = exports.tableHeaderWithNestedTableStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.table = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _fragment = require("../marks/fragment");
 var _unsupportedMark = require("../marks/unsupportedMark");
@@ -15,8 +14,6 @@ var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGrou
 var _tableCellContent = require("./tableCellContent");
 var _nestedExpand = require("./nestedExpand");
 var _unsupportedBlock = require("./unsupportedBlock");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // Declare early to allow for circular references within the file
 var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table');
 var valign = {
@@ -53,7 +50,8 @@ var cellAttributes = {
     type: 'string',
     default: null,
     optional: true
-  }
+  },
+  valign: valign
 };
 var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
   isolating: true,
@@ -62,11 +60,6 @@ var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: cellAttributes,
   content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
@@ -77,12 +70,7 @@ var tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell').define({
   }
 }).variant('with_nested_table', {
   content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_unsupportedBlock.unsupportedBlock, table])))],
-  ignore: ['json-schema', 'validator-spec'],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  }
+  ignore: ['json-schema', 'validator-spec']
 });
 var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
   isolating: true,
@@ -91,11 +79,6 @@ var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: cellAttributes,
   content: [_tableCellContentPseudoGroup.tableHeaderContentPseudoGroup],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
@@ -106,12 +89,7 @@ var tableHeader = (0, _adfSchemaGenerator.adfNode)('tableHeader').define({
   }
 }).variant('with_nested_table', {
   content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, (0, _toConsumableArray2.default)(_tableCellContentPseudoGroup.tableCellContentNodes).concat([_nestedExpand.nestedExpand, table])))],
-  ignore: ['json-schema', 'validator-spec'],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  }
+  ignore: ['json-schema', 'validator-spec']
 });
 var tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
   selectable: false,

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

@@ -56,13 +56,16 @@ var getCellAttrs = exports.getCellAttrs = function getCellAttrs(dom) {
   }
   var backgroundHexCode = dataCellBackgroundHexCode || (backgroundColor && backgroundColor !== defaultValues['background'] ? backgroundColor : null);
   var localId = defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues.localId;
-  return _objectSpread({
+  var valign = (0, _valign.parseValign)(dom.getAttribute('data-valign'));
+  return _objectSpread(_objectSpread({
     colspan: colspan,
     rowspan: Number(dom.getAttribute('rowspan') || 1),
     colwidth: width && width.length === colspan ? width : null,
     background: backgroundHexCode
   }, localId && {
     localId: localId
+  }), valign && {
+    valign: valign
   });
 };
 // these are for test only
@@ -191,22 +194,6 @@ var getCellDomAttrs = exports.getCellDomAttrs = function getCellDomAttrs(node) {
   if (node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId) {
     attrs['data-local-id'] = node.attrs.localId;
   }
-  return attrs;
-};
-var getCellAttrsWithValign = function getCellAttrsWithValign(dom, defaultValues) {
-  var base = getCellAttrs(dom, defaultValues);
-  var valign = (0, _valign.parseValign)(dom.getAttribute('data-valign'));
-  return valign ? _objectSpread(_objectSpread({}, base), {}, {
-    valign: valign
-  }) : base;
-};
-
-/**
- * @stage 0
- * Valign-aware variant of getCellDomAttrs — emits the `valign` HTML attribute when set to a non-default value.
- */
-var getCellDomAttrsWithValign = function getCellDomAttrsWithValign(node) {
-  var attrs = getCellDomAttrs(node);
   if (node.attrs.valign) {
     attrs['data-valign'] = node.attrs.valign;
   }
@@ -391,49 +378,6 @@ var tableRowWithNestedTable = exports.tableRowWithNestedTable = (0, _nodeTypes.t
 var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _nodeTypes.tableCellWithNestedTable)(tableCellNodeSpecOptions);
 var tableHeaderWithNestedTable = exports.tableHeaderWithNestedTable = (0, _nodeTypes.tableHeaderWithNestedTable)(tableHeaderNodeSpecOptions);
 
-// stage-0 table cell nodes with vertical alignment and localId support
-var tableCellNodeStage0SpecOptions = {
-  parseDOM: [
-  // Ignore number cell copied from renderer
-  {
-    tag: '.ak-renderer-table-number-column',
-    ignore: true
-  }, {
-    tag: 'td',
-    getAttrs: function getAttrs(dom) {
-      return getCellAttrsWithValign(
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      dom, {
-        localId: _uuid.uuid.generate()
-      });
-    }
-  }],
-  toDOM: function toDOM(node) {
-    return ['td', getCellDomAttrsWithValign(node), 0];
-  }
-};
-var tableHeaderNodeStage0SpecOptions = {
-  parseDOM: [{
-    tag: 'th',
-    getAttrs: function getAttrs(dom) {
-      return (
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        getCellAttrsWithValign(dom, {
-          background: DEFAULT_TABLE_HEADER_CELL_BACKGROUND,
-          localId: _uuid.uuid.generate()
-        })
-      );
-    }
-  }],
-  toDOM: function toDOM(node) {
-    return ['th', getCellDomAttrsWithValign(node), 0];
-  }
-};
-var tableCellStage0 = exports.tableCellStage0 = (0, _nodeTypes.tableCellStage0)(tableCellNodeStage0SpecOptions);
-var tableHeaderStage0 = exports.tableHeaderStage0 = (0, _nodeTypes.tableHeaderStage0)(tableHeaderNodeStage0SpecOptions);
-var tableCellWithNestedTableStage0 = exports.tableCellWithNestedTableStage0 = (0, _nodeTypes.tableCellWithNestedTableStage0)(tableCellNodeStage0SpecOptions);
-var tableHeaderWithNestedTableStage0 = exports.tableHeaderWithNestedTableStage0 = (0, _nodeTypes.tableHeaderWithNestedTableStage0)(tableHeaderNodeStage0SpecOptions);
-
 // table nodes with localId support
 var tableRowNodeSpecOptionsWithLocalId = {
   parseDOM: [{
@@ -491,4 +435,19 @@ var tableHeaderWithLocalId = exports.tableHeaderWithLocalId = (0, _nodeTypes.tab
 // nested table nodes with localId support
 var tableRowWithNestedTableWithLocalId = exports.tableRowWithNestedTableWithLocalId = (0, _nodeTypes.tableRowWithNestedTable)(tableRowNodeSpecOptionsWithLocalId);
 var tableCellWithNestedTableWithLocalId = exports.tableCellWithNestedTableWithLocalId = (0, _nodeTypes.tableCellWithNestedTable)(tableCellNodeSpecOptionsWithLocalId);
-var tableHeaderWithNestedTableWithLocalId = exports.tableHeaderWithNestedTableWithLocalId = (0, _nodeTypes.tableHeaderWithNestedTable)(tableHeaderNodeSpecOptionsWithLocalId);
+var tableHeaderWithNestedTableWithLocalId = exports.tableHeaderWithNestedTableWithLocalId = (0, _nodeTypes.tableHeaderWithNestedTable)(tableHeaderNodeSpecOptionsWithLocalId);
+
+// `valign` is now in the full schema; the `*Stage0` exports are kept as aliases
+// of the `*WithLocalId` specs for backwards compatibility.
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableCellWithLocalId` */
+var tableCellStage0 = exports.tableCellStage0 = tableCellWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableHeaderWithLocalId` */
+var tableHeaderStage0 = exports.tableHeaderStage0 = tableHeaderWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableCellWithNestedTableWithLocalId` */
+var tableCellWithNestedTableStage0 = exports.tableCellWithNestedTableStage0 = tableCellWithNestedTableWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableHeaderWithNestedTableWithLocalId` */
+var tableHeaderWithNestedTableStage0 = exports.tableHeaderWithNestedTableStage0 = tableHeaderWithNestedTableWithLocalId;

package/dist/es2019/entry-points/schema-next-nodeTypes.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumn as layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';
+export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumn as layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCell as tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTable as tableCellWithNestedTableStage0, tableHeader, tableHeader as tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTable as tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';

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

@@ -1210,30 +1210,6 @@ export const tableWithNestedTable = createPMNodeSpecFactory({
   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: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'cell'
-});
-export const tableCellStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1261,30 +1237,6 @@ export const tableCellStage0 = createPMNodeSpecFactory({
   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: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'cell'
-});
-export const tableCellWithNestedTableStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1312,30 +1264,6 @@ export const tableCellWithNestedTableStage0 = createPMNodeSpecFactory({
   tableRole: 'cell'
 });
 export const tableHeader = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'header_cell'
-});
-export const tableHeaderStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1363,30 +1291,6 @@ export const tableHeaderStage0 = createPMNodeSpecFactory({
   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: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'header_cell'
-});
-export const tableHeaderWithNestedTableStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {

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

@@ -43,7 +43,8 @@ const cellAttributes = {
     type: 'string',
     default: null,
     optional: true
-  }
+  },
+  valign
 };
 const tableCell = adfNode('tableCell').define({
   isolating: true,
@@ -52,12 +53,6 @@ const tableCell = adfNode('tableCell').define({
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: cellAttributes,
   content: [tableCellContentPseudoGroup],
-  stage0: {
-    attrs: {
-      ...cellAttributes,
-      valign
-    }
-  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
@@ -68,13 +63,7 @@ const tableCell = adfNode('tableCell').define({
   }
 }).variant('with_nested_table', {
   content: [$onePlus($or(...tableCellContentNodes, unsupportedBlock, table))],
-  ignore: ['json-schema', 'validator-spec'],
-  stage0: {
-    attrs: {
-      ...cellAttributes,
-      valign
-    }
-  }
+  ignore: ['json-schema', 'validator-spec']
 });
 const tableHeader = adfNode('tableHeader').define({
   isolating: true,
@@ -83,12 +72,6 @@ const tableHeader = adfNode('tableHeader').define({
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: cellAttributes,
   content: [tableHeaderContentPseudoGroup],
-  stage0: {
-    attrs: {
-      ...cellAttributes,
-      valign
-    }
-  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
@@ -99,13 +82,7 @@ const tableHeader = adfNode('tableHeader').define({
   }
 }).variant('with_nested_table', {
   content: [$onePlus($or(...tableCellContentNodes, nestedExpand, table))],
-  ignore: ['json-schema', 'validator-spec'],
-  stage0: {
-    attrs: {
-      ...cellAttributes,
-      valign
-    }
-  }
+  ignore: ['json-schema', 'validator-spec']
 });
 const tableRow = adfNode('tableRow').define({
   selectable: false,

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

@@ -2,7 +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, tableWithNestedTable as tableWithNestedTableFactory, tableRow as tableRowFactory, tableRowWithNestedTable as tableRowWithNestedTableFactory, tableHeader as tableHeaderFactory, tableHeaderWithNestedTable as tableHeaderWithNestedTableFactory, tableHeaderWithNestedTableStage0 as tableHeaderWithNestedTableStage0Factory, tableHeaderStage0 as tableHeaderStage0Factory, tableCell as tableCellFactory, tableCellWithNestedTable as tableCellWithNestedTableFactory, tableCellWithNestedTableStage0 as tableCellWithNestedTableStage0Factory, tableCellStage0 as tableCellStage0Factory } 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';
 import { parseValign } from './types/valign';
 export const tablePrefixSelector = 'pm-table';
 
@@ -44,6 +44,7 @@ export const getCellAttrs = (dom, defaultValues = {}) => {
   }
   const backgroundHexCode = dataCellBackgroundHexCode || (backgroundColor && backgroundColor !== defaultValues['background'] ? backgroundColor : null);
   const localId = defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues.localId;
+  const valign = parseValign(dom.getAttribute('data-valign'));
   return {
     colspan,
     rowspan: Number(dom.getAttribute('rowspan') || 1),
@@ -51,6 +52,9 @@ export const getCellAttrs = (dom, defaultValues = {}) => {
     background: backgroundHexCode,
     ...(localId && {
       localId
+    }),
+    ...(valign && {
+      valign
     })
   };
 };
@@ -182,23 +186,6 @@ export const getCellDomAttrs = node => {
   if (node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId) {
     attrs['data-local-id'] = node.attrs.localId;
   }
-  return attrs;
-};
-const getCellAttrsWithValign = (dom, defaultValues) => {
-  const base = getCellAttrs(dom, defaultValues);
-  const valign = parseValign(dom.getAttribute('data-valign'));
-  return valign ? {
-    ...base,
-    valign
-  } : base;
-};
-
-/**
- * @stage 0
- * Valign-aware variant of getCellDomAttrs — emits the `valign` HTML attribute when set to a non-default value.
- */
-const getCellDomAttrsWithValign = node => {
-  const attrs = getCellDomAttrs(node);
   if (node.attrs.valign) {
     attrs['data-valign'] = node.attrs.valign;
   }
@@ -364,40 +351,6 @@ export const tableRowWithNestedTable = tableRowWithNestedTableFactory(tableRowNo
 export const tableCellWithNestedTable = tableCellWithNestedTableFactory(tableCellNodeSpecOptions);
 export const tableHeaderWithNestedTable = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptions);
 
-// stage-0 table cell nodes with vertical alignment and localId support
-const tableCellNodeStage0SpecOptions = {
-  parseDOM: [
-  // Ignore number cell copied from renderer
-  {
-    tag: '.ak-renderer-table-number-column',
-    ignore: true
-  }, {
-    tag: 'td',
-    getAttrs: dom => getCellAttrsWithValign(
-    // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    dom, {
-      localId: uuid.generate()
-    })
-  }],
-  toDOM: node => ['td', getCellDomAttrsWithValign(node), 0]
-};
-const tableHeaderNodeStage0SpecOptions = {
-  parseDOM: [{
-    tag: 'th',
-    getAttrs: dom =>
-    // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    getCellAttrsWithValign(dom, {
-      background: DEFAULT_TABLE_HEADER_CELL_BACKGROUND,
-      localId: uuid.generate()
-    })
-  }],
-  toDOM: node => ['th', getCellDomAttrsWithValign(node), 0]
-};
-export const tableCellStage0 = tableCellStage0Factory(tableCellNodeStage0SpecOptions);
-export const tableHeaderStage0 = tableHeaderStage0Factory(tableHeaderNodeStage0SpecOptions);
-export const tableCellWithNestedTableStage0 = tableCellWithNestedTableStage0Factory(tableCellNodeStage0SpecOptions);
-export const tableHeaderWithNestedTableStage0 = tableHeaderWithNestedTableStage0Factory(tableHeaderNodeStage0SpecOptions);
-
 // table nodes with localId support
 const tableRowNodeSpecOptionsWithLocalId = {
   parseDOM: [{
@@ -445,4 +398,19 @@ export const tableHeaderWithLocalId = tableHeaderFactory(tableHeaderNodeSpecOpti
 // nested table nodes with localId support
 export const tableRowWithNestedTableWithLocalId = tableRowWithNestedTableFactory(tableRowNodeSpecOptionsWithLocalId);
 export const tableCellWithNestedTableWithLocalId = tableCellWithNestedTableFactory(tableCellNodeSpecOptionsWithLocalId);
-export const tableHeaderWithNestedTableWithLocalId = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptionsWithLocalId);
+export const tableHeaderWithNestedTableWithLocalId = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptionsWithLocalId);
+
+// `valign` is now in the full schema; the `*Stage0` exports are kept as aliases
+// of the `*WithLocalId` specs for backwards compatibility.
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableCellWithLocalId` */
+export const tableCellStage0 = tableCellWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableHeaderWithLocalId` */
+export const tableHeaderStage0 = tableHeaderWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableCellWithNestedTableWithLocalId` */
+export const tableCellWithNestedTableStage0 = tableCellWithNestedTableWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableHeaderWithNestedTableWithLocalId` */
+export const tableHeaderWithNestedTableStage0 = tableHeaderWithNestedTableWithLocalId;

package/dist/esm/entry-points/schema-next-nodeTypes.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumn as layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';
+export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumn as layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCell as tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTable as tableCellWithNestedTableStage0, tableHeader, tableHeader as tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTable as tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';

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

@@ -1210,30 +1210,6 @@ export var tableWithNestedTable = createPMNodeSpecFactory({
   tableRole: 'table'
 });
 export var tableCell = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'cell'
-});
-export var tableCellStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1261,30 +1237,6 @@ export var tableCellStage0 = createPMNodeSpecFactory({
   tableRole: 'cell'
 });
 export var tableCellWithNestedTable = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'cell'
-});
-export var tableCellWithNestedTableStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1312,30 +1264,6 @@ export var tableCellWithNestedTableStage0 = createPMNodeSpecFactory({
   tableRole: 'cell'
 });
 export var tableHeader = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'header_cell'
-});
-export var tableHeaderStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
@@ -1363,30 +1291,6 @@ export var tableHeaderStage0 = createPMNodeSpecFactory({
   tableRole: 'header_cell'
 });
 export var tableHeaderWithNestedTable = createPMNodeSpecFactory({
-  content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
-  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  attrs: {
-    colspan: {
-      default: 1
-    },
-    rowspan: {
-      default: 1
-    },
-    colwidth: {
-      default: null
-    },
-    background: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true,
-  tableRole: 'header_cell'
-});
-export var tableHeaderWithNestedTableStage0 = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
   marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {

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

@@ -1,7 +1,4 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
 import { fragment } from '../marks/fragment';
 import { unsupportedMark } from '../marks/unsupportedMark';
@@ -47,7 +44,8 @@ var cellAttributes = {
     type: 'string',
     default: null,
     optional: true
-  }
+  },
+  valign: valign
 };
 var tableCell = adfNode('tableCell').define({
   isolating: true,
@@ -56,11 +54,6 @@ var tableCell = adfNode('tableCell').define({
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: cellAttributes,
   content: [tableCellContentPseudoGroup],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
@@ -71,12 +64,7 @@ var tableCell = adfNode('tableCell').define({
   }
 }).variant('with_nested_table', {
   content: [$onePlus($or.apply(void 0, _toConsumableArray(tableCellContentNodes).concat([unsupportedBlock, table])))],
-  ignore: ['json-schema', 'validator-spec'],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  }
+  ignore: ['json-schema', 'validator-spec']
 });
 var tableHeader = adfNode('tableHeader').define({
   isolating: true,
@@ -85,11 +73,6 @@ var tableHeader = adfNode('tableHeader').define({
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: cellAttributes,
   content: [tableHeaderContentPseudoGroup],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       required: {
@@ -100,12 +83,7 @@ var tableHeader = adfNode('tableHeader').define({
   }
 }).variant('with_nested_table', {
   content: [$onePlus($or.apply(void 0, _toConsumableArray(tableCellContentNodes).concat([nestedExpand, table])))],
-  ignore: ['json-schema', 'validator-spec'],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, cellAttributes), {}, {
-      valign: valign
-    })
-  }
+  ignore: ['json-schema', 'validator-spec']
 });
 var tableRow = adfNode('tableRow').define({
   selectable: false,

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

@@ -6,7 +6,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, tableWithNestedTable as tableWithNestedTableFactory, tableRow as tableRowFactory, tableRowWithNestedTable as tableRowWithNestedTableFactory, tableHeader as tableHeaderFactory, tableHeaderWithNestedTable as tableHeaderWithNestedTableFactory, tableHeaderWithNestedTableStage0 as tableHeaderWithNestedTableStage0Factory, tableHeaderStage0 as tableHeaderStage0Factory, tableCell as tableCellFactory, tableCellWithNestedTable as tableCellWithNestedTableFactory, tableCellWithNestedTableStage0 as tableCellWithNestedTableStage0Factory, tableCellStage0 as tableCellStage0Factory } 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';
 import { parseValign } from './types/valign';
 export var tablePrefixSelector = 'pm-table';
 
@@ -49,13 +49,16 @@ export var getCellAttrs = function getCellAttrs(dom) {
   }
   var backgroundHexCode = dataCellBackgroundHexCode || (backgroundColor && backgroundColor !== defaultValues['background'] ? backgroundColor : null);
   var localId = defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues.localId;
-  return _objectSpread({
+  var valign = parseValign(dom.getAttribute('data-valign'));
+  return _objectSpread(_objectSpread({
     colspan: colspan,
     rowspan: Number(dom.getAttribute('rowspan') || 1),
     colwidth: width && width.length === colspan ? width : null,
     background: backgroundHexCode
   }, localId && {
     localId: localId
+  }), valign && {
+    valign: valign
   });
 };
 // these are for test only
@@ -184,22 +187,6 @@ export var getCellDomAttrs = function getCellDomAttrs(node) {
   if (node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId) {
     attrs['data-local-id'] = node.attrs.localId;
   }
-  return attrs;
-};
-var getCellAttrsWithValign = function getCellAttrsWithValign(dom, defaultValues) {
-  var base = getCellAttrs(dom, defaultValues);
-  var valign = parseValign(dom.getAttribute('data-valign'));
-  return valign ? _objectSpread(_objectSpread({}, base), {}, {
-    valign: valign
-  }) : base;
-};
-
-/**
- * @stage 0
- * Valign-aware variant of getCellDomAttrs — emits the `valign` HTML attribute when set to a non-default value.
- */
-var getCellDomAttrsWithValign = function getCellDomAttrsWithValign(node) {
-  var attrs = getCellDomAttrs(node);
   if (node.attrs.valign) {
     attrs['data-valign'] = node.attrs.valign;
   }
@@ -384,49 +371,6 @@ export var tableRowWithNestedTable = tableRowWithNestedTableFactory(tableRowNode
 export var tableCellWithNestedTable = tableCellWithNestedTableFactory(tableCellNodeSpecOptions);
 export var tableHeaderWithNestedTable = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptions);
 
-// stage-0 table cell nodes with vertical alignment and localId support
-var tableCellNodeStage0SpecOptions = {
-  parseDOM: [
-  // Ignore number cell copied from renderer
-  {
-    tag: '.ak-renderer-table-number-column',
-    ignore: true
-  }, {
-    tag: 'td',
-    getAttrs: function getAttrs(dom) {
-      return getCellAttrsWithValign(
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      dom, {
-        localId: uuid.generate()
-      });
-    }
-  }],
-  toDOM: function toDOM(node) {
-    return ['td', getCellDomAttrsWithValign(node), 0];
-  }
-};
-var tableHeaderNodeStage0SpecOptions = {
-  parseDOM: [{
-    tag: 'th',
-    getAttrs: function getAttrs(dom) {
-      return (
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        getCellAttrsWithValign(dom, {
-          background: DEFAULT_TABLE_HEADER_CELL_BACKGROUND,
-          localId: uuid.generate()
-        })
-      );
-    }
-  }],
-  toDOM: function toDOM(node) {
-    return ['th', getCellDomAttrsWithValign(node), 0];
-  }
-};
-export var tableCellStage0 = tableCellStage0Factory(tableCellNodeStage0SpecOptions);
-export var tableHeaderStage0 = tableHeaderStage0Factory(tableHeaderNodeStage0SpecOptions);
-export var tableCellWithNestedTableStage0 = tableCellWithNestedTableStage0Factory(tableCellNodeStage0SpecOptions);
-export var tableHeaderWithNestedTableStage0 = tableHeaderWithNestedTableStage0Factory(tableHeaderNodeStage0SpecOptions);
-
 // table nodes with localId support
 var tableRowNodeSpecOptionsWithLocalId = {
   parseDOM: [{
@@ -484,4 +428,19 @@ export var tableHeaderWithLocalId = tableHeaderFactory(tableHeaderNodeSpecOption
 // nested table nodes with localId support
 export var tableRowWithNestedTableWithLocalId = tableRowWithNestedTableFactory(tableRowNodeSpecOptionsWithLocalId);
 export var tableCellWithNestedTableWithLocalId = tableCellWithNestedTableFactory(tableCellNodeSpecOptionsWithLocalId);
-export var tableHeaderWithNestedTableWithLocalId = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptionsWithLocalId);
+export var tableHeaderWithNestedTableWithLocalId = tableHeaderWithNestedTableFactory(tableHeaderNodeSpecOptionsWithLocalId);
+
+// `valign` is now in the full schema; the `*Stage0` exports are kept as aliases
+// of the `*WithLocalId` specs for backwards compatibility.
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableCellWithLocalId` */
+export var tableCellStage0 = tableCellWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableHeaderWithLocalId` */
+export var tableHeaderStage0 = tableHeaderWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableCellWithNestedTableWithLocalId` */
+export var tableCellWithNestedTableStage0 = tableCellWithNestedTableWithLocalId;
+// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
+/** @deprecated [EDITOR-7723] use `tableHeaderWithNestedTableWithLocalId` */
+export var tableHeaderWithNestedTableStage0 = tableHeaderWithNestedTableWithLocalId;

package/dist/json-schema/v1/full.json

@@ -2711,6 +2711,9 @@
             },
             "localId": {
               "type": "string"
+            },
+            "valign": {
+              "enum": ["top", "middle", "bottom"]
             }
           },
           "additionalProperties": false
@@ -2748,6 +2751,9 @@
             },
             "localId": {
               "type": "string"
+            },
+            "valign": {
+              "enum": ["top", "middle", "bottom"]
             }
           },
           "additionalProperties": false

package/dist/types/entry-points/schema-next-nodeTypes.d.ts

@@ -1,2 +1,2 @@
-export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumn as layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline, } from '../next-schema/generated/nodeTypes';
-export type { BlockCardNodeAttributes0, BlockCardNodeAttributes1, BlockCardNodeAttributes2, BlockCardDefinition, BlockCardNode, BlockquoteDefinition, BlockquoteNode, BlockquoteLegacyDefinition, BlockquoteLegacyNode, BlockTaskItemDefinition, BlockTaskItemNode, BodiedExtensionDefinition, BodiedExtensionNode, BodiedExtensionWithMarksDefinition, BodiedExtensionWithMarksNode, BodiedSyncBlockDefinition, BodiedSyncBlockNode, BulletListDefinition, BulletListNode, CaptionDefinition, CaptionNode, CodeBlockDefinition, CodeBlockNode, CodeBlockRootOnlyDefinition, CodeBlockRootOnlyNode, ConfluenceJiraIssueDefinition, ConfluenceJiraIssueNode, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedBlockNode, ConfluenceUnsupportedInlineDefinition, ConfluenceUnsupportedInlineNode, DateDefinition, DateNode, DateStage0Definition, DateStage0Node, DecisionItemDefinition, DecisionItemNode, DecisionListDefinition, DecisionListNode, DocDefinition, DocNode, EmbedCardDefinition, EmbedCardNode, EmojiDefinition, EmojiNode, EmojiStage0Definition, EmojiStage0Node, ExpandDefinition, ExpandNode, ExpandRootOnlyDefinition, ExpandRootOnlyNode, ExtensionDefinition, ExtensionNode, ExtensionWithMarksDefinition, ExtensionWithMarksNode, ExtensionFrameStage0Definition, ExtensionFrameStage0Node, HardBreakDefinition, HardBreakNode, HeadingDefinition, HeadingNode, HeadingWithAlignmentDefinition, HeadingWithAlignmentNode, HeadingWithIndentationDefinition, HeadingWithIndentationNode, HeadingWithNoMarksDefinition, HeadingWithNoMarksNode, ImageDefinition, ImageNode, InlineCardNodeAttributes0, InlineCardNodeAttributes1, InlineCardDefinition, InlineCardNode, InlineCardStage0NodeAttributes0, InlineCardStage0NodeAttributes1, InlineCardStage0Definition, InlineCardStage0Node, InlineExtensionDefinition, InlineExtensionNode, InlineExtensionWithMarksDefinition, InlineExtensionWithMarksNode, LayoutColumnDefinition, LayoutColumnDefinition as LayoutColumnStage0Definition, LayoutColumnNode, LayoutColumnNode as LayoutColumnStage0Node, LayoutSectionDefinition, LayoutSectionNode, LayoutSectionFullDefinition, LayoutSectionFullNode, LayoutSectionWithSingleColumnStage0Definition, LayoutSectionWithSingleColumnStage0Node, ListItemDefinition, ListItemNode, MediaNodeAttributes0, MediaNodeAttributes1, MediaDefinition, MediaNode, MediaGroupDefinition, MediaGroupNode, MediaInlineDefinition, MediaInlineNode, MediaSingleNodeAttributes0, MediaSingleNodeAttributes1, MediaSingleDefinition, MediaSingleNode, MediaSingleCaptionNodeAttributes0, MediaSingleCaptionNodeAttributes1, MediaSingleCaptionDefinition, MediaSingleCaptionNode, MediaSingleFullNodeAttributes0, MediaSingleFullNodeAttributes1, MediaSingleFullDefinition, MediaSingleFullNode, MediaSingleWidthTypeNodeAttributes0, MediaSingleWidthTypeNodeAttributes1, MediaSingleWidthTypeDefinition, MediaSingleWidthTypeNode, MentionDefinition, MentionNode, MentionStage0Definition, MentionStage0Node, MultiBodiedExtensionStage0Definition, MultiBodiedExtensionStage0Node, NestedExpandDefinition, NestedExpandNode, NestedExpandWithNoMarksDefinition, NestedExpandWithNoMarksNode, OrderedListDefinition, OrderedListNode, PanelDefinition, PanelNode, ParagraphDefinition, ParagraphNode, ParagraphWithAlignmentDefinition, ParagraphWithAlignmentNode, ParagraphWithFontSizeDefinition, ParagraphWithFontSizeNode, ParagraphWithIndentationDefinition, ParagraphWithIndentationNode, ParagraphWithNoMarksDefinition, ParagraphWithNoMarksNode, PlaceholderDefinition, PlaceholderNode, RuleDefinition, RuleNode, StatusDefinition, StatusNode, StatusStage0Definition, StatusStage0Node, SyncBlockDefinition, SyncBlockNode, TableDefinition, TableNode, TableWithNestedTableDefinition, TableWithNestedTableNode, TableCellDefinition, TableCellNode, TableCellStage0Definition, TableCellStage0Node, TableCellWithNestedTableDefinition, TableCellWithNestedTableNode, TableCellWithNestedTableStage0Definition, TableCellWithNestedTableStage0Node, TableHeaderDefinition, TableHeaderNode, TableHeaderStage0Definition, TableHeaderStage0Node, TableHeaderWithNestedTableDefinition, TableHeaderWithNestedTableNode, TableHeaderWithNestedTableStage0Definition, TableHeaderWithNestedTableStage0Node, TableRowDefinition, TableRowNode, TableRowWithNestedTableDefinition, TableRowWithNestedTableNode, TaskItemDefinition, TaskItemNode, TaskListDefinition, TaskListNode, TextDefinition, TextNode, TextCodeInlineDefinition, TextCodeInlineNode, TextFormattedDefinition, TextFormattedNode, TextWithNoMarksDefinition, TextWithNoMarksNode, UnsupportedBlockDefinition, UnsupportedBlockNode, UnsupportedInlineDefinition, UnsupportedInlineNode, } from '../next-schema/generated/nodeTypes';
+export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumn as layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCell as tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTable as tableCellWithNestedTableStage0, tableHeader, tableHeader as tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTable as tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline, } from '../next-schema/generated/nodeTypes';
+export type { BlockCardNodeAttributes0, BlockCardNodeAttributes1, BlockCardNodeAttributes2, BlockCardDefinition, BlockCardNode, BlockquoteDefinition, BlockquoteNode, BlockquoteLegacyDefinition, BlockquoteLegacyNode, BlockTaskItemDefinition, BlockTaskItemNode, BodiedExtensionDefinition, BodiedExtensionNode, BodiedExtensionWithMarksDefinition, BodiedExtensionWithMarksNode, BodiedSyncBlockDefinition, BodiedSyncBlockNode, BulletListDefinition, BulletListNode, CaptionDefinition, CaptionNode, CodeBlockDefinition, CodeBlockNode, CodeBlockRootOnlyDefinition, CodeBlockRootOnlyNode, ConfluenceJiraIssueDefinition, ConfluenceJiraIssueNode, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedBlockNode, ConfluenceUnsupportedInlineDefinition, ConfluenceUnsupportedInlineNode, DateDefinition, DateNode, DateStage0Definition, DateStage0Node, DecisionItemDefinition, DecisionItemNode, DecisionListDefinition, DecisionListNode, DocDefinition, DocNode, EmbedCardDefinition, EmbedCardNode, EmojiDefinition, EmojiNode, EmojiStage0Definition, EmojiStage0Node, ExpandDefinition, ExpandNode, ExpandRootOnlyDefinition, ExpandRootOnlyNode, ExtensionDefinition, ExtensionNode, ExtensionWithMarksDefinition, ExtensionWithMarksNode, ExtensionFrameStage0Definition, ExtensionFrameStage0Node, HardBreakDefinition, HardBreakNode, HeadingDefinition, HeadingNode, HeadingWithAlignmentDefinition, HeadingWithAlignmentNode, HeadingWithIndentationDefinition, HeadingWithIndentationNode, HeadingWithNoMarksDefinition, HeadingWithNoMarksNode, ImageDefinition, ImageNode, InlineCardNodeAttributes0, InlineCardNodeAttributes1, InlineCardDefinition, InlineCardNode, InlineCardStage0NodeAttributes0, InlineCardStage0NodeAttributes1, InlineCardStage0Definition, InlineCardStage0Node, InlineExtensionDefinition, InlineExtensionNode, InlineExtensionWithMarksDefinition, InlineExtensionWithMarksNode, LayoutColumnDefinition, LayoutColumnDefinition as LayoutColumnStage0Definition, LayoutColumnNode, LayoutColumnNode as LayoutColumnStage0Node, LayoutSectionDefinition, LayoutSectionNode, LayoutSectionFullDefinition, LayoutSectionFullNode, LayoutSectionWithSingleColumnStage0Definition, LayoutSectionWithSingleColumnStage0Node, ListItemDefinition, ListItemNode, MediaNodeAttributes0, MediaNodeAttributes1, MediaDefinition, MediaNode, MediaGroupDefinition, MediaGroupNode, MediaInlineDefinition, MediaInlineNode, MediaSingleNodeAttributes0, MediaSingleNodeAttributes1, MediaSingleDefinition, MediaSingleNode, MediaSingleCaptionNodeAttributes0, MediaSingleCaptionNodeAttributes1, MediaSingleCaptionDefinition, MediaSingleCaptionNode, MediaSingleFullNodeAttributes0, MediaSingleFullNodeAttributes1, MediaSingleFullDefinition, MediaSingleFullNode, MediaSingleWidthTypeNodeAttributes0, MediaSingleWidthTypeNodeAttributes1, MediaSingleWidthTypeDefinition, MediaSingleWidthTypeNode, MentionDefinition, MentionNode, MentionStage0Definition, MentionStage0Node, MultiBodiedExtensionStage0Definition, MultiBodiedExtensionStage0Node, NestedExpandDefinition, NestedExpandNode, NestedExpandWithNoMarksDefinition, NestedExpandWithNoMarksNode, OrderedListDefinition, OrderedListNode, PanelDefinition, PanelNode, ParagraphDefinition, ParagraphNode, ParagraphWithAlignmentDefinition, ParagraphWithAlignmentNode, ParagraphWithFontSizeDefinition, ParagraphWithFontSizeNode, ParagraphWithIndentationDefinition, ParagraphWithIndentationNode, ParagraphWithNoMarksDefinition, ParagraphWithNoMarksNode, PlaceholderDefinition, PlaceholderNode, RuleDefinition, RuleNode, StatusDefinition, StatusNode, StatusStage0Definition, StatusStage0Node, SyncBlockDefinition, SyncBlockNode, TableDefinition, TableNode, TableWithNestedTableDefinition, TableWithNestedTableNode, TableCellDefinition, TableCellDefinition as TableCellStage0Definition, TableCellNode, TableCellNode as TableCellStage0Node, TableCellWithNestedTableDefinition, TableCellWithNestedTableDefinition as TableCellWithNestedTableStage0Definition, TableCellWithNestedTableNode, TableCellWithNestedTableNode as TableCellWithNestedTableStage0Node, TableHeaderDefinition, TableHeaderDefinition as TableHeaderStage0Definition, TableHeaderNode, TableHeaderNode as TableHeaderStage0Node, TableHeaderWithNestedTableDefinition, TableHeaderWithNestedTableDefinition as TableHeaderWithNestedTableStage0Definition, TableHeaderWithNestedTableNode, TableHeaderWithNestedTableNode as TableHeaderWithNestedTableStage0Node, TableRowDefinition, TableRowNode, TableRowWithNestedTableDefinition, TableRowWithNestedTableNode, TaskItemDefinition, TaskItemNode, TaskListDefinition, TaskListNode, TextDefinition, TextNode, TextCodeInlineDefinition, TextCodeInlineNode, TextFormattedDefinition, TextFormattedNode, TextWithNoMarksDefinition, TextWithNoMarksNode, UnsupportedBlockDefinition, UnsupportedBlockNode, UnsupportedInlineDefinition, UnsupportedInlineNode, } from '../next-schema/generated/nodeTypes';

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -869,25 +869,11 @@ export interface TableCellDefinition {
         colwidth?: Array<number>;
         background?: string;
         localId?: string;
+        valign?: 'top' | 'middle' | 'bottom';
     };
 }
 export type TableCellNode = PMNode & TableCellDefinition;
 export declare const tableCell: PMNodeSpecFactoryInstance<TableCellNode>;
-export interface TableCellStage0Definition {
-    type: 'tableCell';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        colspan?: number;
-        rowspan?: number;
-        colwidth?: Array<number>;
-        background?: string;
-        localId?: string;
-        valign?: 'top' | 'middle' | 'bottom';
-    };
-}
-export type TableCellStage0Node = PMNode & TableCellStage0Definition;
-export declare const tableCellStage0: PMNodeSpecFactoryInstance<TableCellStage0Node>;
 export interface TableCellWithNestedTableDefinition {
     type: 'tableCell';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
@@ -898,25 +884,11 @@ export interface TableCellWithNestedTableDefinition {
         colwidth?: Array<number>;
         background?: string;
         localId?: string;
+        valign?: 'top' | 'middle' | 'bottom';
     };
 }
 export type TableCellWithNestedTableNode = PMNode & TableCellWithNestedTableDefinition;
 export declare const tableCellWithNestedTable: PMNodeSpecFactoryInstance<TableCellWithNestedTableNode>;
-export interface TableCellWithNestedTableStage0Definition {
-    type: 'tableCell';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        colspan?: number;
-        rowspan?: number;
-        colwidth?: Array<number>;
-        background?: string;
-        localId?: string;
-        valign?: 'top' | 'middle' | 'bottom';
-    };
-}
-export type TableCellWithNestedTableStage0Node = PMNode & TableCellWithNestedTableStage0Definition;
-export declare const tableCellWithNestedTableStage0: PMNodeSpecFactoryInstance<TableCellWithNestedTableStage0Node>;
 export interface TableHeaderDefinition {
     type: 'tableHeader';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition>;
@@ -927,25 +899,11 @@ export interface TableHeaderDefinition {
         colwidth?: Array<number>;
         background?: string;
         localId?: string;
+        valign?: 'top' | 'middle' | 'bottom';
     };
 }
 export type TableHeaderNode = PMNode & TableHeaderDefinition;
 export declare const tableHeader: PMNodeSpecFactoryInstance<TableHeaderNode>;
-export interface TableHeaderStage0Definition {
-    type: 'tableHeader';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        colspan?: number;
-        rowspan?: number;
-        colwidth?: Array<number>;
-        background?: string;
-        localId?: string;
-        valign?: 'top' | 'middle' | 'bottom';
-    };
-}
-export type TableHeaderStage0Node = PMNode & TableHeaderStage0Definition;
-export declare const tableHeaderStage0: PMNodeSpecFactoryInstance<TableHeaderStage0Node>;
 export interface TableHeaderWithNestedTableDefinition {
     type: 'tableHeader';
     content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition>;
@@ -956,28 +914,14 @@ export interface TableHeaderWithNestedTableDefinition {
         colwidth?: Array<number>;
         background?: string;
         localId?: string;
+        valign?: 'top' | 'middle' | 'bottom';
     };
 }
 export type TableHeaderWithNestedTableNode = PMNode & TableHeaderWithNestedTableDefinition;
 export declare const tableHeaderWithNestedTable: PMNodeSpecFactoryInstance<TableHeaderWithNestedTableNode>;
-export interface TableHeaderWithNestedTableStage0Definition {
-    type: 'tableHeader';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithAlignmentDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        colspan?: number;
-        rowspan?: number;
-        colwidth?: Array<number>;
-        background?: string;
-        localId?: string;
-        valign?: 'top' | 'middle' | 'bottom';
-    };
-}
-export type TableHeaderWithNestedTableStage0Node = PMNode & TableHeaderWithNestedTableStage0Definition;
-export declare const tableHeaderWithNestedTableStage0: PMNodeSpecFactoryInstance<TableHeaderWithNestedTableStage0Node>;
 export interface TableRowDefinition {
     type: 'tableRow';
-    content: Array<TableCellDefinition | TableCellStage0Definition | TableHeaderDefinition | TableHeaderStage0Definition>;
+    content: Array<TableCellDefinition | TableHeaderDefinition>;
     marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
@@ -987,7 +931,7 @@ export type TableRowNode = PMNode & TableRowDefinition;
 export declare const tableRow: PMNodeSpecFactoryInstance<TableRowNode>;
 export interface TableRowWithNestedTableDefinition {
     type: 'tableRow';
-    content: Array<TableCellWithNestedTableDefinition | TableCellWithNestedTableStage0Definition | TableHeaderWithNestedTableDefinition | TableHeaderWithNestedTableStage0Definition>;
+    content: Array<TableCellWithNestedTableDefinition | TableHeaderWithNestedTableDefinition>;
     marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;

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

@@ -22,9 +22,6 @@ export interface CellAttributes {
     colwidth?: number[];
     localId?: string;
     rowspan?: number;
-    /**
-     * @stage 0
-     */
     valign?: Valign;
 }
 export declare const tablePrefixSelector = "pm-table";
@@ -38,6 +35,7 @@ export declare const getCellAttrs: (dom: HTMLElement, defaultValues?: CellAttrib
     colwidth: number[] | null;
     localId?: string;
     rowspan: number;
+    valign?: Valign;
 };
 export type CellDomAttrs = {
     class?: string;
@@ -162,13 +160,17 @@ export declare const tableWithNestedTable: NodeSpec;
 export declare const tableRowWithNestedTable: NodeSpec;
 export declare const tableCellWithNestedTable: NodeSpec;
 export declare const tableHeaderWithNestedTable: NodeSpec;
-export declare const tableCellStage0: NodeSpec;
-export declare const tableHeaderStage0: NodeSpec;
-export declare const tableCellWithNestedTableStage0: NodeSpec;
-export declare const tableHeaderWithNestedTableStage0: NodeSpec;
 export declare const tableRowWithLocalId: NodeSpec;
 export declare const tableCellWithLocalId: NodeSpec;
 export declare const tableHeaderWithLocalId: NodeSpec;
 export declare const tableRowWithNestedTableWithLocalId: NodeSpec;
 export declare const tableCellWithNestedTableWithLocalId: NodeSpec;
 export declare const tableHeaderWithNestedTableWithLocalId: NodeSpec;
+/** @deprecated [EDITOR-7723] use `tableCellWithLocalId` */
+export declare const tableCellStage0: NodeSpec;
+/** @deprecated [EDITOR-7723] use `tableHeaderWithLocalId` */
+export declare const tableHeaderStage0: NodeSpec;
+/** @deprecated [EDITOR-7723] use `tableCellWithNestedTableWithLocalId` */
+export declare const tableCellWithNestedTableStage0: NodeSpec;
+/** @deprecated [EDITOR-7723] use `tableHeaderWithNestedTableWithLocalId` */
+export declare const tableHeaderWithNestedTableStage0: NodeSpec;

package/json-schema/v1/full.json

@@ -2711,6 +2711,9 @@
             },
             "localId": {
               "type": "string"
+            },
+            "valign": {
+              "enum": ["top", "middle", "bottom"]
             }
           },
           "additionalProperties": false
@@ -2748,6 +2751,9 @@
             },
             "localId": {
               "type": "string"
+            },
+            "valign": {
+              "enum": ["top", "middle", "bottom"]
             }
           },
           "additionalProperties": false

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "55.2.0",
+	"version": "56.0.0",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema-generator": "^3.1.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
-		"@atlaskit/tmp-editor-statsig": "^107.1.0",
+		"@atlaskit/tmp-editor-statsig": "^108.3.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^3.0.3",