@atlaskit/adf-schema 40.3.1 → 40.4.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 +6 -0
- package/dist/cjs/index.js +6 -0
- package/dist/cjs/next-schema/generated/nodeTypes.js +7 -1
- package/dist/cjs/next-schema/nodes/list.js +7 -2
- package/dist/cjs/schema/default-schema.js +2 -1
- package/dist/cjs/schema/index.js +6 -0
- package/dist/cjs/schema/nodes/index.js +6 -0
- package/dist/cjs/schema/nodes/list-item.js +14 -1
- package/dist/cjs/validator-schema/generated/validatorSpec.js +59 -48
- package/dist/es2019/index.js +1 -1
- package/dist/es2019/next-schema/generated/nodeTypes.js +6 -0
- package/dist/es2019/next-schema/nodes/list.js +7 -2
- package/dist/es2019/schema/default-schema.js +3 -2
- package/dist/es2019/schema/index.js +1 -1
- package/dist/es2019/schema/nodes/index.js +1 -1
- package/dist/es2019/schema/nodes/list-item.js +14 -0
- package/dist/es2019/validator-schema/generated/validatorSpec.js +58 -47
- package/dist/esm/index.js +1 -1
- package/dist/esm/next-schema/generated/nodeTypes.js +6 -0
- package/dist/esm/next-schema/nodes/list.js +7 -2
- package/dist/esm/schema/default-schema.js +3 -2
- package/dist/esm/schema/index.js +1 -1
- package/dist/esm/schema/nodes/index.js +1 -1
- package/dist/esm/schema/nodes/list-item.js +14 -0
- package/dist/esm/validator-schema/generated/validatorSpec.js +58 -47
- package/dist/json-schema/v1/full.json +56 -56
- package/dist/json-schema/v1/stage-0.json +135 -58
- package/dist/types/index.d.ts +1 -1
- package/dist/types/next-schema/generated/nodeTypes.d.ts +9 -2
- package/dist/types/schema/index.d.ts +1 -1
- package/dist/types/schema/nodes/index.d.ts +1 -1
- package/dist/types/schema/nodes/list-item.d.ts +5 -0
- package/dist/types/validator-schema/generated/validatorSpec.d.ts +58 -47
- package/json-schema/v1/full.json +56 -56
- package/json-schema/v1/stage-0.json +135 -58
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
package/dist/cjs/index.js
CHANGED
@@ -747,6 +747,12 @@ Object.defineProperty(exports, "listItem", {
|
|
747
747
|
return _schema.listItem;
|
748
748
|
}
|
749
749
|
});
|
750
|
+
Object.defineProperty(exports, "listItemWithDecisionStage0", {
|
751
|
+
enumerable: true,
|
752
|
+
get: function get() {
|
753
|
+
return _schema.listItemWithDecisionStage0;
|
754
|
+
}
|
755
|
+
});
|
750
756
|
Object.defineProperty(exports, "listItemWithTask", {
|
751
757
|
enumerable: true,
|
752
758
|
get: function get() {
|
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelLegacy = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemLegacy = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithNoMark = exports.expandWithNestedExpandStage0 = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
|
6
|
+
exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelLegacy = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItemLegacy = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithNoMark = exports.expandWithNestedExpandStage0 = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithNoMarks = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithNestedCodeblockOrMediaStage0 = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
|
7
7
|
var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
|
8
8
|
/**
|
9
9
|
* This file was automatically generated by @atlaskit/adf-schema-generator
|
@@ -575,6 +575,12 @@ var listItemLegacy = exports.listItemLegacy = (0, _createPMSpecFactory.createPMN
|
|
575
575
|
selectable: false,
|
576
576
|
defining: true
|
577
577
|
});
|
578
|
+
var listItemWithNestedDecisionStage0 = exports.listItemWithNestedDecisionStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
579
|
+
content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock | decisionList) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | decisionList)*',
|
580
|
+
marks: 'unsupportedMark unsupportedNodeAttribute',
|
581
|
+
selectable: false,
|
582
|
+
defining: true
|
583
|
+
});
|
578
584
|
var media = exports.media = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
579
585
|
attrs: {
|
580
586
|
type: {
|
@@ -12,6 +12,7 @@ var _mediaSingle = require("./mediaSingle");
|
|
12
12
|
var _paragraph = require("./paragraph");
|
13
13
|
var _task = require("./task");
|
14
14
|
var _unsupportedBlock = require("./unsupportedBlock");
|
15
|
+
var _decisionList = require("./decisionList");
|
15
16
|
var orderedList = exports.orderedList = (0, _adfSchemaGenerator.adfNode)('orderedList');
|
16
17
|
var bulletList = exports.bulletList = (0, _adfSchemaGenerator.adfNode)('bulletList');
|
17
18
|
var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
|
@@ -23,6 +24,10 @@ var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
|
|
23
24
|
}).variant('legacy', {
|
24
25
|
content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock))],
|
25
26
|
ignore: ['json-schema', 'validator-spec']
|
27
|
+
}).variant('with_nested_decision', {
|
28
|
+
content: [(0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock, _decisionList.decisionList), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), bulletList, orderedList, _task.taskList, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _unsupportedBlock.unsupportedBlock, _decisionList.decisionList))],
|
29
|
+
noExtend: true,
|
30
|
+
stage0: true
|
26
31
|
});
|
27
32
|
orderedList.define({
|
28
33
|
selectable: false,
|
@@ -35,10 +40,10 @@ orderedList.define({
|
|
35
40
|
optional: true
|
36
41
|
}
|
37
42
|
},
|
38
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy')))]
|
43
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
|
39
44
|
});
|
40
45
|
bulletList.define({
|
41
46
|
selectable: false,
|
42
47
|
marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
|
43
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy')))]
|
48
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
|
44
49
|
});
|
@@ -27,7 +27,8 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
|
|
27
27
|
multiBodiedExtension: _nodes.multiBodiedExtension,
|
28
28
|
extensionFrame: _nodes.extensionFrame,
|
29
29
|
expand: _nodes.expandWithNestedExpandStage0,
|
30
|
-
blockquote: _nodes.blockquoteWithNestedCodeblockOrMediaStage0
|
30
|
+
blockquote: _nodes.blockquoteWithNestedCodeblockOrMediaStage0,
|
31
|
+
listItem: _nodes.listItemWithDecisionStage0
|
31
32
|
};
|
32
33
|
}
|
33
34
|
return (0, _createSchema.createSchema)(defaultSchemaConfig);
|
package/dist/cjs/schema/index.js
CHANGED
@@ -399,6 +399,12 @@ Object.defineProperty(exports, "listItem", {
|
|
399
399
|
return _nodes.listItem;
|
400
400
|
}
|
401
401
|
});
|
402
|
+
Object.defineProperty(exports, "listItemWithDecisionStage0", {
|
403
|
+
enumerable: true,
|
404
|
+
get: function get() {
|
405
|
+
return _nodes.listItemWithDecisionStage0;
|
406
|
+
}
|
407
|
+
});
|
402
408
|
Object.defineProperty(exports, "listItemWithTask", {
|
403
409
|
enumerable: true,
|
404
410
|
get: function get() {
|
@@ -238,6 +238,12 @@ Object.defineProperty(exports, "listItem", {
|
|
238
238
|
return _listItem.listItem;
|
239
239
|
}
|
240
240
|
});
|
241
|
+
Object.defineProperty(exports, "listItemWithDecisionStage0", {
|
242
|
+
enumerable: true,
|
243
|
+
get: function get() {
|
244
|
+
return _listItem.listItemWithDecisionStage0;
|
245
|
+
}
|
246
|
+
});
|
241
247
|
Object.defineProperty(exports, "listItemWithTask", {
|
242
248
|
enumerable: true,
|
243
249
|
get: function get() {
|
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.listItemWithTask = exports.listItem = void 0;
|
6
|
+
exports.listItemWithTask = exports.listItemWithDecisionStage0 = exports.listItem = void 0;
|
7
7
|
var _nodeTypes = require("../../next-schema/generated/nodeTypes");
|
8
8
|
var listItem = exports.listItem = (0, _nodeTypes.listItemLegacy)({
|
9
9
|
parseDOM: [{
|
@@ -25,4 +25,17 @@ var listItemWithTask = exports.listItemWithTask = (0, _nodeTypes.listItem)({
|
|
25
25
|
toDOM: function toDOM() {
|
26
26
|
return ['li', 0];
|
27
27
|
}
|
28
|
+
});
|
29
|
+
|
30
|
+
/**
|
31
|
+
* @name list_item_with_decision_stage0
|
32
|
+
* @description this node allows decisions to be nested inside list-item
|
33
|
+
*/
|
34
|
+
var listItemWithDecisionStage0 = exports.listItemWithDecisionStage0 = (0, _nodeTypes.listItemWithNestedDecisionStage0)({
|
35
|
+
parseDOM: [{
|
36
|
+
tag: 'li'
|
37
|
+
}],
|
38
|
+
toDOM: function toDOM() {
|
39
|
+
return ['li', 0];
|
40
|
+
}
|
28
41
|
});
|
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_nested_expand = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_with_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
|
6
|
+
exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_nested_expand = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_with_nested_codeblock_or_media = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
|
7
7
|
var blockCard = exports.blockCard = {
|
8
8
|
props: {
|
9
9
|
type: {
|
@@ -999,6 +999,62 @@ var listItem_legacy = exports.listItem_legacy = ['listItem', {
|
|
999
999
|
}
|
1000
1000
|
}
|
1001
1001
|
}];
|
1002
|
+
var decisionItem = exports.decisionItem = {
|
1003
|
+
props: {
|
1004
|
+
type: {
|
1005
|
+
type: 'enum',
|
1006
|
+
values: ['decisionItem']
|
1007
|
+
},
|
1008
|
+
attrs: {
|
1009
|
+
props: {
|
1010
|
+
localId: {
|
1011
|
+
type: 'string'
|
1012
|
+
},
|
1013
|
+
state: {
|
1014
|
+
type: 'string'
|
1015
|
+
}
|
1016
|
+
}
|
1017
|
+
},
|
1018
|
+
content: {
|
1019
|
+
type: 'array',
|
1020
|
+
items: ['inline'],
|
1021
|
+
optional: true,
|
1022
|
+
allowUnsupportedInline: true
|
1023
|
+
}
|
1024
|
+
}
|
1025
|
+
};
|
1026
|
+
var decisionList = exports.decisionList = {
|
1027
|
+
props: {
|
1028
|
+
type: {
|
1029
|
+
type: 'enum',
|
1030
|
+
values: ['decisionList']
|
1031
|
+
},
|
1032
|
+
attrs: {
|
1033
|
+
props: {
|
1034
|
+
localId: {
|
1035
|
+
type: 'string'
|
1036
|
+
}
|
1037
|
+
}
|
1038
|
+
},
|
1039
|
+
content: {
|
1040
|
+
type: 'array',
|
1041
|
+
items: ['decisionItem'],
|
1042
|
+
minItems: 1,
|
1043
|
+
allowUnsupportedBlock: true
|
1044
|
+
}
|
1045
|
+
}
|
1046
|
+
};
|
1047
|
+
var listItem_with_nested_decision = exports.listItem_with_nested_decision = ['listItem', {
|
1048
|
+
props: {
|
1049
|
+
content: {
|
1050
|
+
type: 'array',
|
1051
|
+
isTupleLike: true,
|
1052
|
+
items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList']],
|
1053
|
+
minItems: 1,
|
1054
|
+
allowUnsupportedBlock: true
|
1055
|
+
}
|
1056
|
+
}
|
1057
|
+
}];
|
1002
1058
|
var bulletList = exports.bulletList = {
|
1003
1059
|
props: {
|
1004
1060
|
type: {
|
@@ -1007,7 +1063,7 @@ var bulletList = exports.bulletList = {
|
|
1007
1063
|
},
|
1008
1064
|
content: {
|
1009
1065
|
type: 'array',
|
1010
|
-
items: ['listItem'],
|
1066
|
+
items: [['listItem', 'listItem_with_nested_decision']],
|
1011
1067
|
minItems: 1
|
1012
1068
|
}
|
1013
1069
|
}
|
@@ -1045,7 +1101,7 @@ var orderedList = exports.orderedList = {
|
|
1045
1101
|
},
|
1046
1102
|
content: {
|
1047
1103
|
type: 'array',
|
1048
|
-
items: ['listItem'],
|
1104
|
+
items: [['listItem', 'listItem_with_nested_decision']],
|
1049
1105
|
minItems: 1
|
1050
1106
|
}
|
1051
1107
|
}
|
@@ -1098,51 +1154,6 @@ var blockquote_with_nested_codeblock_or_media = exports.blockquote_with_nested_c
|
|
1098
1154
|
}
|
1099
1155
|
}
|
1100
1156
|
}];
|
1101
|
-
var decisionItem = exports.decisionItem = {
|
1102
|
-
props: {
|
1103
|
-
type: {
|
1104
|
-
type: 'enum',
|
1105
|
-
values: ['decisionItem']
|
1106
|
-
},
|
1107
|
-
attrs: {
|
1108
|
-
props: {
|
1109
|
-
localId: {
|
1110
|
-
type: 'string'
|
1111
|
-
},
|
1112
|
-
state: {
|
1113
|
-
type: 'string'
|
1114
|
-
}
|
1115
|
-
}
|
1116
|
-
},
|
1117
|
-
content: {
|
1118
|
-
type: 'array',
|
1119
|
-
items: ['inline'],
|
1120
|
-
optional: true,
|
1121
|
-
allowUnsupportedInline: true
|
1122
|
-
}
|
1123
|
-
}
|
1124
|
-
};
|
1125
|
-
var decisionList = exports.decisionList = {
|
1126
|
-
props: {
|
1127
|
-
type: {
|
1128
|
-
type: 'enum',
|
1129
|
-
values: ['decisionList']
|
1130
|
-
},
|
1131
|
-
attrs: {
|
1132
|
-
props: {
|
1133
|
-
localId: {
|
1134
|
-
type: 'string'
|
1135
|
-
}
|
1136
|
-
}
|
1137
|
-
},
|
1138
|
-
content: {
|
1139
|
-
type: 'array',
|
1140
|
-
items: ['decisionItem'],
|
1141
|
-
minItems: 1,
|
1142
|
-
allowUnsupportedBlock: true
|
1143
|
-
}
|
1144
|
-
}
|
1145
|
-
};
|
1146
1157
|
var embedCard = exports.embedCard = {
|
1147
1158
|
props: {
|
1148
1159
|
type: {
|
package/dist/es2019/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
2
|
-
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
|
2
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
|
3
3
|
export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
|
4
4
|
|
5
5
|
// ADF createPMSpecFactory
|
@@ -569,6 +569,12 @@ export const listItemLegacy = createPMNodeSpecFactory({
|
|
569
569
|
selectable: false,
|
570
570
|
defining: true
|
571
571
|
});
|
572
|
+
export const listItemWithNestedDecisionStage0 = createPMNodeSpecFactory({
|
573
|
+
content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock | decisionList) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | decisionList)*',
|
574
|
+
marks: 'unsupportedMark unsupportedNodeAttribute',
|
575
|
+
selectable: false,
|
576
|
+
defining: true
|
577
|
+
});
|
572
578
|
export const media = createPMNodeSpecFactory({
|
573
579
|
attrs: {
|
574
580
|
type: {
|
@@ -6,6 +6,7 @@ import { mediaSingle } from './mediaSingle';
|
|
6
6
|
import { paragraph } from './paragraph';
|
7
7
|
import { taskList } from './task';
|
8
8
|
import { unsupportedBlock } from './unsupportedBlock';
|
9
|
+
import { decisionList } from './decisionList';
|
9
10
|
export const orderedList = adfNode('orderedList');
|
10
11
|
export const bulletList = adfNode('bulletList');
|
11
12
|
const listItem = adfNode('listItem').define({
|
@@ -17,6 +18,10 @@ const listItem = adfNode('listItem').define({
|
|
17
18
|
}).variant('legacy', {
|
18
19
|
content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))],
|
19
20
|
ignore: ['json-schema', 'validator-spec']
|
21
|
+
}).variant('with_nested_decision', {
|
22
|
+
content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList))],
|
23
|
+
noExtend: true,
|
24
|
+
stage0: true
|
20
25
|
});
|
21
26
|
orderedList.define({
|
22
27
|
selectable: false,
|
@@ -29,10 +34,10 @@ orderedList.define({
|
|
29
34
|
optional: true
|
30
35
|
}
|
31
36
|
},
|
32
|
-
content: [$onePlus($or(listItem, listItem.use('legacy')))]
|
37
|
+
content: [$onePlus($or(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
|
33
38
|
});
|
34
39
|
bulletList.define({
|
35
40
|
selectable: false,
|
36
41
|
marks: [unsupportedMark, unsupportedNodeAttribute],
|
37
|
-
content: [$onePlus($or(listItem, listItem.use('legacy')))]
|
42
|
+
content: [$onePlus($or(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
|
38
43
|
});
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import memoizeOne from 'memoize-one';
|
2
|
-
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0 } from './nodes';
|
2
|
+
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0, listItemWithDecisionStage0 } from './nodes';
|
3
3
|
import { createSchema } from './create-schema';
|
4
4
|
const getDefaultSchemaConfig = () => {
|
5
5
|
const defaultSchemaConfig = {
|
@@ -19,7 +19,8 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
|
|
19
19
|
multiBodiedExtension: multiBodiedExtension,
|
20
20
|
extensionFrame: extensionFrame,
|
21
21
|
expand: expandWithNestedExpandStage0,
|
22
|
-
blockquote: blockquoteWithNestedCodeblockOrMediaStage0
|
22
|
+
blockquote: blockquoteWithNestedCodeblockOrMediaStage0,
|
23
|
+
listItem: listItemWithDecisionStage0
|
23
24
|
};
|
24
25
|
}
|
25
26
|
return createSchema(defaultSchemaConfig);
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
|
2
2
|
export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
3
3
|
colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
|
4
4
|
export { unsupportedNodeTypesForMediaCards } from './unsupported';
|
@@ -14,7 +14,7 @@ export { paragraph } from './paragraph';
|
|
14
14
|
export { emoji } from './emoji';
|
15
15
|
export { image } from './image';
|
16
16
|
export { mention, toJSON as mentionToJSON } from './mention';
|
17
|
-
export { listItem, listItemWithTask } from './list-item';
|
17
|
+
export { listItem, listItemWithTask, listItemWithDecisionStage0 } from './list-item';
|
18
18
|
export { extendedPanel, PanelType } from './panel';
|
19
19
|
export { text } from './text';
|
20
20
|
export { default as unknownBlock } from './unknown-block';
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import { listItem as listItemFactory } from '../../next-schema/generated/nodeTypes';
|
2
2
|
import { listItemLegacy as listItemLegacyFactory } from '../../next-schema/generated/nodeTypes';
|
3
|
+
import { listItemWithNestedDecisionStage0 as listItemWithNestedDecisionStage0Factory } from '../../next-schema/generated/nodeTypes';
|
3
4
|
export const listItem = listItemLegacyFactory({
|
4
5
|
parseDOM: [{
|
5
6
|
tag: 'li'
|
@@ -20,4 +21,17 @@ export const listItemWithTask = listItemFactory({
|
|
20
21
|
toDOM() {
|
21
22
|
return ['li', 0];
|
22
23
|
}
|
24
|
+
});
|
25
|
+
|
26
|
+
/**
|
27
|
+
* @name list_item_with_decision_stage0
|
28
|
+
* @description this node allows decisions to be nested inside list-item
|
29
|
+
*/
|
30
|
+
export const listItemWithDecisionStage0 = listItemWithNestedDecisionStage0Factory({
|
31
|
+
parseDOM: [{
|
32
|
+
tag: 'li'
|
33
|
+
}],
|
34
|
+
toDOM() {
|
35
|
+
return ['li', 0];
|
36
|
+
}
|
23
37
|
});
|
@@ -993,6 +993,62 @@ export const listItem_legacy = ['listItem', {
|
|
993
993
|
}
|
994
994
|
}
|
995
995
|
}];
|
996
|
+
export const decisionItem = {
|
997
|
+
props: {
|
998
|
+
type: {
|
999
|
+
type: 'enum',
|
1000
|
+
values: ['decisionItem']
|
1001
|
+
},
|
1002
|
+
attrs: {
|
1003
|
+
props: {
|
1004
|
+
localId: {
|
1005
|
+
type: 'string'
|
1006
|
+
},
|
1007
|
+
state: {
|
1008
|
+
type: 'string'
|
1009
|
+
}
|
1010
|
+
}
|
1011
|
+
},
|
1012
|
+
content: {
|
1013
|
+
type: 'array',
|
1014
|
+
items: ['inline'],
|
1015
|
+
optional: true,
|
1016
|
+
allowUnsupportedInline: true
|
1017
|
+
}
|
1018
|
+
}
|
1019
|
+
};
|
1020
|
+
export const decisionList = {
|
1021
|
+
props: {
|
1022
|
+
type: {
|
1023
|
+
type: 'enum',
|
1024
|
+
values: ['decisionList']
|
1025
|
+
},
|
1026
|
+
attrs: {
|
1027
|
+
props: {
|
1028
|
+
localId: {
|
1029
|
+
type: 'string'
|
1030
|
+
}
|
1031
|
+
}
|
1032
|
+
},
|
1033
|
+
content: {
|
1034
|
+
type: 'array',
|
1035
|
+
items: ['decisionItem'],
|
1036
|
+
minItems: 1,
|
1037
|
+
allowUnsupportedBlock: true
|
1038
|
+
}
|
1039
|
+
}
|
1040
|
+
};
|
1041
|
+
export const listItem_with_nested_decision = ['listItem', {
|
1042
|
+
props: {
|
1043
|
+
content: {
|
1044
|
+
type: 'array',
|
1045
|
+
isTupleLike: true,
|
1046
|
+
items: [['paragraph_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList'], ['paragraph_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'decisionList']],
|
1047
|
+
minItems: 1,
|
1048
|
+
allowUnsupportedBlock: true
|
1049
|
+
}
|
1050
|
+
}
|
1051
|
+
}];
|
996
1052
|
export const bulletList = {
|
997
1053
|
props: {
|
998
1054
|
type: {
|
@@ -1001,7 +1057,7 @@ export const bulletList = {
|
|
1001
1057
|
},
|
1002
1058
|
content: {
|
1003
1059
|
type: 'array',
|
1004
|
-
items: ['listItem'],
|
1060
|
+
items: [['listItem', 'listItem_with_nested_decision']],
|
1005
1061
|
minItems: 1
|
1006
1062
|
}
|
1007
1063
|
}
|
@@ -1039,7 +1095,7 @@ export const orderedList = {
|
|
1039
1095
|
},
|
1040
1096
|
content: {
|
1041
1097
|
type: 'array',
|
1042
|
-
items: ['listItem'],
|
1098
|
+
items: [['listItem', 'listItem_with_nested_decision']],
|
1043
1099
|
minItems: 1
|
1044
1100
|
}
|
1045
1101
|
}
|
@@ -1092,51 +1148,6 @@ export const blockquote_with_nested_codeblock_or_media = ['blockquote', {
|
|
1092
1148
|
}
|
1093
1149
|
}
|
1094
1150
|
}];
|
1095
|
-
export const decisionItem = {
|
1096
|
-
props: {
|
1097
|
-
type: {
|
1098
|
-
type: 'enum',
|
1099
|
-
values: ['decisionItem']
|
1100
|
-
},
|
1101
|
-
attrs: {
|
1102
|
-
props: {
|
1103
|
-
localId: {
|
1104
|
-
type: 'string'
|
1105
|
-
},
|
1106
|
-
state: {
|
1107
|
-
type: 'string'
|
1108
|
-
}
|
1109
|
-
}
|
1110
|
-
},
|
1111
|
-
content: {
|
1112
|
-
type: 'array',
|
1113
|
-
items: ['inline'],
|
1114
|
-
optional: true,
|
1115
|
-
allowUnsupportedInline: true
|
1116
|
-
}
|
1117
|
-
}
|
1118
|
-
};
|
1119
|
-
export const decisionList = {
|
1120
|
-
props: {
|
1121
|
-
type: {
|
1122
|
-
type: 'enum',
|
1123
|
-
values: ['decisionList']
|
1124
|
-
},
|
1125
|
-
attrs: {
|
1126
|
-
props: {
|
1127
|
-
localId: {
|
1128
|
-
type: 'string'
|
1129
|
-
}
|
1130
|
-
}
|
1131
|
-
},
|
1132
|
-
content: {
|
1133
|
-
type: 'array',
|
1134
|
-
items: ['decisionItem'],
|
1135
|
-
minItems: 1,
|
1136
|
-
allowUnsupportedBlock: true
|
1137
|
-
}
|
1138
|
-
}
|
1139
|
-
};
|
1140
1151
|
export const embedCard = {
|
1141
1152
|
props: {
|
1142
1153
|
type: {
|
package/dist/esm/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
2
|
-
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
|
2
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette } from './schema';
|
3
3
|
export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
|
4
4
|
|
5
5
|
// ADF createPMSpecFactory
|
@@ -569,6 +569,12 @@ export var listItemLegacy = createPMNodeSpecFactory({
|
|
569
569
|
selectable: false,
|
570
570
|
defining: true
|
571
571
|
});
|
572
|
+
export var listItemWithNestedDecisionStage0 = createPMNodeSpecFactory({
|
573
|
+
content: '(paragraph | mediaSingle | codeBlock | unsupportedBlock | decisionList) (paragraph | bulletList | orderedList | taskList | mediaSingle | codeBlock | unsupportedBlock | decisionList)*',
|
574
|
+
marks: 'unsupportedMark unsupportedNodeAttribute',
|
575
|
+
selectable: false,
|
576
|
+
defining: true
|
577
|
+
});
|
572
578
|
export var media = createPMNodeSpecFactory({
|
573
579
|
attrs: {
|
574
580
|
type: {
|
@@ -6,6 +6,7 @@ import { mediaSingle } from './mediaSingle';
|
|
6
6
|
import { paragraph } from './paragraph';
|
7
7
|
import { taskList } from './task';
|
8
8
|
import { unsupportedBlock } from './unsupportedBlock';
|
9
|
+
import { decisionList } from './decisionList';
|
9
10
|
export var orderedList = adfNode('orderedList');
|
10
11
|
export var bulletList = adfNode('bulletList');
|
11
12
|
var listItem = adfNode('listItem').define({
|
@@ -17,6 +18,10 @@ var listItem = adfNode('listItem').define({
|
|
17
18
|
}).variant('legacy', {
|
18
19
|
content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock))],
|
19
20
|
ignore: ['json-schema', 'validator-spec']
|
21
|
+
}).variant('with_nested_decision', {
|
22
|
+
content: [$or(paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList), $zeroPlus($or(paragraph.use('with_no_marks'), bulletList, orderedList, taskList, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), unsupportedBlock, decisionList))],
|
23
|
+
noExtend: true,
|
24
|
+
stage0: true
|
20
25
|
});
|
21
26
|
orderedList.define({
|
22
27
|
selectable: false,
|
@@ -29,10 +34,10 @@ orderedList.define({
|
|
29
34
|
optional: true
|
30
35
|
}
|
31
36
|
},
|
32
|
-
content: [$onePlus($or(listItem, listItem.use('legacy')))]
|
37
|
+
content: [$onePlus($or(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
|
33
38
|
});
|
34
39
|
bulletList.define({
|
35
40
|
selectable: false,
|
36
41
|
marks: [unsupportedMark, unsupportedNodeAttribute],
|
37
|
-
content: [$onePlus($or(listItem, listItem.use('legacy')))]
|
42
|
+
content: [$onePlus($or(listItem, listItem.use('legacy'), listItem.use('with_nested_decision')))]
|
38
43
|
});
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import memoizeOne from 'memoize-one';
|
2
|
-
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0 } from './nodes';
|
2
|
+
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpandStage0, blockquoteWithNestedCodeblockOrMediaStage0, listItemWithDecisionStage0 } from './nodes';
|
3
3
|
import { createSchema } from './create-schema';
|
4
4
|
var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
|
5
5
|
var defaultSchemaConfig = {
|
@@ -20,7 +20,8 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
|
|
20
20
|
multiBodiedExtension: multiBodiedExtension,
|
21
21
|
extensionFrame: extensionFrame,
|
22
22
|
expand: expandWithNestedExpandStage0,
|
23
|
-
blockquote: blockquoteWithNestedCodeblockOrMediaStage0
|
23
|
+
blockquote: blockquoteWithNestedCodeblockOrMediaStage0,
|
24
|
+
listItem: listItemWithDecisionStage0
|
24
25
|
};
|
25
26
|
}
|
26
27
|
return createSchema(defaultSchemaConfig);
|
package/dist/esm/schema/index.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMediaStage0, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
|
2
2
|
export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
3
3
|
colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
|
4
4
|
export { unsupportedNodeTypesForMediaCards } from './unsupported';
|