@atlaskit/adf-schema 42.1.0 → 42.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/adf-schema
2
2
 
3
+ ## 42.2.1
4
+
5
+ ### Patch Changes
6
+
7
+ - e4e695f: Change order of layoutSection_with_single_column with layoutSection_full to fix validator issues in the editor
8
+
9
+ ## 42.2.0
10
+
11
+ ### Minor Changes
12
+
13
+ - 767b124: Added columnRuleStyle to layoutSection_with_single_column, and add layoutSectionAdvLayouts nodespec export
14
+
3
15
  ## 42.1.0
4
16
 
5
17
  ### Minor Changes
@@ -14,7 +14,7 @@ var _expand = require("./nodes/expand");
14
14
  var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
15
15
  root: true,
16
16
  version: 1,
17
- content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('with_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _layoutSection.layoutSection.use('with_single_column'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('with_breakout_mark')))],
17
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('with_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('with_breakout_mark')))],
18
18
  DANGEROUS_MANUAL_OVERRIDE: {
19
19
  'validator-spec': {
20
20
  'props.content.minItems': {
@@ -563,8 +563,13 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _createPMSpecFactory.cre
563
563
  isolating: true
564
564
  });
565
565
  var layoutSectionWithSingleColumnStage0 = exports.layoutSectionWithSingleColumnStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
566
- content: '(layoutColumn | unsupportedBlock){1,3}',
566
+ content: '(layoutColumn | unsupportedBlock){1,5}',
567
567
  marks: 'unsupportedMark unsupportedNodeAttribute',
568
+ attrs: {
569
+ columnRuleStyle: {
570
+ default: null
571
+ }
572
+ },
568
573
  isolating: true
569
574
  });
570
575
  var listItem = exports.listItem = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
@@ -30,8 +30,16 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
30
30
  }
