@atlaskit/adf-schema 57.2.11 → 57.3.2
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 +20 -0
- package/bodied-rule/package.json +8 -0
- package/dist/cjs/next-schema/full-schema.adf.js +2 -1
- package/dist/cjs/next-schema/generated/nodeTypes.js +91 -17
- package/dist/cjs/next-schema/groups/blockContentGroup.js +2 -1
- package/dist/cjs/next-schema/groups/blockGroup.js +2 -1
- package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js +2 -1
- package/dist/cjs/next-schema/nodes/bodiedRule.js +56 -0
- package/dist/cjs/next-schema/nodes/bodiedSyncBlock.js +2 -1
- package/dist/cjs/next-schema/nodes/extensionFrame.js +2 -1
- package/dist/cjs/next-schema/nodes/nestedExpand.js +2 -1
- package/dist/cjs/next-schema/nodes/panel.js +2 -1
- package/dist/cjs/next-schema/nodes/rule.js +33 -0
- package/dist/cjs/schema/default-schema.js +3 -1
- package/dist/cjs/schema/nodes/bodied-rule.js +57 -0
- package/dist/cjs/schema/nodes/rule.js +53 -1
- package/dist/cjs/schema/nodes-in-order.js +4 -0
- package/dist/cjs/validator-schema/generated/validatorSpec.js +142 -14
- package/dist/es2019/next-schema/full-schema.adf.js +2 -1
- package/dist/es2019/next-schema/generated/nodeTypes.js +90 -16
- package/dist/es2019/next-schema/groups/blockContentGroup.js +2 -1
- package/dist/es2019/next-schema/groups/blockGroup.js +2 -1
- package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js +2 -1
- package/dist/es2019/next-schema/nodes/bodiedRule.js +50 -0
- package/dist/es2019/next-schema/nodes/bodiedSyncBlock.js +2 -1
- package/dist/es2019/next-schema/nodes/extensionFrame.js +2 -1
- package/dist/es2019/next-schema/nodes/nestedExpand.js +2 -1
- package/dist/es2019/next-schema/nodes/panel.js +2 -1
- package/dist/es2019/next-schema/nodes/rule.js +33 -0
- package/dist/es2019/schema/default-schema.js +4 -2
- package/dist/es2019/schema/nodes/bodied-rule.js +50 -0
- package/dist/es2019/schema/nodes/rule.js +56 -0
- package/dist/es2019/schema/nodes-in-order.js +4 -0
- package/dist/es2019/validator-schema/generated/validatorSpec.js +140 -13
- package/dist/esm/next-schema/full-schema.adf.js +2 -1
- package/dist/esm/next-schema/generated/nodeTypes.js +90 -16
- package/dist/esm/next-schema/groups/blockContentGroup.js +2 -1
- package/dist/esm/next-schema/groups/blockGroup.js +2 -1
- package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js +2 -1
- package/dist/esm/next-schema/nodes/bodiedRule.js +50 -0
- package/dist/esm/next-schema/nodes/bodiedSyncBlock.js +2 -1
- package/dist/esm/next-schema/nodes/extensionFrame.js +2 -1
- package/dist/esm/next-schema/nodes/nestedExpand.js +2 -1
- package/dist/esm/next-schema/nodes/panel.js +2 -1
- package/dist/esm/next-schema/nodes/rule.js +33 -0
- package/dist/esm/schema/default-schema.js +4 -2
- package/dist/esm/schema/nodes/bodied-rule.js +51 -0
- package/dist/esm/schema/nodes/rule.js +52 -0
- package/dist/esm/schema/nodes-in-order.js +4 -0
- package/dist/esm/validator-schema/generated/validatorSpec.js +140 -13
- package/dist/json-schema/v1/stage-0.json +248 -0
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +3 -3
- package/dist/types/next-schema/generated/nodeTypes.d.ts +67 -16
- package/dist/types/next-schema/nodes/bodiedRule.d.ts +2 -0
- package/dist/types/next-schema/nodes/rule.d.ts +6 -1
- package/dist/types/schema/default-schema.d.ts +1 -1
- package/dist/types/schema/nodes/bodied-rule.d.ts +34 -0
- package/dist/types/schema/nodes/bodied-sync-block.d.ts +2 -1
- package/dist/types/schema/nodes/doc.d.ts +2 -1
- package/dist/types/schema/nodes/multi-bodied-extension.d.ts +2 -1
- package/dist/types/schema/nodes/nested-expand.d.ts +2 -1
- package/dist/types/schema/nodes/panel.d.ts +3 -2
- package/dist/types/schema/nodes/rule.d.ts +20 -0
- package/dist/types/schema/nodes/tableNodes.d.ts +2 -1
- package/dist/types/schema/nodes/types/block-content.d.ts +2 -1
- package/dist/types/schema/nodes/types/non-nestable-block-content.d.ts +2 -1
- package/dist/types/validator-schema/generated/validatorSpec.d.ts +127 -0
- package/json-schema/v1/stage-0.json +248 -0
- package/package.json +2 -2
- package/schema/bodied-rule/package.json +8 -0
- package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts +2 -0
|
@@ -49,7 +49,7 @@ export const backgroundColor = {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
|
|
52
|
+
export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
|
|
53
53
|
export const blockCard = {
|
|
54
54
|
props: {
|
|
55
55
|
attrs: [{
|
|
@@ -246,6 +246,64 @@ export const bodiedExtension_with_marks = ['bodiedExtension', {
|
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
}];
|
|
249
|
+
export const bodiedRule = {
|
|
250
|
+
meta: {
|
|
251
|
+
stage0: true
|
|
252
|
+
},
|
|
253
|
+
props: {
|
|
254
|
+
attrs: {
|
|
255
|
+
props: {
|
|
256
|
+
alignment: {
|
|
257
|
+
optional: true,
|
|
258
|
+
type: 'enum',
|
|
259
|
+
values: ['start', 'center', 'end']
|
|
260
|
+
},
|
|
261
|
+
color: {
|
|
262
|
+
optional: true,
|
|
263
|
+
pattern: '^#[0-9a-fA-F]{6}$',
|
|
264
|
+
type: 'string'
|
|
265
|
+
},
|
|
266
|
+
localId: {
|
|
267
|
+
minLength: 1,
|
|
268
|
+
type: 'string'
|
|
269
|
+
},
|
|
270
|
+
style: {
|
|
271
|
+
optional: true,
|
|
272
|
+
type: 'enum',
|
|
273
|
+
values: ['solid', 'dashed', 'dotted', 'sketch', 'fade']
|
|
274
|
+
},
|
|
275
|
+
weight: {
|
|
276
|
+
maximum: 3,
|
|
277
|
+
minimum: 1,
|
|
278
|
+
optional: true,
|
|
279
|
+
type: 'number'
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
},
|
|
283
|
+
content: {
|
|
284
|
+
items: [['paragraph_with_no_marks', 'heading_with_no_marks']],
|
|
285
|
+
maxItems: 1,
|
|
286
|
+
minItems: 1,
|
|
287
|
+
type: 'array'
|
|
288
|
+
},
|
|
289
|
+
type: {
|
|
290
|
+
type: 'enum',
|
|
291
|
+
values: ['bodiedRule']
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
};
|
|
295
|
+
export const bodiedRule_root_only = ['bodiedRule', {
|
|
296
|
+
meta: {
|
|
297
|
+
stage0: true
|
|
298
|
+
},
|
|
299
|
+
props: {
|
|
300
|
+
marks: {
|
|
301
|
+
items: ['breakout'],
|
|
302
|
+
optional: true,
|
|
303
|
+
type: 'array'
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
}];
|
|
249
307
|
export const bodiedSyncBlock = {
|
|
250
308
|
props: {
|
|
251
309
|
attrs: {
|
|
@@ -260,7 +318,7 @@ export const bodiedSyncBlock = {
|
|
|
260
318
|
},
|
|
261
319
|
content: {
|
|
262
320
|
allowUnsupportedBlock: true,
|
|
263
|
-
items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'table', 'taskList']],
|
|
321
|
+
items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'layoutSection_with_single_column', 'layoutSection_full', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel_c1', 'panel', 'rule', 'rule_with_attrs', 'bodiedRule', 'table', 'taskList']],
|
|
264
322
|
minItems: 1,
|
|
265
323
|
type: 'array'
|
|
266
324
|
},
|
|
@@ -531,7 +589,7 @@ export const doc = {
|
|
|
531
589
|
props: {
|
|
532
590
|
content: {
|
|
533
591
|
allowUnsupportedBlock: true,
|
|
534
|
-
items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
|
|
592
|
+
items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'panel_root_only', 'panel_c1_root_only', 'rule_root_only', 'rule_with_attrs_root_only', 'bodiedRule_root_only', 'extension_root_only', 'bodiedExtension_root_only', 'multiBodiedExtension_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
|
|
535
593
|
type: 'array'
|
|
536
594
|
},
|
|
537
595
|
type: {
|
|
@@ -639,7 +697,7 @@ export const expand = {
|
|
|
639
697
|
},
|
|
640
698
|
content: {
|
|
641
699
|
allowUnsupportedBlock: true,
|
|
642
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
|
|
700
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
|
|
643
701
|
minItems: 1,
|
|
644
702
|
type: 'array'
|
|
645
703
|
},
|
|
@@ -734,7 +792,7 @@ export const extensionFrame = {
|
|
|
734
792
|
},
|
|
735
793
|
props: {
|
|
736
794
|
content: {
|
|
737
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
|
|
795
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_full', 'mediaSingle_caption', 'decisionList', 'taskList', 'table', 'extension_with_marks', 'bodiedExtension_with_marks', 'blockCard', 'embedCard']],
|
|
738
796
|
minItems: 1,
|
|
739
797
|
type: 'array'
|
|
740
798
|
},
|
|
@@ -990,7 +1048,7 @@ export const layoutColumn = {
|
|
|
990
1048
|
},
|
|
991
1049
|
content: {
|
|
992
1050
|
allowUnsupportedBlock: true,
|
|
993
|
-
items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
|
|
1051
|
+
items: [['panel_c1', 'blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks']],
|
|
994
1052
|
minItems: 1,
|
|
995
1053
|
type: 'array'
|
|
996
1054
|
},
|
|
@@ -1493,7 +1551,7 @@ export const nestedExpand = {
|
|
|
1493
1551
|
};
|
|
1494
1552
|
export const nestedExpand_content = {
|
|
1495
1553
|
allowUnsupportedBlock: true,
|
|
1496
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks']],
|
|
1554
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'rule_with_attrs', 'bodiedRule', 'panel', 'blockquote', 'extension_with_marks']],
|
|
1497
1555
|
minItems: 1,
|
|
1498
1556
|
type: 'array'
|
|
1499
1557
|
};
|
|
@@ -1507,7 +1565,7 @@ export const nestedExpand_with_no_marks = ['nestedExpand', {
|
|
|
1507
1565
|
}
|
|
1508
1566
|
}
|
|
1509
1567
|
}];
|
|
1510
|
-
export const non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
|
|
1568
|
+
export const non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
|
|
1511
1569
|
export const orderedList = {
|
|
1512
1570
|
props: {
|
|
1513
1571
|
attrs: {
|
|
@@ -1567,7 +1625,7 @@ export const panel = {
|
|
|
1567
1625
|
},
|
|
1568
1626
|
content: {
|
|
1569
1627
|
allowUnsupportedBlock: true,
|
|
1570
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList', 'extension_with_marks']],
|
|
1628
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks']],
|
|
1571
1629
|
minItems: 1,
|
|
1572
1630
|
type: 'array'
|
|
1573
1631
|
},
|
|
@@ -1584,7 +1642,7 @@ export const panel_c1 = ['panel', {
|
|
|
1584
1642
|
props: {
|
|
1585
1643
|
content: {
|
|
1586
1644
|
allowUnsupportedBlock: true,
|
|
1587
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList', 'extension_with_marks', 'table']],
|
|
1645
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'table']],
|
|
1588
1646
|
minItems: 1,
|
|
1589
1647
|
type: 'array'
|
|
1590
1648
|
}
|
|
@@ -1597,7 +1655,7 @@ export const panel_c1_root_only = ['panel', {
|
|
|
1597
1655
|
props: {
|
|
1598
1656
|
content: {
|
|
1599
1657
|
allowUnsupportedBlock: true,
|
|
1600
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'decisionList', 'extension_with_marks', 'table']],
|
|
1658
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'rule', 'rule_with_attrs', 'bodiedRule', 'decisionList', 'extension_with_marks', 'table']],
|
|
1601
1659
|
minItems: 1,
|
|
1602
1660
|
type: 'array'
|
|
1603
1661
|
},
|
|
@@ -1733,6 +1791,75 @@ export const rule_root_only = ['rule', {
|
|
|
1733
1791
|
}
|
|
1734
1792
|
}
|
|
1735
1793
|
}];
|
|
1794
|
+
export const rule_with_attrs = ['rule', {
|
|
1795
|
+
meta: {
|
|
1796
|
+
stage0: true
|
|
1797
|
+
},
|
|
1798
|
+
props: {
|
|
1799
|
+
attrs: {
|
|
1800
|
+
optional: true,
|
|
1801
|
+
props: {
|
|
1802
|
+
color: {
|
|
1803
|
+
optional: true,
|
|
1804
|
+
pattern: '^#[0-9a-fA-F]{6}$',
|
|
1805
|
+
type: 'string'
|
|
1806
|
+
},
|
|
1807
|
+
localId: {
|
|
1808
|
+
optional: true,
|
|
1809
|
+
type: 'string'
|
|
1810
|
+
},
|
|
1811
|
+
style: {
|
|
1812
|
+
optional: true,
|
|
1813
|
+
type: 'enum',
|
|
1814
|
+
values: ['solid', 'dashed', 'dotted', 'sketch', 'fade']
|
|
1815
|
+
},
|
|
1816
|
+
weight: {
|
|
1817
|
+
maximum: 3,
|
|
1818
|
+
minimum: 1,
|
|
1819
|
+
optional: true,
|
|
1820
|
+
type: 'number'
|
|
1821
|
+
}
|
|
1822
|
+
}
|
|
1823
|
+
}
|
|
1824
|
+
}
|
|
1825
|
+
}];
|
|
1826
|
+
export const rule_with_attrs_root_only = ['rule', {
|
|
1827
|
+
meta: {
|
|
1828
|
+
stage0: true
|
|
1829
|
+
},
|
|
1830
|
+
props: {
|
|
1831
|
+
attrs: {
|
|
1832
|
+
optional: true,
|
|
1833
|
+
props: {
|
|
1834
|
+
color: {
|
|
1835
|
+
optional: true,
|
|
1836
|
+
pattern: '^#[0-9a-fA-F]{6}$',
|
|
1837
|
+
type: 'string'
|
|
1838
|
+
},
|
|
1839
|
+
localId: {
|
|
1840
|
+
optional: true,
|
|
1841
|
+
type: 'string'
|
|
1842
|
+
},
|
|
1843
|
+
style: {
|
|
1844
|
+
optional: true,
|
|
1845
|
+
type: 'enum',
|
|
1846
|
+
values: ['solid', 'dashed', 'dotted', 'sketch', 'fade']
|
|
1847
|
+
},
|
|
1848
|
+
weight: {
|
|
1849
|
+
maximum: 3,
|
|
1850
|
+
minimum: 1,
|
|
1851
|
+
optional: true,
|
|
1852
|
+
type: 'number'
|
|
1853
|
+
}
|
|
1854
|
+
}
|
|
1855
|
+
},
|
|
1856
|
+
marks: {
|
|
1857
|
+
items: ['breakout'],
|
|
1858
|
+
optional: true,
|
|
1859
|
+
type: 'array'
|
|
1860
|
+
}
|
|
1861
|
+
}
|
|
1862
|
+
}];
|
|
1736
1863
|
export const status = {
|
|
1737
1864
|
props: {
|
|
1738
1865
|
attrs: {
|
|
@@ -1904,7 +2031,7 @@ export const tableCell = {
|
|
|
1904
2031
|
},
|
|
1905
2032
|
content: {
|
|
1906
2033
|
allowUnsupportedBlock: true,
|
|
1907
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
|
|
2034
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
|
|
1908
2035
|
minItems: 1,
|
|
1909
2036
|
type: 'array'
|
|
1910
2037
|
},
|
|
@@ -1951,7 +2078,7 @@ export const tableHeader = {
|
|
|
1951
2078
|
}
|
|
1952
2079
|
},
|
|
1953
2080
|
content: {
|
|
1954
|
-
items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
|
|
2081
|
+
items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'rule_with_attrs', 'bodiedRule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
|
|
1955
2082
|
minItems: 1,
|
|
1956
2083
|
type: 'array'
|
|
1957
2084
|
},
|
|
@@ -12,6 +12,7 @@ import { extension } from './nodes/extension';
|
|
|
12
12
|
import { multiBodiedExtension } from './nodes/multiBodiedExtension';
|
|
13
13
|
import { panel } from './nodes/panel';
|
|
14
14
|
import { rule } from './nodes/rule';
|
|
15
|
+
import { bodiedRule } from './nodes/bodiedRule';
|
|
15
16
|
var doc = adfNode('doc').define({
|
|
16
17
|
root: true,
|
|
17
18
|
version: 1,
|
|
@@ -24,7 +25,7 @@ var doc = adfNode('doc').define({
|
|
|
24
25
|
// Deliberately placed AFTER `blockGroup` rather than first: `blockContentGroup` is ignored
|
|
25
26
|
// for `pm-spec`, so this keeps `block` the leading alternative in the PM content
|
|
26
27
|
// expression and leaves ProseMirror's defaultType/fill behaviour untouched.
|
|
27
|
-
panel.use('c1'), blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1_root_only'), rule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
|
|
28
|
+
panel.use('c1'), blockContentGroup, codeBlock.use('root_only'), panel.use('root_only'), panel.use('c1_root_only'), rule.use('root_only'), rule.use('with_attrs_root_only'), bodiedRule.use('root_only'), extension.use('root_only'), bodiedExtension.use('root_only'), multiBodiedExtension.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
|
|
28
29
|
DANGEROUS_MANUAL_OVERRIDE: {
|
|
29
30
|
'validator-spec': {
|
|
30
31
|
'props.content.minItems': {
|
|
@@ -69,7 +69,7 @@ export var blockTaskItem = createPMNodeSpecFactory({
|
|
|
69
69
|
defining: true
|
|
70
70
|
});
|
|
71
71
|
export var bodiedExtension = createPMNodeSpecFactory({
|
|
72
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
72
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
73
73
|
marks: 'dataConsumer fontSize fragment unsupportedMark unsupportedNodeAttribute',
|
|
74
74
|
group: 'block',
|
|
75
75
|
attrs: {
|
|
@@ -97,7 +97,7 @@ export var bodiedExtension = createPMNodeSpecFactory({
|
|
|
97
97
|
isolating: true
|
|
98
98
|
});
|
|
99
99
|
export var bodiedExtensionRootOnlyStage0 = createPMNodeSpecFactory({
|
|
100
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
100
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
101
101
|
marks: 'dataConsumer fontSize fragment unsupportedMark unsupportedNodeAttribute',
|
|
102
102
|
attrs: {
|
|
103
103
|
extensionKey: {
|
|
@@ -150,8 +150,49 @@ export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
|
|
|
150
150
|
defining: true,
|
|
151
151
|
isolating: true
|
|
152
152
|
});
|
|
153
|
+
export var bodiedRuleRootOnlyStage0 = createPMNodeSpecFactory({
|
|
154
|
+
content: '(paragraph | heading){1,1}',
|
|
155
|
+
attrs: {
|
|
156
|
+
localId: {
|
|
157
|
+
default: ''
|
|
158
|
+
},
|
|
159
|
+
alignment: {
|
|
160
|
+
default: null
|
|
161
|
+
},
|
|
162
|
+
color: {
|
|
163
|
+
default: null
|
|
164
|
+
},
|
|
165
|
+
style: {
|
|
166
|
+
default: null
|
|
167
|
+
},
|
|
168
|
+
weight: {
|
|
169
|
+
default: null
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
export var bodiedRuleStage0 = createPMNodeSpecFactory({
|
|
174
|
+
content: '(paragraph | heading){1,1}',
|
|
175
|
+
group: 'block',
|
|
176
|
+
attrs: {
|
|
177
|
+
localId: {
|
|
178
|
+
default: ''
|
|
179
|
+
},
|
|
180
|
+
alignment: {
|
|
181
|
+
default: null
|
|
182
|
+
},
|
|
183
|
+
color: {
|
|
184
|
+
default: null
|
|
185
|
+
},
|
|
186
|
+
style: {
|
|
187
|
+
default: null
|
|
188
|
+
},
|
|
189
|
+
weight: {
|
|
190
|
+
default: null
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
});
|
|
153
194
|
export var bodiedSyncBlock = createPMNodeSpecFactory({
|
|
154
|
-
content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | table | taskList | unsupportedBlock)+',
|
|
195
|
+
content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | bodiedRule | table | taskList | unsupportedBlock)+',
|
|
155
196
|
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
|
|
156
197
|
attrs: {
|
|
157
198
|
resourceId: {
|
|
@@ -325,7 +366,7 @@ export var decisionList = createPMNodeSpecFactory({
|
|
|
325
366
|
defining: true
|
|
326
367
|
});
|
|
327
368
|
export var doc = createPMNodeSpecFactory({
|
|
328
|
-
content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
|
|
369
|
+
content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | bodiedRule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
|
|
329
370
|
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
|
|
330
371
|
});
|
|
331
372
|
export var embedCard = createPMNodeSpecFactory({
|
|
@@ -391,7 +432,7 @@ export var emojiStage0 = createPMNodeSpecFactory({
|
|
|
391
432
|
selectable: true
|
|
392
433
|
});
|
|
393
434
|
export var expand = createPMNodeSpecFactory({
|
|
394
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
435
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
395
436
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
|
396
437
|
group: 'block',
|
|
397
438
|
attrs: {
|
|
@@ -409,7 +450,7 @@ export var expand = createPMNodeSpecFactory({
|
|
|
409
450
|
isolating: true
|
|
410
451
|
});
|
|
411
452
|
export var expandRootOnly = createPMNodeSpecFactory({
|
|
412
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
453
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
413
454
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
|
414
455
|
attrs: {
|
|
415
456
|
title: {
|
|
@@ -500,7 +541,7 @@ export var extensionWithMarks = createPMNodeSpecFactory({
|
|
|
500
541
|
selectable: true
|
|
501
542
|
});
|
|
502
543
|
export var extensionFrameStage0 = createPMNodeSpecFactory({
|
|
503
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
|
|
544
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
|
|
504
545
|
marks: 'dataConsumer fontSize fragment unsupportedMark unsupportedNodeAttribute',
|
|
505
546
|
attrs: {},
|
|
506
547
|
selectable: false,
|
|
@@ -1016,7 +1057,7 @@ export var multiBodiedExtensionStage0 = createPMNodeSpecFactory({
|
|
|
1016
1057
|
definingAsContext: true
|
|
1017
1058
|
});
|
|
1018
1059
|
export var nestedExpand = createPMNodeSpecFactory({
|
|
1019
|
-
content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock | extension)+',
|
|
1060
|
+
content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | bodiedRule | panel | blockquote | unsupportedBlock | extension)+',
|
|
1020
1061
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1021
1062
|
attrs: {
|
|
1022
1063
|
title: {
|
|
@@ -1062,7 +1103,7 @@ export var orderedList = createPMNodeSpecFactory({
|
|
|
1062
1103
|
selectable: false
|
|
1063
1104
|
});
|
|
1064
1105
|
export var panel = createPMNodeSpecFactory({
|
|
1065
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
|
|
1106
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
|
|
1066
1107
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1067
1108
|
group: 'block',
|
|
1068
1109
|
attrs: {
|
|
@@ -1088,7 +1129,7 @@ export var panel = createPMNodeSpecFactory({
|
|
|
1088
1129
|
selectable: true
|
|
1089
1130
|
});
|
|
1090
1131
|
export var panelC1RootOnlyStage0 = createPMNodeSpecFactory({
|
|
1091
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension | table)+',
|
|
1132
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
|
|
1092
1133
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1093
1134
|
attrs: {
|
|
1094
1135
|
panelType: {
|
|
@@ -1113,7 +1154,7 @@ export var panelC1RootOnlyStage0 = createPMNodeSpecFactory({
|
|
|
1113
1154
|
selectable: true
|
|
1114
1155
|
});
|
|
1115
1156
|
export var panelC1Stage0 = createPMNodeSpecFactory({
|
|
1116
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension | table)+',
|
|
1157
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
|
|
1117
1158
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1118
1159
|
group: 'block',
|
|
1119
1160
|
attrs: {
|
|
@@ -1139,7 +1180,7 @@ export var panelC1Stage0 = createPMNodeSpecFactory({
|
|
|
1139
1180
|
selectable: true
|
|
1140
1181
|
});
|
|
1141
1182
|
export var panelRootOnlyStage0 = createPMNodeSpecFactory({
|
|
1142
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
|
|
1183
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
|
|
1143
1184
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1144
1185
|
attrs: {
|
|
1145
1186
|
panelType: {
|
|
@@ -1238,6 +1279,39 @@ export var ruleRootOnlyStage0 = createPMNodeSpecFactory({
|
|
|
1238
1279
|
}
|
|
1239
1280
|
}
|
|
1240
1281
|
});
|
|
1282
|
+
export var ruleWithAttrsRootOnlyStage0 = createPMNodeSpecFactory({
|
|
1283
|
+
attrs: {
|
|
1284
|
+
localId: {
|
|
1285
|
+
default: null
|
|
1286
|
+
},
|
|
1287
|
+
color: {
|
|
1288
|
+
default: null
|
|
1289
|
+
},
|
|
1290
|
+
style: {
|
|
1291
|
+
default: null
|
|
1292
|
+
},
|
|
1293
|
+
weight: {
|
|
1294
|
+
default: null
|
|
1295
|
+
}
|
|
1296
|
+
}
|
|
1297
|
+
});
|
|
1298
|
+
export var ruleWithAttrsStage0 = createPMNodeSpecFactory({
|
|
1299
|
+
group: 'block',
|
|
1300
|
+
attrs: {
|
|
1301
|
+
localId: {
|
|
1302
|
+
default: null
|
|
1303
|
+
},
|
|
1304
|
+
color: {
|
|
1305
|
+
default: null
|
|
1306
|
+
},
|
|
1307
|
+
style: {
|
|
1308
|
+
default: null
|
|
1309
|
+
},
|
|
1310
|
+
weight: {
|
|
1311
|
+
default: null
|
|
1312
|
+
}
|
|
1313
|
+
}
|
|
1314
|
+
});
|
|
1241
1315
|
export var status = createPMNodeSpecFactory({
|
|
1242
1316
|
group: 'inline',
|
|
1243
1317
|
inline: true,
|
|
@@ -1344,7 +1418,7 @@ export var tableWithNestedTable = createPMNodeSpecFactory({
|
|
|
1344
1418
|
tableRole: 'table'
|
|
1345
1419
|
});
|
|
1346
1420
|
export var tableCell = createPMNodeSpecFactory({
|
|
1347
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
|
|
1421
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
|
|
1348
1422
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1349
1423
|
attrs: {
|
|
1350
1424
|
colspan: {
|
|
@@ -1371,7 +1445,7 @@ export var tableCell = createPMNodeSpecFactory({
|
|
|
1371
1445
|
tableRole: 'cell'
|
|
1372
1446
|
});
|
|
1373
1447
|
export var tableCellWithNestedTable = createPMNodeSpecFactory({
|
|
1374
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
|
|
1448
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
|
|
1375
1449
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1376
1450
|
attrs: {
|
|
1377
1451
|
colspan: {
|
|
@@ -1398,7 +1472,7 @@ export var tableCellWithNestedTable = createPMNodeSpecFactory({
|
|
|
1398
1472
|
tableRole: 'cell'
|
|
1399
1473
|
});
|
|
1400
1474
|
export var tableHeader = createPMNodeSpecFactory({
|
|
1401
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
|
|
1475
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
|
|
1402
1476
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1403
1477
|
attrs: {
|
|
1404
1478
|
colspan: {
|
|
@@ -1425,7 +1499,7 @@ export var tableHeader = createPMNodeSpecFactory({
|
|
|
1425
1499
|
tableRole: 'header_cell'
|
|
1426
1500
|
});
|
|
1427
1501
|
export var tableHeaderWithNestedTable = createPMNodeSpecFactory({
|
|
1428
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
|
|
1502
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
|
|
1429
1503
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1430
1504
|
attrs: {
|
|
1431
1505
|
colspan: {
|
|
@@ -2,6 +2,7 @@ import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
|
|
|
2
2
|
import { blockCard } from '../nodes/blockCard';
|
|
3
3
|
import { blockquote } from '../nodes/blockquote';
|
|
4
4
|
import { bodiedExtension } from '../nodes/bodiedExtension';
|
|
5
|
+
import { bodiedRule } from '../nodes/bodiedRule';
|
|
5
6
|
import { codeBlock } from '../nodes/codeBlock';
|
|
6
7
|
import { confluenceUnsupportedBlock } from '../nodes/confluenceUnsupportedBlock';
|
|
7
8
|
import { decisionList } from '../nodes/decisionList';
|
|
@@ -31,7 +32,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
|
31
32
|
* - no base mediaSingle
|
|
32
33
|
* - no base heading
|
|
33
34
|
*/
|
|
34
|
-
export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table,
|
|
35
|
+
export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, rule.use('with_attrs'), bodiedRule, panel, blockquote, extension.use('with_marks'), embedCard, table,
|
|
35
36
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
36
37
|
table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
|
|
37
38
|
ignore: ['pm-spec']
|
|
@@ -2,6 +2,7 @@ import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
|
|
|
2
2
|
import { blockCard } from '../nodes/blockCard';
|
|
3
3
|
import { blockquote } from '../nodes/blockquote';
|
|
4
4
|
import { bodiedExtension } from '../nodes/bodiedExtension';
|
|
5
|
+
import { bodiedRule } from '../nodes/bodiedRule';
|
|
5
6
|
import { codeBlock } from '../nodes/codeBlock';
|
|
6
7
|
import { confluenceUnsupportedBlock } from '../nodes/confluenceUnsupportedBlock';
|
|
7
8
|
import { decisionList } from '../nodes/decisionList';
|
|
@@ -18,7 +19,7 @@ import { rule } from '../nodes/rule';
|
|
|
18
19
|
import { table } from '../nodes/tableNodes';
|
|
19
20
|
import { taskList } from '../nodes/task';
|
|
20
21
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
21
|
-
export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('c1'), table,
|
|
22
|
+
export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, rule.use('with_attrs'), bodiedRule, panel, panel.use('c1'), table,
|
|
22
23
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
23
24
|
table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
|
|
24
25
|
// @DSLCompatibilityException
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { blockCard } from '../nodes/blockCard';
|
|
3
|
+
import { bodiedRule } from '../nodes/bodiedRule';
|
|
3
4
|
import { blockquote } from '../nodes/blockquote';
|
|
4
5
|
import { codeBlock } from '../nodes/codeBlock';
|
|
5
6
|
import { decisionList } from '../nodes/decisionList';
|
|
@@ -19,7 +20,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
|
19
20
|
// Not an actual group, but a collection of nodes that can't be nested inside each other
|
|
20
21
|
// TODO: ED-29537 - make it an actual group
|
|
21
22
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22
|
-
export var nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
|
|
23
|
+
export var nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
|
|
23
24
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
24
25
|
table.use('with_nested_table'), blockCard, embedCard, extension.use('with_marks'), unsupportedBlock];
|
|
25
26
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { $onePlus, $or } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { blockCard } from '../nodes/blockCard';
|
|
3
|
+
import { bodiedRule } from '../nodes/bodiedRule';
|
|
3
4
|
import { blockquote } from '../nodes/blockquote';
|
|
4
5
|
import { codeBlock } from '../nodes/codeBlock';
|
|
5
6
|
import { decisionList } from '../nodes/decisionList';
|
|
@@ -17,7 +18,7 @@ import { taskList } from '../nodes/task';
|
|
|
17
18
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
18
19
|
|
|
19
20
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
20
|
-
export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
|
|
21
|
+
export var tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
|
|
21
22
|
|
|
22
23
|
// This is not an actual group, but a collection of nodes
|
|
23
24
|
// @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { $or, $range, adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
|
+
import { breakout } from '../marks/breakout';
|
|
3
|
+
import { unsupportedMark } from '../marks/unsupportedMark';
|
|
4
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
5
|
+
import { heading } from './heading';
|
|
6
|
+
import { paragraph } from './paragraph';
|
|
7
|
+
var bodiedRuleAttributes = {
|
|
8
|
+
localId: {
|
|
9
|
+
type: 'string',
|
|
10
|
+
default: '',
|
|
11
|
+
minLength: 1
|
|
12
|
+
},
|
|
13
|
+
alignment: {
|
|
14
|
+
type: 'enum',
|
|
15
|
+
values: ['start', 'center', 'end'],
|
|
16
|
+
default: null,
|
|
17
|
+
optional: true
|
|
18
|
+
},
|
|
19
|
+
color: {
|
|
20
|
+
type: 'string',
|
|
21
|
+
default: null,
|
|
22
|
+
optional: true,
|
|
23
|
+
pattern: '^#[0-9a-fA-F]{6}$'
|
|
24
|
+
},
|
|
25
|
+
style: {
|
|
26
|
+
type: 'enum',
|
|
27
|
+
values: ['solid', 'dashed', 'dotted', 'sketch', 'fade'],
|
|
28
|
+
default: null,
|
|
29
|
+
optional: true
|
|
30
|
+
},
|
|
31
|
+
weight: {
|
|
32
|
+
type: 'number',
|
|
33
|
+
default: null,
|
|
34
|
+
minimum: 1,
|
|
35
|
+
maximum: 3,
|
|
36
|
+
optional: true
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
export var bodiedRule = adfNode('bodiedRule').define({
|
|
40
|
+
stage0: true,
|
|
41
|
+
attrs: bodiedRuleAttributes,
|
|
42
|
+
content: [$range(1, 1, $or(paragraph.use('with_no_marks'), heading.use('with_no_marks')))],
|
|
43
|
+
marks: [unsupportedMark, unsupportedNodeAttribute]
|
|
44
|
+
})
|
|
45
|
+
// this variant is used to support breakout resizing for bodiedRule nodes at the document root
|
|
46
|
+
.variant('root_only', {
|
|
47
|
+
stage0: true,
|
|
48
|
+
marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
|
|
49
|
+
noExtend: true
|
|
50
|
+
});
|