@atlaskit/adf-schema 53.0.4 → 54.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/adf-schema
 
+## 54.0.0
+
+### Major Changes
+
+- [`f95240aab2e55`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f95240aab2e55) -
+  Promote layout column vertical alignment in ADF schema
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 53.0.4
 
 ### Patch Changes

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

@@ -234,7 +234,7 @@ Object.defineProperty(exports, "layoutColumn", {
 Object.defineProperty(exports, "layoutColumnStage0", {
   enumerable: true,
   get: function get() {
-    return _nodeTypes.layoutColumnStage0;
+    return _nodeTypes.layoutColumn;
   }
 });
 Object.defineProperty(exports, "layoutSection", {

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.layoutColumnStage0 = 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.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;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -626,20 +626,6 @@ var inlineExtensionWithMarks = exports.inlineExtensionWithMarks = (0, _createPMS
   selectable: true
 });
 var layoutColumn = exports.layoutColumn = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
-  attrs: {
-    width: {
-      default: undefined
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true
-});
-var layoutColumnStage0 = exports.layoutColumnStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(block | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {

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

@@ -1,19 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.layoutColumn = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _blockContentGroup = require("../groups/blockContentGroup");
 var _blockGroup = require("../groups/blockGroup");
 var _unsupportedMark = require("../marks/unsupportedMark");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _unsupportedBlock = require("../nodes/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; }
 var layoutColumnAttributes = {
   width: {
     type: 'number',
@@ -25,6 +21,12 @@ var layoutColumnAttributes = {
     type: 'string',
     default: null,
     optional: true
+  },
+  valign: {
+    type: 'enum',
+    values: ['top', 'middle', 'bottom'],
+    default: null,
+    optional: true
   }
 };
 var layoutColumn = exports.layoutColumn = (0, _adfSchemaGenerator.adfNode)('layoutColumn').define({
@@ -32,15 +34,5 @@ var layoutColumn = exports.layoutColumn = (0, _adfSchemaGenerator.adfNode)('layo
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: layoutColumnAttributes,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _unsupportedBlock.unsupportedBlock))],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, layoutColumnAttributes), {}, {
-      valign: {
-        type: 'enum',
-        values: ['top', 'middle', 'bottom'],
-        default: null,
-        optional: true
-      }
-    })
-  }
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -28,7 +28,6 @@ function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: _nodes.layoutSectionWithSingleColumn,
-      layoutColumn: _nodes.layoutColumnStage0,
       multiBodiedExtension: _nodes.multiBodiedExtension,
       extensionFrame: _nodes.extensionFrame,
       expand: _nodes.expandWithNestedExpand,

package/dist/cjs/schema/nodes/layout-column.js

@@ -15,9 +15,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var setColumnAttributes = function setColumnAttributes(node) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _ref$withLocalId = _ref.withLocalId,
-    withLocalId = _ref$withLocalId === void 0 ? false : _ref$withLocalId,
-    _ref$withValign = _ref.withValign,
-    withValign = _ref$withValign === void 0 ? false : _ref$withValign;
+    withLocalId = _ref$withLocalId === void 0 ? false : _ref$withLocalId;
   var attrs = {
     'data-layout-column': 'true'
   };
@@ -31,7 +29,7 @@ var setColumnAttributes = function setColumnAttributes(node) {
     attrs['style'] = baseStyle + columnWidthVar;
     attrs['data-column-width'] = "".concat(width);
   }
-  if (withValign && valign) {
+  if (valign) {
     attrs['data-valign'] = valign;
   }
   if (withLocalId && localId) {
@@ -42,9 +40,7 @@ var setColumnAttributes = function setColumnAttributes(node) {
 var getColumnAttrs = function getColumnAttrs() {
   var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref2$withLocalId = _ref2.withLocalId,
-    withLocalId = _ref2$withLocalId === void 0 ? false : _ref2$withLocalId,
-    _ref2$withValign = _ref2.withValign,
-    withValign = _ref2$withValign === void 0 ? false : _ref2$withValign;
+    withLocalId = _ref2$withLocalId === void 0 ? false : _ref2$withLocalId;
   return function (domNode) {
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     var dom = domNode;
@@ -54,7 +50,7 @@ var getColumnAttrs = function getColumnAttrs() {
       localId: _uuid.uuid.generate()
     });
     var valign = (0, _valign.parseValign)(dom.getAttribute('data-valign'));
-    return withValign && valign ? _objectSpread(_objectSpread({}, base), {}, {
+    return valign ? _objectSpread(_objectSpread({}, base), {}, {
       valign: valign
     }) : base;
   };
@@ -83,25 +79,6 @@ var layoutColumn = exports.layoutColumn = (0, _nodeTypes.layoutColumn)({
     return ['div', setColumnAttributes(node), ['div', LAYOUT_CONTENT_ATTRS, 0]];
   }
 });
-var layoutColumnStage0 = exports.layoutColumnStage0 = (0, _nodeTypes.layoutColumnStage0)({
-  parseDOM: [{
-    context: 'layoutColumn//',
-    tag: 'div[data-layout-column]',
-    skip: true
-  }, {
-    tag: 'div[data-layout-column]',
-    getAttrs: getColumnAttrs({
-      withLocalId: true,
-      withValign: true
-    })
-  }],
-  toDOM: function toDOM(node) {
-    return ['div', setColumnAttributes(node, {
-      withLocalId: true,
-      withValign: true
-    }), ['div', LAYOUT_CONTENT_ATTRS, 0]];
-  }
-});
 var layoutColumnWithLocalId = exports.layoutColumnWithLocalId = (0, _nodeTypes.layoutColumn)({
   parseDOM: [{
     context: 'layoutColumn//',
@@ -118,4 +95,5 @@ var layoutColumnWithLocalId = exports.layoutColumnWithLocalId = (0, _nodeTypes.l
       withLocalId: true
     }), ['div', LAYOUT_CONTENT_ATTRS, 0]];
   }
-});
+});
+var layoutColumnStage0 = exports.layoutColumnStage0 = layoutColumnWithLocalId;

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, 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, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';

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

@@ -620,20 +620,6 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
   selectable: true
 });
 export const layoutColumn = createPMNodeSpecFactory({
-  content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
-  attrs: {
-    width: {
-      default: undefined
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true
-});
-export const layoutColumnStage0 = createPMNodeSpecFactory({
   content: '(block | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {

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

@@ -15,6 +15,12 @@ const layoutColumnAttributes = {
     type: 'string',
     default: null,
     optional: true
+  },
+  valign: {
+    type: 'enum',
+    values: ['top', 'middle', 'bottom'],
+    default: null,
+    optional: true
   }
 };
 export const layoutColumn = adfNode('layoutColumn').define({
@@ -22,16 +28,5 @@ export const layoutColumn = adfNode('layoutColumn').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: layoutColumnAttributes,
-  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock))],
-  stage0: {
-    attrs: {
-      ...layoutColumnAttributes,
-      valign: {
-        type: 'enum',
-        values: ['top', 'middle', 'bottom'],
-        default: null,
-        optional: true
-      }
-    }
-  }
+  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock))]
 });

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, layoutColumnStage0 } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0 } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -20,7 +20,6 @@ export const getSchemaBasedOnStage = memoizeOne(
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      layoutColumn: layoutColumnStage0,
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
       expand: expandWithNestedExpand,

package/dist/es2019/schema/nodes/layout-column.js

@@ -1,10 +1,9 @@
-import { layoutColumn as layoutColumnFactory, layoutColumnStage0 as layoutColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { layoutColumn as layoutColumnFactory } from '../../next-schema/generated/nodeTypes';
 import { uuid } from '../../utils/uuid';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { parseValign } from './types/valign';
 const setColumnAttributes = (node, {
-  withLocalId = false,
-  withValign = false
+  withLocalId = false
 } = {}) => {
   const attrs = {
     'data-layout-column': 'true'
@@ -20,7 +19,7 @@ const setColumnAttributes = (node, {
     attrs['style'] = baseStyle + columnWidthVar;
     attrs['data-column-width'] = `${width}`;
   }
-  if (withValign && valign) {
+  if (valign) {
     attrs['data-valign'] = valign;
   }
   if (withLocalId && localId) {
@@ -29,8 +28,7 @@ const setColumnAttributes = (node, {
   return attrs;
 };
 const getColumnAttrs = ({
-  withLocalId = false,
-  withValign = false
+  withLocalId = false
 } = {}) => domNode => {
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   const dom = domNode;
@@ -41,7 +39,7 @@ const getColumnAttrs = ({
     })
   };
   const valign = parseValign(dom.getAttribute('data-valign'));
-  return withValign && valign ? {
+  return valign ? {
     ...base,
     valign
   } : base;
@@ -70,25 +68,6 @@ export const layoutColumn = layoutColumnFactory({
     return ['div', setColumnAttributes(node), ['div', LAYOUT_CONTENT_ATTRS, 0]];
   }
 });
-export const layoutColumnStage0 = layoutColumnStage0Factory({
-  parseDOM: [{
-    context: 'layoutColumn//',
-    tag: 'div[data-layout-column]',
-    skip: true
-  }, {
-    tag: 'div[data-layout-column]',
-    getAttrs: getColumnAttrs({
-      withLocalId: true,
-      withValign: true
-    })
-  }],
-  toDOM(node) {
-    return ['div', setColumnAttributes(node, {
-      withLocalId: true,
-      withValign: true
-    }), ['div', LAYOUT_CONTENT_ATTRS, 0]];
-  }
-});
 export const layoutColumnWithLocalId = layoutColumnFactory({
   parseDOM: [{
     context: 'layoutColumn//',
@@ -105,4 +84,5 @@ export const layoutColumnWithLocalId = layoutColumnFactory({
       withLocalId: true
     }), ['div', LAYOUT_CONTENT_ATTRS, 0]];
   }
-});
+});
+export const layoutColumnStage0 = layoutColumnWithLocalId;

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, 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, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';

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

@@ -620,20 +620,6 @@ export var inlineExtensionWithMarks = createPMNodeSpecFactory({
   selectable: true
 });
 export var layoutColumn = createPMNodeSpecFactory({
-  content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
-  attrs: {
-    width: {
-      default: undefined
-    },
-    localId: {
-      default: null
-    }
-  },
-  selectable: false,
-  isolating: true
-});
-export var layoutColumnStage0 = createPMNodeSpecFactory({
   content: '(block | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {

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

@@ -1,6 +1,3 @@
-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 { blockContentGroup } from '../groups/blockContentGroup';
 import { blockGroup } from '../groups/blockGroup';
@@ -18,6 +15,12 @@ var layoutColumnAttributes = {
     type: 'string',
     default: null,
     optional: true
+  },
+  valign: {
+    type: 'enum',
+    values: ['top', 'middle', 'bottom'],
+    default: null,
+    optional: true
   }
 };
 export var layoutColumn = adfNode('layoutColumn').define({
@@ -25,15 +28,5 @@ export var layoutColumn = adfNode('layoutColumn').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   attrs: layoutColumnAttributes,
-  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock))],
-  stage0: {
-    attrs: _objectSpread(_objectSpread({}, layoutColumnAttributes), {}, {
-      valign: {
-        type: 'enum',
-        values: ['top', 'middle', 'bottom'],
-        default: null,
-        optional: true
-      }
-    })
-  }
+  content: [$onePlus($or(blockGroup, blockContentGroup, unsupportedBlock))]
 });

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, layoutColumnStage0 } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0 } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -21,7 +21,6 @@ function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
-      layoutColumn: layoutColumnStage0,
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
       expand: expandWithNestedExpand,

package/dist/esm/schema/nodes/layout-column.js

@@ -1,16 +1,14 @@
 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 { layoutColumn as layoutColumnFactory, layoutColumnStage0 as layoutColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { layoutColumn as layoutColumnFactory } from '../../next-schema/generated/nodeTypes';
 import { uuid } from '../../utils/uuid';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { parseValign } from './types/valign';
 var setColumnAttributes = function setColumnAttributes(node) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _ref$withLocalId = _ref.withLocalId,
-    withLocalId = _ref$withLocalId === void 0 ? false : _ref$withLocalId,
-    _ref$withValign = _ref.withValign,
-    withValign = _ref$withValign === void 0 ? false : _ref$withValign;
+    withLocalId = _ref$withLocalId === void 0 ? false : _ref$withLocalId;
   var attrs = {
     'data-layout-column': 'true'
   };
@@ -24,7 +22,7 @@ var setColumnAttributes = function setColumnAttributes(node) {
     attrs['style'] = baseStyle + columnWidthVar;
     attrs['data-column-width'] = "".concat(width);
   }
-  if (withValign && valign) {
+  if (valign) {
     attrs['data-valign'] = valign;
   }
   if (withLocalId && localId) {
@@ -35,9 +33,7 @@ var setColumnAttributes = function setColumnAttributes(node) {
 var getColumnAttrs = function getColumnAttrs() {
   var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref2$withLocalId = _ref2.withLocalId,
-    withLocalId = _ref2$withLocalId === void 0 ? false : _ref2$withLocalId,
-    _ref2$withValign = _ref2.withValign,
-    withValign = _ref2$withValign === void 0 ? false : _ref2$withValign;
+    withLocalId = _ref2$withLocalId === void 0 ? false : _ref2$withLocalId;
   return function (domNode) {
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     var dom = domNode;
@@ -47,7 +43,7 @@ var getColumnAttrs = function getColumnAttrs() {
       localId: uuid.generate()
     });
     var valign = parseValign(dom.getAttribute('data-valign'));
-    return withValign && valign ? _objectSpread(_objectSpread({}, base), {}, {
+    return valign ? _objectSpread(_objectSpread({}, base), {}, {
       valign: valign
     }) : base;
   };
@@ -76,25 +72,6 @@ export var layoutColumn = layoutColumnFactory({
     return ['div', setColumnAttributes(node), ['div', LAYOUT_CONTENT_ATTRS, 0]];
   }
 });
-export var layoutColumnStage0 = layoutColumnStage0Factory({
-  parseDOM: [{
-    context: 'layoutColumn//',
-    tag: 'div[data-layout-column]',
-    skip: true
-  }, {
-    tag: 'div[data-layout-column]',
-    getAttrs: getColumnAttrs({
-      withLocalId: true,
-      withValign: true
-    })
-  }],
-  toDOM: function toDOM(node) {
-    return ['div', setColumnAttributes(node, {
-      withLocalId: true,
-      withValign: true
-    }), ['div', LAYOUT_CONTENT_ATTRS, 0]];
-  }
-});
 export var layoutColumnWithLocalId = layoutColumnFactory({
   parseDOM: [{
     context: 'layoutColumn//',
@@ -111,4 +88,5 @@ export var layoutColumnWithLocalId = layoutColumnFactory({
       withLocalId: true
     }), ['div', LAYOUT_CONTENT_ATTRS, 0]];
   }
-});
+});
+export var layoutColumnStage0 = layoutColumnWithLocalId;

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

@@ -1591,6 +1591,9 @@
             },
             "localId": {
               "type": "string"
+            },
+            "valign": {
+              "enum": ["top", "middle", "bottom"]
             }
           },
           "required": ["width"],

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, 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, LayoutColumnNode, LayoutColumnStage0Definition, 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, 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';

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

@@ -441,25 +441,14 @@ export interface LayoutColumnDefinition {
     attrs: {
         width: number;
         localId?: string;
+        valign?: 'top' | 'middle' | 'bottom';
     };
 }
 export type LayoutColumnNode = PMNode & LayoutColumnDefinition;
 export declare const layoutColumn: PMNodeSpecFactoryInstance<LayoutColumnNode>;
-export interface LayoutColumnStage0Definition {
-    type: 'layoutColumn';
-    content: Array<BlockDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        width: number;
-        localId?: string;
-        valign?: 'top' | 'middle' | 'bottom';
-    };
-}
-export type LayoutColumnStage0Node = PMNode & LayoutColumnStage0Definition;
-export declare const layoutColumnStage0: PMNodeSpecFactoryInstance<LayoutColumnStage0Node>;
 export interface LayoutSectionDefinition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | LayoutColumnStage0Definition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
@@ -469,7 +458,7 @@ export type LayoutSectionNode = PMNode & LayoutSectionDefinition;
 export declare const layoutSection: PMNodeSpecFactoryInstance<LayoutSectionNode>;
 export interface LayoutSectionFullDefinition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | LayoutColumnStage0Definition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
@@ -479,7 +468,7 @@ export type LayoutSectionFullNode = PMNode & LayoutSectionFullDefinition;
 export declare const layoutSectionFull: PMNodeSpecFactoryInstance<LayoutSectionFullNode>;
 export interface LayoutSectionWithSingleColumnStage0Definition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | LayoutColumnStage0Definition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         columnRuleStyle?: 'solid';

package/dist/types/schema/nodes/layout-column.d.ts

@@ -7,10 +7,6 @@ import type { Valign } from './types/valign';
 export interface LayoutColumnDefinition {
     attrs: {
         localId?: string;
-        /**
-         // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
-         * @stage 0
-         */
         valign?: Valign;
         /**
          // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
@@ -30,5 +26,5 @@ export interface LayoutColumnDefinition {
     type: 'layoutColumn';
 }
 export declare const layoutColumn: NodeSpec;
-export declare const layoutColumnStage0: NodeSpec;
 export declare const layoutColumnWithLocalId: NodeSpec;
+export declare const layoutColumnStage0: NodeSpec;

package/dist/types-ts4.5/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, 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, LayoutColumnNode, LayoutColumnStage0Definition, 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, 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';

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

@@ -441,25 +441,14 @@ export interface LayoutColumnDefinition {
     attrs: {
         width: number;
         localId?: string;
+        valign?: 'top' | 'middle' | 'bottom';
     };
 }
 export type LayoutColumnNode = PMNode & LayoutColumnDefinition;
 export declare const layoutColumn: PMNodeSpecFactoryInstance<LayoutColumnNode>;
-export interface LayoutColumnStage0Definition {
-    type: 'layoutColumn';
-    content: Array<BlockDefinition | UnsupportedBlockDefinition>;
-    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
-    attrs: {
-        width: number;
-        localId?: string;
-        valign?: 'top' | 'middle' | 'bottom';
-    };
-}
-export type LayoutColumnStage0Node = PMNode & LayoutColumnStage0Definition;
-export declare const layoutColumnStage0: PMNodeSpecFactoryInstance<LayoutColumnStage0Node>;
 export interface LayoutSectionDefinition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | LayoutColumnStage0Definition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
@@ -469,7 +458,7 @@ export type LayoutSectionNode = PMNode & LayoutSectionDefinition;
 export declare const layoutSection: PMNodeSpecFactoryInstance<LayoutSectionNode>;
 export interface LayoutSectionFullDefinition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | LayoutColumnStage0Definition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         localId?: string;
@@ -479,7 +468,7 @@ export type LayoutSectionFullNode = PMNode & LayoutSectionFullDefinition;
 export declare const layoutSectionFull: PMNodeSpecFactoryInstance<LayoutSectionFullNode>;
 export interface LayoutSectionWithSingleColumnStage0Definition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | LayoutColumnStage0Definition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         columnRuleStyle?: 'solid';

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

@@ -7,10 +7,6 @@ import type { Valign } from './types/valign';
 export interface LayoutColumnDefinition {
     attrs: {
         localId?: string;
-        /**
-         // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
-         * @stage 0
-         */
         valign?: Valign;
         /**
          // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
@@ -30,5 +26,5 @@ export interface LayoutColumnDefinition {
     type: 'layoutColumn';
 }
 export declare const layoutColumn: NodeSpec;
-export declare const layoutColumnStage0: NodeSpec;
 export declare const layoutColumnWithLocalId: NodeSpec;
+export declare const layoutColumnStage0: NodeSpec;

package/json-schema/v1/full.json

@@ -1591,6 +1591,9 @@
             },
             "localId": {
               "type": "string"
+            },
+            "valign": {
+              "enum": ["top", "middle", "bottom"]
             }
           },
           "required": ["width"],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "53.0.4",
+	"version": "54.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": "^2.4.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
-		"@atlaskit/tmp-editor-statsig": "^98.0.0",
+		"@atlaskit/tmp-editor-statsig": "^99.0.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^3.0.3",