@atlaskit/adf-schema 42.2.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,11 @@
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
+
3
9
  ## 42.2.0
4
10
 
5
11
  ### 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': {
@@ -1781,26 +1781,6 @@ var layoutSection = exports.layoutSection = {
1781
1781
  }
1782
1782
  }
1783
1783
  };
1784
- var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
1785
- props: {
1786
- content: {
1787
- type: 'array',
1788
- items: ['layoutColumn'],
1789
- minItems: 2,
1790
- maxItems: 3,
1791
- allowUnsupportedBlock: true
1792
- },
1793
- marks: {
1794
- type: 'array',
1795
- optional: true,
1796
- items: ['breakout']
1797
- },
1798
- type: {
1799
- type: 'enum',
1800
- values: ['layoutSection']
1801
- }
1802
- }
1803
- }];
1804
1784
  var layoutSection_with_single_column = exports.layoutSection_with_single_column = ['layoutSection', {
1805
1785
  props: {
1806
1786
  attrs: {
@@ -1831,6 +1811,26 @@ var layoutSection_with_single_column = exports.layoutSection_with_single_column
1831
1811
  }
1832
1812
  }
1833
1813
  }];
1814
+ var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
1815
+ props: {
1816
+ content: {
1817
+ type: 'array',
1818
+ items: ['layoutColumn'],
1819
+ minItems: 2,
1820
+ maxItems: 3,
1821
+ allowUnsupportedBlock: true
1822
+ },
1823
+ marks: {
1824
+ type: 'array',
1825
+ optional: true,
1826
+ items: ['breakout']
1827
+ },
1828
+ type: {
1829
+ type: 'enum',
1830
+ values: ['layoutSection']
1831
+ }
1832
+ }
1833
+ }];
1834
1834
  var extensionFrame = exports.extensionFrame = {
1835
1835
  props: {
1836
1836
  type: {
@@ -1925,7 +1925,7 @@ var doc = exports.doc = {
1925
1925
  },
1926
1926
  content: {
1927
1927
  type: 'array',
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_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']],
1929
1929
  allowUnsupportedBlock: true
1930
1930
  }
1931
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': {
@@ -1775,26 +1775,6 @@ export const layoutSection = {
1775
1775
  }
1776
1776
  }
1777
1777
  };
1778
- export const layoutSection_full = ['layoutSection', {
1779
- props: {
1780
- content: {
1781
- type: 'array',
1782
- items: ['layoutColumn'],
1783
- minItems: 2,
1784
- maxItems: 3,
1785
- allowUnsupportedBlock: true
1786
- },
1787
- marks: {
1788
- type: 'array',
1789
- optional: true,
1790
- items: ['breakout']
1791
- },
1792
- type: {
1793
- type: 'enum',
1794
- values: ['layoutSection']
1795
- }
1796
- }
1797
- }];
1798
1778
  export const layoutSection_with_single_column = ['layoutSection', {
1799
1779
  props: {
1800
1780
  attrs: {
@@ -1825,6 +1805,26 @@ export const layoutSection_with_single_column = ['layoutSection', {
1825
1805
  }
1826
1806
  }
1827
1807
  }];
1808
+ export const layoutSection_full = ['layoutSection', {
1809
+ props: {
1810
+ content: {
1811
+ type: 'array',
1812
+ items: ['layoutColumn'],
1813
+ minItems: 2,
1814
+ maxItems: 3,
1815
+ allowUnsupportedBlock: true
1816
+ },
1817
+ marks: {
1818
+ type: 'array',
1819
+ optional: true,
1820
+ items: ['breakout']
1821
+ },
1822
+ type: {
1823
+ type: 'enum',
1824
+ values: ['layoutSection']
1825
+ }
1826
+ }
1827
+ }];
1828
1828
  export const extensionFrame = {
1829
1829
  props: {
1830
1830
  type: {
@@ -1919,7 +1919,7 @@ export const doc = {
1919
1919
  },
1920
1920
  content: {
1921
1921
  type: 'array',
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_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']],
1923
1923
  allowUnsupportedBlock: true
1924
1924
  }
1925
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': {
@@ -1775,26 +1775,6 @@ export var layoutSection = {
1775
1775
  }
1776
1776
  }
1777
1777
  };
1778
- export var layoutSection_full = ['layoutSection', {
1779
- props: {
1780
- content: {
1781
- type: 'array',
1782
- items: ['layoutColumn'],
1783
- minItems: 2,
1784
- maxItems: 3,
1785
- allowUnsupportedBlock: true
1786
- },
1787
- marks: {
1788
- type: 'array',
1789
- optional: true,
1790
- items: ['breakout']
1791
- },
1792
- type: {
1793
- type: 'enum',
1794
- values: ['layoutSection']
1795
- }
1796
- }
1797
- }];
1798
1778
  export var layoutSection_with_single_column = ['layoutSection', {
1799
1779
  props: {
1800
1780
  attrs: {
@@ -1825,6 +1805,26 @@ export var layoutSection_with_single_column = ['layoutSection', {
1825
1805
  }
1826
1806
  }
1827
1807
  }];
1808
+ export var layoutSection_full = ['layoutSection', {
1809
+ props: {
1810
+ content: {
1811
+ type: 'array',
1812
+ items: ['layoutColumn'],
1813
+ minItems: 2,
1814
+ maxItems: 3,
1815
+ allowUnsupportedBlock: true
1816
+ },
1817
+ marks: {
1818
+ type: 'array',
1819
+ optional: true,
1820
+ items: ['breakout']
1821
+ },
1822
+ type: {
1823
+ type: 'enum',
1824
+ values: ['layoutSection']
1825
+ }
1826
+ }
1827
+ }];
1828
1828
  export var extensionFrame = {
1829
1829
  props: {
1830
1830
  type: {
@@ -1919,7 +1919,7 @@ export var doc = {
1919
1919
  },
1920
1920
  content: {
1921
1921
  type: 'array',
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_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']],
1923
1923
  allowUnsupportedBlock: true
1924
1924
  }
1925
1925
  }
@@ -2613,37 +2613,6 @@
2613
2613
  "additionalProperties": false,
2614
2614
  "required": ["type", "content"]
2615
2615
  },
2616
- "layoutSection_full_node": {
2617
- "allOf": [
2618
- {
2619
- "$ref": "#/definitions/layoutSection_node"
2620
- },
2621
- {
2622
- "type": "object",
2623
- "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"]
2640
- }
2641
- },
2642
- "required": ["type", "content"],
2643
- "additionalProperties": false
2644
- }
2645
- ]
2646
- },
2647
2616
  "layoutSection_with_single_column_node": {
2648
2617
  "type": "object",
2649
2618
  "properties": {
@@ -2677,6 +2646,37 @@
2677
2646
  "additionalProperties": false,
2678
2647
  "required": ["type", "content"]
2679
2648
  },
2649
+ "layoutSection_full_node": {
2650
+ "allOf": [
2651
+ {
2652
+ "$ref": "#/definitions/layoutSection_node"
2653
+ },
2654
+ {
2655
+ "type": "object",
2656
+ "properties": {
2657
+ "marks": {
2658
+ "type": "array",
2659
+ "items": {
2660
+ "$ref": "#/definitions/breakout_mark"
2661
+ }
2662
+ },
2663
+ "content": {
2664
+ "type": "array",
2665
+ "items": {
2666
+ "$ref": "#/definitions/layoutColumn_node"
2667
+ },
2668
+ "minItems": 2,
2669
+ "maxItems": 3
2670
+ },
2671
+ "type": {
2672
+ "enum": ["layoutSection"]
2673
+ }
2674
+ },
2675
+ "required": ["type", "content"],
2676
+ "additionalProperties": false
2677
+ }
2678
+ ]
2679
+ },
2680
2680
  "extensionFrame_node": {
2681
2681
  "type": "object",
2682
2682
  "properties": {
@@ -2896,10 +2896,10 @@
2896
2896
  "$ref": "#/definitions/expand_with_breakout_mark_node"
2897
2897
  },
2898
2898
  {
2899
- "$ref": "#/definitions/layoutSection_full_node"
2899
+ "$ref": "#/definitions/layoutSection_with_single_column_node"
2900
2900
  },
2901
2901
  {
2902
- "$ref": "#/definitions/layoutSection_with_single_column_node"
2902
+ "$ref": "#/definitions/layoutSection_full_node"
2903
2903
  },
2904
2904
  {
2905
2905
  "$ref": "#/definitions/multiBodiedExtension_node"
@@ -1794,26 +1794,6 @@ export declare const layoutSection: {
1794
1794
  };
1795
1795
  };
1796
1796
  };
1797
- export declare const layoutSection_full: (string | {
1798
- props: {
1799
- content: {
1800
- type: string;
1801
- items: string[];
1802
- minItems: number;
1803
- maxItems: number;
1804
- allowUnsupportedBlock: boolean;
1805
- };
1806
- marks: {
1807
- type: string;
1808
- optional: boolean;
1809
- items: string[];
1810
- };
1811
- type: {
1812
- type: string;
1813
- values: string[];
1814
- };
1815
- };
1816
- })[];
1817
1797
  export declare const layoutSection_with_single_column: (string | {
1818
1798
  props: {
1819
1799
  attrs: {
@@ -1844,6 +1824,26 @@ export declare const layoutSection_with_single_column: (string | {
1844
1824
  };
1845
1825
  };
1846
1826
  })[];
1827
+ export declare const layoutSection_full: (string | {
1828
+ props: {
1829
+ content: {
1830
+ type: string;
1831
+ items: string[];
1832
+ minItems: number;
1833
+ maxItems: number;
1834
+ allowUnsupportedBlock: boolean;
1835
+ };
1836
+ marks: {
1837
+ type: string;
1838
+ optional: boolean;
1839
+ items: string[];
1840
+ };
1841
+ type: {
1842
+ type: string;
1843
+ values: string[];
1844
+ };
1845
+ };
1846
+ })[];
1847
1847
  export declare const extensionFrame: {
1848
1848
  props: {
1849
1849
  type: {
@@ -2613,37 +2613,6 @@
2613
2613
  "additionalProperties": false,
2614
2614
  "required": ["type", "content"]
2615
2615
  },
2616
- "layoutSection_full_node": {
2617
- "allOf": [
2618
- {
2619
- "$ref": "#/definitions/layoutSection_node"
2620
- },
2621
- {
2622
- "type": "object",
2623
- "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"]
2640
- }
2641
- },
2642
- "required": ["type", "content"],
2643
- "additionalProperties": false
2644
- }
2645
- ]
2646
- },
2647
2616
  "layoutSection_with_single_column_node": {
2648
2617
  "type": "object",
2649
2618
  "properties": {
@@ -2677,6 +2646,37 @@
2677
2646
  "additionalProperties": false,
2678
2647
  "required": ["type", "content"]
2679
2648
  },
2649
+ "layoutSection_full_node": {
2650
+ "allOf": [
2651
+ {
2652
+ "$ref": "#/definitions/layoutSection_node"
2653
+ },
2654
+ {
2655
+ "type": "object",
2656
+ "properties": {
2657
+ "marks": {
2658
+ "type": "array",
2659
+ "items": {
2660
+ "$ref": "#/definitions/breakout_mark"
2661
+ }
2662
+ },
2663
+ "content": {
2664
+ "type": "array",
2665
+ "items": {
2666
+ "$ref": "#/definitions/layoutColumn_node"
2667
+ },
2668
+ "minItems": 2,
2669
+ "maxItems": 3
2670
+ },
2671
+ "type": {
2672
+ "enum": ["layoutSection"]
2673
+ }
2674
+ },
2675
+ "required": ["type", "content"],
2676
+ "additionalProperties": false
2677
+ }
2678
+ ]
2679
+ },
2680
2680
  "extensionFrame_node": {
2681
2681
  "type": "object",
2682
2682
  "properties": {
@@ -2896,10 +2896,10 @@
2896
2896
  "$ref": "#/definitions/expand_with_breakout_mark_node"
2897
2897
  },
2898
2898
  {
2899
- "$ref": "#/definitions/layoutSection_full_node"
2899
+ "$ref": "#/definitions/layoutSection_with_single_column_node"
2900
2900
  },
2901
2901
  {
2902
- "$ref": "#/definitions/layoutSection_with_single_column_node"
2902
+ "$ref": "#/definitions/layoutSection_full_node"
2903
2903
  },
2904
2904
  {
2905
2905
  "$ref": "#/definitions/multiBodiedExtension_node"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "42.2.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/"