@atlaskit/adf-schema 19.1.0 → 19.2.3

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

@@ -23,7 +23,7 @@ export { media, copyPrivateAttributes as copyPrivateMediaAttributes, toJSON as m
 export { mediaGroup } from './media-group';
 export { mediaInline } from './media-inline';
 export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON } from './media-single';
-export { table, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, setCellAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector } from './tableNodes';
+export { table, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector } from './tableNodes';
 export { decisionList, decisionListSelector } from './decision-list';
 export { decisionItem } from './decision-item';
 export { taskList, taskListSelector } from './task-list';
@@ -33,7 +33,7 @@ export { inlineExtension } from './inline-extension';
 export { bodiedExtension } from './bodied-extension';
 export { date } from './date';
 export { placeholder } from './placeholder';
-export { layoutSection } from './layout-section';
+export { layoutSection, layoutSectionWithSingleColumn } from './layout-section';
 export { layoutColumn } from './layout-column';
 export { inlineCard } from './inline-card';
 export { blockCard } from './block-card';

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

@@ -1,8 +1,39 @@
 /**
  * @name layoutSection_node
  */
+
+/**
+ * Need duplicate `type` and `marks` to make both validator and json-schema satisfied
+ */
+
+/**
+ * @name layoutSection_full_node
+ */
+
+/**
+ * @stage 0
+ * @name layoutSection_with_single_column_node
+ */
 export var layoutSection = {
-  content: '(layoutColumn | unsupportedBlock){2,3} unsupportedBlock*',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  isolating: true,
+  parseDOM: [{
+    context: 'layoutSection//|layoutColumn//',
+    tag: 'div[data-layout-section]',
+    skip: true
+  }, {
+    tag: 'div[data-layout-section]'
+  }],
+  toDOM: function toDOM() {
+    var attrs = {
+      'data-layout-section': 'true'
+    };
+    return ['div', attrs, 0];
+  }
+};
+export var layoutSectionWithSingleColumn = {
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{

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

@@ -7,8 +7,7 @@ export var tableHeaderSelector = "".concat(tablePrefixSelector, "-header-content
 export var tableCellContentWrapperSelector = "".concat(tablePrefixSelector, "-cell-nodeview-wrapper");
 export var tableCellContentDomSelector = "".concat(tablePrefixSelector, "-cell-nodeview-content-dom");
 var DEFAULT_TABLE_HEADER_CELL_BACKGROUND = N20.toLocaleLowerCase();
-
-var getCellAttrs = function getCellAttrs(dom) {
+export var getCellAttrs = function getCellAttrs(dom) {
   var defaultValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var widthAttr = dom.getAttribute('data-colwidth');
   var width = widthAttr && /^\d+(,\d+)*$/.test(widthAttr) ? widthAttr.split(',').map(function (str) {
@@ -33,17 +32,19 @@ var getCellAttrs = function getCellAttrs(dom) {
   };
 };
 
-export var setCellAttrs = function setCellAttrs(node, cell) {
+/**
+ * gets cell dom attributes based on node attributes
+ * @returns CellDomAttrs
+ */
+export var getCellDomAttrs = function getCellDomAttrs(node) {
   var attrs = {};
   var nodeType = node.type.name;
-  var colspan = cell ? parseInt(cell.getAttribute('colspan') || '1', 10) : 1;
-  var rowspan = cell ? parseInt(cell.getAttribute('rowspan') || '1', 10) : 1;
 
-  if (node.attrs.colspan !== colspan) {
+  if (node.attrs.colspan !== 1) {
     attrs.colspan = node.attrs.colspan;
   }
 
-  if (node.attrs.rowspan !== rowspan) {
+  if (node.attrs.rowspan !== 1) {
     attrs.rowspan = node.attrs.rowspan;
   }
 
@@ -201,7 +202,7 @@ export var tableCell = {
     }
   }],
   toDOM: function toDOM(node) {
-    return ['td', setCellAttrs(node), 0];
+    return ['td', getCellDomAttrs(node), 0];
   }
 };
 export var toJSONTableCell = function toJSONTableCell(node) {
@@ -231,7 +232,7 @@ export var tableHeader = {
     }
   }],
   toDOM: function toDOM(node) {
-    return ['th', setCellAttrs(node), 0];
+    return ['th', getCellDomAttrs(node), 0];
   }
 };
 export var toJSONTableHeader = toJSONTableCell;

package/dist/esm/steps/analytics.js

@@ -68,12 +68,12 @@ export var AnalyticsStep = /*#__PURE__*/function (_Step) {
 
   var _super = _createSuper(AnalyticsStep);
 
-  function AnalyticsStep(analyticsEvents) // Used to create the map, prevent splitting history.
-  {
+  function AnalyticsStep(analyticsEvents) {
     var _this;
 
     var actionsToIgnore = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var pos = arguments.length > 2 ? arguments[2] : undefined;
+    var pos // Used to create the map, prevent splitting history.
+    = arguments.length > 2 ? arguments[2] : undefined;
 
     _classCallCheck(this, AnalyticsStep);
 

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "19.1.0",
+	"version": "19.2.3",
 	"sideEffects": false
 }

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

@@ -2368,18 +2368,16 @@
             "layoutSection"
           ]
         },
-        "content": {
+        "marks": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/layoutColumn_node"
-          },
-          "minItems": 2,
-          "maxItems": 3
+            "$ref": "#/definitions/breakout_mark"
+          }
         },
-        "marks": {
+        "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/breakout_mark"
+            "$ref": "#/definitions/layoutColumn_node"
           }
         }
       },
@@ -2389,6 +2387,42 @@
       ],
       "additionalProperties": false
     },
