@atlaskit/adf-schema 19.0.0 → 19.2.2

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

@@ -21,8 +21,9 @@ export { default as unknownBlock } from './unknown-block';
 export { caption } from './caption';
 export { media, copyPrivateAttributes as copyPrivateMediaAttributes, toJSON as mediaToJSON } from './media';
 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';
@@ -32,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/es2019/schema/nodes/layout-section.js

@@ -1,8 +1,41 @@
 /**
  * @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 const 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() {
+    const attrs = {
+      'data-layout-section': 'true'
+    };
+    return ['div', attrs, 0];
+  }
+
+};
+export const layoutSectionWithSingleColumn = {
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{

package/dist/es2019/schema/nodes/media-inline.js

@@ -0,0 +1,2 @@
+import { createMediaSpec, defaultAttrs } from './media';
+export const mediaInline = createMediaSpec(defaultAttrs, true);

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

@@ -43,83 +43,89 @@ export const defaultAttrs = {
     default: false
   }
 };
-export const createMediaSpec = attributes => ({
-  selectable: true,
-  attrs: attributes,
-  parseDOM: [{
-    tag: 'div[data-node-type="media"]',
-    getAttrs: dom => {
-      const attrs = {};
+export const createMediaSpec = (attributes, inline = false) => {
+  const domNodeType = inline ? 'span' : 'div';
+  const nodeName = inline ? 'mediaInline' : 'media';
+  return {
+    selectable: true,
+    inline,
+    group: inline ? 'inline' : undefined,
+    attrs: attributes,
+    parseDOM: [{
+      tag: `${domNodeType}[data-node-type="${nodeName}"]`,
+      getAttrs: dom => {
+        const attrs = {};
 
-      if (attributes) {
-        Object.keys(attributes).forEach(k => {
-          const key = camelCaseToKebabCase(k).replace(/^__/, '');
-          const value = dom.getAttribute(`data-${key}`) || '';
+        if (attributes) {
+          Object.keys(attributes).forEach(k => {
+            const key = camelCaseToKebabCase(k).replace(/^__/, '');
+            const value = dom.getAttribute(`data-${key}`) || '';
 
-          if (value) {
-            attrs[k] = value;
-          }
-        });
-      } // Need to do validation & type conversion manually
+            if (value) {
+              attrs[k] = value;
+            }
+          });
+        } // Need to do validation & type conversion manually
 
 
-      if (attrs.__fileSize) {
-        attrs.__fileSize = +attrs.__fileSize;
-      }
+        if (attrs.__fileSize) {
+          attrs.__fileSize = +attrs.__fileSize;
+        }
 
-      const width = Number(attrs.width);
+        const width = Number(attrs.width);
 
-      if (typeof width !== 'undefined' && !isNaN(width)) {
-        attrs.width = width;
-      }
+        if (typeof width !== 'undefined' && !isNaN(width)) {
+          attrs.width = width;
+        }
 
-      const height = Number(attrs.height);
+        const height = Number(attrs.height);
 
-      if (typeof height !== 'undefined' && !isNaN(height)) {
-        attrs.height = height;
+        if (typeof height !== 'undefined' && !isNaN(height)) {
+          attrs.height = height;
+        }
+
+        return attrs;
+      }
+    }, // Don't match data URI
+    {
+      tag: 'img[src^="data:image"]',
+      ignore: true
+    }, {
+      tag: 'img:not(.smart-link-icon)',
+      getAttrs: dom => {
+        return {
+          type: 'external',
+          url: dom.getAttribute('src') || '',
+          alt: dom.getAttribute('alt') || ''
+        };
       }
+    }],
 
-      return attrs;
-    }
-  }, // Don't match data URI
-  {
-    tag: 'img[src^="data:image"]',
-    ignore: true
-  }, {
-    tag: 'img:not(.smart-link-icon)',
-    getAttrs: dom => {
-      return {
-        type: 'external',
-        url: dom.getAttribute('src') || '',
-        alt: dom.getAttribute('alt') || ''
+    toDOM(node) {
+      const attrs = {
+        'data-id': node.attrs.id,
+        'data-node-type': `${nodeName}`,
+        'data-type': node.attrs.type,
+        'data-collection': node.attrs.collection,
+        'data-occurrence-key': node.attrs.occurrenceKey,
+        'data-width': node.attrs.width,
+        'data-height': node.attrs.height,
+        'data-url': node.attrs.url,
+        'data-alt': node.attrs.alt,
+        // toDOM is used for static rendering as well as editor rendering. This comes into play for
+        // emails, copy/paste, etc, so the title and styling here *is* useful (despite a React-based
+        // node view being used for editing).
+        title: 'Attachment',
+        // Manually kept in sync with the style of media cards. The goal is to render a plain gray
+        // rectangle that provides an affordance for media.
+        style: `display: inline-block; border-radius: 3px; background: ${N30}; box-shadow: 0 1px 1px rgba(9, 30, 66, 0.2), 0 0 1px 0 rgba(9, 30, 66, 0.24);`
       };
+      copyPrivateAttributes(node.attrs, attrs, key => `data-${camelCaseToKebabCase(key.slice(2))}`);
+      return [`${domNodeType}`, attrs];
     }
-  }],
-
-  toDOM(node) {
-    const attrs = {
-      'data-id': node.attrs.id,
-      'data-node-type': 'media',
-      'data-type': node.attrs.type,
-      'data-collection': node.attrs.collection,
-      'data-occurrence-key': node.attrs.occurrenceKey,
-      'data-width': node.attrs.width,
-      'data-height': node.attrs.height,
-      'data-url': node.attrs.url,
-      'data-alt': node.attrs.alt,
-      // toDOM is used for static rendering as well as editor rendering. This comes into play for
-      // emails, copy/paste, etc, so the title and styling here *is* useful (despite a React-based
-      // node view being used for editing).
-      title: 'Attachment',
-      // Manually kept in sync with the style of media cards. The goal is to render a plain gray
-      // rectangle that provides an affordance for media.
-      style: `display: inline-block; border-radius: 3px; background: ${N30}; box-shadow: 0 1px 1px rgba(9, 30, 66, 0.2), 0 0 1px 0 rgba(9, 30, 66, 0.24);`
-    };
-    copyPrivateAttributes(node.attrs, attrs, key => `data-${camelCaseToKebabCase(key.slice(2))}`);
-    return ['div', attrs];
-  }
 
-});
+  };
+};
 export const media = createMediaSpec(defaultAttrs);
 export const camelCaseToKebabCase = str => str.replace(/([^A-Z]+)([A-Z])/g, (_, x, y) => `${x}-${y.toLowerCase()}`);
 export const copyPrivateAttributes = (from, to, map) => {

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

@@ -6,8 +6,7 @@ export const tableHeaderSelector = `${tablePrefixSelector}-header-content-wrap`;
 export const tableCellContentWrapperSelector = `${tablePrefixSelector}-cell-nodeview-wrapper`;
 export const tableCellContentDomSelector = `${tablePrefixSelector}-cell-nodeview-content-dom`;
 const DEFAULT_TABLE_HEADER_CELL_BACKGROUND = N20.toLocaleLowerCase();
-
-const getCellAttrs = (dom, defaultValues = {}) => {
+export const getCellAttrs = (dom, defaultValues = {}) => {
   const widthAttr = dom.getAttribute('data-colwidth');
   const width = widthAttr && /^\d+(,\d+)*$/.test(widthAttr) ? widthAttr.split(',').map(str => Number(str)) : null;
   const colspan = Number(dom.getAttribute('colspan') || 1);
@@ -31,17 +30,19 @@ const getCellAttrs = (dom, defaultValues = {}) => {
   };
 };
 
-export const setCellAttrs = (node, cell) => {
+/**
+ * gets cell dom attributes based on node attributes
+ * @returns CellDomAttrs
+ */
+export const getCellDomAttrs = node => {
   const attrs = {};
   const nodeType = node.type.name;
-  const colspan = cell ? parseInt(cell.getAttribute('colspan') || '1', 10) : 1;
-  const 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;
   }
 
