@atlaskit/adf-schema 40.6.0 → 40.7.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 +24 -1
- package/dist/cjs/next-schema/groups/blockGroup.js +1 -1
- package/dist/cjs/next-schema/nodes/panel.js +5 -0
- 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/panel.js +19 -1
- package/dist/cjs/validator-schema/generated/validatorSpec.js +12 -1
- package/dist/es2019/index.js +1 -1
- package/dist/es2019/next-schema/generated/nodeTypes.js +23 -0
- package/dist/es2019/next-schema/groups/blockGroup.js +1 -1
- package/dist/es2019/next-schema/nodes/panel.js +5 -0
- 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/panel.js +17 -1
- package/dist/es2019/validator-schema/generated/validatorSpec.js +10 -0
- package/dist/esm/index.js +1 -1
- package/dist/esm/next-schema/generated/nodeTypes.js +23 -0
- package/dist/esm/next-schema/groups/blockGroup.js +1 -1
- package/dist/esm/next-schema/nodes/panel.js +5 -0
- 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/panel.js +19 -1
- package/dist/esm/validator-schema/generated/validatorSpec.js +10 -0
- package/dist/json-schema/v1/stage-0.json +93 -0
- package/dist/types/index.d.ts +1 -1
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
- package/dist/types/next-schema/generated/nodeTypes.d.ts +14 -0
- package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts +5 -1
- package/dist/types/next-schema/nodes/panel.d.ts +5 -1
- package/dist/types/schema/index.d.ts +1 -1
- package/dist/types/schema/nodes/index.d.ts +1 -1
- package/dist/types/schema/nodes/panel.d.ts +1 -0
- package/dist/types/validator-schema/generated/validatorSpec.d.ts +10 -0
- package/json-schema/v1/stage-0.json +93 -0
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
package/dist/cjs/index.js
CHANGED
@@ -873,6 +873,12 @@ Object.defineProperty(exports, "orderedListWithOrder", {
|
|
873
873
|
return _schema.orderedListWithOrder;
|
874
874
|
}
|
875
875
|
});
|
876
|
+
Object.defineProperty(exports, "panelWithBlockquoteStage0", {
|
877
|
+
enumerable: true,
|
878
|
+
get: function get() {
|
879
|
+
return _schema.panelWithBlockquoteStage0;
|
880
|
+
}
|
881
|
+
});
|
876
882
|
Object.defineProperty(exports, "paragraph", {
|
877
883
|
enumerable: true,
|
878
884
|
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.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.expandWithoutNestedExpand = exports.expandWithNoMark = 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.blockquoteWithoutNestedCodeblockOrMedia = 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.panelWithNestedBlockquoteStage0 = 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.expandWithoutNestedExpand = exports.expandWithNoMark = 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.blockquoteWithoutNestedCodeblockOrMedia = 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
|
@@ -909,6 +909,29 @@ var panelLegacy = exports.panelLegacy = (0, _createPMSpecFactory.createPMNodeSpe
|
|
909
909
|
},
|
910
910
|
selectable: true
|
911
911
|
});
|
912
|
+
var panelWithNestedBlockquoteStage0 = exports.panelWithNestedBlockquoteStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
913
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | blockquote)+',
|
914
|
+
marks: 'unsupportedMark unsupportedNodeAttribute',
|
915
|
+
group: 'block',
|
916
|
+
attrs: {
|
917
|
+
panelType: {
|
918
|
+
default: 'info'
|
919
|
+
},
|
920
|
+
panelIcon: {
|
921
|
+
default: null
|
922
|
+
},
|
923
|
+
panelIconId: {
|
924
|
+
default: null
|
925
|
+
},
|
926
|
+
panelIconText: {
|
927
|
+
default: null
|
928
|
+
},
|
929
|
+
panelColor: {
|
930
|
+
default: null
|
931
|
+
}
|
932
|
+
},
|
933
|
+
selectable: true
|
934
|
+
});
|
912
935
|
var paragraph = exports.paragraph = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
913
936
|
content: 'inline*',
|
914
937
|
marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
|
@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
|
|
24
24
|
var _table = require("../nodes/table");
|
25
25
|
var _task = require("../nodes/task");
|
26
26
|
var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
27
|
-
var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
|
27
|
+
var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('legacy'), _panel.panel.use('with_nested_blockquote'), _table.table, _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _expand.expand.use('with_no_mark'), _expand.expand.use('with_breakout_mark'), _expand.expand.use('without_nested_expand'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
|
28
28
|
// @DSLCompatibilityException
|
29
29
|
// Block group in PM doesn't match ADF
|
30
30
|
ignore: ['validator-spec']
|
@@ -18,6 +18,7 @@ var _paragraph = require("./paragraph");
|
|
18
18
|
var _rule = require("./rule");
|
19
19
|
var _task = require("./task");
|
20
20
|
var _unsupportedBlock = require("./unsupportedBlock");
|
21
|
+
var _blockquote = require("./blockquote");
|
21
22
|
var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
|
22
23
|
selectable: true,
|
23
24
|
marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
|
@@ -52,4 +53,8 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
|
|
52
53
|
}).variant('legacy', {
|
53
54
|
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _unsupportedBlock.unsupportedBlock))],
|
54
55
|
ignore: ['json-schema', 'validator-spec']
|
56
|
+
}).variant('with_nested_blockquote', {
|
57
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _rule.rule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock, _blockquote.blockquote))],
|
58
|
+
noExtend: true,
|
59
|
+
stage0: true
|
55
60
|
});
|
@@ -28,7 +28,8 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
|
|
28
28
|
extensionFrame: _nodes.extensionFrame,
|
29
29
|
expand: _nodes.expandWithNestedExpand,
|
30
30
|
blockquote: _nodes.blockquoteWithNestedCodeblockOrMedia,
|
31
|
-
listItem: _nodes.listItemWithDecisionStage0
|
31
|
+
listItem: _nodes.listItemWithDecisionStage0,
|
32
|
+
panel: (0, _nodes.panelWithBlockquoteStage0)(true)
|
32
33
|
};
|
33
34
|
}
|
34
35
|
return (0, _createSchema.createSchema)(defaultSchemaConfig);
|
package/dist/cjs/schema/index.js
CHANGED
@@ -513,6 +513,12 @@ Object.defineProperty(exports, "orderedListWithOrder", {
|
|
513
513
|
return _nodes.orderedListWithOrder;
|
514
514
|
}
|
515
515
|
});
|
516
|
+
Object.defineProperty(exports, "panelWithBlockquoteStage0", {
|
517
|
+
enumerable: true,
|
518
|
+
get: function get() {
|
519
|
+
return _nodes.panelWithBlockquoteStage0;
|
520
|
+
}
|
521
|
+
});
|
516
522
|
Object.defineProperty(exports, "paragraph", {
|
517
523
|
enumerable: true,
|
518
524
|
get: function get() {
|
@@ -352,6 +352,12 @@ Object.defineProperty(exports, "orderedListWithOrder", {
|
|
352
352
|
return _orderedList.orderedListWithOrder;
|
353
353
|
}
|
354
354
|
});
|
355
|
+
Object.defineProperty(exports, "panelWithBlockquoteStage0", {
|
356
|
+
enumerable: true,
|
357
|
+
get: function get() {
|
358
|
+
return _panel.panelWithBlockquoteStage0;
|
359
|
+
}
|
360
|
+
});
|
355
361
|
Object.defineProperty(exports, "paragraph", {
|
356
362
|
enumerable: true,
|
357
363
|
get: function get() {
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
5
5
|
value: true
|
6
6
|
});
|
7
|
-
exports.extendedPanel = exports.PanelType = void 0;
|
7
|
+
exports.panelWithBlockquoteStage0 = exports.extendedPanel = exports.PanelType = void 0;
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
9
9
|
var _nodeTypes = require("../../next-schema/generated/nodeTypes");
|
10
10
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
@@ -72,4 +72,22 @@ var extendedPanel = exports.extendedPanel = function extendedPanel(allowCustomPa
|
|
72
72
|
}
|
73
73
|
});
|
74
74
|
return panelNodeSpec;
|
75
|
+
};
|
76
|
+
var panelWithBlockquoteStage0 = exports.panelWithBlockquoteStage0 = function panelWithBlockquoteStage0(allowCustomPanel) {
|
77
|
+
var panelNodeSpec = (0, _nodeTypes.panelWithNestedBlockquoteStage0)({
|
78
|
+
parseDOM: [{
|
79
|
+
tag: 'div[data-panel-type]',
|
80
|
+
getAttrs: function getAttrs(dom) {
|
81
|
+
return getParseDOMAttrs(allowCustomPanel, dom);
|
82
|
+
}
|
83
|
+
}],
|
84
|
+
toDOM: function toDOM(node) {
|
85
|
+
var attrs = getDomAttrs(node.attrs);
|
86
|
+
var contentAttrs = {
|
87
|
+
'data-panel-content': 'true'
|
88
|
+
};
|
89
|
+
return ['div', attrs, ['div', contentAttrs, 0]];
|
90
|
+
}
|
91
|
+
});
|
92
|
+
return panelNodeSpec;
|
75
93
|
};
|
@@ -3,7 +3,8 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.
|
6
|
+
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_with_nested_blockquote = 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_without_nested_expand = exports.expand_with_no_mark = 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_without_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
|
+
exports.unsupportedInline = void 0;
|
7
8
|
var blockCard = exports.blockCard = {
|
8
9
|
props: {
|
9
10
|
type: {
|
@@ -1356,6 +1357,16 @@ var panel_legacy = exports.panel_legacy = ['panel', {
|
|
1356
1357
|
}
|
1357
1358
|
}
|
1358
1359
|
}];
|
1360
|
+
var panel_with_nested_blockquote = exports.panel_with_nested_blockquote = ['panel', {
|
1361
|
+
props: {
|
1362
|
+
content: {
|
1363
|
+
type: 'array',
|
1364
|
+
items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList', 'blockquote']],
|
1365
|
+
minItems: 1,
|
1366
|
+
allowUnsupportedBlock: true
|
1367
|
+
}
|
1368
|
+
}
|
1369
|
+
}];
|
1359
1370
|
var nestedExpand_content = exports.nestedExpand_content = {
|
1360
1371
|
type: 'array',
|
1361
1372
|
items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
|
package/dist/es2019/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, 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, expandWithNestedExpand, 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';
|
2
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, 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, panelWithBlockquoteStage0, 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
|
@@ -903,6 +903,29 @@ export const panelLegacy = createPMNodeSpecFactory({
|
|
903
903
|
},
|
904
904
|
selectable: true
|
905
905
|
});
|
906
|
+
export const panelWithNestedBlockquoteStage0 = createPMNodeSpecFactory({
|
907
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | blockquote)+',
|
908
|
+
marks: 'unsupportedMark unsupportedNodeAttribute',
|
909
|
+
group: 'block',
|
910
|
+
attrs: {
|
911
|
+
panelType: {
|
912
|
+
default: 'info'
|
913
|
+
},
|
914
|
+
panelIcon: {
|
915
|
+
default: null
|
916
|
+
},
|
917
|
+
panelIconId: {
|
918
|
+
default: null
|
919
|
+
},
|
920
|
+
panelIconText: {
|
921
|
+
default: null
|
922
|
+
},
|
923
|
+
panelColor: {
|
924
|
+
default: null
|
925
|
+
}
|
926
|
+
},
|
927
|
+
selectable: true
|
928
|
+
});
|
906
929
|
export const paragraph = createPMNodeSpecFactory({
|
907
930
|
content: 'inline*',
|
908
931
|
marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
|
@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
|
|
18
18
|
import { table } from '../nodes/table';
|
19
19
|
import { taskList } from '../nodes/task';
|
20
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'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, 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'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), panel.use('with_nested_blockquote'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
|
22
22
|
// @DSLCompatibilityException
|
23
23
|
// Block group in PM doesn't match ADF
|
24
24
|
ignore: ['validator-spec']
|
@@ -12,6 +12,7 @@ import { paragraph } from './paragraph';
|
|
12
12
|
import { rule } from './rule';
|
13
13
|
import { taskList } from './task';
|
14
14
|
import { unsupportedBlock } from './unsupportedBlock';
|
15
|
+
import { blockquote } from './blockquote';
|
15
16
|
export const panel = adfNode('panel').define({
|
16
17
|
selectable: true,
|
17
18
|
marks: [unsupportedMark, unsupportedNodeAttribute],
|
@@ -46,4 +47,8 @@ export const panel = adfNode('panel').define({
|
|
46
47
|
}).variant('legacy', {
|
47
48
|
content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, unsupportedBlock))],
|
48
49
|
ignore: ['json-schema', 'validator-spec']
|
50
|
+
}).variant('with_nested_blockquote', {
|
51
|
+
content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock, blockquote))],
|
52
|
+
noExtend: true,
|
53
|
+
stage0: true
|
49
54
|
});
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import memoizeOne from 'memoize-one';
|
2
|
-
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0 } from './nodes';
|
2
|
+
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0, panelWithBlockquoteStage0 } from './nodes';
|
3
3
|
import { createSchema } from './create-schema';
|
4
4
|
const getDefaultSchemaConfig = () => {
|
5
5
|
const defaultSchemaConfig = {
|
@@ -20,7 +20,8 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
|
|
20
20
|
extensionFrame: extensionFrame,
|
21
21
|
expand: expandWithNestedExpand,
|
22
22
|
blockquote: blockquoteWithNestedCodeblockOrMedia,
|
23
|
-
listItem: listItemWithDecisionStage0
|
23
|
+
listItem: listItemWithDecisionStage0,
|
24
|
+
panel: panelWithBlockquoteStage0(true)
|
24
25
|
};
|
25
26
|
}
|
26
27
|
return createSchema(defaultSchemaConfig);
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, 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';
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, 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, panelWithBlockquoteStage0, 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';
|
@@ -15,7 +15,7 @@ export { emoji } from './emoji';
|
|
15
15
|
export { image } from './image';
|
16
16
|
export { mention, toJSON as mentionToJSON } from './mention';
|
17
17
|
export { listItem, listItemWithTask, listItemWithDecisionStage0 } from './list-item';
|
18
|
-
export { extendedPanel, PanelType } from './panel';
|
18
|
+
export { extendedPanel, PanelType, panelWithBlockquoteStage0 } from './panel';
|
19
19
|
export { text } from './text';
|
20
20
|
export { default as unknownBlock } from './unknown-block';
|
21
21
|
export { caption } from './caption';
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { panel as panelFactory } from '../../next-schema/generated/nodeTypes';
|
1
|
+
import { panel as panelFactory, panelWithNestedBlockquoteStage0 as panelWithNestedBlockquoteStage0Factory } from '../../next-schema/generated/nodeTypes';
|
2
2
|
export let PanelType = /*#__PURE__*/function (PanelType) {
|
3
3
|
PanelType["INFO"] = "info";
|
4
4
|
PanelType["NOTE"] = "note";
|
@@ -63,4 +63,20 @@ export const extendedPanel = allowCustomPanel => {
|
|
63
63
|
}
|
64
64
|
});
|
65
65
|
return panelNodeSpec;
|
66
|
+
};
|
67
|
+
export const panelWithBlockquoteStage0 = allowCustomPanel => {
|
68
|
+
const panelNodeSpec = panelWithNestedBlockquoteStage0Factory({
|
69
|
+
parseDOM: [{
|
70
|
+
tag: 'div[data-panel-type]',
|
71
|
+
getAttrs: dom => getParseDOMAttrs(allowCustomPanel, dom)
|
72
|
+
}],
|
73
|
+
toDOM(node) {
|
74
|
+
const attrs = getDomAttrs(node.attrs);
|
75
|
+
const contentAttrs = {
|
76
|
+
'data-panel-content': 'true'
|
77
|
+
};
|
78
|
+
return ['div', attrs, ['div', contentAttrs, 0]];
|
79
|
+
}
|
80
|
+
});
|
81
|
+
return panelNodeSpec;
|
66
82
|
};
|
@@ -1350,6 +1350,16 @@ export const panel_legacy = ['panel', {
|
|
1350
1350
|
}
|
1351
1351
|
}
|
1352
1352
|
}];
|
1353
|
+
export const panel_with_nested_blockquote = ['panel', {
|
1354
|
+
props: {
|
1355
|
+
content: {
|
1356
|
+
type: 'array',
|
1357
|
+
items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList', 'blockquote']],
|
1358
|
+
minItems: 1,
|
1359
|
+
allowUnsupportedBlock: true
|
1360
|
+
}
|
1361
|
+
}
|
1362
|
+
}];
|
1353
1363
|
export const nestedExpand_content = {
|
1354
1364
|
type: 'array',
|
1355
1365
|
items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
|
package/dist/esm/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, 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, expandWithNestedExpand, 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';
|
2
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, 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, panelWithBlockquoteStage0, 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
|
@@ -903,6 +903,29 @@ export var panelLegacy = createPMNodeSpecFactory({
|
|
903
903
|
},
|
904
904
|
selectable: true
|
905
905
|
});
|
906
|
+
export var panelWithNestedBlockquoteStage0 = createPMNodeSpecFactory({
|
907
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | blockquote)+',
|
908
|
+
marks: 'unsupportedMark unsupportedNodeAttribute',
|
909
|
+
group: 'block',
|
910
|
+
attrs: {
|
911
|
+
panelType: {
|
912
|
+
default: 'info'
|
913
|
+
},
|
914
|
+
panelIcon: {
|
915
|
+
default: null
|
916
|
+
},
|
917
|
+
panelIconId: {
|
918
|
+
default: null
|
919
|
+
},
|
920
|
+
panelIconText: {
|
921
|
+
default: null
|
922
|
+
},
|
923
|
+
panelColor: {
|
924
|
+
default: null
|
925
|
+
}
|
926
|
+
},
|
927
|
+
selectable: true
|
928
|
+
});
|
906
929
|
export var paragraph = createPMNodeSpecFactory({
|
907
930
|
content: 'inline*',
|
908
931
|
marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
|
@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
|
|
18
18
|
import { table } from '../nodes/table';
|
19
19
|
import { taskList } from '../nodes/task';
|
20
20
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
21
|
-
export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
|
21
|
+
export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_marks'), codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('legacy'), panel.use('with_nested_blockquote'), table, bodiedExtension, bodiedExtension.use('with_marks'), expand, expand.use('with_no_mark'), expand.use('with_breakout_mark'), expand.use('without_nested_expand'), confluenceUnsupportedBlock, unsupportedBlock], {
|
22
22
|
// @DSLCompatibilityException
|
23
23
|
// Block group in PM doesn't match ADF
|
24
24
|
ignore: ['validator-spec']
|
@@ -12,6 +12,7 @@ import { paragraph } from './paragraph';
|
|
12
12
|
import { rule } from './rule';
|
13
13
|
import { taskList } from './task';
|
14
14
|
import { unsupportedBlock } from './unsupportedBlock';
|
15
|
+
import { blockquote } from './blockquote';
|
15
16
|
export var panel = adfNode('panel').define({
|
16
17
|
selectable: true,
|
17
18
|
marks: [unsupportedMark, unsupportedNodeAttribute],
|
@@ -46,4 +47,8 @@ export var panel = adfNode('panel').define({
|
|
46
47
|
}).variant('legacy', {
|
47
48
|
content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, unsupportedBlock))],
|
48
49
|
ignore: ['json-schema', 'validator-spec']
|
50
|
+
}).variant('with_nested_blockquote', {
|
51
|
+
content: [$onePlus($or(paragraph.use('with_no_marks'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, rule, decisionList, unsupportedBlock, blockquote))],
|
52
|
+
noExtend: true,
|
53
|
+
stage0: true
|
49
54
|
});
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import memoizeOne from 'memoize-one';
|
2
|
-
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0 } from './nodes';
|
2
|
+
import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, blockquoteWithNestedCodeblockOrMedia, listItemWithDecisionStage0, panelWithBlockquoteStage0 } from './nodes';
|
3
3
|
import { createSchema } from './create-schema';
|
4
4
|
var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
|
5
5
|
var defaultSchemaConfig = {
|
@@ -21,7 +21,8 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
|
|
21
21
|
extensionFrame: extensionFrame,
|
22
22
|
expand: expandWithNestedExpand,
|
23
23
|
blockquote: blockquoteWithNestedCodeblockOrMedia,
|
24
|
-
listItem: listItemWithDecisionStage0
|
24
|
+
listItem: listItemWithDecisionStage0,
|
25
|
+
panel: panelWithBlockquoteStage0(true)
|
25
26
|
};
|
26
27
|
}
|
27
28
|
return createSchema(defaultSchemaConfig);
|
package/dist/esm/schema/index.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, 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';
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, 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, panelWithBlockquoteStage0, 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';
|
@@ -15,7 +15,7 @@ export { emoji } from './emoji';
|
|
15
15
|
export { image } from './image';
|
16
16
|
export { mention, toJSON as mentionToJSON } from './mention';
|
17
17
|
export { listItem, listItemWithTask, listItemWithDecisionStage0 } from './list-item';
|
18
|
-
export { extendedPanel, PanelType } from './panel';
|
18
|
+
export { extendedPanel, PanelType, panelWithBlockquoteStage0 } from './panel';
|
19
19
|
export { text } from './text';
|
20
20
|
export { default as unknownBlock } from './unknown-block';
|
21
21
|
export { caption } from './caption';
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
2
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
4
|
-
import { panel as panelFactory } from '../../next-schema/generated/nodeTypes';
|
4
|
+
import { panel as panelFactory, panelWithNestedBlockquoteStage0 as panelWithNestedBlockquoteStage0Factory } from '../../next-schema/generated/nodeTypes';
|
5
5
|
export var PanelType = /*#__PURE__*/function (PanelType) {
|
6
6
|
PanelType["INFO"] = "info";
|
7
7
|
PanelType["NOTE"] = "note";
|
@@ -67,4 +67,22 @@ export var extendedPanel = function extendedPanel(allowCustomPanel) {
|
|
67
67
|
}
|
68
68
|
});
|
69
69
|
return panelNodeSpec;
|
70
|
+
};
|
71
|
+
export var panelWithBlockquoteStage0 = function panelWithBlockquoteStage0(allowCustomPanel) {
|
72
|
+
var panelNodeSpec = panelWithNestedBlockquoteStage0Factory({
|
73
|
+
parseDOM: [{
|
74
|
+
tag: 'div[data-panel-type]',
|
75
|
+
getAttrs: function getAttrs(dom) {
|
76
|
+
return getParseDOMAttrs(allowCustomPanel, dom);
|
77
|
+
}
|
78
|
+
}],
|
79
|
+
toDOM: function toDOM(node) {
|
80
|
+
var attrs = getDomAttrs(node.attrs);
|
81
|
+
var contentAttrs = {
|
82
|
+
'data-panel-content': 'true'
|
83
|
+
};
|
84
|
+
return ['div', attrs, ['div', contentAttrs, 0]];
|
85
|
+
}
|
86
|
+
});
|
87
|
+
return panelNodeSpec;
|
70
88
|
};
|
@@ -1350,6 +1350,16 @@ export var panel_legacy = ['panel', {
|
|
1350
1350
|
}
|
1351
1351
|
}
|
1352
1352
|
}];
|
1353
|
+
export var panel_with_nested_blockquote = ['panel', {
|
1354
|
+
props: {
|
1355
|
+
content: {
|
1356
|
+
type: 'array',
|
1357
|
+
items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'bulletList', 'orderedList', 'blockCard', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'rule', 'decisionList', 'blockquote']],
|
1358
|
+
minItems: 1,
|
1359
|
+
allowUnsupportedBlock: true
|
1360
|
+
}
|
1361
|
+
}
|
1362
|
+
}];
|
1353
1363
|
export var nestedExpand_content = {
|
1354
1364
|
type: 'array',
|
1355
1365
|
items: [['paragraph_with_no_marks', 'heading_with_no_marks', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'codeBlock_with_no_marks', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'rule', 'panel', 'blockquote']],
|
@@ -1903,6 +1903,93 @@
|
|
1903
1903
|
"additionalProperties": false,
|
1904
1904
|
"required": ["type", "attrs", "content"]
|
1905
1905
|
},
|
1906
|
+
"panel_with_nested_blockquote_node": {
|
1907
|
+
"type": "object",
|
1908
|
+
"properties": {
|
1909
|
+
"type": {
|
1910
|
+
"enum": ["panel"]
|
1911
|
+
},
|
1912
|
+
"attrs": {
|
1913
|
+
"type": "object",
|
1914
|
+
"properties": {
|
1915
|
+
"panelType": {
|
1916
|
+
"enum": [
|
1917
|
+
"info",
|
1918
|
+
"note",
|
1919
|
+
"tip",
|
1920
|
+
"warning",
|
1921
|
+
"error",
|
1922
|
+
"success",
|
1923
|
+
"custom"
|
1924
|
+
]
|
1925
|
+
},
|
1926
|
+
"panelIcon": {
|
1927
|
+
"type": "string"
|
1928
|
+
},
|
1929
|
+
"panelIconId": {
|
1930
|
+
"type": "string"
|
1931
|
+
},
|
1932
|
+
"panelIconText": {
|
1933
|
+
"type": "string"
|
1934
|
+
},
|
1935
|
+
"panelColor": {
|
1936
|
+
"type": "string"
|
1937
|
+
}
|
1938
|
+
},
|
1939
|
+
"required": ["panelType"],
|
1940
|
+
"additionalProperties": false
|
1941
|
+
},
|
1942
|
+
"content": {
|
1943
|
+
"type": "array",
|
1944
|
+
"items": {
|
1945
|
+
"anyOf": [
|
1946
|
+
{
|
1947
|
+
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
1948
|
+
},
|
1949
|
+
{
|
1950
|
+
"$ref": "#/definitions/heading_with_no_marks_node"
|
1951
|
+
},
|
1952
|
+
{
|
1953
|
+
"$ref": "#/definitions/bulletList_node"
|
1954
|
+
},
|
1955
|
+
{
|
1956
|
+
"$ref": "#/definitions/orderedList_node"
|
1957
|
+
},
|
1958
|
+
{
|
1959
|
+
"$ref": "#/definitions/blockCard_node"
|
1960
|
+
},
|
1961
|
+
{
|
1962
|
+
"$ref": "#/definitions/mediaGroup_node"
|
1963
|
+
},
|
1964
|
+
{
|
1965
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
1966
|
+
},
|
1967
|
+
{
|
1968
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
1969
|
+
},
|
1970
|
+
{
|
1971
|
+
"$ref": "#/definitions/codeBlock_with_no_marks_node"
|
1972
|
+
},
|
1973
|
+
{
|
1974
|
+
"$ref": "#/definitions/taskList_node"
|
1975
|
+
},
|
1976
|
+
{
|
1977
|
+
"$ref": "#/definitions/rule_node"
|
1978
|
+
},
|
1979
|
+
{
|
1980
|
+
"$ref": "#/definitions/decisionList_node"
|
1981
|
+
},
|
1982
|
+
{
|
1983
|
+
"$ref": "#/definitions/blockquote_node"
|
1984
|
+
}
|
1985
|
+
]
|
1986
|
+
},
|
1987
|
+
"minItems": 1
|
1988
|
+
}
|
1989
|
+
},
|
1990
|
+
"additionalProperties": false,
|
1991
|
+
"required": ["type", "attrs", "content"]
|
1992
|
+
},
|
1906
1993
|
"nestedExpand_content": {
|
1907
1994
|
"type": "array",
|
1908
1995
|
"items": {
|
@@ -2461,6 +2548,9 @@
|
|
2461
2548
|
{
|
2462
2549
|
"$ref": "#/definitions/panel_node"
|
2463
2550
|
},
|
2551
|
+
{
|
2552
|
+
"$ref": "#/definitions/panel_with_nested_blockquote_node"
|
2553
|
+
},
|
2464
2554
|
{
|
2465
2555
|
"$ref": "#/definitions/table_node"
|
2466
2556
|
},
|
@@ -2788,6 +2878,9 @@
|
|
2788
2878
|
{
|
2789
2879
|
"$ref": "#/definitions/panel_node"
|
2790
2880
|
},
|
2881
|
+
{
|
2882
|
+
"$ref": "#/definitions/panel_with_nested_blockquote_node"
|
2883
|
+
},
|
2791
2884
|
{
|
2792
2885
|
"$ref": "#/definitions/table_node"
|
2793
2886
|
},
|
package/dist/types/index.d.ts
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette,
|
2
2
|
/** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
3
|
-
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, 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
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandWithNestedExpand, 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, panelWithBlockquoteStage0, 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';
|
4
4
|
export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, MultiBodiedExtensionDefinition, ExtensionFrameDefinition, BackgroundColorDefinition, } from './schema';
|
5
5
|
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';
|
6
6
|
export type { Match, NameToEmoji } from './utils';
|
@@ -3,8 +3,8 @@
|
|
3
3
|
* DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
|
4
4
|
* and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
|
5
5
|
*/
|
6
|
-
import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNoMarkDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
|
7
|
-
export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
|
6
|
+
import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, CodeBlockWithNoMarksDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExpandWithNoMarkDefinition, ExpandWithoutNestedExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelLegacyDefinition, PanelWithNestedBlockquoteStage0Definition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
|
7
|
+
export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelLegacyDefinition | PanelWithNestedBlockquoteStage0Definition | TableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ExpandWithNoMarkDefinition | ExpandWithoutNestedExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
|
8
8
|
export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
|
9
9
|
export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | DateStage0Definition | EmojiDefinition | EmojiStage0Definition | HardBreakDefinition | InlineCardDefinition | InlineCardStage0Definition | MentionDefinition | MentionStage0Definition | PlaceholderDefinition | StatusDefinition | StatusStage0Definition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
|
10
10
|
export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;
|
@@ -674,6 +674,20 @@ export interface PanelLegacyDefinition {
|
|
674
674
|
}
|
675
675
|
export type PanelLegacyNode = PMNode & PanelLegacyDefinition;
|
676
676
|
export declare const panelLegacy: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<PanelLegacyNode>) => import("prosemirror-model").NodeSpec;
|
677
|
+
export interface PanelWithNestedBlockquoteStage0Definition {
|
678
|
+
type: 'panel';
|
679
|
+
content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
|
680
|
+
marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
|
681
|
+
attrs: {
|
682
|
+
panelType: 'info' | 'note' | 'tip' | 'warning' | 'error' | 'success' | 'custom';
|
683
|
+
panelIcon?: string;
|
684
|
+
panelIconId?: string;
|
685
|
+
panelIconText?: string;
|
686
|
+
panelColor?: string;
|
687
|
+
};
|
688
|
+
}
|
689
|
+
export type PanelWithNestedBlockquoteStage0Node = PMNode & PanelWithNestedBlockquoteStage0Definition;
|
690
|
+
export declare const panelWithNestedBlockquoteStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<PanelWithNestedBlockquoteStage0Node>) => import("prosemirror-model").NodeSpec;
|
677
691
|
export interface ParagraphDefinition {
|
678
692
|
type: 'paragraph';
|
679
693
|
content: Array<InlineDefinition>;
|
@@ -60,9 +60,13 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
|
|
60
60
|
* Pseudo group used to match existing validator and json schema specs.
|
61
61
|
*/
|
62
62
|
ignore: ("json-schema" | "validator-spec")[];
|
63
|
-
}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
|
63
|
+
}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
|
64
64
|
content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
|
65
65
|
ignore: ("json-schema" | "validator-spec")[];
|
66
|
+
} & {
|
67
|
+
content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
|
68
|
+
noExtend: true;
|
69
|
+
stage0: true;
|
66
70
|
}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<any, import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
|
67
71
|
marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
|
68
72
|
ignore: any[];
|
@@ -1,4 +1,8 @@
|
|
1
|
-
export declare const panel: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
|
1
|
+
export declare const panel: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
|
2
2
|
content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
|
3
3
|
ignore: ("json-schema" | "validator-spec")[];
|
4
|
+
} & {
|
5
|
+
content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
|
6
|
+
noExtend: true;
|
7
|
+
stage0: true;
|
4
8
|
}>;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, 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';
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, 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, panelWithBlockquoteStage0, 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 type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, ExtensionFrameDefinition, MultiBodiedExtensionDefinition, } from './nodes';
|
3
3
|
export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette,
|
4
4
|
/** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
@@ -28,7 +28,7 @@ export { mention, toJSON as mentionToJSON } from './mention';
|
|
28
28
|
export type { MentionAttributes, UserType as MentionUserType, MentionDefinition, } from './mention';
|
29
29
|
export { listItem, listItemWithTask, listItemWithDecisionStage0, } from './list-item';
|
30
30
|
export type { ListItemArray, ListItemDefinition } from './types/list';
|
31
|
-
export { extendedPanel, PanelType } from './panel';
|
31
|
+
export { extendedPanel, PanelType, panelWithBlockquoteStage0 } from './panel';
|
32
32
|
export type { PanelAttributes, PanelDefinition } from './panel';
|
33
33
|
export { text } from './text';
|
34
34
|
export type { TextDefinition } from './text';
|
@@ -47,3 +47,4 @@ export interface DOMAttributes {
|
|
47
47
|
* addition to content allowed inside panel
|
48
48
|
*/
|
49
49
|
export declare const extendedPanel: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;
|
50
|
+
export declare const panelWithBlockquoteStage0: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;
|
@@ -1369,6 +1369,16 @@ export declare const panel_legacy: (string | {
|
|
1369
1369
|
};
|
1370
1370
|
};
|
1371
1371
|
})[];
|
1372
|
+
export declare const panel_with_nested_blockquote: (string | {
|
1373
|
+
props: {
|
1374
|
+
content: {
|
1375
|
+
type: string;
|
1376
|
+
items: string[][];
|
1377
|
+
minItems: number;
|
1378
|
+
allowUnsupportedBlock: boolean;
|
1379
|
+
};
|
1380
|
+
};
|
1381
|
+
})[];
|
1372
1382
|
export declare const nestedExpand_content: {
|
1373
1383
|
type: string;
|
1374
1384
|
items: string[][];
|
@@ -1903,6 +1903,93 @@
|
|
1903
1903
|
"additionalProperties": false,
|
1904
1904
|
"required": ["type", "attrs", "content"]
|
1905
1905
|
},
|
1906
|
+
"panel_with_nested_blockquote_node": {
|
1907
|
+
"type": "object",
|
1908
|
+
"properties": {
|
1909
|
+
"type": {
|
1910
|
+
"enum": ["panel"]
|
1911
|
+
},
|
1912
|
+
"attrs": {
|
1913
|
+
"type": "object",
|
1914
|
+
"properties": {
|
1915
|
+
"panelType": {
|
1916
|
+
"enum": [
|
1917
|
+
"info",
|
1918
|
+
"note",
|
1919
|
+
"tip",
|
1920
|
+
"warning",
|
1921
|
+
"error",
|
1922
|
+
"success",
|
1923
|
+
"custom"
|
1924
|
+
]
|
1925
|
+
},
|
1926
|
+
"panelIcon": {
|
1927
|
+
"type": "string"
|
1928
|
+
},
|
1929
|
+
"panelIconId": {
|
1930
|
+
"type": "string"
|
1931
|
+
},
|
1932
|
+
"panelIconText": {
|
1933
|
+
"type": "string"
|
1934
|
+
},
|
1935
|
+
"panelColor": {
|
1936
|
+
"type": "string"
|
1937
|
+
}
|
1938
|
+
},
|
1939
|
+
"required": ["panelType"],
|
1940
|
+
"additionalProperties": false
|
1941
|
+
},
|
1942
|
+
"content": {
|
1943
|
+
"type": "array",
|
1944
|
+
"items": {
|
1945
|
+
"anyOf": [
|
1946
|
+
{
|
1947
|
+
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
1948
|
+
},
|
1949
|
+
{
|
1950
|
+
"$ref": "#/definitions/heading_with_no_marks_node"
|
1951
|
+
},
|
1952
|
+
{
|
1953
|
+
"$ref": "#/definitions/bulletList_node"
|
1954
|
+
},
|
1955
|
+
{
|
1956
|
+
"$ref": "#/definitions/orderedList_node"
|
1957
|
+
},
|
1958
|
+
{
|
1959
|
+
"$ref": "#/definitions/blockCard_node"
|
1960
|
+
},
|
1961
|
+
{
|
1962
|
+
"$ref": "#/definitions/mediaGroup_node"
|
1963
|
+
},
|
1964
|
+
{
|
1965
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
1966
|
+
},
|
1967
|
+
{
|
1968
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
1969
|
+
},
|
1970
|
+
{
|
1971
|
+
"$ref": "#/definitions/codeBlock_with_no_marks_node"
|
1972
|
+
},
|
1973
|
+
{
|
1974
|
+
"$ref": "#/definitions/taskList_node"
|
1975
|
+
},
|
1976
|
+
{
|
1977
|
+
"$ref": "#/definitions/rule_node"
|
1978
|
+
},
|
1979
|
+
{
|
1980
|
+
"$ref": "#/definitions/decisionList_node"
|
1981
|
+
},
|
1982
|
+
{
|
1983
|
+
"$ref": "#/definitions/blockquote_node"
|
1984
|
+
}
|
1985
|
+
]
|
1986
|
+
},
|
1987
|
+
"minItems": 1
|
1988
|
+
}
|
1989
|
+
},
|
1990
|
+
"additionalProperties": false,
|
1991
|
+
"required": ["type", "attrs", "content"]
|
1992
|
+
},
|
1906
1993
|
"nestedExpand_content": {
|
1907
1994
|
"type": "array",
|
1908
1995
|
"items": {
|
@@ -2461,6 +2548,9 @@
|
|
2461
2548
|
{
|
2462
2549
|
"$ref": "#/definitions/panel_node"
|
2463
2550
|
},
|
2551
|
+
{
|
2552
|
+
"$ref": "#/definitions/panel_with_nested_blockquote_node"
|
2553
|
+
},
|
2464
2554
|
{
|
2465
2555
|
"$ref": "#/definitions/table_node"
|
2466
2556
|
},
|
@@ -2788,6 +2878,9 @@
|
|
2788
2878
|
{
|
2789
2879
|
"$ref": "#/definitions/panel_node"
|
2790
2880
|
},
|
2881
|
+
{
|
2882
|
+
"$ref": "#/definitions/panel_with_nested_blockquote_node"
|
2883
|
+
},
|
2791
2884
|
{
|
2792
2885
|
"$ref": "#/definitions/table_node"
|
2793
2886
|
},
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@atlaskit/adf-schema",
|
3
|
-
"version": "40.
|
3
|
+
"version": "40.7.0",
|
4
4
|
"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
|
5
5
|
"publishConfig": {
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
@@ -46,7 +46,7 @@
|
|
46
46
|
"memoize-one": "^6.0.0"
|
47
47
|
},
|
48
48
|
"devDependencies": {
|
49
|
-
"@atlassian/adf-schema-json": "^1.
|
49
|
+
"@atlassian/adf-schema-json": "^1.22.0",
|
50
50
|
"@atlassian/feature-flags-test-utils": "^0.2.0",
|
51
51
|
"@atlaskit/adf-schema-generator": "^1.30.0",
|
52
52
|
"@atlaskit/codemod-utils": "^4.2.4",
|