+    "layoutSection_full_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "enum": [
+                "layoutSection"
+              ]
+            },
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 2,
+              "maxItems": 3
+            }
+          },
+          "required": [
+            "type",
+            "content"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
     "doc_node": {
       "type": "object",
       "properties": {
@@ -2485,7 +2519,7 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_node"
+                "$ref": "#/definitions/layoutSection_full_node"
               }
             ]
           }

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

@@ -2527,18 +2527,16 @@
             "layoutSection"
           ]
         },
-        "content": {
+        "marks": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/layoutColumn_node"
-          },
-          "minItems": 2,
-          "maxItems": 3
+            "$ref": "#/definitions/breakout_mark"
+          }
         },
-        "marks": {
+        "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/breakout_mark"
+            "$ref": "#/definitions/layoutColumn_node"
           }
         }
       },
@@ -2548,6 +2546,78 @@
       ],
       "additionalProperties": false
     },
+    "layoutSection_full_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "enum": [
+                "layoutSection"
+              ]
+            },
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 2,
+              "maxItems": 3
+            }
+          },
+          "required": [
+            "type",
+            "content"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "layoutSection_with_single_column_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "enum": [
+                "layoutSection"
+              ]
+            },
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 1,
+              "maxItems": 3
+            }
+          },
+          "required": [
+            "type",
+            "content"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
     "doc_node": {
       "type": "object",
       "properties": {
@@ -2647,7 +2717,10 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_node"
+                "$ref": "#/definitions/layoutSection_full_node"
+              },
+              {
+                "$ref": "#/definitions/layoutSection_with_single_column_node"
               }
             ]
           }

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, sanitizeNodes, setCellAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, } from './schema';
-export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, } from './schema';
+export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, } from './schema';
+export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, normalizeHexColor, normalizeUrl, rgbToHex, uuid, } from './utils';
 export type { Match, NameToEmoji } from './utils';

package/dist/types/schema/index.d.ts

@@ -1,5 +1,5 @@
-export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, listItem, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, setCellAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
-export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, RichMediaLayout, CellDomAttrs, } from './nodes';
+export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, customPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
+export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, RichMediaLayout, CellDomAttrs, } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, } from './marks';
 export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, CodeDefinition, EmDefinition, IndentationMarkAttributes, IndentationMarkDefinition, LinkAttributes, LinkDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TextColorAttributes, TextColorDefinition, UnderlineDefinition, AnnotationId, AnnotationDataAttributes, DataConsumerAttributes, DataConsumerDefinition, } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

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

@@ -43,7 +43,7 @@ export type { MediaInlineAttributes, MediaInlineDefinition, } from './media-inli
 export type { MediaGroupDefinition } from './media-group';
 export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON, } from './media-single';
 export type { MediaSingleDefinition } from './media-single';
-export { table, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, setCellAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector, } from './tableNodes';
+export { table, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector, } from './tableNodes';
 export type { TableAttributes, CellAttributes, Layout as TableLayout, TableDefinition, TableCell as TableCellDefinition, TableHeader as TableHeaderDefinition, TableRow as TableRowDefinition, CellDomAttrs, } from './tableNodes';
 export { decisionList, decisionListSelector } from './decision-list';
 export type { DecisionListDefinition } from './decision-list';
@@ -63,8 +63,8 @@ export { date } from './date';
 export type { DateDefinition } from './date';
 export { placeholder } from './placeholder';
 export type { PlaceholderDefinition } from './placeholder';
-export { layoutSection } from './layout-section';
-export type { LayoutSectionDefinition } from './layout-section';
+export { layoutSection, layoutSectionWithSingleColumn } from './layout-section';
+export type { LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, } from './layout-section';
 export { layoutColumn } from './layout-column';
 export type { LayoutColumnDefinition } from './layout-column';
 export { inlineCard } from './inline-card';

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

@@ -4,14 +4,41 @@ import { BreakoutMarkDefinition } from '../marks';
 /**
  * @name layoutSection_node
  */
