@atlaskit/adf-schema 36.12.3 → 36.14.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 +12 -0
- package/dist/cjs/next-schema/full-schema.adf.js +2 -1
- package/dist/cjs/next-schema/generated/markTypes.js +18 -1
- package/dist/cjs/next-schema/generated/nodeTypes.js +128 -77
- package/dist/cjs/next-schema/groups/blockGroup.js +3 -1
- package/dist/cjs/next-schema/groups/inlineGroup.js +3 -1
- package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/cjs/next-schema/marks/unsupportedMark.js +16 -0
- package/dist/cjs/next-schema/marks/unsupportedNodeAttribute.js +20 -0
- package/dist/cjs/next-schema/nodes/blockCard.js +3 -0
- package/dist/cjs/next-schema/nodes/blockquote.js +6 -2
- package/dist/cjs/next-schema/nodes/bodiedExtension.js +4 -1
- package/dist/cjs/next-schema/nodes/caption.js +5 -2
- package/dist/cjs/next-schema/nodes/codeBlock.js +6 -2
- package/dist/cjs/next-schema/nodes/confluenceUnsupportedBlock.js +16 -0
- package/dist/cjs/next-schema/nodes/confluenceUnsupportedInline.js +18 -0
- package/dist/cjs/next-schema/nodes/date.js +3 -0
- package/dist/cjs/next-schema/nodes/decisionItem.js +5 -1
- package/dist/cjs/next-schema/nodes/decisionList.js +5 -1
- package/dist/cjs/next-schema/nodes/embedCard.js +3 -0
- package/dist/cjs/next-schema/nodes/emoji.js +3 -0
- package/dist/cjs/next-schema/nodes/expand.js +4 -1
- package/dist/cjs/next-schema/nodes/extension.js +4 -1
- package/dist/cjs/next-schema/nodes/extensionFrame.js +3 -1
- package/dist/cjs/next-schema/nodes/hardBreak.js +3 -0
- package/dist/cjs/next-schema/nodes/heading.js +9 -6
- package/dist/cjs/next-schema/nodes/inlineCard.js +4 -1
- package/dist/cjs/next-schema/nodes/inlineExtension.js +3 -0
- package/dist/cjs/next-schema/nodes/layoutColumn.js +3 -0
- package/dist/cjs/next-schema/nodes/layoutSection.js +5 -2
- package/dist/cjs/next-schema/nodes/list.js +7 -1
- package/dist/cjs/next-schema/nodes/media.js +3 -1
- package/dist/cjs/next-schema/nodes/mediaGroup.js +5 -1
- package/dist/cjs/next-schema/nodes/mediaInline.js +3 -1
- package/dist/cjs/next-schema/nodes/mediaSingle.js +5 -2
- package/dist/cjs/next-schema/nodes/mention.js +3 -0
- package/dist/cjs/next-schema/nodes/multiBodiedExtension.js +3 -0
- package/dist/cjs/next-schema/nodes/nestedExpand.js +5 -1
- package/dist/cjs/next-schema/nodes/panel.js +5 -1
- package/dist/cjs/next-schema/nodes/paragraph.js +8 -4
- package/dist/cjs/next-schema/nodes/placeholder.js +3 -0
- package/dist/cjs/next-schema/nodes/status.js +3 -0
- package/dist/cjs/next-schema/nodes/table.js +3 -1
- package/dist/cjs/next-schema/nodes/tableCell.js +5 -1
- package/dist/cjs/next-schema/nodes/tableHeader.js +3 -0
- package/dist/cjs/next-schema/nodes/tableRow.js +3 -0
- package/dist/cjs/next-schema/nodes/task.js +8 -2
- package/dist/cjs/next-schema/nodes/text.js +4 -2
- package/dist/cjs/next-schema/nodes/unsupportedBlock.js +18 -0
- package/dist/cjs/next-schema/nodes/unsupportedInline.js +18 -0
- package/dist/es2019/next-schema/full-schema.adf.js +2 -1
- package/dist/es2019/next-schema/generated/markTypes.js +17 -0
- package/dist/es2019/next-schema/generated/nodeTypes.js +127 -76
- package/dist/es2019/next-schema/groups/blockGroup.js +3 -1
- package/dist/es2019/next-schema/groups/inlineGroup.js +3 -1
- package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/es2019/next-schema/marks/unsupportedMark.js +10 -0
- package/dist/es2019/next-schema/marks/unsupportedNodeAttribute.js +14 -0
- package/dist/es2019/next-schema/nodes/blockCard.js +3 -0
- package/dist/es2019/next-schema/nodes/blockquote.js +6 -2
- package/dist/es2019/next-schema/nodes/bodiedExtension.js +4 -1
- package/dist/es2019/next-schema/nodes/caption.js +5 -3
- package/dist/es2019/next-schema/nodes/codeBlock.js +6 -2
- package/dist/es2019/next-schema/nodes/confluenceUnsupportedBlock.js +10 -0
- package/dist/es2019/next-schema/nodes/confluenceUnsupportedInline.js +12 -0
- package/dist/es2019/next-schema/nodes/date.js +3 -0
- package/dist/es2019/next-schema/nodes/decisionItem.js +5 -1
- package/dist/es2019/next-schema/nodes/decisionList.js +5 -1
- package/dist/es2019/next-schema/nodes/embedCard.js +3 -0
- package/dist/es2019/next-schema/nodes/emoji.js +3 -0
- package/dist/es2019/next-schema/nodes/expand.js +4 -1
- package/dist/es2019/next-schema/nodes/extension.js +4 -1
- package/dist/es2019/next-schema/nodes/extensionFrame.js +3 -1
- package/dist/es2019/next-schema/nodes/hardBreak.js +3 -0
- package/dist/es2019/next-schema/nodes/heading.js +8 -5
- package/dist/es2019/next-schema/nodes/inlineCard.js +4 -1
- package/dist/es2019/next-schema/nodes/inlineExtension.js +3 -0
- package/dist/es2019/next-schema/nodes/layoutColumn.js +3 -0
- package/dist/es2019/next-schema/nodes/layoutSection.js +5 -2
- package/dist/es2019/next-schema/nodes/list.js +7 -1
- package/dist/es2019/next-schema/nodes/media.js +3 -1
- package/dist/es2019/next-schema/nodes/mediaGroup.js +5 -1
- package/dist/es2019/next-schema/nodes/mediaInline.js +3 -1
- package/dist/es2019/next-schema/nodes/mediaSingle.js +5 -2
- package/dist/es2019/next-schema/nodes/mention.js +3 -0
- package/dist/es2019/next-schema/nodes/multiBodiedExtension.js +3 -0
- package/dist/es2019/next-schema/nodes/nestedExpand.js +5 -1
- package/dist/es2019/next-schema/nodes/panel.js +5 -1
- package/dist/es2019/next-schema/nodes/paragraph.js +8 -4
- package/dist/es2019/next-schema/nodes/placeholder.js +3 -0
- package/dist/es2019/next-schema/nodes/status.js +3 -0
- package/dist/es2019/next-schema/nodes/table.js +3 -1
- package/dist/es2019/next-schema/nodes/tableCell.js +5 -1
- package/dist/es2019/next-schema/nodes/tableHeader.js +3 -0
- package/dist/es2019/next-schema/nodes/tableRow.js +4 -1
- package/dist/es2019/next-schema/nodes/task.js +8 -2
- package/dist/es2019/next-schema/nodes/text.js +4 -2
- package/dist/es2019/next-schema/nodes/unsupportedBlock.js +12 -0
- package/dist/es2019/next-schema/nodes/unsupportedInline.js +12 -0
- package/dist/esm/next-schema/full-schema.adf.js +2 -1
- package/dist/esm/next-schema/generated/markTypes.js +17 -0
- package/dist/esm/next-schema/generated/nodeTypes.js +127 -76
- package/dist/esm/next-schema/groups/blockGroup.js +3 -1
- package/dist/esm/next-schema/groups/inlineGroup.js +3 -1
- package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/esm/next-schema/marks/unsupportedMark.js +10 -0
- package/dist/esm/next-schema/marks/unsupportedNodeAttribute.js +14 -0
- package/dist/esm/next-schema/nodes/blockCard.js +3 -0
- package/dist/esm/next-schema/nodes/blockquote.js +6 -2
- package/dist/esm/next-schema/nodes/bodiedExtension.js +4 -1
- package/dist/esm/next-schema/nodes/caption.js +5 -3
- package/dist/esm/next-schema/nodes/codeBlock.js +6 -2
- package/dist/esm/next-schema/nodes/confluenceUnsupportedBlock.js +10 -0
- package/dist/esm/next-schema/nodes/confluenceUnsupportedInline.js +12 -0
- package/dist/esm/next-schema/nodes/date.js +3 -0
- package/dist/esm/next-schema/nodes/decisionItem.js +5 -1
- package/dist/esm/next-schema/nodes/decisionList.js +5 -1
- package/dist/esm/next-schema/nodes/embedCard.js +3 -0
- package/dist/esm/next-schema/nodes/emoji.js +3 -0
- package/dist/esm/next-schema/nodes/expand.js +4 -1
- package/dist/esm/next-schema/nodes/extension.js +4 -1
- package/dist/esm/next-schema/nodes/extensionFrame.js +3 -1
- package/dist/esm/next-schema/nodes/hardBreak.js +3 -0
- package/dist/esm/next-schema/nodes/heading.js +8 -5
- package/dist/esm/next-schema/nodes/inlineCard.js +4 -1
- package/dist/esm/next-schema/nodes/inlineExtension.js +3 -0
- package/dist/esm/next-schema/nodes/layoutColumn.js +3 -0
- package/dist/esm/next-schema/nodes/layoutSection.js +5 -2
- package/dist/esm/next-schema/nodes/list.js +7 -1
- package/dist/esm/next-schema/nodes/media.js +3 -1
- package/dist/esm/next-schema/nodes/mediaGroup.js +5 -1
- package/dist/esm/next-schema/nodes/mediaInline.js +3 -1
- package/dist/esm/next-schema/nodes/mediaSingle.js +5 -2
- package/dist/esm/next-schema/nodes/mention.js +3 -0
- package/dist/esm/next-schema/nodes/multiBodiedExtension.js +3 -0
- package/dist/esm/next-schema/nodes/nestedExpand.js +5 -1
- package/dist/esm/next-schema/nodes/panel.js +5 -1
- package/dist/esm/next-schema/nodes/paragraph.js +8 -4
- package/dist/esm/next-schema/nodes/placeholder.js +3 -0
- package/dist/esm/next-schema/nodes/status.js +3 -0
- package/dist/esm/next-schema/nodes/table.js +3 -1
- package/dist/esm/next-schema/nodes/tableCell.js +5 -1
- package/dist/esm/next-schema/nodes/tableHeader.js +3 -0
- package/dist/esm/next-schema/nodes/tableRow.js +4 -1
- package/dist/esm/next-schema/nodes/task.js +8 -2
- package/dist/esm/next-schema/nodes/text.js +4 -2
- package/dist/esm/next-schema/nodes/unsupportedBlock.js +12 -0
- package/dist/esm/next-schema/nodes/unsupportedInline.js +12 -0
- package/dist/types/next-schema/generated/markTypes.d.ts +23 -0
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +4 -4
- package/dist/types/next-schema/generated/nodeTypes.d.ts +137 -67
- package/dist/types/next-schema/marks/unsupportedMark.d.ts +1 -0
- package/dist/types/next-schema/marks/unsupportedNodeAttribute.d.ts +1 -0
- package/dist/types/next-schema/nodes/confluenceUnsupportedBlock.d.ts +19 -0
- package/dist/types/next-schema/nodes/confluenceUnsupportedInline.d.ts +19 -0
- package/dist/types/next-schema/nodes/heading.d.ts +0 -23
- package/dist/types/next-schema/nodes/unsupportedBlock.d.ts +19 -0
- package/dist/types/next-schema/nodes/unsupportedInline.d.ts +19 -0
- package/package.json +2 -2
@@ -6,14 +6,26 @@ export const blockCard = createPMNodeSpecFactory({
|
|
6
6
|
datasource: {},
|
7
7
|
width: {},
|
8
8
|
layout: {},
|
9
|
-
data: {
|
9
|
+
data: {
|
10
|
+
default: null
|
11
|
+
}
|
10
12
|
},
|
11
13
|
selectable: true,
|
12
14
|
draggable: true
|
13
15
|
});
|
14
16
|
export const text = createPMNodeSpecFactory({});
|
17
|
+
export const unsupportedInline = createPMNodeSpecFactory({
|
18
|
+
group: 'inline',
|
19
|
+
inline: true,
|
20
|
+
attrs: {
|
21
|
+
originalValue: {
|
22
|
+
default: {}
|
23
|
+
}
|
24
|
+
},
|
25
|
+
selectable: true
|
26
|
+
});
|
15
27
|
export const codeBlock = createPMNodeSpecFactory({
|
16
|
-
content: 'text*',
|
28
|
+
content: '(text | unsupportedInline)*',
|
17
29
|
group: 'block',
|
18
30
|
attrs: {
|
19
31
|
language: {
|
@@ -24,7 +36,7 @@ export const codeBlock = createPMNodeSpecFactory({
|
|
24
36
|
defining: true
|
25
37
|
});
|
26
38
|
export const codeBlockWithMarks = createPMNodeSpecFactory({
|
27
|
-
content: 'text*',
|
39
|
+
content: '(text | unsupportedInline)*',
|
28
40
|
group: 'block',
|
29
41
|
attrs: {
|
30
42
|
language: {
|
@@ -35,7 +47,7 @@ export const codeBlockWithMarks = createPMNodeSpecFactory({
|
|
35
47
|
defining: true
|
36
48
|
});
|
37
49
|
export const codeBlockWithNoMarks = createPMNodeSpecFactory({
|
38
|
-
content: 'text*',
|
50
|
+
content: '(text | unsupportedInline)*',
|
39
51
|
group: 'block',
|
40
52
|
attrs: {
|
41
53
|
language: {
|
@@ -66,13 +78,13 @@ export const media = createPMNodeSpecFactory({
|
|
66
78
|
type: {
|
67
79
|
default: 'file'
|
68
80
|
},
|
69
|
-
|
81
|
+
id: {
|
70
82
|
default: ''
|
71
83
|
},
|
72
|
-
|
84
|
+
alt: {
|
73
85
|
default: ''
|
74
86
|
},
|
75
|
-
|
87
|
+
collection: {
|
76
88
|
default: ''
|
77
89
|
},
|
78
90
|
height: {
|
@@ -111,6 +123,16 @@ export const media = createPMNodeSpecFactory({
|
|
111
123
|
},
|
112
124
|
selectable: true
|
113
125
|
});
|
126
|
+
export const unsupportedBlock = createPMNodeSpecFactory({
|
127
|
+
group: 'block',
|
128
|
+
atom: true,
|
129
|
+
attrs: {
|
130
|
+
originalValue: {
|
131
|
+
default: {}
|
132
|
+
}
|
133
|
+
},
|
134
|
+
selectable: true
|
135
|
+
});
|
114
136
|
export const hardBreak = createPMNodeSpecFactory({
|
115
137
|
group: 'inline',
|
116
138
|
inline: true,
|
@@ -215,14 +237,14 @@ export const textCodeInline = createPMNodeSpecFactory({
|
|
215
237
|
group: 'inline'
|
216
238
|
});
|
217
239
|
export const caption = createPMNodeSpecFactory({
|
218
|
-
content: '(hardBreak | mention | emoji | date | placeholder | inlineCard | status | text)*',
|
219
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code',
|
240
|
+
content: '(hardBreak | mention | emoji | date | placeholder | inlineCard | status | text | unsupportedInline)*',
|
241
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link em strong strike subsup underline textColor annotation backgroundColor code',
|
220
242
|
selectable: false,
|
221
243
|
isolating: true
|
222
244
|
});
|
223
245
|
export const mediaSingleCaption = createPMNodeSpecFactory({
|
224
|
-
content: 'media caption',
|
225
|
-
marks: 'link annotation border',
|
246
|
+
content: 'media | unsupportedBlock caption | unsupportedBlock',
|
247
|
+
marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
|
226
248
|
group: 'block',
|
227
249
|
atom: false,
|
228
250
|
attrs: {
|
@@ -258,10 +280,10 @@ export const inlineExtension = createPMNodeSpecFactory({
|
|
258
280
|
group: 'inline',
|
259
281
|
inline: true,
|
260
282
|
attrs: {
|
261
|
-
|
283
|
+
extensionKey: {
|
262
284
|
default: ''
|
263
285
|
},
|
264
|
-
|
286
|
+
extensionType: {
|
265
287
|
default: ''
|
266
288
|
},
|
267
289
|
parameters: {
|
@@ -280,10 +302,10 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
|
|
280
302
|
group: 'inline',
|
281
303
|
inline: true,
|
282
304
|
attrs: {
|
283
|
-
|
305
|
+
extensionKey: {
|
284
306
|
default: ''
|
285
307
|
},
|
286
|
-
|
308
|
+
extensionType: {
|
287
309
|
default: ''
|
288
310
|
},
|
289
311
|
parameters: {
|
@@ -324,27 +346,37 @@ export const mediaInline = createPMNodeSpecFactory({
|
|
324
346
|
},
|
325
347
|
selectable: true
|
326
348
|
});
|
349
|
+
export const confluenceUnsupportedInline = createPMNodeSpecFactory({
|
350
|
+
group: 'inline',
|
351
|
+
inline: true,
|
352
|
+
atom: true,
|
353
|
+
attrs: {
|
354
|
+
cxhtml: {
|
355
|
+
default: null
|
356
|
+
}
|
357
|
+
}
|
358
|
+
});
|
327
359
|
export const paragraphWithAlignment = createPMNodeSpecFactory({
|
328
|
-
content: 'inline*',
|
329
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
360
|
+
content: '(inline | unsupportedInline)*',
|
361
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
330
362
|
group: 'block',
|
331
363
|
selectable: false
|
332
364
|
});
|
333
365
|
export const paragraphWithIndentation = createPMNodeSpecFactory({
|
334
|
-
content: 'inline*',
|
335
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
366
|
+
content: '(inline | unsupportedInline)*',
|
367
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
336
368
|
group: 'block',
|
337
369
|
selectable: false
|
338
370
|
});
|
339
371
|
export const paragraphWithNoMarks = createPMNodeSpecFactory({
|
340
|
-
content: 'inline*',
|
341
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
372
|
+
content: '(inline | unsupportedInline)*',
|
373
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
342
374
|
group: 'block',
|
343
375
|
selectable: false
|
344
376
|
});
|
345
377
|
export const taskItem = createPMNodeSpecFactory({
|
346
|
-
content: 'inline*',
|
347
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
378
|
+
content: '(inline | unsupportedInline)*',
|
379
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
348
380
|
attrs: {
|
349
381
|
localId: {
|
350
382
|
default: ''
|
@@ -357,7 +389,8 @@ export const taskItem = createPMNodeSpecFactory({
|
|
357
389
|
defining: true
|
358
390
|
});
|
359
391
|
export const taskList = createPMNodeSpecFactory({
|
360
|
-
content: 'taskItem+ (taskItem | taskList)*',
|
392
|
+
content: '(taskItem | unsupportedBlock)+ (taskItem | taskList | unsupportedBlock)*',
|
393
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
361
394
|
group: 'block',
|
362
395
|
attrs: {
|
363
396
|
localId: {
|
@@ -369,17 +402,19 @@ export const taskList = createPMNodeSpecFactory({
|
|
369
402
|
});
|
370
403
|
export const bulletList = createPMNodeSpecFactory({
|
371
404
|
content: 'listItem+',
|
405
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
372
406
|
group: 'block',
|
373
407
|
selectable: false
|
374
408
|
});
|
375
409
|
export const listItem = createPMNodeSpecFactory({
|
376
|
-
content: 'codeBlock | paragraph | mediaSingle | mediaSingle (codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList)*',
|
377
|
-
marks: 'link',
|
410
|
+
content: 'codeBlock | paragraph | mediaSingle | mediaSingle | unsupportedBlock (codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | unsupportedBlock)*',
|
411
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link',
|
378
412
|
selectable: false,
|
379
413
|
defining: true
|
380
414
|
});
|
381
415
|
export const orderedList = createPMNodeSpecFactory({
|
382
416
|
content: 'listItem+',
|
417
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
383
418
|
group: 'block',
|
384
419
|
attrs: {
|
385
420
|
order: {
|
@@ -389,14 +424,15 @@ export const orderedList = createPMNodeSpecFactory({
|
|
389
424
|
selectable: false
|
390
425
|
});
|
391
426
|
export const blockquote = createPMNodeSpecFactory({
|
392
|
-
content: '(paragraph | bulletList | orderedList)+',
|
427
|
+
content: '(paragraph | bulletList | orderedList | unsupportedBlock)+',
|
428
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
393
429
|
group: 'block',
|
394
430
|
selectable: false,
|
395
431
|
defining: true
|
396
432
|
});
|
397
433
|
export const decisionItem = createPMNodeSpecFactory({
|
398
|
-
content: 'inline*',
|
399
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
434
|
+
content: '(inline | unsupportedBlock)*',
|
435
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
400
436
|
attrs: {
|
401
437
|
localId: {
|
402
438
|
default: ''
|
@@ -408,7 +444,8 @@ export const decisionItem = createPMNodeSpecFactory({
|
|
408
444
|
defining: true
|
409
445
|
});
|
410
446
|
export const decisionList = createPMNodeSpecFactory({
|
411
|
-
content: 'decisionItem+',
|
447
|
+
content: '(decisionItem | unsupportedBlock)+',
|
448
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
412
449
|
group: 'block',
|
413
450
|
attrs: {
|
414
451
|
localId: {
|
@@ -443,10 +480,10 @@ export const extension = createPMNodeSpecFactory({
|
|
443
480
|
group: 'block',
|
444
481
|
atom: true,
|
445
482
|
attrs: {
|
446
|
-
|
483
|
+
extensionKey: {
|
447
484
|
default: ''
|
448
485
|
},
|
449
|
-
|
486
|
+
extensionType: {
|
450
487
|
default: ''
|
451
488
|
},
|
452
489
|
parameters: {
|
@@ -468,10 +505,10 @@ export const extensionWithMarks = createPMNodeSpecFactory({
|
|
468
505
|
group: 'block',
|
469
506
|
atom: true,
|
470
507
|
attrs: {
|
471
|
-
|
508
|
+
extensionKey: {
|
472
509
|
default: ''
|
473
510
|
},
|
474
|
-
|
511
|
+
extensionType: {
|
475
512
|
default: ''
|
476
513
|
},
|
477
514
|
parameters: {
|
@@ -490,8 +527,8 @@ export const extensionWithMarks = createPMNodeSpecFactory({
|
|
490
527
|
selectable: true
|
491
528
|
});
|
492
529
|
export const heading = createPMNodeSpecFactory({
|
493
|
-
content: 'inline*',
|
494
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
530
|
+
content: '(inline | unsupportedInline)*',
|
531
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
495
532
|
group: 'block',
|
496
533
|
attrs: {
|
497
534
|
level: {
|
@@ -502,8 +539,8 @@ export const heading = createPMNodeSpecFactory({
|
|
502
539
|
defining: true
|
503
540
|
});
|
504
541
|
export const headingWithNoMarks = createPMNodeSpecFactory({
|
505
|
-
content: 'inline*',
|
506
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
542
|
+
content: '(inline | unsupportedInline)*',
|
543
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
507
544
|
group: 'block',
|
508
545
|
attrs: {
|
509
546
|
level: {
|
@@ -514,8 +551,8 @@ export const headingWithNoMarks = createPMNodeSpecFactory({
|
|
514
551
|
defining: true
|
515
552
|
});
|
516
553
|
export const mediaGroup = createPMNodeSpecFactory({
|
517
|
-
content: 'media+',
|
518
|
-
marks: 'link annotation border',
|
554
|
+
content: '(media | unsupportedBlock)+',
|
555
|
+
marks: 'link annotation border unsupportedNodeAttribute unsupportedMark',
|
519
556
|
group: 'block',
|
520
557
|
selectable: false
|
521
558
|
});
|
@@ -523,8 +560,8 @@ export const rule = createPMNodeSpecFactory({
|
|
523
560
|
group: 'block'
|
524
561
|
});
|
525
562
|
export const panel = createPMNodeSpecFactory({
|
526
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule)+',
|
527
|
-
marks: 'link',
|
563
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | unsupportedBlock)+',
|
564
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link',
|
528
565
|
group: 'block',
|
529
566
|
attrs: {
|
530
567
|
panelType: {
|
@@ -546,8 +583,8 @@ export const panel = createPMNodeSpecFactory({
|
|
546
583
|
selectable: true
|
547
584
|
});
|
548
585
|
export const headingWithAlignment = createPMNodeSpecFactory({
|
549
|
-
content: 'inline*',
|
550
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
586
|
+
content: '(inline | unsupportedInline)*',
|
587
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
551
588
|
attrs: {
|
552
589
|
level: {
|
553
590
|
default: 1
|
@@ -557,8 +594,8 @@ export const headingWithAlignment = createPMNodeSpecFactory({
|
|
557
594
|
defining: true
|
558
595
|
});
|
559
596
|
export const headingWithIndentation = createPMNodeSpecFactory({
|
560
|
-
content: 'inline*',
|
561
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
597
|
+
content: '(inline | unsupportedInline)*',
|
598
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
562
599
|
attrs: {
|
563
600
|
level: {
|
564
601
|
default: 1
|
@@ -568,8 +605,8 @@ export const headingWithIndentation = createPMNodeSpecFactory({
|
|
568
605
|
defining: true
|
569
606
|
});
|
570
607
|
export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
|
571
|
-
content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote)+',
|
572
|
-
marks: 'link',
|
608
|
+
content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | unsupportedBlock)+',
|
609
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link',
|
573
610
|
attrs: {
|
574
611
|
title: {
|
575
612
|
default: ''
|
@@ -582,8 +619,8 @@ export const nestedExpandWithNoMarks = createPMNodeSpecFactory({
|
|
582
619
|
isolating: true
|
583
620
|
});
|
584
621
|
export const tableCell = createPMNodeSpecFactory({
|
585
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
|
586
|
-
marks: 'alignment link indentation dataConsumer fragment',
|
622
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand | unsupportedBlock)+',
|
623
|
+
marks: 'unsupportedNodeAttribute unsupportedMark alignment link indentation dataConsumer fragment',
|
587
624
|
attrs: {
|
588
625
|
colspan: {
|
589
626
|
default: 1
|
@@ -603,7 +640,7 @@ export const tableCell = createPMNodeSpecFactory({
|
|
603
640
|
});
|
604
641
|
export const tableHeader = createPMNodeSpecFactory({
|
605
642
|
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | nestedExpand)+',
|
606
|
-
marks: 'alignment link indentation dataConsumer fragment',
|
643
|
+
marks: 'unsupportedNodeAttribute unsupportedMark alignment link indentation dataConsumer fragment',
|
607
644
|
attrs: {
|
608
645
|
colspan: {
|
609
646
|
default: 1
|
@@ -622,14 +659,18 @@ export const tableHeader = createPMNodeSpecFactory({
|
|
622
659
|
isolating: true
|
623
660
|
});
|
624
661
|
export const tableRow = createPMNodeSpecFactory({
|
625
|
-
content: '(tableCell | tableHeader)
|
662
|
+
content: '(tableCell | tableHeader)+',
|
663
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
626
664
|
selectable: false
|
627
665
|
});
|
628
666
|
export const table = createPMNodeSpecFactory({
|
629
667
|
content: 'tableRow+',
|
668
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
630
669
|
group: 'block',
|
631
670
|
attrs: {
|
632
|
-
displayMode: {
|
671
|
+
displayMode: {
|
672
|
+
default: 'default'
|
673
|
+
},
|
633
674
|
isNumberColumnEnabled: {
|
634
675
|
default: false
|
635
676
|
},
|
@@ -650,14 +691,14 @@ export const table = createPMNodeSpecFactory({
|
|
650
691
|
isolating: true
|
651
692
|
});
|
652
693
|
export const bodiedExtension = createPMNodeSpecFactory({
|
653
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
|
654
|
-
marks: 'link dataConsumer fragment',
|
694
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
|
695
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
|
655
696
|
group: 'block',
|
656
697
|
attrs: {
|
657
|
-
|
698
|
+
extensionKey: {
|
658
699
|
default: ''
|
659
700
|
},
|
660
|
-
|
701
|
+
extensionType: {
|
661
702
|
default: ''
|
662
703
|
},
|
663
704
|
parameters: {
|
@@ -678,14 +719,14 @@ export const bodiedExtension = createPMNodeSpecFactory({
|
|
678
719
|
isolating: true
|
679
720
|
});
|
680
721
|
export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
|
681
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
|
682
|
-
marks: 'link dataConsumer fragment',
|
722
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
|
723
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
|
683
724
|
group: 'block',
|
684
725
|
attrs: {
|
685
|
-
|
726
|
+
extensionKey: {
|
686
727
|
default: ''
|
687
728
|
},
|
688
|
-
|
729
|
+
extensionType: {
|
689
730
|
default: ''
|
690
731
|
},
|
691
732
|
parameters: {
|
@@ -706,8 +747,8 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
|
|
706
747
|
isolating: true
|
707
748
|
});
|
708
749
|
export const expand = createPMNodeSpecFactory({
|
709
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
|
710
|
-
marks: 'link dataConsumer fragment',
|
750
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
|
751
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
|
711
752
|
group: 'block',
|
712
753
|
attrs: {
|
713
754
|
title: {
|
@@ -721,8 +762,8 @@ export const expand = createPMNodeSpecFactory({
|
|
721
762
|
isolating: true
|
722
763
|
});
|
723
764
|
export const expandWithBreakoutMark = createPMNodeSpecFactory({
|
724
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
|
725
|
-
marks: 'link dataConsumer fragment',
|
765
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
|
766
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
|
726
767
|
group: 'block',
|
727
768
|
attrs: {
|
728
769
|
title: {
|
@@ -736,8 +777,8 @@ export const expandWithBreakoutMark = createPMNodeSpecFactory({
|
|
736
777
|
isolating: true
|
737
778
|
});
|
738
779
|
export const expandWithNoMark = createPMNodeSpecFactory({
|
739
|
-
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table)+',
|
740
|
-
marks: 'link dataConsumer fragment',
|
780
|
+
content: '(codeBlock | blockCard | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | extension | embedCard | table | unsupportedBlock)+',
|
781
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link dataConsumer fragment',
|
741
782
|
group: 'block',
|
742
783
|
attrs: {
|
743
784
|
title: {
|
@@ -750,9 +791,17 @@ export const expandWithNoMark = createPMNodeSpecFactory({
|
|
750
791
|
selectable: true,
|
751
792
|
isolating: true
|
752
793
|
});
|
794
|
+
export const confluenceUnsupportedBlock = createPMNodeSpecFactory({
|
795
|
+
group: 'block',
|
796
|
+
attrs: {
|
797
|
+
cxhtml: {
|
798
|
+
default: null
|
799
|
+
}
|
800
|
+
}
|
801
|
+
});
|
753
802
|
export const layoutColumn = createPMNodeSpecFactory({
|
754
803
|
content: 'block+',
|
755
|
-
marks: 'breakout link alignment indentation dataConsumer fragment',
|
804
|
+
marks: 'unsupportedNodeAttribute unsupportedMark breakout link alignment indentation dataConsumer fragment',
|
756
805
|
attrs: {
|
757
806
|
width: {}
|
758
807
|
},
|
@@ -760,16 +809,18 @@ export const layoutColumn = createPMNodeSpecFactory({
|
|
760
809
|
isolating: true
|
761
810
|
});
|
762
811
|
export const layoutSection = createPMNodeSpecFactory({
|
763
|
-
content: 'layoutColumn{1,3}',
|
812
|
+
content: '(layoutColumn | unsupportedBlock){1,3}',
|
813
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
764
814
|
isolating: true
|
765
815
|
});
|
766
816
|
export const layoutSectionFull = createPMNodeSpecFactory({
|
767
|
-
content: 'layoutColumn{1,3}',
|
817
|
+
content: '(layoutColumn | unsupportedBlock){1,3}',
|
818
|
+
marks: 'unsupportedNodeAttribute unsupportedMark',
|
768
819
|
isolating: true
|
769
820
|
});
|
770
821
|
export const nestedExpand = createPMNodeSpecFactory({
|
771
|
-
content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote)+',
|
772
|
-
marks: 'link',
|
822
|
+
content: '(codeBlock | paragraph | mediaSingle | taskList | bulletList | orderedList | heading | mediaGroup | decisionList | rule | panel | blockquote | unsupportedBlock)+',
|
823
|
+
marks: 'unsupportedNodeAttribute unsupportedMark link',
|
773
824
|
attrs: {
|
774
825
|
title: {
|
775
826
|
default: ''
|
@@ -782,11 +833,11 @@ export const nestedExpand = createPMNodeSpecFactory({
|
|
782
833
|
isolating: true
|
783
834
|
});
|
784
835
|
export const paragraph = createPMNodeSpecFactory({
|
785
|
-
content: 'inline*',
|
786
|
-
marks: 'link em strong strike subsup underline textColor annotation backgroundColor code border',
|
836
|
+
content: '(inline | unsupportedInline)*',
|
837
|
+
marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code border',
|
787
838
|
selectable: false
|
788
839
|
});
|
789
840
|
export const doc = createPMNodeSpecFactory({
|
790
|
-
content: '(block | layoutSection | blockRootOnly | nestedExpand | paragraph)
|
791
|
-
marks: 'breakout link alignment indentation dataConsumer fragment'
|
841
|
+
content: '(block | layoutSection | blockRootOnly | nestedExpand | paragraph | unsupportedBlock)+',
|
842
|
+
marks: 'unsupportedNodeAttribute unsupportedMark breakout link alignment indentation dataConsumer fragment'
|
792
843
|
});
|
@@ -3,6 +3,7 @@ import { blockCard } from '../nodes/blockCard';
|
|
3
3
|
import { blockquote } from '../nodes/blockquote';
|
4
4
|
import { bodiedExtension } from '../nodes/bodiedExtension';
|
5
5
|
import { codeBlock } from '../nodes/codeBlock';
|
6
|
+
import { confluenceUnsupportedBlock } from '../nodes/confluenceUnsupportedBlock';
|
6
7
|
import { decisionList } from '../nodes/decisionList';
|
7
8
|
import { embedCard } from '../nodes/embedCard';
|
8
9
|
import { expand } from '../nodes/expand';
|
@@ -16,4 +17,5 @@ import { paragraph } from '../nodes/paragraph';
|
|
16
17
|
import { rule } from '../nodes/rule';
|
17
18
|
import { table } from '../nodes/table';
|
18
19
|
import { taskList } from '../nodes/task';
|
19
|
-
|
20
|
+
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
21
|
+
export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_no_marks'), mediaGroup, rule, panel, table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_breakout_mark'), expand.use('with_no_mark'), confluenceUnsupportedBlock, unsupportedBlock]);
|
@@ -9,6 +9,8 @@ import { text } from '../nodes/text';
|
|
9
9
|
import { status } from '../nodes/status';
|
10
10
|
import { inlineExtension } from '../nodes/inlineExtension';
|
11
11
|
import { mediaInline } from '../nodes/mediaInline';
|
12
|
+
import { unsupportedInline } from '../nodes/unsupportedInline';
|
13
|
+
import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
|
12
14
|
export const inlineGroup = adfNodeGroup('inline', [
|
13
15
|
// text,
|
14
|
-
text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension, inlineExtension.use('with_marks'), mediaInline]);
|
16
|
+
text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension, inlineExtension.use('with_marks'), mediaInline, confluenceUnsupportedInline, unsupportedInline]);
|
@@ -13,7 +13,8 @@ import { paragraph } from '../nodes/paragraph';
|
|
13
13
|
import { rule } from '../nodes/rule';
|
14
14
|
import { table } from '../nodes/table';
|
15
15
|
import { taskList } from '../nodes/task';
|
16
|
+
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
16
17
|
|
17
18
|
// Not an actual group, but a collection of nodes that can't be nested inside each other
|
18
19
|
// TODO: make it an actual group
|
19
|
-
export const nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table];
|
20
|
+
export const nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, unsupportedBlock];
|
@@ -0,0 +1,10 @@
|
|
1
|
+
import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
|
2
|
+
export const unsupportedMark = adfMark('unsupportedMark').define({
|
3
|
+
ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
|
4
|
+
attrs: {
|
5
|
+
originalValue: {
|
6
|
+
type: 'object',
|
7
|
+
default: {}
|
8
|
+
}
|
9
|
+
}
|
10
|
+
});
|
@@ -0,0 +1,14 @@
|
|
1
|
+
import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
|
2
|
+
export const unsupportedNodeAttribute = adfMark('unsupportedNodeAttribute').define({
|
3
|
+
ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
|
4
|
+
attrs: {
|
5
|
+
type: {
|
6
|
+
type: 'string',
|
7
|
+
default: null
|
8
|
+
},
|
9
|
+
unsupported: {
|
10
|
+
type: 'object',
|
11
|
+
default: {}
|
12
|
+
}
|
13
|
+
}
|
14
|
+
});
|
@@ -1,7 +1,10 @@
|
|
1
1
|
import { adfNode } from '@atlaskit/adf-schema-generator';
|
2
|
+
import { unsupportedMark } from '../marks/unsupportedMark';
|
3
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
2
4
|
export const blockCard = adfNode('blockCard').define({
|
3
5
|
draggable: true,
|
4
6
|
selectable: true,
|
7
|
+
marks: [unsupportedNodeAttribute, unsupportedMark],
|
5
8
|
attrs: {
|
6
9
|
anyOf: [{
|
7
10
|
url: {
|
@@ -1,10 +1,14 @@
|
|
1
1
|
import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
|
2
|
+
import { unsupportedMark } from '../marks/unsupportedMark';
|
3
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
2
4
|
import { bulletList, orderedList } from './list';
|
3
5
|
import { paragraph } from './paragraph';
|
6
|
+
import { unsupportedBlock } from './unsupportedBlock';
|
4
7
|
export const blockquote = adfNode('blockquote').define({
|
5
8
|
defining: true,
|
6
9
|
selectable: false,
|
7
|
-
|
10
|
+
marks: [unsupportedNodeAttribute, unsupportedMark],
|
11
|
+
content: [$onePlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, unsupportedBlock))]
|
8
12
|
}).variant('with_list', {
|
9
|
-
content: [$onePlus($or(paragraph, orderedList, bulletList))]
|
13
|
+
content: [$onePlus($or(paragraph, orderedList, bulletList, unsupportedBlock))]
|
10
14
|
});
|
@@ -2,10 +2,13 @@ import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
|
|
2
2
|
import { nonNestableBlockContent } from '../groups/nonNestableBlockContentGroup';
|
3
3
|
import { dataConsumer } from '../marks/dataConsumer';
|
4
4
|
import { fragment } from '../marks/fragment';
|
5
|
+
import { unsupportedMark } from '../marks/unsupportedMark';
|
6
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
5
7
|
export const bodiedExtension = adfNode('bodiedExtension').define({
|
6
8
|
defining: true,
|
7
9
|
selectable: true,
|
8
10
|
isolating: true,
|
11
|
+
marks: [unsupportedNodeAttribute, unsupportedMark],
|
9
12
|
attrs: {
|
10
13
|
extensionKey: {
|
11
14
|
minLength: 1,
|
@@ -41,5 +44,5 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
|
|
41
44
|
},
|
42
45
|
content: [$onePlus($or(...nonNestableBlockContent))]
|
43
46
|
}).variant('with_marks', {
|
44
|
-
marks: [dataConsumer, fragment]
|
47
|
+
marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark]
|
45
48
|
});
|
@@ -1,4 +1,6 @@
|
|
1
1
|
import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
|
2
|
+
import { unsupportedMark } from '../marks/unsupportedMark';
|
3
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
2
4
|
import { date } from './date';
|
3
5
|
import { emoji } from './emoji';
|
4
6
|
import { hardBreak } from './hardBreak';
|
@@ -7,10 +9,10 @@ import { mention } from './mention';
|
|
7
9
|
import { placeholder } from './placeholder';
|
8
10
|
import { status } from './status';
|
9
11
|
import { text } from './text';
|
10
|
-
|
11
|
-
// TODO: marks
|
12
|
+
import { unsupportedInline } from './unsupportedInline';
|
12
13
|
export const caption = adfNode('caption').define({
|
13
14
|
isolating: true,
|
14
15
|
selectable: false,
|
15
|
-
|
16
|
+
marks: [unsupportedNodeAttribute, unsupportedMark],
|
17
|
+
content: [$zeroPlus($or(hardBreak, mention, emoji, date, placeholder, inlineCard, status, text.use('formatted'), text.use('code_inline'), unsupportedInline))]
|
16
18
|
});
|
@@ -1,9 +1,13 @@
|
|
1
1
|
import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
|
2
2
|
import { breakout } from '../marks/breakout';
|
3
|
+
import { unsupportedMark } from '../marks/unsupportedMark';
|
4
|
+
import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
|
3
5
|
import { text } from './text';
|
6
|
+
import { unsupportedInline } from './unsupportedInline';
|
4
7
|
export const codeBlock = adfNode('codeBlock').define({
|
5
8
|
code: true,
|
6
9
|
defining: true,
|
10
|
+
marks: [unsupportedNodeAttribute, unsupportedMark],
|
7
11
|
attrs: {
|
8
12
|
language: {
|
9
13
|
type: 'string',
|
@@ -11,8 +15,8 @@ export const codeBlock = adfNode('codeBlock').define({
|
|
11
15
|
optional: true
|
12
16
|
}
|
13
17
|
},
|
14
|
-
content: [$zeroPlus($or(text))]
|
18
|
+
content: [$zeroPlus($or(text, unsupportedInline))]
|
15
19
|
}).variant('with_marks', {
|
16
|
-
marks: [breakout]
|
20
|
+
marks: [breakout, unsupportedNodeAttribute, unsupportedMark]
|
17
21
|
}).variant('with_no_marks', {});
|
18
22
|
export const codeBlockWithMarks = codeBlock;
|