31
31
  }).variant('with_single_column', {
32
32
  stage0: true,
33
- content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
33
+ content: [(0, _adfSchemaGenerator.$range)(1, 5, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
34
34
  ignore: [],
35
+ attrs: {
36
+ columnRuleStyle: {
37
+ type: 'enum',
38
+ values: ['solid'],
39
+ default: null,
40
+ optional: true
41
+ }
42
+ },
35
43
  DANGEROUS_MANUAL_OVERRIDE: {
36
44
  'validator-spec': {
37
45
  'props.type': {
@@ -53,18 +53,26 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _nodeTypes.layoutSection
53
53
  }
54
54
  });
55
55
 
56
- // it's same as layoutSection
57
- var layoutSectionWithSingleColumn = exports.layoutSectionWithSingleColumn = (0, _nodeTypes.layoutSection)({
56
+ // stage-0 support for columnRuleStyle attribute and 1-5 columns
57
+ var layoutSectionWithSingleColumn = exports.layoutSectionWithSingleColumn = (0, _nodeTypes.layoutSectionWithSingleColumnStage0)({
58
58
  parseDOM: [{
59
59
  context: 'layoutSection//|layoutColumn//',
60
60
  tag: 'div[data-layout-section]',
61
61
  skip: true
62
62
  }, {
63
- tag: 'div[data-layout-section]'
63
+ tag: 'div[data-layout-section]',
64
+ getAttrs: function getAttrs(dom) {
65
+ var columnRuleStyle = dom.getAttribute('data-column-rule-style');
66
+ return columnRuleStyle ? {
67
+ columnRuleStyle: columnRuleStyle
68
+ } : {};
69
+ }
64
70
  }],
65
- toDOM: function toDOM() {
71
+ toDOM: function toDOM(node) {
72
+ var columnRuleStyle = node.attrs.columnRuleStyle;
66
73
  var attrs = {
67
- 'data-layout-section': 'true'
74
+ 'data-layout-section': 'true',
75
+ 'data-column-rule-style': columnRuleStyle || undefined
68
76
  };
69
77
  return ['div', attrs, 0];
70
78
  }
@@ -1781,43 +1781,53 @@ var layoutSection = exports.layoutSection = {
1781
1781
  }
1782
1782
  }
1783
1783
  };
1784
- var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
1784
+ var layoutSection_with_single_column = exports.layoutSection_with_single_column = ['layoutSection', {
1785
1785
  props: {
1786
+ attrs: {
1787
+ props: {
1788
+ columnRuleStyle: {
1789
+ type: 'enum',
1790
+ values: ['solid'],
1791
+ optional: true
1792
+ }
1793
+ },
1794
+ optional: true
1795
+ },
1786
1796
  content: {
1787
1797
  type: 'array',
1788
1798
  items: ['layoutColumn'],
1789
- minItems: 2,
1790
- maxItems: 3,
1799
+ minItems: 1,
1800
+ maxItems: 5,
1791
1801
  allowUnsupportedBlock: true
1792
1802
  },
1793
- marks: {
1794
- type: 'array',
1795
- optional: true,
1796
- items: ['breakout']
1797
- },
1798
1803
  type: {
1799
1804
  type: 'enum',
1800
1805
  values: ['layoutSection']
1806
+ },
1807
+ marks: {
1808
+ items: ['breakout'],
1809
+ optional: true,
1810
+ type: 'array'
1801
1811
  }
1802
1812
  }
1803
1813
  }];
1804
- var layoutSection_with_single_column = exports.layoutSection_with_single_column = ['layoutSection', {
1814
+ var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
1805
1815
  props: {
1806
1816
  content: {
1807
1817
  type: 'array',
1808
1818
  items: ['layoutColumn'],
1809
- minItems: 1,
1819
+ minItems: 2,
1810
1820
  maxItems: 3,
1811
1821
  allowUnsupportedBlock: true
1812
1822
  },
1823
+ marks: {
1824
+ type: 'array',
1825
+ optional: true,
1826
+ items: ['breakout']
1827
+ },
1813
1828
  type: {
1814
1829
  type: 'enum',
1815
1830
  values: ['layoutSection']
1816
- },
1817
- marks: {
1818
- items: ['breakout'],
1819
- optional: true,
1820
- type: 'array'
1821
1831
  }
1822
1832
  }
1823
1833
  }];
@@ -1915,7 +1925,7 @@ var doc = exports.doc = {
1915
1925
  },
1916
1926
  content: {
1917
1927
  type: 'array',
1918
- items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
1928
+ items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
1919
1929
  allowUnsupportedBlock: true
1920
1930
  }
1921
1931
  }
@@ -8,7 +8,7 @@ import { expand } from './nodes/expand';
8
8
  const doc = adfNode('doc').define({
9
9
  root: true,
10
10
  version: 1,
11
- content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('full'), layoutSection.use('with_single_column'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
11
+ content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
12
12
  DANGEROUS_MANUAL_OVERRIDE: {
13
13
  'validator-spec': {
14
14
  'props.content.minItems': {
@@ -557,8 +557,13 @@ export const layoutSectionFull = createPMNodeSpecFactory({
557
557
  isolating: true
558
558
  });
559
559
  export const layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
560
- content: '(layoutColumn | unsupportedBlock){1,3}',
560
+ content: '(layoutColumn | unsupportedBlock){1,5}',
561
561
  marks: 'unsupportedMark unsupportedNodeAttribute',
562
+ attrs: {
563
+ columnRuleStyle: {
564
+ default: null
565
+ }
566
+ },
562
567
  isolating: true
563
568
  });
564
569
  export const listItem = createPMNodeSpecFactory({
@@ -24,8 +24,16 @@ export const layoutSection = adfNode('layoutSection').define({
24
24
  }
25
25
  }).variant('with_single_column', {
26
26
  stage0: true,
27
- content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
27
+ content: [$range(1, 5, $or(layoutColumn, unsupportedBlock))],
28
28
  ignore: [],
29
+ attrs: {
30
+ columnRuleStyle: {
31
+ type: 'enum',
32
+ values: ['solid'],
33
+ default: null,
34
+ optional: true
35
+ }
36
+ },
29
37
  DANGEROUS_MANUAL_OVERRIDE: {
30
38
  'validator-spec': {
31
39
  'props.type': {
@@ -1,4 +1,4 @@
1
- import { layoutSection as layoutSectionFactory } from '../../next-schema/generated/nodeTypes';
1
+ import { layoutSection as layoutSectionFactory, layoutSectionWithSingleColumnStage0 as layoutSectionWithSingleColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
2
2
  import { layoutSectionFull as layoutSectionFullFactory } from '../../next-schema/generated/nodeTypes';
3
3
 
4
4
  /**
@@ -49,18 +49,28 @@ export const layoutSectionFull = layoutSectionFullFactory({
49
49
  }
50
50
  });
51
51
 
52
- // it's same as layoutSection
53
- export const layoutSectionWithSingleColumn = layoutSectionFactory({
52
+ // stage-0 support for columnRuleStyle attribute and 1-5 columns
53
+ export const layoutSectionWithSingleColumn = layoutSectionWithSingleColumnStage0Factory({
54
54
  parseDOM: [{
55
55
  context: 'layoutSection//|layoutColumn//',
56
56
  tag: 'div[data-layout-section]',
57
57
  skip: true
58
58
  }, {
59
- tag: 'div[data-layout-section]'
59
+ tag: 'div[data-layout-section]',
60
+ getAttrs: dom => {
61
+ const columnRuleStyle = dom.getAttribute('data-column-rule-style');
62
+ return columnRuleStyle ? {
63
+ columnRuleStyle
64
+ } : {};
65
+ }
60
66
  }],
61
- toDOM() {
67
+ toDOM(node) {
68
+ const {
69
+ columnRuleStyle
70
+ } = node.attrs;
62
71
  const attrs = {
63
- 'data-layout-section': 'true'
72
+ 'data-layout-section': 'true',
73
+ 'data-column-rule-style': columnRuleStyle || undefined
64
74
  };
65
75
  return ['div', attrs, 0];
66
76
  }
@@ -1775,43 +1775,53 @@ export const layoutSection = {
1775
1775
  }
1776
1776
  }
1777
1777
  };
1778
- export const layoutSection_full = ['layoutSection', {
1778
+ export const layoutSection_with_single_column = ['layoutSection', {
1779
1779
  props: {
1780
+ attrs: {
1781
+ props: {
1782
+ columnRuleStyle: {
1783
+ type: 'enum',
1784
+ values: ['solid'],
1785
+ optional: true
1786
+ }
1787
+ },
1788
+ optional: true
1789
+ },
1780
1790
  content: {
1781
1791
  type: 'array',
1782
1792
  items: ['layoutColumn'],
1783
- minItems: 2,
1784
- maxItems: 3,
1793
+ minItems: 1,
1794
+ maxItems: 5,
1785
1795
  allowUnsupportedBlock: true
1786
1796
  },
1787
- marks: {
1788
- type: 'array',
1789
- optional: true,
1790
- items: ['breakout']
1791
- },
1792
1797
  type: {
1793
1798
  type: 'enum',
1794
1799
  values: ['layoutSection']
1800
+ },
1801
+ marks: {
1802
+ items: ['breakout'],
1803
+ optional: true,
1804
+ type: 'array'
1795
1805
  }
1796
1806
  }
1797
1807
  }];
1798
- export const layoutSection_with_single_column = ['layoutSection', {
1808
+ export const layoutSection_full = ['layoutSection', {
1799
1809
  props: {
1800
1810
  content: {
1801
1811
  type: 'array',
1802
1812
  items: ['layoutColumn'],
1803
- minItems: 1,
1813
+ minItems: 2,
1804
1814
  maxItems: 3,
1805
1815
  allowUnsupportedBlock: true
1806
1816
  },
1817
+ marks: {
1818
+ type: 'array',
1819
+ optional: true,
1820
+ items: ['breakout']
1821
+ },
1807
1822
  type: {
1808
1823
  type: 'enum',
1809
1824
  values: ['layoutSection']
1810
- },
1811
- marks: {
1812
- items: ['breakout'],
1813
- optional: true,
1814
- type: 'array'
1815
1825
  }
1816
1826
  }
1817
1827
  }];
@@ -1909,7 +1919,7 @@ export const doc = {
1909
1919
  },
1910
1920
  content: {
1911
1921
  type: 'array',
1912
- items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
1922
+ items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
1913
1923
  allowUnsupportedBlock: true
1914
1924
  }
1915
1925
  }
@@ -8,7 +8,7 @@ import { expand } from './nodes/expand';
8
8
  var doc = adfNode('doc').define({
9
9
  root: true,
10
10
  version: 1,
11
- content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('full'), layoutSection.use('with_single_column'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
11
+ content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('with_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark')))],
12
12
  DANGEROUS_MANUAL_OVERRIDE: {
13
13
  'validator-spec': {
14
14
  'props.content.minItems': {
@@ -557,8 +557,13 @@ export var layoutSectionFull = createPMNodeSpecFactory({
557
557
  isolating: true
558
558
  });
559
559
  export var layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
560
- content: '(layoutColumn | unsupportedBlock){1,3}',
560
+ content: '(layoutColumn | unsupportedBlock){1,5}',
561
561
  marks: 'unsupportedMark unsupportedNodeAttribute',
562
+ attrs: {
563
+ columnRuleStyle: {
564
+ default: null
565
+ }
566
+ },
562
567
  isolating: true
563
568
  });
564
569
  export var listItem = createPMNodeSpecFactory({
@@ -24,8 +24,16 @@ export var layoutSection = adfNode('layoutSection').define({
24
24
  }
25
25
  }).variant('with_single_column', {
26
26
  stage0: true,
27
- content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
27
+ content: [$range(1, 5, $or(layoutColumn, unsupportedBlock))],
28
28
  ignore: [],
29
+ attrs: {
30
+ columnRuleStyle: {
31
+ type: 'enum',
32
+ values: ['solid'],
33
+ default: null,
34
+ optional: true
35
+ }
36
+ },
29
37
  DANGEROUS_MANUAL_OVERRIDE: {
30
38
  'validator-spec': {
31
39
  'props.type': {
@@ -1,4 +1,4 @@
1
- import { layoutSection as layoutSectionFactory } from '../../next-schema/generated/nodeTypes';
1
+ import { layoutSection as layoutSectionFactory, layoutSectionWithSingleColumnStage0 as layoutSectionWithSingleColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
2
2
  import { layoutSectionFull as layoutSectionFullFactory } from '../../next-schema/generated/nodeTypes';
3
3
 
4
4
  /**
@@ -49,18 +49,26 @@ export var layoutSectionFull = layoutSectionFullFactory({
49
49
  }
50
50
  });
51
51
 
52
- // it's same as layoutSection
53
- export var layoutSectionWithSingleColumn = layoutSectionFactory({
52
+ // stage-0 support for columnRuleStyle attribute and 1-5 columns
53
+ export var layoutSectionWithSingleColumn = layoutSectionWithSingleColumnStage0Factory({
54
54
  parseDOM: [{
55
55
  context: 'layoutSection//|layoutColumn//',
56
56
  tag: 'div[data-layout-section]',
57
57
  skip: true
58
58
  }, {
59
- tag: 'div[data-layout-section]'
59
+ tag: 'div[data-layout-section]',
60
+ getAttrs: function getAttrs(dom) {
61
+ var columnRuleStyle = dom.getAttribute('data-column-rule-style');
62
+ return columnRuleStyle ? {
63
+ columnRuleStyle: columnRuleStyle
64
+ } : {};
65
+ }
60
66
  }],
61
- toDOM: function toDOM() {
67
+ toDOM: function toDOM(node) {
68
+ var columnRuleStyle = node.attrs.columnRuleStyle;
62
69
  var attrs = {
63
- 'data-layout-section': 'true'
70
+ 'data-layout-section': 'true',
71
+ 'data-column-rule-style': columnRuleStyle || undefined
64
72
  };
65
73
  return ['div', attrs, 0];
66
74
  }
@@ -1775,43 +1775,53 @@ export var layoutSection = {
1775
1775
  }
1776
1776
  }
1777
1777
  };
1778
- export var layoutSection_full = ['layoutSection', {
1778
+ export var layoutSection_with_single_column = ['layoutSection', {
1779
1779
  props: {
1780
+ attrs: {
1781
+ props: {
1782
+ columnRuleStyle: {
1783
+ type: 'enum',
1784
+ values: ['solid'],
1785
+ optional: true
1786
+ }
1787
+ },
1788
+ optional: true
1789
+ },
1780
1790
  content: {
1781
1791
  type: 'array',
1782
1792
  items: ['layoutColumn'],
1783
- minItems: 2,
1784
- maxItems: 3,
1793
+ minItems: 1,
1794
+ maxItems: 5,
1785
1795
  allowUnsupportedBlock: true
1786
1796
  },
1787
- marks: {
1788
- type: 'array',
1789
- optional: true,
1790
- items: ['breakout']
1791
- },
1792
1797
  type: {
1793
1798
  type: 'enum',
1794
1799
  values: ['layoutSection']
1800
+ },
1801
+ marks: {
1802
+ items: ['breakout'],
1803
+ optional: true,
1804
+ type: 'array'
1795
1805
  }
1796
1806
  }
1797
1807
  }];
1798
- export var layoutSection_with_single_column = ['layoutSection', {
1808
+ export var layoutSection_full = ['layoutSection', {
1799
1809
  props: {
1800
1810
  content: {
1801
1811
  type: 'array',
1802
1812
  items: ['layoutColumn'],
1803
- minItems: 1,
1813
+ minItems: 2,
1804
1814
  maxItems: 3,
1805
1815
  allowUnsupportedBlock: true
1806
1816
  },
1817
+ marks: {
1818
+ type: 'array',
1819
+ optional: true,
1820
+ items: ['breakout']
1821
+ },
1807
1822
  type: {
1808
1823
  type: 'enum',
1809
1824
  values: ['layoutSection']
1810
- },
1811
- marks: {
1812
- items: ['breakout'],
1813
- optional: true,
1814
- type: 'array'
1815
1825
  }
1816
1826
  }
1817
1827
  }];
@@ -1909,7 +1919,7 @@ export var doc = {
1909
1919
  },
1910
1920
  content: {
1911
1921
  type: 'array',
1912
- items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
1922
+ items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_with_breakout_mark']],
1913
1923
  allowUnsupportedBlock: true
1914
1924
  }
1915
1925
  }
@@ -2613,38 +2613,40 @@
2613
2613
  "additionalProperties": false,
2614
2614
  "required": ["type", "content"]
2615
2615
  },
2616
- "layoutSection_full_node": {
2617
- "allOf": [
2618
- {
2619
- "$ref": "#/definitions/layoutSection_node"
2616
+ "layoutSection_with_single_column_node": {
2617
+ "type": "object",
2618
+ "properties": {
2619
+ "type": {
2620
+ "enum": ["layoutSection"]
2620
2621
  },
2621
- {
2622
+ "marks": {
2623
+ "type": "array",
2624
+ "items": {
2625
+ "$ref": "#/definitions/breakout_mark"
2626
+ }
2627
+ },
2628
+ "attrs": {
2622
2629
  "type": "object",
2623
2630
  "properties": {
2624
- "marks": {
2625
- "type": "array",
2626
- "items": {
2627
- "$ref": "#/definitions/breakout_mark"
2628
- }
2629
- },
2630
- "content": {
2631
- "type": "array",
2632
- "items": {
2633
- "$ref": "#/definitions/layoutColumn_node"
2634
- },
2635
- "minItems": 2,
2636
- "maxItems": 3
2637
- },
2638
- "type": {
2639
- "enum": ["layoutSection"]
2631
+ "columnRuleStyle": {
2632
+ "enum": ["solid"]
2640
2633
  }
2641
2634
  },
2642
- "required": ["type", "content"],
2643
2635
  "additionalProperties": false
2636
+ },
2637
+ "content": {
2638
+ "type": "array",
2639
+ "items": {
2640
+ "$ref": "#/definitions/layoutColumn_node"
2641
+ },
2642
+ "minItems": 1,
2643
+ "maxItems": 5
2644
2644
  }
2645
- ]
2645
+ },
2646
+ "additionalProperties": false,
2647
+ "required": ["type", "content"]
2646
2648
  },
2647
- "layoutSection_with_single_column_node": {
2649
+ "layoutSection_full_node": {
2648
2650
  "allOf": [
2649
2651
  {
2650
2652
  "$ref": "#/definitions/layoutSection_node"
@@ -2663,7 +2665,7 @@
2663
2665
  "items": {
2664
2666
  "$ref": "#/definitions/layoutColumn_node"
2665
2667
  },
2666
- "minItems": 1,
2668
+ "minItems": 2,
2667
2669
  "maxItems": 3
2668
2670
  },
2669
2671
  "type": {
@@ -2894,10 +2896,10 @@
2894
2896
  "$ref": "#/definitions/expand_with_breakout_mark_node"
2895
2897
  },
2896
2898
  {
2897
- "$ref": "#/definitions/layoutSection_full_node"
2899
+ "$ref": "#/definitions/layoutSection_with_single_column_node"
2898
2900
  },
2899
2901
  {
2900
- "$ref": "#/definitions/layoutSection_with_single_column_node"
2902
+ "$ref": "#/definitions/layoutSection_full_node"
2901
2903
  },
2902
2904
  {
2903
2905
  "$ref": "#/definitions/multiBodiedExtension_node"
@@ -421,6 +421,9 @@ export interface LayoutSectionWithSingleColumnStage0Definition {
421
421
  type: 'layoutSection';
422
422
  content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
423
423
  marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
424
+ attrs: {
425
+ columnRuleStyle?: 'solid';
426
+ };
424
427
  }
425
428
  export type LayoutSectionWithSingleColumnStage0Node = PMNode & LayoutSectionWithSingleColumnStage0Definition;
426
429
  export declare const layoutSectionWithSingleColumnStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<LayoutSectionWithSingleColumnStage0Node>) => import("prosemirror-model").NodeSpec;
@@ -2,6 +2,14 @@ export declare const layoutSection: import("@atlaskit/adf-schema-generator/dist/
2
2
  stage0: true;
3
3
  content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentRangeSpec[];
4
4
  ignore: any[];
5
+ attrs: {
6
+ columnRuleStyle: {
7
+ type: "enum";
8
+ values: string[];
9
+ default: any;
10
+ optional: true;
11
+ };
12
+ };
5
13
  DANGEROUS_MANUAL_OVERRIDE: {
6
14
  'validator-spec': {
7
15
  'props.type': {
@@ -1794,8 +1794,18 @@ export declare const layoutSection: {
1794
1794
  };
1795
1795
  };
1796
1796
  };
1797
- export declare const layoutSection_full: (string | {
1797
+ export declare const layoutSection_with_single_column: (string | {
1798
1798
  props: {
1799
+ attrs: {
1800
+ props: {
1801
+ columnRuleStyle: {
1802
+ type: string;
1803
+ values: string[];
1804
+ optional: boolean;
1805
+ };
1806
+ };
1807
+ optional: boolean;
1808
+ };
1799
1809
  content: {
1800
1810
  type: string;
1801
1811
  items: string[];
@@ -1803,18 +1813,18 @@ export declare const layoutSection_full: (string | {
1803
1813
  maxItems: number;
1804
1814
  allowUnsupportedBlock: boolean;
1805
1815
  };
1806
- marks: {
1807
- type: string;
1808
- optional: boolean;
1809
- items: string[];
1810
- };
1811
1816
  type: {
1812
1817
  type: string;
1813
1818
  values: string[];
1814
1819
  };
1820
+ marks: {
1821
+ items: string[];
1822
+ optional: boolean;
1823
+ type: string;
1824
+ };
1815
1825
  };
1816
1826
  })[];
1817
- export declare const layoutSection_with_single_column: (string | {
1827
+ export declare const layoutSection_full: (string | {
1818
1828
  props: {
1819
1829
  content: {
1820
1830
  type: string;
@@ -1823,14 +1833,14 @@ export declare const layoutSection_with_single_column: (string | {
1823
1833
  maxItems: number;
1824
1834
  allowUnsupportedBlock: boolean;
1825
1835
  };
1826
- type: {
1827
- type: string;
1828
- values: string[];
1829
- };
1830
1836
  marks: {
1831
- items: string[];
1837
+ type: string;
1832
1838
  optional: boolean;
1839
+ items: string[];
1840
+ };
1841
+ type: {
1833
1842
  type: string;
1843
+ values: string[];
1834
1844
  };
1835
1845
  };
1836
1846
  })[];
@@ -2613,38 +2613,40 @@
2613
2613
  "additionalProperties": false,
2614
2614
  "required": ["type", "content"]
2615
2615
  },
2616
- "layoutSection_full_node": {
2617
- "allOf": [
2618
- {
2619
- "$ref": "#/definitions/layoutSection_node"
2616
+ "layoutSection_with_single_column_node": {
2617
+ "type": "object",
2618
+ "properties": {
2619
+ "type": {
2620
+ "enum": ["layoutSection"]
2620
2621
  },
2621
- {
2622
+ "marks": {
2623
+ "type": "array",
2624
+ "items": {
2625
+ "$ref": "#/definitions/breakout_mark"
2626
+ }
2627
+ },
2628
+ "attrs": {
2622
2629
  "type": "object",
2623
2630
  "properties": {
2624
- "marks": {
2625
- "type": "array",
2626
- "items": {
2627
- "$ref": "#/definitions/breakout_mark"
2628
- }
2629
- },
2630
- "content": {
2631
- "type": "array",
2632
- "items": {
2633
- "$ref": "#/definitions/layoutColumn_node"
2634
- },
2635
- "minItems": 2,
2636
- "maxItems": 3
2637
- },
2638
- "type": {
2639
- "enum": ["layoutSection"]
2631
+ "columnRuleStyle": {
2632
+ "enum": ["solid"]
2640
2633
  }
2641
2634
  },
2642
- "required": ["type", "content"],
2643
2635
  "additionalProperties": false
2636
+ },
2637
+ "content": {
2638
+ "type": "array",
2639
+ "items": {
2640
+ "$ref": "#/definitions/layoutColumn_node"
2641
+ },
2642
+ "minItems": 1,
2643
+ "maxItems": 5
2644
2644
  }
2645
- ]
2645
+ },
2646
+ "additionalProperties": false,
2647
+ "required": ["type", "content"]
2646
2648
  },
2647
- "layoutSection_with_single_column_node": {
2649
+ "layoutSection_full_node": {
2648
2650
  "allOf": [
2649
2651
  {
2650
2652
  "$ref": "#/definitions/layoutSection_node"
@@ -2663,7 +2665,7 @@
2663
2665
  "items": {
2664
2666
  "$ref": "#/definitions/layoutColumn_node"
2665
2667
  },
2666
- "minItems": 1,
2668
+ "minItems": 2,
2667
2669
  "maxItems": 3
2668
2670
  },
2669
2671
  "type": {
@@ -2894,10 +2896,10 @@
2894
2896
  "$ref": "#/definitions/expand_with_breakout_mark_node"
2895
2897
  },
2896
2898
  {
2897
- "$ref": "#/definitions/layoutSection_full_node"
2899
+ "$ref": "#/definitions/layoutSection_with_single_column_node"
2898
2900
  },
2899
2901
  {
2900
- "$ref": "#/definitions/layoutSection_with_single_column_node"
2902
+ "$ref": "#/definitions/layoutSection_full_node"
2901
2903
  },
2902
2904
  {
2903
2905
  "$ref": "#/definitions/multiBodiedExtension_node"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "42.1.0",
3
+ "version": "42.2.1",
4
4
  "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"