-export declare type LayoutSectionDefinition = {
+export declare type LayoutSectionBaseDefinition = {
     type: 'layoutSection';
+    marks?: Array<BreakoutMarkDefinition>;
+    content: Array<LayoutColumnDefinition>;
+};
+/**
+ * Need duplicate `type` and `marks` to make both validator and json-schema satisfied
+ */
+/**
+ * @name layoutSection_full_node
+ */
+export declare type LayoutSectionFullDefinition = LayoutSectionBaseDefinition & {
+    type: 'layoutSection';
+    marks?: Array<BreakoutMarkDefinition>;
     /**
      * @minItems 2
      * @maxItems 3
      * @allowUnsupportedBlock true
      */
     content: Array<LayoutColumnDefinition>;
+};
+/**
+ * @stage 0
+ * @name layoutSection_with_single_column_node
+ */
+export declare type LayoutSectionWithSingleColumnDefinition = LayoutSectionBaseDefinition & {
+    type: 'layoutSection';
     marks?: Array<BreakoutMarkDefinition>;
+    /**
+     * @minItems 1
+     * @maxItems 3
+     * @allowUnsupportedBlock true
+     */
+    content: Array<LayoutColumnDefinition>;
 };
+export declare type LayoutSectionDefinition = LayoutSectionFullDefinition | LayoutSectionWithSingleColumnDefinition;
 export declare const layoutSection: NodeSpec;
+export declare const layoutSectionWithSingleColumn: NodeSpec;

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

@@ -22,6 +22,12 @@ export declare const tableCellSelector: string;
 export declare const tableHeaderSelector: string;
 export declare const tableCellContentWrapperSelector: string;
 export declare const tableCellContentDomSelector: string;
+export declare const getCellAttrs: (dom: HTMLElement, defaultValues?: CellAttributes) => {
+    colspan: number;
+    rowspan: number;
+    colwidth: number[] | null;
+    background: string | null;
+};
 export declare type CellDomAttrs = {
     colspan?: string;
     rowspan?: string;
@@ -30,7 +36,11 @@ export declare type CellDomAttrs = {
     'data-colwidth'?: string;
     class?: string;
 };
-export declare const setCellAttrs: (node: PmNode, cell?: HTMLElement | undefined) => CellDomAttrs;
+/**
+ * gets cell dom attributes based on node attributes
+ * @returns CellDomAttrs
+ */
+export declare const getCellDomAttrs: (node: PmNode) => CellDomAttrs;
 export declare const tableBackgroundColorPalette: Map<string, string>;
 export declare const tableBackgroundBorderColor: string;
 export declare const tableBackgroundColorNames: Map<string, string>;

package/json-schema/v1/full.json

@@ -2368,18 +2368,16 @@
             "layoutSection"
           ]
         },
-        "content": {
+        "marks": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/layoutColumn_node"
-          },
-          "minItems": 2,
-          "maxItems": 3
+            "$ref": "#/definitions/breakout_mark"
+          }
         },
-        "marks": {
+        "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/breakout_mark"
+            "$ref": "#/definitions/layoutColumn_node"
           }
         }
       },
@@ -2389,6 +2387,42 @@
       ],
       "additionalProperties": false
     },
+    "layoutSection_full_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "enum": [
+                "layoutSection"
+              ]
+            },
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 2,
+              "maxItems": 3
+            }
+          },
+          "required": [
+            "type",
+            "content"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
     "doc_node": {
       "type": "object",
       "properties": {
@@ -2485,7 +2519,7 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_node"
+                "$ref": "#/definitions/layoutSection_full_node"
               }
             ]
           }

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

@@ -2527,18 +2527,16 @@
             "layoutSection"
           ]
         },
-        "content": {
+        "marks": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/layoutColumn_node"
-          },
-          "minItems": 2,
-          "maxItems": 3
+            "$ref": "#/definitions/breakout_mark"
+          }
         },
-        "marks": {
+        "content": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/breakout_mark"
+            "$ref": "#/definitions/layoutColumn_node"
           }
         }
       },
@@ -2548,6 +2546,78 @@
       ],
       "additionalProperties": false
     },
+    "layoutSection_full_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "enum": [
+                "layoutSection"
+              ]
+            },
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 2,
+              "maxItems": 3
+            }
+          },
+          "required": [
+            "type",
+            "content"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "layoutSection_with_single_column_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/layoutSection_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "type": {
+              "enum": [
+                "layoutSection"
+              ]
+            },
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/breakout_mark"
+              }
+            },
+            "content": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/layoutColumn_node"
+              },
+              "minItems": 1,
+              "maxItems": 3
+            }
+          },
+          "required": [
+            "type",
+            "content"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
     "doc_node": {
       "type": "object",
       "properties": {
@@ -2647,7 +2717,10 @@
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
               {
-                "$ref": "#/definitions/layoutSection_node"
+                "$ref": "#/definitions/layoutSection_full_node"
+              },
+              {
+                "$ref": "#/definitions/layoutSection_with_single_column_node"
               }
             ]
           }