@@ -192,7 +193,7 @@ export const tableCell = {
     tag: 'td',
     getAttrs: dom => getCellAttrs(dom)
   }],
-  toDOM: node => ['td', setCellAttrs(node), 0]
+  toDOM: node => ['td', getCellDomAttrs(node), 0]
 };
 export const toJSONTableCell = node => ({
   attrs: Object.keys(node.attrs).reduce((obj, key) => {
@@ -216,6 +217,6 @@ export const tableHeader = {
       background: DEFAULT_TABLE_HEADER_CELL_BACKGROUND
     })
   }],
-  toDOM: node => ['th', setCellAttrs(node), 0]
+  toDOM: node => ['th', getCellDomAttrs(node), 0]
 };
 export const toJSONTableHeader = toJSONTableCell;

package/dist/es2019/steps/analytics.js

@@ -46,8 +46,8 @@ function isHistoryAnalyticsEvent(event) {
  * undo/redo events for free
  */
 export class AnalyticsStep extends Step {
-  constructor(analyticsEvents, actionsToIgnore = [], pos) // Used to create the map, prevent splitting history.
-  {
+  constructor(analyticsEvents, actionsToIgnore = [], pos // Used to create the map, prevent splitting history.
+  ) {
     super();
 
     _defineProperty(this, "analyticsEvents", []);

package/dist/es2019/steps/type-ahead.js

@@ -0,0 +1,85 @@
+import { Slice } from 'prosemirror-model';
+import { ReplaceStep, Step, StepMap, StepResult } from 'prosemirror-transform';
+export const insertTypeAheadStepType = 'atlaskit-insert-type-ahead';
+export let InsertTypeAheadStages;
+
+(function (InsertTypeAheadStages) {
+  InsertTypeAheadStages["DELETING_RAW_QUERY"] = "DELETING_RAW_QUERY";
+  InsertTypeAheadStages["INSERTING_ITEM"] = "INSERTING_ITEM";
+})(InsertTypeAheadStages || (InsertTypeAheadStages = {}));
+
+export class InsertTypeAheadStep extends Step {
+  constructor({
+    stage,
+    query,
+    trigger,
+    selectedIndex
+  }, isInvertStep = false) {
+    super();
+    this.isInvertStep = isInvertStep;
+    this.stage = stage;
+    this.query = query;
+    this.trigger = trigger;
+    this.selectedIndex = selectedIndex;
+  }
+
+  invert() {
+    const config = {
+      stage: this.stage,
+      query: this.query,
+      trigger: this.trigger,
+      selectedIndex: this.selectedIndex
+    };
+    return new InsertTypeAheadStep(config, !this.isInvertStep);
+  }
+
+  apply(doc) {
+    return StepResult.ok(doc);
+  }
+
+  merge() {
+    return null;
+  }
+
+  isInsertionStep() {
+    return !this.isInvertStep;
+  }
+
+  isUndoingStep() {
+    return this.isInvertStep;
+  }
+
+  map(mapping) {
+    const config = {
+      stage: this.stage,
+      query: this.query,
+      trigger: this.trigger,
+      selectedIndex: this.selectedIndex
+    }; // Return the same events, this step will never be removed
+
+    return new InsertTypeAheadStep(config, this.isInvertStep);
+  }
+
+  getMap() {
+    return new StepMap([0, 0, 0]);
+  }
+
+  toJSON() {
+    // When serialized we should create a noop Replace step
+    return {
+      stepType: 'replace',
+      from: 0,
+      to: 0
+    };
+  }
+
+  static fromJSON() {
+    // This is a "local custom step" once serialized
+    // we need to transform it in a no-operation action
+    return new ReplaceStep(0, 0, Slice.empty);
+  }
+
+}
+/** Register this step with Prosemirror */
+
+Step.jsonID(insertTypeAheadStepType, InsertTypeAheadStep);

package/dist/es2019/steps.js

@@ -1,5 +1,6 @@
 export { SortOrder as TableSortOrder } from './steps/table/constants';
 export { TableSortStep } from './steps/table/sort-column';
+export { InsertTypeAheadStages, InsertTypeAheadStep } from './steps/type-ahead';
 export { AddColumnStep } from './steps/table/add-column';
 export { SetAttrsStep } from './steps/set-attrs';
 export { AnalyticsStep } from './steps/analytics';

package/dist/es2019/version.json

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

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-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, 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 { 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 { 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';

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

@@ -7,7 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { Schema } from 'prosemirror-model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedList, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaGroup, mediaSingle, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedList, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaGroup, mediaSingle, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -115,6 +115,9 @@ var nodesInOrder = [{
 }, {
   name: 'mediaSingle',
   spec: mediaSingle
+}, {
+  name: 'mediaInline',
+  spec: mediaInline
 }, {
   name: 'placeholder',
   spec: placeholder

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

@@ -1,11 +1,12 @@
 import { customPanel } from './nodes/panel';
+import { layoutSectionWithSingleColumn } from './nodes/layout-section';
 import { dataConsumer } from './marks/data-consumer';
 import { createSchema } from './create-schema';
 import { mediaSingleWithCaption } from './nodes';
 
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
-    nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'rule', 'image', 'mention', 'media', 'mediaGroup', 'mediaSingle', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'hardBreak', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'decisionList', 'decisionItem', 'taskList', 'taskItem', 'unknownBlock', 'date', 'status', 'placeholder', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard', 'unsupportedBlock', 'unsupportedInline'],
+    nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'rule', 'image', 'mention', 'media', 'mediaGroup', 'mediaSingle', 'mediaInline', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'hardBreak', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'decisionList', 'decisionItem', 'taskList', 'taskItem', 'unknownBlock', 'date', 'status', 'placeholder', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard', 'unsupportedBlock', 'unsupportedInline'],
     marks: ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'code', 'textColor', 'confluenceInlineComment', 'breakout', 'alignment', 'indentation', 'annotation', 'unsupportedMark', 'unsupportedNodeAttribute', 'typeAheadQuery' // https://product-fabric.atlassian.net/browse/ED-10214,
     ]
   };
@@ -20,12 +21,14 @@ export var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       panel: customPanel,
-      mediaSingle: mediaSingleWithCaption
+      mediaSingle: mediaSingleWithCaption,
+      layoutSection: layoutSectionWithSingleColumn
     };
     defaultSchemaConfig.customMarkSpecs = {
       dataConsumer: dataConsumer
     };
     defaultSchemaConfig.nodes.push('caption');
+    defaultSchemaConfig.nodes.push('mediaInline');
   }
 
   return createSchema(defaultSchemaConfig);

package/dist/esm/schema/index.js

@@ -1,4 +1,4 @@
-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, 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 { 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 { 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 { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';

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

@@ -21,8 +21,9 @@ export { default as unknownBlock } from './unknown-block';
 export { caption } from './caption';
 export { media, copyPrivateAttributes as copyPrivateMediaAttributes, toJSON as mediaToJSON } from './media';
 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';
@@ -32,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/media-inline.js

@@ -0,0 +1,2 @@
+import { createMediaSpec, defaultAttrs } from './media';
+export var mediaInline = createMediaSpec(defaultAttrs, true);

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

@@ -44,11 +44,16 @@ export var defaultAttrs = {
   }
 };
 export var createMediaSpec = function createMediaSpec(attributes) {
+  var inline = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var domNodeType = inline ? 'span' : 'div';
+  var nodeName = inline ? 'mediaInline' : 'media';
   return {
     selectable: true,
+    inline: inline,
+    group: inline ? 'inline' : undefined,
     attrs: attributes,
     parseDOM: [{
-      tag: 'div[data-node-type="media"]',
+      tag: "".concat(domNodeType, "[data-node-type=\"").concat(nodeName, "\"]"),
       getAttrs: function getAttrs(dom) {
         var attrs = {};
 
@@ -99,7 +104,7 @@ export var createMediaSpec = function createMediaSpec(attributes) {
     toDOM: function toDOM(node) {
       var attrs = {
         'data-id': node.attrs.id,
-        'data-node-type': 'media',
+        'data-node-type': "".concat(nodeName),
         'data-type': node.attrs.type,
         'data-collection': node.attrs.collection,
         'data-occurrence-key': node.attrs.occurrenceKey,
@@ -118,7 +123,7 @@ export var createMediaSpec = function createMediaSpec(attributes) {
       copyPrivateAttributes(node.attrs, attrs, function (key) {
         return "data-".concat(camelCaseToKebabCase(key.slice(2)));
       });
-      return ['div', attrs];
+      return ["".concat(domNodeType), attrs];
     }
   };
 };

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);