@atlaskit/adf-schema 19.1.0 → 19.2.3

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/adf-schema
 
+## 19.2.3
+
+### Patch Changes
+
+- [`a80f50a843c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a80f50a843c) - [HOT-97158] Fix paste link heading issue
+
+## 19.2.2
+
+### Patch Changes
+
+- [`b85e7ce12cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b85e7ce12cd) - Internal upgrade of memoize-one to 6.0.0
+
+## 19.2.1
+
+### Patch Changes
+
+- [`a55dbcb3ecd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a55dbcb3ecd) - [ED-13882] Fix layout section ProseMirror Schema content
+
+## 19.2.0
+
+### Minor Changes
+
+- [`cf853e39278`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cf853e39278) - CETI-72 Web: Copy from renderer loses custom panel attributes
+- [`cf853e39278`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cf853e39278) - Add single column support for layouts
+- [`9fbaa50c904`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9fbaa50c904) - ED-13133 fixed broken table with sticky headers after undo merge cells with tableCellOptimisation on
+- [`cf853e39278`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cf853e39278) - [ux] add single layout support for layout
+- [`6840e64d105`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6840e64d105) - CETI-124: Revert panel content wrapper from span to div
+
 ## 19.1.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -507,10 +507,16 @@ Object.defineProperty(exports, "sanitizeNodes", {
     return _schema.sanitizeNodes;
   }
 });
-Object.defineProperty(exports, "setCellAttrs", {
+Object.defineProperty(exports, "getCellAttrs", {
   enumerable: true,
   get: function get() {
-    return _schema.setCellAttrs;
+    return _schema.getCellAttrs;
+  }
+});
+Object.defineProperty(exports, "getCellDomAttrs", {
+  enumerable: true,
+  get: function get() {
+    return _schema.getCellDomAttrs;
   }
 });
 Object.defineProperty(exports, "status", {

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

@@ -7,6 +7,8 @@ exports.defaultSchema = exports.getSchemaBasedOnStage = exports.defaultSchemaCon
 
 var _panel = require("./nodes/panel");
 
+var _layoutSection = require("./nodes/layout-section");
+
 var _dataConsumer = require("./marks/data-consumer");
 
 var _createSchema = require("./create-schema");
@@ -32,7 +34,8 @@ var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       panel: _panel.customPanel,
-      mediaSingle: _nodes.mediaSingleWithCaption
+      mediaSingle: _nodes.mediaSingleWithCaption,
+      layoutSection: _layoutSection.layoutSectionWithSingleColumn
     };
     defaultSchemaConfig.customMarkSpecs = {
       dataConsumer: _dataConsumer.dataConsumer

package/dist/cjs/schema/index.js

@@ -185,6 +185,12 @@ Object.defineProperty(exports, "layoutSection", {
     return _nodes.layoutSection;
   }
 });
+Object.defineProperty(exports, "layoutSectionWithSingleColumn", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.layoutSectionWithSingleColumn;
+  }
+});
 Object.defineProperty(exports, "listItem", {
   enumerable: true,
   get: function get() {
@@ -293,10 +299,16 @@ Object.defineProperty(exports, "rule", {
     return _nodes.rule;
   }
 });
-Object.defineProperty(exports, "setCellAttrs", {
+Object.defineProperty(exports, "getCellAttrs", {
+  enumerable: true,
+  get: function get() {
+    return _nodes.getCellAttrs;
+  }
+});
+Object.defineProperty(exports, "getCellDomAttrs", {
   enumerable: true,
   get: function get() {
-    return _nodes.setCellAttrs;
+    return _nodes.getCellDomAttrs;
   }
 });
 Object.defineProperty(exports, "status", {

package/dist/cjs/schema/marks/link.js

@@ -37,6 +37,32 @@ var getLinkAttrs = function getLinkAttrs(attribute) {
   };
 };
 
+var getLinkAttrsWithCheck = function getLinkAttrsWithCheck(attribute) {
+  return function (domNode) {
+    var dom = domNode;
+    var hasTextOnlyChildren = Array.from(dom.childNodes).every(function (node) {
+      return node.nodeType === Node.TEXT_NODE || node.nodeName === 'SPAN';
+    });
+
+    if (hasTextOnlyChildren) {
+      var href = dom.getAttribute(attribute) || '';
+      var attrs = {
+        __confluenceMetadata: dom.hasAttribute('__confluenceMetadata') ? JSON.parse(dom.getAttribute('__confluenceMetadata') || '') : undefined
+      };
+
+      if ((0, _url.isSafeUrl)(href)) {
+        attrs.href = (0, _url.normalizeUrl)(href);
+      } else {
+        return false;
+      }
+
+      return attrs;
+    }
+
+    return false;
+  };
+};
+
 var link = {
   excludes: "".concat(_groups.LINK, " ").concat(_groups.COLOR),
   // ED-5844 No multiple links in media node
@@ -60,8 +86,11 @@ var link = {
     }
   }, {
     tag: 'a[href]',
-    context: 'paragraph/|heading/|mediaSingle/|taskItem/|decisionItem/',
+    context: 'mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
+  }, {
+    tag: 'a[href]',
+    getAttrs: getLinkAttrsWithCheck('href')
   }, {
     /**
      * When links aren't wrapped in a paragraph and due to
@@ -72,7 +101,7 @@ var link = {
      * This change comes through via prosemirror-model@1.9.1
      */
     tag: 'a[href]',
-    getAttrs: getLinkAttrs('href'),
+    getAttrs: getLinkAttrsWithCheck('href'),
     getContent: function getContent(node, schema) {
       if (node instanceof HTMLAnchorElement) {
         var href = node.getAttribute('href');

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

@@ -281,10 +281,16 @@ Object.defineProperty(exports, "tableBackgroundColorNames", {
     return _tableNodes.tableBackgroundColorNames;
   }
 });
-Object.defineProperty(exports, "setCellAttrs", {
+Object.defineProperty(exports, "getCellAttrs", {
   enumerable: true,
   get: function get() {
-    return _tableNodes.setCellAttrs;
+    return _tableNodes.getCellAttrs;
+  }
+});
+Object.defineProperty(exports, "getCellDomAttrs", {
+  enumerable: true,
+  get: function get() {
+    return _tableNodes.getCellDomAttrs;
   }
 });
 Object.defineProperty(exports, "tablePrefixSelector", {
@@ -389,6 +395,12 @@ Object.defineProperty(exports, "layoutSection", {
     return _layoutSection.layoutSection;
   }
 });
+Object.defineProperty(exports, "layoutSectionWithSingleColumn", {
+  enumerable: true,
+  get: function get() {
+    return _layoutSection.layoutSectionWithSingleColumn;
+  }
+});
 Object.defineProperty(exports, "layoutColumn", {
   enumerable: true,
   get: function get() {

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

@@ -3,13 +3,45 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.layoutSection = void 0;
+exports.layoutSectionWithSingleColumn = exports.layoutSection = void 0;
 
 /**
  * @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
+ */
 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];
+  }
+};
+exports.layoutSection = layoutSection;
+var layoutSectionWithSingleColumn = {
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [{
@@ -26,4 +58,4 @@ var layoutSection = {
     return ['div', attrs, 0];
   }
 };
-exports.layoutSection = layoutSection;
+exports.layoutSectionWithSingleColumn = layoutSectionWithSingleColumn;

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toJSONTableHeader = exports.tableHeader = exports.toJSONTableCell = exports.tableCell = exports.tableRow = exports.tableToJSON = exports.table = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.tableBackgroundColorPalette = exports.setCellAttrs = exports.tableCellContentDomSelector = exports.tableCellContentWrapperSelector = exports.tableHeaderSelector = exports.tableCellSelector = exports.tablePrefixSelector = void 0;
+exports.toJSONTableHeader = exports.tableHeader = exports.toJSONTableCell = exports.tableCell = exports.tableRow = exports.tableToJSON = exports.table = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.tableBackgroundColorPalette = exports.getCellDomAttrs = exports.getCellAttrs = exports.tableCellContentDomSelector = exports.tableCellContentWrapperSelector = exports.tableHeaderSelector = exports.tableCellSelector = exports.tablePrefixSelector = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -51,17 +51,21 @@ var getCellAttrs = function getCellAttrs(dom) {
   };
 };
 
-var setCellAttrs = function setCellAttrs(node, cell) {
+exports.getCellAttrs = getCellAttrs;
+
+/**
+ * gets cell dom attributes based on node attributes
+ * @returns CellDomAttrs
+ */
+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;
   }
 
@@ -94,7 +98,7 @@ var setCellAttrs = function setCellAttrs(node, cell) {
   return attrs;
 };
 
-exports.setCellAttrs = setCellAttrs;
+exports.getCellDomAttrs = getCellDomAttrs;
 var tableBackgroundColorPalette = new Map();
 exports.tableBackgroundColorPalette = tableBackgroundColorPalette;
 
@@ -230,7 +234,7 @@ var tableCell = {
     }
   }],
   toDOM: function toDOM(node) {
-    return ['td', setCellAttrs(node), 0];
+    return ['td', getCellDomAttrs(node), 0];
   }
 };
 exports.tableCell = tableCell;
@@ -264,7 +268,7 @@ var tableHeader = {
     }
   }],
   toDOM: function toDOM(node) {
-    return ['th', setCellAttrs(node), 0];
+    return ['th', getCellDomAttrs(node), 0];
   }
 };
 exports.tableHeader = tableHeader;

package/dist/cjs/steps/analytics.js

@@ -88,12 +88,12 @@ 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;
     (0, _classCallCheck2.default)(this, AnalyticsStep);
     _this = _super.call(this);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "analyticsEvents", []);

package/dist/cjs/version.json

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

package/dist/es2019/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, 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 { 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/es2019/schema/default-schema.js

@@ -1,4 +1,5 @@
 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';
@@ -19,7 +20,8 @@ export const getSchemaBasedOnStage = (stage = 'final') => {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       panel: customPanel,
-      mediaSingle: mediaSingleWithCaption
+      mediaSingle: mediaSingleWithCaption,
+      layoutSection: layoutSectionWithSingleColumn
     };
     defaultSchemaConfig.customMarkSpecs = {
       dataConsumer: dataConsumer

package/dist/es2019/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, 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 { 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/es2019/schema/marks/link.js

@@ -18,6 +18,28 @@ const getLinkAttrs = attribute => domNode => {
   return attrs;
 };
 
+const getLinkAttrsWithCheck = attribute => domNode => {
+  const dom = domNode;
+  const hasTextOnlyChildren = Array.from(dom.childNodes).every(node => node.nodeType === Node.TEXT_NODE || node.nodeName === 'SPAN');
+
+  if (hasTextOnlyChildren) {
+    const href = dom.getAttribute(attribute) || '';
+    const attrs = {
+      __confluenceMetadata: dom.hasAttribute('__confluenceMetadata') ? JSON.parse(dom.getAttribute('__confluenceMetadata') || '') : undefined
+    };
+
+    if (isSafeUrl(href)) {
+      attrs.href = normalizeUrl(href);
+    } else {
+      return false;
+    }
+
+    return attrs;
+  }
+
+  return false;
+};
+
 export const link = {
   excludes: `${LINK} ${COLOR}`,
   // ED-5844 No multiple links in media node
@@ -41,8 +63,11 @@ export const link = {
     }
   }, {
     tag: 'a[href]',
-    context: 'paragraph/|heading/|mediaSingle/|taskItem/|decisionItem/',
+    context: 'mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
+  }, {
+    tag: 'a[href]',
+    getAttrs: getLinkAttrsWithCheck('href')
   }, {
     /**
      * When links aren't wrapped in a paragraph and due to
@@ -53,7 +78,7 @@ export const link = {
      * This change comes through via prosemirror-model@1.9.1
      */
     tag: 'a[href]',
-    getAttrs: getLinkAttrs('href'),
+    getAttrs: getLinkAttrsWithCheck('href'),
     getContent: (node, schema) => {
       if (node instanceof HTMLAnchorElement) {
         const href = node.getAttribute('href');

package/dist/es2019/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/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/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/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "19.1.0",
+	"version": "19.2.3",
 	"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, 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 { 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/default-schema.js

@@ -1,4 +1,5 @@
 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';
@@ -20,7 +21,8 @@ export var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       panel: customPanel,
-      mediaSingle: mediaSingleWithCaption
+      mediaSingle: mediaSingleWithCaption,
+      layoutSection: layoutSectionWithSingleColumn
     };
     defaultSchemaConfig.customMarkSpecs = {
       dataConsumer: dataConsumer

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, 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 { 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/marks/link.js

@@ -26,6 +26,32 @@ var getLinkAttrs = function getLinkAttrs(attribute) {
   };
 };
 
+var getLinkAttrsWithCheck = function getLinkAttrsWithCheck(attribute) {
+  return function (domNode) {
+    var dom = domNode;
+    var hasTextOnlyChildren = Array.from(dom.childNodes).every(function (node) {
+      return node.nodeType === Node.TEXT_NODE || node.nodeName === 'SPAN';
+    });
+
+    if (hasTextOnlyChildren) {
+      var href = dom.getAttribute(attribute) || '';
+      var attrs = {
+        __confluenceMetadata: dom.hasAttribute('__confluenceMetadata') ? JSON.parse(dom.getAttribute('__confluenceMetadata') || '') : undefined
+      };
+
+      if (isSafeUrl(href)) {
+        attrs.href = normalizeUrl(href);
+      } else {
+        return false;
+      }
+
+      return attrs;
+    }
+
+    return false;
+  };
+};
+
 export var link = {
   excludes: "".concat(LINK, " ").concat(COLOR),
   // ED-5844 No multiple links in media node
@@ -49,8 +75,11 @@ export var link = {
     }
   }, {
     tag: 'a[href]',
-    context: 'paragraph/|heading/|mediaSingle/|taskItem/|decisionItem/',
+    context: 'mediaSingle/|taskItem/|decisionItem/',
     getAttrs: getLinkAttrs('href')
+  }, {
+    tag: 'a[href]',
+    getAttrs: getLinkAttrsWithCheck('href')
   }, {
     /**
      * When links aren't wrapped in a paragraph and due to
@@ -61,7 +90,7 @@ export var link = {
      * This change comes through via prosemirror-model@1.9.1
      */
     tag: 'a[href]',
-    getAttrs: getLinkAttrs('href'),
+    getAttrs: getLinkAttrsWithCheck('href'),
     getContent: function getContent(node, schema) {
       if (node instanceof HTMLAnchorElement) {
         var href = node.getAttribute('href');