@atlaskit/adf-schema 57.5.3 → 57.6.0
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 +25 -0
- package/codemods/23.0.0-move-bitbucket-schema-to-own-entry-points.ts +1 -0
- package/codemods/23.0.0-move-confluence-schema-to-own-entry-points.ts +1 -0
- package/codemods/23.0.0-move-default-schema-to-own-entry-points.ts +1 -0
- package/codemods/23.0.0-move-jira-schema-to-own-entry-points.ts +1 -0
- package/dist/cjs/next-schema/full-schema.adf.js +8 -8
- package/dist/cjs/next-schema/generated/nodeTypes.js +66 -17
- package/dist/cjs/next-schema/groups/blockContentGroup.js +1 -1
- package/dist/cjs/next-schema/groups/blockGroup.js +1 -1
- package/dist/cjs/next-schema/groups/inlineContentGroup.js +6 -6
- package/dist/cjs/next-schema/groups/inlineGroup.js +6 -6
- package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js +1 -1
- package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js +2 -2
- package/dist/cjs/next-schema/nodes/blockquote.js +5 -5
- package/dist/cjs/next-schema/nodes/bodiedSyncBlock.js +3 -3
- package/dist/cjs/next-schema/nodes/expand.js +3 -2
- package/dist/cjs/next-schema/nodes/extension.js +8 -0
- package/dist/cjs/next-schema/nodes/list.js +1 -1
- package/dist/cjs/next-schema/nodes/nestedExpand.js +1 -1
- package/dist/cjs/next-schema/nodes/panel.js +5 -5
- package/dist/cjs/next-schema/nodes/tableNodes.js +3 -3
- package/dist/cjs/next-schema/nodes/task.js +1 -1
- package/dist/cjs/next-schema/nodes/text.js +4 -4
- package/dist/cjs/schema/default-schema.js +3 -1
- package/dist/cjs/schema/nodes/decision-item.js +1 -1
- package/dist/cjs/schema/nodes/decision-list.js +1 -1
- package/dist/cjs/schema/nodes/extension.js +15 -1
- package/dist/cjs/schema/nodes/status.js +1 -1
- package/dist/cjs/schema/nodes/task-item.js +1 -1
- package/dist/cjs/steps/analytics.js +1 -1
- package/dist/cjs/steps/batch-attrs-step.js +1 -1
- package/dist/cjs/steps/link-meta-step.js +1 -1
- package/dist/cjs/steps/override-document-step.js +1 -1
- package/dist/cjs/steps/set-attrs.js +2 -2
- package/dist/cjs/steps/type-ahead.js +1 -1
- package/dist/cjs/utils/colors.js +1 -0
- package/dist/cjs/validator-schema/generated/validatorSpec.js +39 -15
- package/dist/es2019/next-schema/full-schema.adf.js +8 -8
- package/dist/es2019/next-schema/generated/nodeTypes.js +65 -16
- package/dist/es2019/next-schema/groups/blockContentGroup.js +1 -1
- package/dist/es2019/next-schema/groups/blockGroup.js +1 -1
- package/dist/es2019/next-schema/groups/inlineContentGroup.js +6 -6
- package/dist/es2019/next-schema/groups/inlineGroup.js +6 -6
- package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js +1 -1
- package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js +2 -2
- package/dist/es2019/next-schema/nodes/blockquote.js +5 -5
- package/dist/es2019/next-schema/nodes/bodiedSyncBlock.js +3 -3
- package/dist/es2019/next-schema/nodes/expand.js +3 -2
- package/dist/es2019/next-schema/nodes/extension.js +8 -0
- package/dist/es2019/next-schema/nodes/list.js +1 -1
- package/dist/es2019/next-schema/nodes/nestedExpand.js +1 -1
- package/dist/es2019/next-schema/nodes/panel.js +5 -5
- package/dist/es2019/next-schema/nodes/tableNodes.js +3 -3
- package/dist/es2019/next-schema/nodes/task.js +1 -1
- package/dist/es2019/next-schema/nodes/text.js +4 -4
- package/dist/es2019/schema/default-schema.js +3 -1
- package/dist/es2019/schema/jira-schema.js +1 -0
- package/dist/es2019/schema/nodes/decision-item.js +1 -1
- package/dist/es2019/schema/nodes/decision-list.js +1 -1
- package/dist/es2019/schema/nodes/extension.js +16 -0
- package/dist/es2019/schema/nodes/status.js +1 -1
- package/dist/es2019/schema/nodes/task-item.js +1 -1
- package/dist/es2019/steps/analytics.js +1 -1
- package/dist/es2019/steps/batch-attrs-step.js +1 -1
- package/dist/es2019/steps/link-meta-step.js +1 -1
- package/dist/es2019/steps/override-document-step.js +1 -1
- package/dist/es2019/steps/set-attrs.js +2 -2
- package/dist/es2019/steps/type-ahead.js +1 -1
- package/dist/es2019/utils/colors.js +1 -0
- package/dist/es2019/validator-schema/generated/validatorSpec.js +37 -13
- package/dist/esm/next-schema/full-schema.adf.js +8 -8
- package/dist/esm/next-schema/generated/nodeTypes.js +65 -16
- package/dist/esm/next-schema/groups/blockContentGroup.js +1 -1
- package/dist/esm/next-schema/groups/blockGroup.js +1 -1
- package/dist/esm/next-schema/groups/inlineContentGroup.js +6 -6
- package/dist/esm/next-schema/groups/inlineGroup.js +6 -6
- package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js +1 -1
- package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js +2 -2
- package/dist/esm/next-schema/nodes/blockquote.js +5 -5
- package/dist/esm/next-schema/nodes/bodiedSyncBlock.js +3 -3
- package/dist/esm/next-schema/nodes/expand.js +3 -2
- package/dist/esm/next-schema/nodes/extension.js +8 -0
- package/dist/esm/next-schema/nodes/list.js +1 -1
- package/dist/esm/next-schema/nodes/nestedExpand.js +1 -1
- package/dist/esm/next-schema/nodes/panel.js +5 -5
- package/dist/esm/next-schema/nodes/tableNodes.js +3 -3
- package/dist/esm/next-schema/nodes/task.js +1 -1
- package/dist/esm/next-schema/nodes/text.js +4 -4
- package/dist/esm/schema/default-schema.js +3 -1
- package/dist/esm/schema/jira-schema.js +1 -0
- package/dist/esm/schema/nodes/decision-item.js +1 -1
- package/dist/esm/schema/nodes/decision-list.js +1 -1
- package/dist/esm/schema/nodes/extension.js +14 -0
- package/dist/esm/schema/nodes/status.js +1 -1
- package/dist/esm/schema/nodes/task-item.js +1 -1
- package/dist/esm/steps/analytics.js +1 -1
- package/dist/esm/steps/batch-attrs-step.js +1 -1
- package/dist/esm/steps/link-meta-step.js +1 -1
- package/dist/esm/steps/override-document-step.js +1 -1
- package/dist/esm/steps/set-attrs.js +2 -2
- package/dist/esm/steps/type-ahead.js +1 -1
- package/dist/esm/utils/colors.js +1 -0
- package/dist/esm/validator-schema/generated/validatorSpec.js +37 -13
- package/dist/json-schema/v1/stage-0.json +106 -0
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
- package/dist/types/next-schema/generated/nodeTypes.d.ts +43 -15
- package/dist/types/next-schema/nodes/extension.d.ts +3 -1
- package/dist/types/schema/nodes/block-card.d.ts +1 -1
- package/dist/types/schema/nodes/blockquote.d.ts +3 -3
- package/dist/types/schema/nodes/bodied-rule.d.ts +1 -1
- package/dist/types/schema/nodes/bodied-sync-block.d.ts +8 -8
- package/dist/types/schema/nodes/caption.d.ts +1 -1
- package/dist/types/schema/nodes/date.d.ts +1 -1
- package/dist/types/schema/nodes/decision-item.d.ts +1 -1
- package/dist/types/schema/nodes/decision-list.d.ts +1 -1
- package/dist/types/schema/nodes/doc.d.ts +8 -8
- package/dist/types/schema/nodes/embed-card.d.ts +1 -1
- package/dist/types/schema/nodes/expand.d.ts +1 -1
- package/dist/types/schema/nodes/extension.d.ts +11 -0
- package/dist/types/schema/nodes/heading.d.ts +2 -2
- package/dist/types/schema/nodes/inline-card.d.ts +2 -2
- package/dist/types/schema/nodes/layout-column.d.ts +1 -1
- package/dist/types/schema/nodes/layout-section.d.ts +2 -2
- package/dist/types/schema/nodes/media-group.d.ts +1 -1
- package/dist/types/schema/nodes/multi-bodied-extension.d.ts +1 -1
- package/dist/types/schema/nodes/nested-expand.d.ts +11 -11
- package/dist/types/schema/nodes/panel.d.ts +1 -1
- package/dist/types/schema/nodes/paragraph.d.ts +2 -2
- package/dist/types/schema/nodes/status.d.ts +1 -1
- package/dist/types/schema/nodes/tableNodes.d.ts +1 -1
- package/dist/types/schema/nodes/task-item.d.ts +3 -3
- package/dist/types/schema/nodes/types/block-content.d.ts +12 -12
- package/dist/types/schema/nodes/types/inline-content.d.ts +1 -1
- package/dist/types/schema/nodes/types/list.d.ts +2 -2
- package/dist/types/schema/nodes/types/non-nestable-block-content.d.ts +10 -10
- package/dist/types/steps/analytics.d.ts +1 -1
- package/dist/types/steps/batch-attrs-step.d.ts +1 -1
- package/dist/types/steps/link-meta-step.d.ts +1 -1
- package/dist/types/steps/override-document-step.d.ts +2 -2
- package/dist/types/steps/set-attrs.d.ts +2 -2
- package/dist/types/steps/type-ahead.d.ts +1 -1
- package/dist/types/validator-schema/generated/validatorSpec.d.ts +24 -0
- package/json-schema/v1/stage-0.json +106 -0
- package/package.json +6 -2
- package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts +2 -0
- package/schema-generators/__tests__/unit/json-full-schema-backwards-compat.unit.ts +2 -0
- package/schema-generators/helpers/writeToFile.ts +1 -0
- package/schema-generators/json-full-schema.ts +2 -0
- package/schema-generators/pm-full-schema.ts +2 -0
- package/schema-generators/validator-full-schema.ts +2 -0
|
@@ -32,7 +32,7 @@ export const blockCard = createPMNodeSpecFactory({
|
|
|
32
32
|
});
|
|
33
33
|
export const blockquote = createPMNodeSpecFactory({
|
|
34
34
|
content: '(paragraph | orderedList | bulletList | unsupportedBlock | codeBlock | mediaSingle | mediaGroup | extension)+',
|
|
35
|
-
marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
35
|
+
marks: 'unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
36
36
|
group: 'block',
|
|
37
37
|
attrs: {
|
|
38
38
|
localId: {
|
|
@@ -56,7 +56,7 @@ export const blockquoteLegacy = createPMNodeSpecFactory({
|
|
|
56
56
|
});
|
|
57
57
|
export const blockTaskItem = createPMNodeSpecFactory({
|
|
58
58
|
content: '(paragraph | extension) (paragraph | extension)*',
|
|
59
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
59
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
60
60
|
attrs: {
|
|
61
61
|
localId: {
|
|
62
62
|
default: ''
|
|
@@ -367,7 +367,7 @@ export const decisionList = createPMNodeSpecFactory({
|
|
|
367
367
|
});
|
|
368
368
|
export const doc = createPMNodeSpecFactory({
|
|
369
369
|
content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | bodiedRule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
|
|
370
|
-
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
|
|
370
|
+
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment annotation breakout'
|
|
371
371
|
});
|
|
372
372
|
export const embedCard = createPMNodeSpecFactory({
|
|
373
373
|
group: 'block',
|
|
@@ -433,7 +433,7 @@ export const emojiStage0 = createPMNodeSpecFactory({
|
|
|
433
433
|
});
|
|
434
434
|
export const expand = createPMNodeSpecFactory({
|
|
435
435
|
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
436
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
|
436
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer annotation',
|
|
437
437
|
group: 'block',
|
|
438
438
|
attrs: {
|
|
439
439
|
title: {
|
|
@@ -451,7 +451,7 @@ export const expand = createPMNodeSpecFactory({
|
|
|
451
451
|
});
|
|
452
452
|
export const expandRootOnly = createPMNodeSpecFactory({
|
|
453
453
|
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
454
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
|
454
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer annotation',
|
|
455
455
|
attrs: {
|
|
456
456
|
title: {
|
|
457
457
|
default: ''
|
|
@@ -515,6 +515,55 @@ export const extensionRootOnlyStage0 = createPMNodeSpecFactory({
|
|
|
515
515
|
},
|
|
516
516
|
selectable: true
|
|
517
517
|
});
|
|
518
|
+
export const extensionRootOnlyWithAnnotationStage0 = createPMNodeSpecFactory({
|
|
519
|
+
atom: true,
|
|
520
|
+
attrs: {
|
|
521
|
+
extensionKey: {
|
|
522
|
+
default: ''
|
|
523
|
+
},
|
|
524
|
+
extensionType: {
|
|
525
|
+
default: ''
|
|
526
|
+
},
|
|
527
|
+
parameters: {
|
|
528
|
+
default: null
|
|
529
|
+
},
|
|
530
|
+
text: {
|
|
531
|
+
default: null
|
|
532
|
+
},
|
|
533
|
+
layout: {
|
|
534
|
+
default: 'default'
|
|
535
|
+
},
|
|
536
|
+
localId: {
|
|
537
|
+
default: null
|
|
538
|
+
}
|
|
539
|
+
},
|
|
540
|
+
selectable: true
|
|
541
|
+
});
|
|
542
|
+
export const extensionWithAnnotationStage0 = createPMNodeSpecFactory({
|
|
543
|
+
group: 'block',
|
|
544
|
+
atom: true,
|
|
545
|
+
attrs: {
|
|
546
|
+
extensionKey: {
|
|
547
|
+
default: ''
|
|
548
|
+
},
|
|
549
|
+
extensionType: {
|
|
550
|
+
default: ''
|
|
551
|
+
},
|
|
552
|
+
parameters: {
|
|
553
|
+
default: null
|
|
554
|
+
},
|
|
555
|
+
text: {
|
|
556
|
+
default: null
|
|
557
|
+
},
|
|
558
|
+
layout: {
|
|
559
|
+
default: 'default'
|
|
560
|
+
},
|
|
561
|
+
localId: {
|
|
562
|
+
default: null
|
|
563
|
+
}
|
|
564
|
+
},
|
|
565
|
+
selectable: true
|
|
566
|
+
});
|
|
518
567
|
export const extensionWithMarks = createPMNodeSpecFactory({
|
|
519
568
|
group: 'block',
|
|
520
569
|
atom: true,
|
|
@@ -713,7 +762,7 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
|
|
|
713
762
|
});
|
|
714
763
|
export const layoutColumn = createPMNodeSpecFactory({
|
|
715
764
|
content: '(block | panel_c1 | unsupportedBlock)+',
|
|
716
|
-
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
|
|
765
|
+
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment annotation',
|
|
717
766
|
attrs: {
|
|
718
767
|
width: {
|
|
719
768
|
default: undefined
|
|
@@ -763,7 +812,7 @@ export const layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
|
|
|
763
812
|
});
|
|
764
813
|
export const listItem = createPMNodeSpecFactory({
|
|
765
814
|
content: '(paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | extension)+',
|
|
766
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
815
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
767
816
|
attrs: {
|
|
768
817
|
localId: {
|
|
769
818
|
default: null
|
|
@@ -1058,7 +1107,7 @@ export const multiBodiedExtensionStage0 = createPMNodeSpecFactory({
|
|
|
1058
1107
|
});
|
|
1059
1108
|
export const nestedExpand = createPMNodeSpecFactory({
|
|
1060
1109
|
content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | bodiedRule | panel | blockquote | unsupportedBlock | extension)+',
|
|
1061
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1110
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1062
1111
|
attrs: {
|
|
1063
1112
|
title: {
|
|
1064
1113
|
default: ''
|
|
@@ -1104,7 +1153,7 @@ export const orderedList = createPMNodeSpecFactory({
|
|
|
1104
1153
|
});
|
|
1105
1154
|
export const panel = createPMNodeSpecFactory({
|
|
1106
1155
|
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
|
|
1107
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1156
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1108
1157
|
group: 'block',
|
|
1109
1158
|
attrs: {
|
|
1110
1159
|
panelType: {
|
|
@@ -1130,7 +1179,7 @@ export const panel = createPMNodeSpecFactory({
|
|
|
1130
1179
|
});
|
|
1131
1180
|
export const panelC1RootOnlyStage0 = createPMNodeSpecFactory({
|
|
1132
1181
|
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
|
|
1133
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1182
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1134
1183
|
attrs: {
|
|
1135
1184
|
panelType: {
|
|
1136
1185
|
default: 'info'
|
|
@@ -1155,7 +1204,7 @@ export const panelC1RootOnlyStage0 = createPMNodeSpecFactory({
|
|
|
1155
1204
|
});
|
|
1156
1205
|
export const panelC1Stage0 = createPMNodeSpecFactory({
|
|
1157
1206
|
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
|
|
1158
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1207
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1159
1208
|
group: 'block',
|
|
1160
1209
|
attrs: {
|
|
1161
1210
|
panelType: {
|
|
@@ -1181,7 +1230,7 @@ export const panelC1Stage0 = createPMNodeSpecFactory({
|
|
|
1181
1230
|
});
|
|
1182
1231
|
export const panelRootOnlyStage0 = createPMNodeSpecFactory({
|
|
1183
1232
|
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
|
|
1184
|
-
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1233
|
+
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1185
1234
|
attrs: {
|
|
1186
1235
|
panelType: {
|
|
1187
1236
|
default: 'info'
|
|
@@ -1419,7 +1468,7 @@ export const tableWithNestedTable = createPMNodeSpecFactory({
|
|
|
1419
1468
|
});
|
|
1420
1469
|
export const tableCell = createPMNodeSpecFactory({
|
|
1421
1470
|
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
|
|
1422
|
-
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1471
|
+
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1423
1472
|
attrs: {
|
|
1424
1473
|
colspan: {
|
|
1425
1474
|
default: 1
|
|
@@ -1446,7 +1495,7 @@ export const tableCell = createPMNodeSpecFactory({
|
|
|
1446
1495
|
});
|
|
1447
1496
|
export const tableCellWithNestedTable = createPMNodeSpecFactory({
|
|
1448
1497
|
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
|
|
1449
|
-
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1498
|
+
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1450
1499
|
attrs: {
|
|
1451
1500
|
colspan: {
|
|
1452
1501
|
default: 1
|
|
@@ -1473,7 +1522,7 @@ export const tableCellWithNestedTable = createPMNodeSpecFactory({
|
|
|
1473
1522
|
});
|
|
1474
1523
|
export const tableHeader = createPMNodeSpecFactory({
|
|
1475
1524
|
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
|
|
1476
|
-
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1525
|
+
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1477
1526
|
attrs: {
|
|
1478
1527
|
colspan: {
|
|
1479
1528
|
default: 1
|
|
@@ -1500,7 +1549,7 @@ export const tableHeader = createPMNodeSpecFactory({
|
|
|
1500
1549
|
});
|
|
1501
1550
|
export const tableHeaderWithNestedTable = createPMNodeSpecFactory({
|
|
1502
1551
|
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
|
|
1503
|
-
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1552
|
+
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment annotation',
|
|
1504
1553
|
attrs: {
|
|
1505
1554
|
colspan: {
|
|
1506
1555
|
default: 1
|
|
@@ -32,7 +32,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
|
32
32
|
* - no base mediaSingle
|
|
33
33
|
* - no base heading
|
|
34
34
|
*/
|
|
35
|
-
export const 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
|
+
export const 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'), extension.use('with_annotation'), embedCard, table,
|
|
36
36
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
37
37
|
table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
|
|
38
38
|
ignore: ['pm-spec']
|
|
@@ -19,7 +19,7 @@ import { rule } from '../nodes/rule';
|
|
|
19
19
|
import { table } from '../nodes/tableNodes';
|
|
20
20
|
import { taskList } from '../nodes/task';
|
|
21
21
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
22
|
-
export const 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
|
+
export const 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'), extension.use('with_annotation'), 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,
|
|
23
23
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
24
24
|
table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
|
|
25
25
|
// @DSLCompatibilityException
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
|
|
2
|
+
import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
|
|
3
|
+
import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
|
|
2
4
|
import { date } from '../nodes/date';
|
|
3
5
|
import { emoji } from '../nodes/emoji';
|
|
4
6
|
import { hardBreak } from '../nodes/hardBreak';
|
|
7
|
+
import { image } from '../nodes/image';
|
|
5
8
|
import { inlineCard } from '../nodes/inlineCard';
|
|
9
|
+
import { inlineExtension } from '../nodes/inlineExtension';
|
|
10
|
+
import { mediaInline } from '../nodes/mediaInline';
|
|
6
11
|
import { mention } from '../nodes/mention';
|
|
7
12
|
import { placeholder } from '../nodes/placeholder';
|
|
8
|
-
import { text } from '../nodes/text';
|
|
9
13
|
import { status } from '../nodes/status';
|
|
10
|
-
import {
|
|
11
|
-
import { mediaInline } from '../nodes/mediaInline';
|
|
14
|
+
import { text } from '../nodes/text';
|
|
12
15
|
import { unsupportedInline } from '../nodes/unsupportedInline';
|
|
13
|
-
import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
|
|
14
|
-
import { image } from '../nodes/image';
|
|
15
|
-
import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
// eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
|
|
2
|
+
import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
|
|
3
|
+
import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
|
|
2
4
|
import { date } from '../nodes/date';
|
|
3
5
|
import { emoji } from '../nodes/emoji';
|
|
4
6
|
import { hardBreak } from '../nodes/hardBreak';
|
|
7
|
+
import { image } from '../nodes/image';
|
|
5
8
|
import { inlineCard } from '../nodes/inlineCard';
|
|
9
|
+
import { inlineExtension } from '../nodes/inlineExtension';
|
|
10
|
+
import { mediaInline } from '../nodes/mediaInline';
|
|
6
11
|
import { mention } from '../nodes/mention';
|
|
7
12
|
import { placeholder } from '../nodes/placeholder';
|
|
8
|
-
import { text } from '../nodes/text';
|
|
9
13
|
import { status } from '../nodes/status';
|
|
10
|
-
import {
|
|
11
|
-
import { mediaInline } from '../nodes/mediaInline';
|
|
14
|
+
import { text } from '../nodes/text';
|
|
12
15
|
import { unsupportedInline } from '../nodes/unsupportedInline';
|
|
13
|
-
import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
|
|
14
|
-
import { image } from '../nodes/image';
|
|
15
|
-
import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
|
|
16
16
|
export const inlineGroup = adfNodeGroup('inline', [text, text.use('link_inline'), text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline], {
|
|
17
17
|
// @DSLCompatibilityException
|
|
18
18
|
// Inline group in PM doesn't match ADF
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { blockCard } from '../nodes/blockCard';
|
|
3
|
-
import { bodiedRule } from '../nodes/bodiedRule';
|
|
4
3
|
import { blockquote } from '../nodes/blockquote';
|
|
4
|
+
import { bodiedRule } from '../nodes/bodiedRule';
|
|
5
5
|
import { codeBlock } from '../nodes/codeBlock';
|
|
6
6
|
import { decisionList } from '../nodes/decisionList';
|
|
7
7
|
import { embedCard } from '../nodes/embedCard';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { $onePlus, $or } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { blockCard } from '../nodes/blockCard';
|
|
3
|
-
import { bodiedRule } from '../nodes/bodiedRule';
|
|
4
3
|
import { blockquote } from '../nodes/blockquote';
|
|
4
|
+
import { bodiedRule } from '../nodes/bodiedRule';
|
|
5
5
|
import { codeBlock } from '../nodes/codeBlock';
|
|
6
6
|
import { decisionList } from '../nodes/decisionList';
|
|
7
7
|
import { embedCard } from '../nodes/embedCard';
|
|
@@ -18,7 +18,7 @@ import { taskList } from '../nodes/task';
|
|
|
18
18
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
19
19
|
|
|
20
20
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
21
|
-
export const 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
|
+
export const 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'), extension.use('with_annotation'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
|
|
22
22
|
|
|
23
23
|
// This is not an actual group, but a collection of nodes
|
|
24
24
|
// @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { unsupportedMark } from '../marks/unsupportedMark';
|
|
3
3
|
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
4
|
-
import { bulletList, orderedList } from './list';
|
|
5
|
-
import { paragraph } from './paragraph';
|
|
6
|
-
import { unsupportedBlock } from './unsupportedBlock';
|
|
7
4
|
import { codeBlock } from './codeBlock';
|
|
5
|
+
import { extension } from './extension';
|
|
6
|
+
import { bulletList, orderedList } from './list';
|
|
8
7
|
import { mediaGroup } from './mediaGroup';
|
|
9
8
|
import { mediaSingle } from './mediaSingle';
|
|
10
|
-
import {
|
|
11
|
-
|
|
9
|
+
import { paragraph } from './paragraph';
|
|
10
|
+
import { unsupportedBlock } from './unsupportedBlock';
|
|
11
|
+
const blockQuoteContent = [paragraph.use('with_no_marks'), orderedList, bulletList, unsupportedBlock, codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, extension.use('with_marks'), extension.use('with_annotation')];
|
|
12
12
|
export const blockquote = adfNode('blockquote').define({
|
|
13
13
|
defining: true,
|
|
14
14
|
selectable: true,
|
|
@@ -4,23 +4,23 @@ import { unsupportedMark } from '../marks/unsupportedMark';
|
|
|
4
4
|
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
5
5
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
6
6
|
import { blockCard } from './blockCard';
|
|
7
|
-
import { bodiedRule } from './bodiedRule';
|
|
8
7
|
import { blockquote } from './blockquote';
|
|
8
|
+
import { bodiedRule } from './bodiedRule';
|
|
9
9
|
import { codeBlock } from './codeBlock';
|
|
10
10
|
import { confluenceUnsupportedBlock } from './confluenceUnsupportedBlock';
|
|
11
11
|
import { decisionList } from './decisionList';
|
|
12
12
|
import { embedCard } from './embedCard';
|
|
13
13
|
import { expand } from './expand';
|
|
14
|
+
import { heading } from './heading';
|
|
15
|
+
import { layoutSection } from './layoutSection';
|
|
14
16
|
import { bulletList, orderedList } from './list';
|
|
15
17
|
import { mediaGroup } from './mediaGroup';
|
|
16
18
|
import { mediaSingle } from './mediaSingle';
|
|
17
19
|
import { panel } from './panel';
|
|
18
20
|
import { paragraph } from './paragraph';
|
|
19
21
|
import { rule } from './rule';
|
|
20
|
-
import { heading } from './heading';
|
|
21
22
|
import { table } from './tableNodes';
|
|
22
23
|
import { taskList } from './task';
|
|
23
|
-
import { layoutSection } from './layoutSection';
|
|
24
24
|
export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
|
|
25
25
|
selectable: true,
|
|
26
26
|
isolating: true,
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
|
+
import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentGroup';
|
|
2
3
|
import { breakout } from '../marks/breakout';
|
|
3
4
|
import { unsupportedMark } from '../marks/unsupportedMark';
|
|
4
5
|
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
6
|
+
import { extension } from './extension';
|
|
5
7
|
import { nestedExpand } from './nestedExpand';
|
|
6
|
-
import { nonNestableBlockContentGroup } from '../groups/nonNestableBlockContentGroup';
|
|
7
8
|
export const expand = adfNode('expand').define({
|
|
8
9
|
isolating: true,
|
|
9
10
|
selectable: true,
|
|
@@ -25,7 +26,7 @@ export const expand = adfNode('expand').define({
|
|
|
25
26
|
optional: true
|
|
26
27
|
}
|
|
27
28
|
},
|
|
28
|
-
content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks')))]
|
|
29
|
+
content: [$onePlus($or(nonNestableBlockContentGroup, extension.use('with_annotation'), nestedExpand.use('with_no_marks')))]
|
|
29
30
|
}).variant('root_only', {
|
|
30
31
|
marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
|
|
31
32
|
noMarks: false,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
|
+
import { annotation } from '../marks/annotation';
|
|
2
3
|
import { breakout } from '../marks/breakout';
|
|
3
4
|
import { dataConsumer } from '../marks/dataConsumer';
|
|
4
5
|
import { fragment } from '../marks/fragment';
|
|
@@ -46,9 +47,16 @@ export const extension = adfNode('extension').define({
|
|
|
46
47
|
}).variant('with_marks', {
|
|
47
48
|
marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
|
|
48
49
|
ignore: []
|
|
50
|
+
}).variant('with_annotation', {
|
|
51
|
+
stage0: true,
|
|
52
|
+
marks: [annotation, dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
|
|
53
|
+
ignore: []
|
|
49
54
|
})
|
|
50
55
|
// this variant is used to support breakout resizing for extension nodes at the document root
|
|
51
56
|
.variant('root_only', {
|
|
52
57
|
stage0: true,
|
|
53
58
|
marks: [breakout, dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute]
|
|
59
|
+
}).variant('root_only_with_annotation', {
|
|
60
|
+
stage0: true,
|
|
61
|
+
marks: [annotation, breakout, dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute]
|
|
54
62
|
});
|
|
@@ -21,7 +21,7 @@ const listItem = adfNode('listItem').define({
|
|
|
21
21
|
},
|
|
22
22
|
marks: [unsupportedMark, unsupportedNodeAttribute],
|
|
23
23
|
contentMinItems: 1,
|
|
24
|
-
content: [$onePlus($or(paragraph.use('with_font_size'), paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, extension.use('with_marks')))]
|
|
24
|
+
content: [$onePlus($or(paragraph.use('with_font_size'), paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, unsupportedBlock, extension.use('with_marks'), extension.use('with_annotation')))]
|
|
25
25
|
});
|
|
26
26
|
orderedList.define({
|
|
27
27
|
selectable: false,
|
|
@@ -37,7 +37,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
|
|
|
37
37
|
optional: true
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
|
-
content: [$onePlus($or(...nestedExpandContent, extension.use('with_marks')))],
|
|
40
|
+
content: [$onePlus($or(...nestedExpandContent, extension.use('with_marks'), extension.use('with_annotation')))],
|
|
41
41
|
DANGEROUS_MANUAL_OVERRIDE: {
|
|
42
42
|
'validator-spec': {
|
|
43
43
|
'props.attrs.optional': {
|
|
@@ -6,16 +6,16 @@ import { blockCard } from './blockCard';
|
|
|
6
6
|
import { bodiedRule } from './bodiedRule';
|
|
7
7
|
import { codeBlock } from './codeBlock';
|
|
8
8
|
import { decisionList } from './decisionList';
|
|
9
|
+
import { extension } from './extension';
|
|
9
10
|
import { heading } from './heading';
|
|
10
11
|
import { bulletList, orderedList } from './list';
|
|
11
12
|
import { mediaGroup } from './mediaGroup';
|
|
12
13
|
import { mediaSingle } from './mediaSingle';
|
|
13
14
|
import { paragraph } from './paragraph';
|
|
14
15
|
import { rule } from './rule';
|
|
16
|
+
import { table } from './tableStub';
|
|
15
17
|
import { taskList } from './task';
|
|
16
18
|
import { unsupportedBlock } from './unsupportedBlock';
|
|
17
|
-
import { extension } from './extension';
|
|
18
|
-
import { table } from './tableStub';
|
|
19
19
|
const panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, rule.use('with_attrs'), bodiedRule, decisionList, unsupportedBlock];
|
|
20
20
|
export const panel = adfNode('panel').define({
|
|
21
21
|
selectable: true,
|
|
@@ -52,7 +52,7 @@ export const panel = adfNode('panel').define({
|
|
|
52
52
|
optional: true
|
|
53
53
|
}
|
|
54
54
|
},
|
|
55
|
-
content: [$onePlus($or(...panelContent, extension.use('with_marks')))]
|
|
55
|
+
content: [$onePlus($or(...panelContent, extension.use('with_marks'), extension.use('with_annotation')))]
|
|
56
56
|
}).variant('c1', {
|
|
57
57
|
// panel_c1 allows all standard panel content plus table. `stage0: true` includes it in the
|
|
58
58
|
// stage-0 JSON schema (not full) and the validator spec so table-in-panel validates.
|
|
@@ -61,7 +61,7 @@ export const panel = adfNode('panel').define({
|
|
|
61
61
|
// acceptance is gated in adf-utils behind the patch flag.
|
|
62
62
|
stage0: true,
|
|
63
63
|
noExtend: true,
|
|
64
|
-
content: [$onePlus($or(...panelContent, extension.use('with_marks'), table))],
|
|
64
|
+
content: [$onePlus($or(...panelContent, extension.use('with_marks'), extension.use('with_annotation'), table))],
|
|
65
65
|
preserveVariantNameInPm: true
|
|
66
66
|
})
|
|
67
67
|
// this variant is used to support breakout resizing for panel nodes at the document root
|
|
@@ -75,6 +75,6 @@ export const panel = adfNode('panel').define({
|
|
|
75
75
|
noExtend: true,
|
|
76
76
|
marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
|
|
77
77
|
// panel_c1_root_only allows all standard panel content plus table (see c1 above).
|
|
78
|
-
content: [$onePlus($or(...panelContent, extension.use('with_marks'), table))],
|
|
78
|
+
content: [$onePlus($or(...panelContent, extension.use('with_marks'), extension.use('with_annotation'), table))],
|
|
79
79
|
preserveVariantNameInPm: true
|
|
80
80
|
});
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
|
+
import { tableCellContentPseudoGroup, tableCellContentNodes, tableHeaderContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
|
|
2
3
|
import { fragment } from '../marks/fragment';
|
|
3
4
|
import { unsupportedMark } from '../marks/unsupportedMark';
|
|
4
5
|
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
5
|
-
import { tableCellContentPseudoGroup, tableCellContentNodes, tableHeaderContentPseudoGroup } from '../groups/tableCellContentPseudoGroup';
|
|
6
|
-
import { tableCellContent } from './tableCellContent';
|
|
7
6
|
import { nestedExpand } from './nestedExpand';
|
|
8
|
-
import {
|
|
7
|
+
import { tableCellContent } from './tableCellContent';
|
|
9
8
|
import { table } from './tableStub';
|
|
9
|
+
import { unsupportedBlock } from './unsupportedBlock';
|
|
10
10
|
const valign = {
|
|
11
11
|
type: 'enum',
|
|
12
12
|
values: ['top', 'middle', 'bottom'],
|
|
@@ -36,7 +36,7 @@ blockTaskItem.define({
|
|
|
36
36
|
allowAnyChildMark: false,
|
|
37
37
|
// Override the commonTaskItemProps setting
|
|
38
38
|
contentMinItems: 1,
|
|
39
|
-
content: [$or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks')), $zeroPlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks')))]
|
|
39
|
+
content: [$or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks'), extension.use('with_annotation')), $zeroPlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), extension.use('with_marks'), extension.use('with_annotation')))]
|
|
40
40
|
});
|
|
41
41
|
taskList.define({
|
|
42
42
|
defining: true,
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { annotation } from '../marks/annotation';
|
|
3
3
|
import { code } from '../marks/code';
|
|
4
|
+
import { backgroundColor, textColor } from '../marks/color';
|
|
5
|
+
import { confluenceInlineComment } from '../marks/confluenceInlineComment';
|
|
4
6
|
import { em } from '../marks/em';
|
|
5
7
|
import { link } from '../marks/link';
|
|
6
8
|
import { strike } from '../marks/strike';
|
|
7
9
|
import { strong } from '../marks/strong';
|
|
8
10
|
import { subsup } from '../marks/subsup';
|
|
11
|
+
import { typeAheadQuery } from '../marks/typeAheadQuery';
|
|
9
12
|
import { underline } from '../marks/underline';
|
|
10
|
-
import { backgroundColor, textColor } from '../marks/color';
|
|
11
|
-
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
12
13
|
import { unsupportedMark } from '../marks/unsupportedMark';
|
|
13
|
-
import {
|
|
14
|
-
import { confluenceInlineComment } from '../marks/confluenceInlineComment';
|
|
14
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
|
15
15
|
export const text = adfNode('text').define({
|
|
16
16
|
marks: [],
|
|
17
17
|
hasEmptyMarks: true
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import memoizeOne from 'memoize-one';
|
|
2
|
+
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
2
3
|
import { createSchema } from './create-schema';
|
|
3
4
|
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtensionRootOnlyStage0, bodiedExtensionRootOnlyStage0, extensionRootOnlyStage0, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0 } from './nodes';
|
|
4
5
|
import { bodiedRuleRootOnlyStage0 } from './nodes/bodied-rule';
|
|
5
6
|
import { extendedPanelC1RootOnlyStage0 } from './nodes/extended-panel-c1-root-only-stage0';
|
|
6
7
|
import { extendedPanelRootOnlyStage0 } from './nodes/extended-panel-root-only-stage0';
|
|
8
|
+
import { extensionRootOnlyWithAnnotationStage0 } from './nodes/extension';
|
|
7
9
|
import { ruleWithAttrsRootOnlyStage0 } from './nodes/rule';
|
|
8
10
|
const getDefaultSchemaConfig = () => {
|
|
9
11
|
const defaultSchemaConfig = {
|
|
@@ -24,7 +26,7 @@ export const getSchemaBasedOnStage = memoizeOne(
|
|
|
24
26
|
if (stage === 'stage0') {
|
|
25
27
|
defaultSchemaConfig.customNodeSpecs = {
|
|
26
28
|
layoutSection: layoutSectionWithSingleColumn,
|
|
27
|
-
extension: extensionRootOnlyStage0,
|
|
29
|
+
extension: fg('cc_maui_annotations_on_extensions') ? extensionRootOnlyWithAnnotationStage0 : extensionRootOnlyStage0,
|
|
28
30
|
bodiedExtension: bodiedExtensionRootOnlyStage0,
|
|
29
31
|
multiBodiedExtension: multiBodiedExtensionRootOnlyStage0,
|
|
30
32
|
extensionFrame: extensionFrame,
|
|
@@ -13,6 +13,14 @@ import { getExtensionAttrs } from '../../utils/get-extension-attrs';
|
|
|
13
13
|
* @name extension_root_only_node
|
|
14
14
|
*/
|
|
15
15
|
|
|
16
|
+
/**
|
|
17
|
+
* @name extension_with_annotation_node
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* @name extension_root_only_with_annotation_node
|
|
22
|
+
*/
|
|
23
|
+
|
|
16
24
|
export const extension = extensionFactory({
|
|
17
25
|
parseDOM: [{
|
|
18
26
|
tag: '[data-node-type="extension"]',
|
|
@@ -35,4 +43,12 @@ export const extension = extensionFactory({
|
|
|
35
43
|
export const extensionRootOnlyStage0 = {
|
|
36
44
|
...extension,
|
|
37
45
|
marks: 'breakout dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
|
|
46
|
+
};
|
|
47
|
+
export const extensionWithAnnotationStage0 = {
|
|
48
|
+
...extension,
|
|
49
|
+
marks: 'annotation dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
|
|
50
|
+
};
|
|
51
|
+
export const extensionRootOnlyWithAnnotationStage0 = {
|
|
52
|
+
...extension,
|
|
53
|
+
marks: 'annotation breakout dataConsumer fragment unsupportedMark unsupportedNodeAttribute'
|
|
38
54
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import { Slice } from '@atlaskit/editor-prosemirror/model';
|
|
3
|
-
import { Step } from '@atlaskit/editor-prosemirror/transform-override';
|
|
4
3
|
import { StepResult, StepMap, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
|
|
4
|
+
import { Step } from '@atlaskit/editor-prosemirror/transform-override';
|
|
5
5
|
export const analyticsStepType = 'atlaskit-analytics';
|
|
6
6
|
export const analyticsInvertStepType = 'atlaskit-analytics-invert';
|
|
7
7
|
var HISTORY_ACTIONS = /*#__PURE__*/function (HISTORY_ACTIONS) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// oxlint-disable-next-line import/no-duplicates
|
|
2
2
|
import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
|
|
3
|
-
import { Step } from '@atlaskit/editor-prosemirror/transform-override';
|
|
4
3
|
import { StepResult } from '@atlaskit/editor-prosemirror/transform';
|
|
4
|
+
import { Step } from '@atlaskit/editor-prosemirror/transform-override';
|
|
5
5
|
const stepType = 'batchAttrs';
|
|
6
6
|
const isValidData = data => {
|
|
7
7
|
if (data !== null && !Array.isArray(data)) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Slice } from '@atlaskit/editor-prosemirror/model';
|
|
2
|
-
import { Step } from '@atlaskit/editor-prosemirror/transform-override';
|
|
3
2
|
import { ReplaceStep, StepMap, StepResult } from '@atlaskit/editor-prosemirror/transform';
|
|
3
|
+
import { Step } from '@atlaskit/editor-prosemirror/transform-override';
|
|
4
4
|
export const stepType = 'editor-linking-meta';
|
|
5
5
|
export const invertStepType = 'editor-linking-meta-invert';
|
|
6
6
|
/**
|