@atlaskit/adf-schema 40.9.0 → 40.9.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
+ ## 40.9.1
4
+
5
+ ### Patch Changes
6
+
7
+ - 3fbc24f: [ED-24525] Move mediaGroup ranking after mediaSingle in blockquote's content to fix bug where pasting external images would be converted to a mediaGroup instead of mediaSingle.
8
+
3
9
  ## 40.9.0
4
10
 
5
11
  ### Minor Changes
@@ -34,7 +34,7 @@ var blockCard = exports.blockCard = (0, _createPMSpecFactory.createPMNodeSpecFac
34
34
  draggable: true
35
35
  });
36
36
  var blockquote = exports.blockquote = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
37
- content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
37
+ content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
38
38
  group: 'block',
39
39
  selectable: false,
40
40
  defining: true
@@ -17,7 +17,7 @@ var blockquote = exports.blockquote = (0, _adfSchemaGenerator.adfNode)('blockquo
17
17
  defining: true,
18
18
  selectable: false,
19
19
  marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
20
- content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full')))]
20
+ content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _list.orderedList, _list.bulletList, _unsupportedBlock.unsupportedBlock, _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup))]
21
21
  }).variant('legacy', {
22
22
  ignore: ['json-schema', 'validator-spec'],
23
23
  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _unsupportedBlock.unsupportedBlock))]
@@ -1129,7 +1129,7 @@ var blockquote = exports.blockquote = {
1129
1129
  },
1130
1130
  content: {
1131
1131
  type: 'array',
1132
- items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
1132
+ items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
1133
1133
  minItems: 1,
1134
1134
  allowUnsupportedBlock: true
1135
1135
  }
@@ -28,7 +28,7 @@ export const blockCard = createPMNodeSpecFactory({
28
28
  draggable: true
29
29
  });
30
30
  export const blockquote = createPMNodeSpecFactory({
31
- content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
31
+ content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
32
32
  group: 'block',
33
33
  selectable: false,
34
34
  defining: true
@@ -11,7 +11,7 @@ export const blockquote = adfNode('blockquote').define({
11
11
  defining: true,
12
12
  selectable: false,
13
13
  marks: [unsupportedMark, unsupportedNodeAttribute],
14
- content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))]
14
+ content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))]
15
15
  }).variant('legacy', {
16
16
  ignore: ['json-schema', 'validator-spec'],
17
17
  content: [$onePlus($or(paragraph, unsupportedBlock))]
@@ -1122,7 +1122,7 @@ export const blockquote = {
1122
1122
  },
1123
1123
  content: {
1124
1124
  type: 'array',
1125
- items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
1125
+ items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
1126
1126
  minItems: 1,
1127
1127
  allowUnsupportedBlock: true
1128
1128
  }
@@ -28,7 +28,7 @@ export var blockCard = createPMNodeSpecFactory({
28
28
  draggable: true
29
29
  });
30
30
  export var blockquote = createPMNodeSpecFactory({
31
- content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaGroup | mediaSingle)+',
31
+ content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup)+',
32
32
  group: 'block',
33
33
  selectable: false,
34
34
  defining: true
@@ -11,7 +11,7 @@ export var blockquote = adfNode('blockquote').define({
11
11
  defining: true,
12
12
  selectable: false,
13
13
  marks: [unsupportedMark, unsupportedNodeAttribute],
14
- content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full')))]
14
+ content: [$onePlus($or(paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup))]
15
15
  }).variant('legacy', {
16
16
  ignore: ['json-schema', 'validator-spec'],
17
17
  content: [$onePlus($or(paragraph, unsupportedBlock))]
@@ -1122,7 +1122,7 @@ export var blockquote = {
1122
1122
  },
1123
1123
  content: {
1124
1124
  type: 'array',
1125
- items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full']],
1125
+ items: [['paragraph_with_no_marks', 'orderedList', 'bulletList', 'codeBlock_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup']],
1126
1126
  minItems: 1,
1127
1127
  allowUnsupportedBlock: true
1128
1128
  }
@@ -1489,14 +1489,14 @@
1489
1489
  {
1490
1490
  "$ref": "#/definitions/codeBlock_with_no_marks_node"
1491
1491
  },
1492
- {
1493
- "$ref": "#/definitions/mediaGroup_node"
1494
- },
1495
1492
  {
1496
1493
  "$ref": "#/definitions/mediaSingle_caption_node"
1497
1494
  },
1498
1495
  {
1499
1496
  "$ref": "#/definitions/mediaSingle_full_node"
1497
+ },
1498
+ {
1499
+ "$ref": "#/definitions/mediaGroup_node"
1500
1500
  }
1501
1501
  ]
1502
1502
  },
@@ -1596,14 +1596,14 @@
1596
1596
  {
1597
1597
  "$ref": "#/definitions/codeBlock_with_no_marks_node"
1598
1598
  },
1599
- {
1600
- "$ref": "#/definitions/mediaGroup_node"
1601
- },
1602
1599
  {
1603
1600
  "$ref": "#/definitions/mediaSingle_caption_node"
1604
1601
  },
1605
1602
  {
1606
1603
  "$ref": "#/definitions/mediaSingle_full_node"
1604
+ },
1605
+ {
1606
+ "$ref": "#/definitions/mediaGroup_node"
1607
1607
  }
1608
1608
  ]
1609
1609
  },
@@ -1489,14 +1489,14 @@
1489
1489
  {
1490
1490
  "$ref": "#/definitions/codeBlock_with_no_marks_node"
1491
1491
  },
1492
- {
1493
- "$ref": "#/definitions/mediaGroup_node"
1494
- },
1495
1492
  {
1496
1493
  "$ref": "#/definitions/mediaSingle_caption_node"
1497
1494
  },
1498
1495
  {
1499
1496
  "$ref": "#/definitions/mediaSingle_full_node"
1497
+ },
1498
+ {
1499
+ "$ref": "#/definitions/mediaGroup_node"
1500
1500
  }
1501
1501
  ]
1502
1502
  },
@@ -1596,14 +1596,14 @@
1596
1596
  {
1597
1597
  "$ref": "#/definitions/codeBlock_with_no_marks_node"
1598
1598
  },
1599
- {
1600
- "$ref": "#/definitions/mediaGroup_node"
1601
- },
1602
1599
  {
1603
1600
  "$ref": "#/definitions/mediaSingle_caption_node"
1604
1601
  },
1605
1602
  {
1606
1603
  "$ref": "#/definitions/mediaSingle_full_node"
1604
+ },
1605
+ {
1606
+ "$ref": "#/definitions/mediaGroup_node"
1607
1607
  }
1608
1608
  ]
1609
1609
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "40.9.0",
3
+ "version": "40.9.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/"