@atlaskit/adf-schema 57.2.10 → 57.3.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 +14 -0
- package/bodied-rule/package.json +8 -0
- package/dist/cjs/next-schema/full-schema.adf.js +2 -1
- package/dist/cjs/next-schema/generated/nodeTypes.js +91 -17
- package/dist/cjs/next-schema/groups/blockContentGroup.js +2 -1
- package/dist/cjs/next-schema/groups/blockGroup.js +2 -1
- package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js +2 -1
- package/dist/cjs/next-schema/nodes/bodiedRule.js +56 -0
- package/dist/cjs/next-schema/nodes/bodiedSyncBlock.js +2 -1
- package/dist/cjs/next-schema/nodes/extensionFrame.js +2 -1
- package/dist/cjs/next-schema/nodes/nestedExpand.js +2 -1
- package/dist/cjs/next-schema/nodes/panel.js +2 -1
- package/dist/cjs/next-schema/nodes/rule.js +33 -0
- package/dist/cjs/schema/default-schema.js +3 -1
- package/dist/cjs/schema/nodes/bodied-rule.js +57 -0
- package/dist/cjs/schema/nodes/rule.js +53 -1
- package/dist/cjs/schema/nodes-in-order.js +4 -0
- package/dist/cjs/validator-schema/generated/validatorSpec.js +142 -14
- package/dist/es2019/next-schema/full-schema.adf.js +2 -1
- package/dist/es2019/next-schema/generated/nodeTypes.js +90 -16
- package/dist/es2019/next-schema/groups/blockContentGroup.js +2 -1
- package/dist/es2019/next-schema/groups/blockGroup.js +2 -1
- package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js +2 -1
- package/dist/es2019/next-schema/nodes/bodiedRule.js +50 -0
- package/dist/es2019/next-schema/nodes/bodiedSyncBlock.js +2 -1
- package/dist/es2019/next-schema/nodes/extensionFrame.js +2 -1
- package/dist/es2019/next-schema/nodes/nestedExpand.js +2 -1
- package/dist/es2019/next-schema/nodes/panel.js +2 -1
- package/dist/es2019/next-schema/nodes/rule.js +33 -0
- package/dist/es2019/schema/default-schema.js +4 -2
- package/dist/es2019/schema/nodes/bodied-rule.js +50 -0
- package/dist/es2019/schema/nodes/rule.js +56 -0
- package/dist/es2019/schema/nodes-in-order.js +4 -0
- package/dist/es2019/validator-schema/generated/validatorSpec.js +140 -13
- package/dist/esm/next-schema/full-schema.adf.js +2 -1
- package/dist/esm/next-schema/generated/nodeTypes.js +90 -16
- package/dist/esm/next-schema/groups/blockContentGroup.js +2 -1
- package/dist/esm/next-schema/groups/blockGroup.js +2 -1
- package/dist/esm/next-schema/groups/nonNestableBlockContentGroup.js +2 -1
- package/dist/esm/next-schema/groups/tableCellContentPseudoGroup.js +2 -1
- package/dist/esm/next-schema/nodes/bodiedRule.js +50 -0
- package/dist/esm/next-schema/nodes/bodiedSyncBlock.js +2 -1
- package/dist/esm/next-schema/nodes/extensionFrame.js +2 -1
- package/dist/esm/next-schema/nodes/nestedExpand.js +2 -1
- package/dist/esm/next-schema/nodes/panel.js +2 -1
- package/dist/esm/next-schema/nodes/rule.js +33 -0
- package/dist/esm/schema/default-schema.js +4 -2
- package/dist/esm/schema/nodes/bodied-rule.js +51 -0
- package/dist/esm/schema/nodes/rule.js +52 -0
- package/dist/esm/schema/nodes-in-order.js +4 -0
- package/dist/esm/validator-schema/generated/validatorSpec.js +140 -13
- package/dist/json-schema/v1/stage-0.json +248 -0
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +3 -3
- package/dist/types/next-schema/generated/nodeTypes.d.ts +67 -16
- package/dist/types/next-schema/nodes/bodiedRule.d.ts +2 -0
- package/dist/types/next-schema/nodes/rule.d.ts +6 -1
- package/dist/types/schema/default-schema.d.ts +1 -1
- package/dist/types/schema/nodes/bodied-rule.d.ts +34 -0
- package/dist/types/schema/nodes/bodied-sync-block.d.ts +2 -1
- package/dist/types/schema/nodes/doc.d.ts +2 -1
- package/dist/types/schema/nodes/multi-bodied-extension.d.ts +2 -1
- package/dist/types/schema/nodes/nested-expand.d.ts +2 -1
- package/dist/types/schema/nodes/panel.d.ts +3 -2
- package/dist/types/schema/nodes/rule.d.ts +20 -0
- package/dist/types/schema/nodes/tableNodes.d.ts +2 -1
- package/dist/types/schema/nodes/types/block-content.d.ts +2 -1
- package/dist/types/schema/nodes/types/non-nestable-block-content.d.ts +2 -1
- package/dist/types/validator-schema/generated/validatorSpec.d.ts +127 -0
- package/json-schema/v1/stage-0.json +248 -0
- package/package.json +2 -2
- package/schema/bodied-rule/package.json +8 -0
- package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/adf-schema
|
|
2
2
|
|
|
3
|
+
## 57.3.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`a282017db3b85`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a282017db3b85) -
|
|
8
|
+
[EDITOR-8339] introduce new bodiedRule node and new rule node variants to support styling
|
|
9
|
+
attributes and content
|
|
10
|
+
|
|
11
|
+
## 57.2.11
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 57.2.10
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/adf-schema/bodied-rule",
|
|
3
|
+
"main": "../dist/cjs/schema/nodes/bodied-rule.js",
|
|
4
|
+
"module": "../dist/esm/schema/nodes/bodied-rule.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/schema/nodes/bodied-rule.js",
|
|
6
|
+
"sideEffects": false,
|
|
7
|
+
"types": "../dist/types/schema/nodes/bodied-rule.d.ts"
|
|
8
|
+
}
|
|
@@ -18,6 +18,7 @@ var _extension = require("./nodes/extension");
|
|
|
18
18
|
var _multiBodiedExtension = require("./nodes/multiBodiedExtension");
|
|
19
19
|
var _panel = require("./nodes/panel");
|
|
20
20
|
var _rule = require("./nodes/rule");
|
|
21
|
+
var _bodiedRule = require("./nodes/bodiedRule");
|
|
21
22
|
var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
|
|
22
23
|
root: true,
|
|
23
24
|
version: 1,
|
|
@@ -30,7 +31,7 @@ var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
|
|
|
30
31
|
// Deliberately placed AFTER `blockGroup` rather than first: `blockContentGroup` is ignored
|
|
31
32
|
// for `pm-spec`, so this keeps `block` the leading alternative in the PM content
|
|
32
33
|
// expression and leaves ProseMirror's defaultType/fill behaviour untouched.
|
|
33
|
-
_panel.panel.use('c1'), _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _panel.panel.use('root_only'), _panel.panel.use('c1_root_only'), _rule.rule.use('root_only'), _extension.extension.use('root_only'), _bodiedExtension.bodiedExtension.use('root_only'), _multiBodiedExtension.multiBodiedExtension.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
|
|
34
|
+
_panel.panel.use('c1'), _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _panel.panel.use('root_only'), _panel.panel.use('c1_root_only'), _rule.rule.use('root_only'), _rule.rule.use('with_attrs_root_only'), _bodiedRule.bodiedRule.use('root_only'), _extension.extension.use('root_only'), _bodiedExtension.bodiedExtension.use('root_only'), _multiBodiedExtension.multiBodiedExtension.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
|
|
34
35
|
DANGEROUS_MANUAL_OVERRIDE: {
|
|
35
36
|
'validator-spec': {
|
|
36
37
|
'props.content.minItems': {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.ruleRootOnlyStage0 = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelRootOnlyStage0 = exports.panelC1Stage0 = exports.panelC1RootOnlyStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.multiBodiedExtensionRootOnlyStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = 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.extensionRootOnlyStage0 = exports.extensionFrameStage0 = exports.extension = exports.expandRootOnly = 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.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedExtensionWithMarks = exports.bodiedExtensionRootOnlyStage0 = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
|
|
6
|
+
exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.ruleWithAttrsStage0 = exports.ruleWithAttrsRootOnlyStage0 = exports.ruleRootOnlyStage0 = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelRootOnlyStage0 = exports.panelC1Stage0 = exports.panelC1RootOnlyStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.multiBodiedExtensionRootOnlyStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = 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.extensionRootOnlyStage0 = exports.extensionFrameStage0 = exports.extension = exports.expandRootOnly = 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.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedRuleStage0 = exports.bodiedRuleRootOnlyStage0 = exports.bodiedExtensionWithMarks = exports.bodiedExtensionRootOnlyStage0 = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = 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
|
|
@@ -75,7 +75,7 @@ var blockTaskItem = exports.blockTaskItem = (0, _createPMSpecFactory.createPMNod
|
|
|
75
75
|
defining: true
|
|
76
76
|
});
|
|
77
77
|
var bodiedExtension = exports.bodiedExtension = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
78
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
78
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
79
79
|
marks: 'dataConsumer fontSize fragment unsupportedMark unsupportedNodeAttribute',
|
|
80
80
|
group: 'block',
|
|
81
81
|
attrs: {
|
|
@@ -103,7 +103,7 @@ var bodiedExtension = exports.bodiedExtension = (0, _createPMSpecFactory.createP
|
|
|
103
103
|
isolating: true
|
|
104
104
|
});
|
|
105
105
|
var bodiedExtensionRootOnlyStage0 = exports.bodiedExtensionRootOnlyStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
106
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
106
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
|
107
107
|
marks: 'dataConsumer fontSize fragment unsupportedMark unsupportedNodeAttribute',
|
|
108
108
|
attrs: {
|
|
109
109
|
extensionKey: {
|
|
@@ -156,8 +156,49 @@ var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _createPMS
|
|
|
156
156
|
defining: true,
|
|
157
157
|
isolating: true
|
|
158
158
|
});
|
|
159
|
+
var bodiedRuleRootOnlyStage0 = exports.bodiedRuleRootOnlyStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
160
|
+
content: '(paragraph | heading){1,1}',
|
|
161
|
+
attrs: {
|
|
162
|
+
localId: {
|
|
163
|
+
default: ''
|
|
164
|
+
},
|
|
165
|
+
alignment: {
|
|
166
|
+
default: null
|
|
167
|
+
},
|
|
168
|
+
color: {
|
|
169
|
+
default: null
|
|
170
|
+
},
|
|
171
|
+
style: {
|
|
172
|
+
default: null
|
|
173
|
+
},
|
|
174
|
+
weight: {
|
|
175
|
+
default: null
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
});
|
|
179
|
+
var bodiedRuleStage0 = exports.bodiedRuleStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
180
|
+
content: '(paragraph | heading){1,1}',
|
|
181
|
+
group: 'block',
|
|
182
|
+
attrs: {
|
|
183
|
+
localId: {
|
|
184
|
+
default: ''
|
|
185
|
+
},
|
|
186
|
+
alignment: {
|
|
187
|
+
default: null
|
|
188
|
+
},
|
|
189
|
+
color: {
|
|
190
|
+
default: null
|
|
191
|
+
},
|
|
192
|
+
style: {
|
|
193
|
+
default: null
|
|
194
|
+
},
|
|
195
|
+
weight: {
|
|
196
|
+
default: null
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
});
|
|
159
200
|
var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
160
|
-
content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | table | taskList | unsupportedBlock)+',
|
|
201
|
+
content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel_c1 | panel | rule | bodiedRule | table | taskList | unsupportedBlock)+',
|
|
161
202
|
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
|
|
162
203
|
attrs: {
|
|
163
204
|
resourceId: {
|
|
@@ -331,7 +372,7 @@ var decisionList = exports.decisionList = (0, _createPMSpecFactory.createPMNodeS
|
|
|
331
372
|
defining: true
|
|
332
373
|
});
|
|
333
374
|
var doc = exports.doc = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
334
|
-
content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
|
|
375
|
+
content: '(block | panel_c1 | codeBlock | panel | panel_c1_root_only | rule | bodiedRule | extension | bodiedExtension | multiBodiedExtension | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
|
|
335
376
|
marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
|
|
336
377
|
});
|
|
337
378
|
var embedCard = exports.embedCard = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
@@ -397,7 +438,7 @@ var emojiStage0 = exports.emojiStage0 = (0, _createPMSpecFactory.createPMNodeSpe
|
|
|
397
438
|
selectable: true
|
|
398
439
|
});
|
|
399
440
|
var expand = exports.expand = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
400
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
441
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
401
442
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
|
402
443
|
group: 'block',
|
|
403
444
|
attrs: {
|
|
@@ -415,7 +456,7 @@ var expand = exports.expand = (0, _createPMSpecFactory.createPMNodeSpecFactory)(
|
|
|
415
456
|
isolating: true
|
|
416
457
|
});
|
|
417
458
|
var expandRootOnly = exports.expandRootOnly = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
418
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
459
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock | nestedExpand)+',
|
|
419
460
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
|
420
461
|
attrs: {
|
|
421
462
|
title: {
|
|
@@ -506,7 +547,7 @@ var extensionWithMarks = exports.extensionWithMarks = (0, _createPMSpecFactory.c
|
|
|
506
547
|
selectable: true
|
|
507
548
|
});
|
|
508
549
|
var extensionFrameStage0 = exports.extensionFrameStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
509
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
|
|
550
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
|
|
510
551
|
marks: 'dataConsumer fontSize fragment unsupportedMark unsupportedNodeAttribute',
|
|
511
552
|
attrs: {},
|
|
512
553
|
selectable: false,
|
|
@@ -1022,7 +1063,7 @@ var multiBodiedExtensionStage0 = exports.multiBodiedExtensionStage0 = (0, _creat
|
|
|
1022
1063
|
definingAsContext: true
|
|
1023
1064
|
});
|
|
1024
1065
|
var nestedExpand = exports.nestedExpand = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1025
|
-
content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock | extension)+',
|
|
1066
|
+
content: '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | bodiedRule | panel | blockquote | unsupportedBlock | extension)+',
|
|
1026
1067
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1027
1068
|
attrs: {
|
|
1028
1069
|
title: {
|
|
@@ -1068,7 +1109,7 @@ var orderedList = exports.orderedList = (0, _createPMSpecFactory.createPMNodeSpe
|
|
|
1068
1109
|
selectable: false
|
|
1069
1110
|
});
|
|
1070
1111
|
var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1071
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
|
|
1112
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
|
|
1072
1113
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1073
1114
|
group: 'block',
|
|
1074
1115
|
attrs: {
|
|
@@ -1094,7 +1135,7 @@ var panel = exports.panel = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
|
1094
1135
|
selectable: true
|
|
1095
1136
|
});
|
|
1096
1137
|
var panelC1RootOnlyStage0 = exports.panelC1RootOnlyStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1097
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension | table)+',
|
|
1138
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
|
|
1098
1139
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1099
1140
|
attrs: {
|
|
1100
1141
|
panelType: {
|
|
@@ -1119,7 +1160,7 @@ var panelC1RootOnlyStage0 = exports.panelC1RootOnlyStage0 = (0, _createPMSpecFac
|
|
|
1119
1160
|
selectable: true
|
|
1120
1161
|
});
|
|
1121
1162
|
var panelC1Stage0 = exports.panelC1Stage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1122
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension | table)+',
|
|
1163
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension | table)+',
|
|
1123
1164
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1124
1165
|
group: 'block',
|
|
1125
1166
|
attrs: {
|
|
@@ -1145,7 +1186,7 @@ var panelC1Stage0 = exports.panelC1Stage0 = (0, _createPMSpecFactory.createPMNod
|
|
|
1145
1186
|
selectable: true
|
|
1146
1187
|
});
|
|
1147
1188
|
var panelRootOnlyStage0 = exports.panelRootOnlyStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1148
|
-
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | decisionList | unsupportedBlock | extension)+',
|
|
1189
|
+
content: '(paragraph | heading | bulletList | orderedList | blockCard | mediaGroup | mediaSingle | codeBlock | taskList | rule | bodiedRule | decisionList | unsupportedBlock | extension)+',
|
|
1149
1190
|
marks: 'fontSize unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1150
1191
|
attrs: {
|
|
1151
1192
|
panelType: {
|
|
@@ -1244,6 +1285,39 @@ var ruleRootOnlyStage0 = exports.ruleRootOnlyStage0 = (0, _createPMSpecFactory.c
|
|
|
1244
1285
|
}
|
|
1245
1286
|
}
|
|
1246
1287
|
});
|
|
1288
|
+
var ruleWithAttrsRootOnlyStage0 = exports.ruleWithAttrsRootOnlyStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1289
|
+
attrs: {
|
|
1290
|
+
localId: {
|
|
1291
|
+
default: null
|
|
1292
|
+
},
|
|
1293
|
+
color: {
|
|
1294
|
+
default: null
|
|
1295
|
+
},
|
|
1296
|
+
style: {
|
|
1297
|
+
default: null
|
|
1298
|
+
},
|
|
1299
|
+
weight: {
|
|
1300
|
+
default: null
|
|
1301
|
+
}
|
|
1302
|
+
}
|
|
1303
|
+
});
|
|
1304
|
+
var ruleWithAttrsStage0 = exports.ruleWithAttrsStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1305
|
+
group: 'block',
|
|
1306
|
+
attrs: {
|
|
1307
|
+
localId: {
|
|
1308
|
+
default: null
|
|
1309
|
+
},
|
|
1310
|
+
color: {
|
|
1311
|
+
default: null
|
|
1312
|
+
},
|
|
1313
|
+
style: {
|
|
1314
|
+
default: null
|
|
1315
|
+
},
|
|
1316
|
+
weight: {
|
|
1317
|
+
default: null
|
|
1318
|
+
}
|
|
1319
|
+
}
|
|
1320
|
+
});
|
|
1247
1321
|
var status = exports.status = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1248
1322
|
group: 'inline',
|
|
1249
1323
|
inline: true,
|
|
@@ -1350,7 +1424,7 @@ var tableWithNestedTable = exports.tableWithNestedTable = (0, _createPMSpecFacto
|
|
|
1350
1424
|
tableRole: 'table'
|
|
1351
1425
|
});
|
|
1352
1426
|
var tableCell = exports.tableCell = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1353
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
|
|
1427
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
|
|
1354
1428
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1355
1429
|
attrs: {
|
|
1356
1430
|
colspan: {
|
|
@@ -1377,7 +1451,7 @@ var tableCell = exports.tableCell = (0, _createPMSpecFactory.createPMNodeSpecFac
|
|
|
1377
1451
|
tableRole: 'cell'
|
|
1378
1452
|
});
|
|
1379
1453
|
var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1380
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
|
|
1454
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
|
|
1381
1455
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1382
1456
|
attrs: {
|
|
1383
1457
|
colspan: {
|
|
@@ -1404,7 +1478,7 @@ var tableCellWithNestedTable = exports.tableCellWithNestedTable = (0, _createPMS
|
|
|
1404
1478
|
tableRole: 'cell'
|
|
1405
1479
|
});
|
|
1406
1480
|
var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1407
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
|
|
1481
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
|
|
1408
1482
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1409
1483
|
attrs: {
|
|
1410
1484
|
colspan: {
|
|
@@ -1431,7 +1505,7 @@ var tableHeader = exports.tableHeader = (0, _createPMSpecFactory.createPMNodeSpe
|
|
|
1431
1505
|
tableRole: 'header_cell'
|
|
1432
1506
|
});
|
|
1433
1507
|
var tableHeaderWithNestedTable = exports.tableHeaderWithNestedTable = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
|
1434
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
|
|
1508
|
+
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | bodiedRule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
|
|
1435
1509
|
marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
|
|
1436
1510
|
attrs: {
|
|
1437
1511
|
colspan: {
|
|
@@ -8,6 +8,7 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
|
8
8
|
var _blockCard = require("../nodes/blockCard");
|
|
9
9
|
var _blockquote = require("../nodes/blockquote");
|
|
10
10
|
var _bodiedExtension = require("../nodes/bodiedExtension");
|
|
11
|
+
var _bodiedRule = require("../nodes/bodiedRule");
|
|
11
12
|
var _codeBlock = require("../nodes/codeBlock");
|
|
12
13
|
var _confluenceUnsupportedBlock = require("../nodes/confluenceUnsupportedBlock");
|
|
13
14
|
var _decisionList = require("../nodes/decisionList");
|
|
@@ -36,7 +37,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
|
|
36
37
|
* - no base mediaSingle
|
|
37
38
|
* - no base heading
|
|
38
39
|
*/
|
|
39
|
-
var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
|
|
40
|
+
var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
|
|
40
41
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
41
42
|
_tableNodes.table.use('with_nested_table'), _expand.expand, _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
|
|
42
43
|
ignore: ['pm-spec']
|
|
@@ -8,6 +8,7 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
|
8
8
|
var _blockCard = require("../nodes/blockCard");
|
|
9
9
|
var _blockquote = require("../nodes/blockquote");
|
|
10
10
|
var _bodiedExtension = require("../nodes/bodiedExtension");
|
|
11
|
+
var _bodiedRule = require("../nodes/bodiedRule");
|
|
11
12
|
var _codeBlock = require("../nodes/codeBlock");
|
|
12
13
|
var _confluenceUnsupportedBlock = require("../nodes/confluenceUnsupportedBlock");
|
|
13
14
|
var _decisionList = require("../nodes/decisionList");
|
|
@@ -24,7 +25,7 @@ var _rule = require("../nodes/rule");
|
|
|
24
25
|
var _tableNodes = require("../nodes/tableNodes");
|
|
25
26
|
var _task = require("../nodes/task");
|
|
26
27
|
var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
|
27
|
-
var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _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'), _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('c1'), _tableNodes.table,
|
|
28
|
+
var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _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'), _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, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
|
|
28
29
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
29
30
|
_tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
|
|
30
31
|
// @DSLCompatibilityException
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.nonNestableBlockContentGroup = exports.nonNestableBlockContent = void 0;
|
|
7
7
|
var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
8
8
|
var _blockCard = require("../nodes/blockCard");
|
|
9
|
+
var _bodiedRule = require("../nodes/bodiedRule");
|
|
9
10
|
var _blockquote = require("../nodes/blockquote");
|
|
10
11
|
var _codeBlock = require("../nodes/codeBlock");
|
|
11
12
|
var _decisionList = require("../nodes/decisionList");
|
|
@@ -24,7 +25,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
|
|
24
25
|
// Not an actual group, but a collection of nodes that can't be nested inside each other
|
|
25
26
|
// TODO: ED-29537 - make it an actual group
|
|
26
27
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
27
|
-
var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
|
|
28
|
+
var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
|
|
28
29
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
29
30
|
_tableNodes.table.use('with_nested_table'), _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _unsupportedBlock.unsupportedBlock];
|
|
30
31
|
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.tableHeaderContentPseudoGroup = exports.tableCellContentPseudoGroup = exports.tableCellContentNodes = void 0;
|
|
7
7
|
var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
8
8
|
var _blockCard = require("../nodes/blockCard");
|
|
9
|
+
var _bodiedRule = require("../nodes/bodiedRule");
|
|
9
10
|
var _blockquote = require("../nodes/blockquote");
|
|
10
11
|
var _codeBlock = require("../nodes/codeBlock");
|
|
11
12
|
var _decisionList = require("../nodes/decisionList");
|
|
@@ -22,7 +23,7 @@ var _rule = require("../nodes/rule");
|
|
|
22
23
|
var _task = require("../nodes/task");
|
|
23
24
|
var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
|
24
25
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
25
|
-
var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
|
|
26
|
+
var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
|
|
26
27
|
|
|
27
28
|
// This is not an actual group, but a collection of nodes
|
|
28
29
|
// @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.bodiedRule = void 0;
|
|
7
|
+
var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
8
|
+
var _breakout = require("../marks/breakout");
|
|
9
|
+
var _unsupportedMark = require("../marks/unsupportedMark");
|
|
10
|
+
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
11
|
+
var _heading = require("./heading");
|
|
12
|
+
var _paragraph = require("./paragraph");
|
|
13
|
+
var bodiedRuleAttributes = {
|
|
14
|
+
localId: {
|
|
15
|
+
type: 'string',
|
|
16
|
+
default: '',
|
|
17
|
+
minLength: 1
|
|
18
|
+
},
|
|
19
|
+
alignment: {
|
|
20
|
+
type: 'enum',
|
|
21
|
+
values: ['start', 'center', 'end'],
|
|
22
|
+
default: null,
|
|
23
|
+
optional: true
|
|
24
|
+
},
|
|
25
|
+
color: {
|
|
26
|
+
type: 'string',
|
|
27
|
+
default: null,
|
|
28
|
+
optional: true,
|
|
29
|
+
pattern: '^#[0-9a-fA-F]{6}$'
|
|
30
|
+
},
|
|
31
|
+
style: {
|
|
32
|
+
type: 'enum',
|
|
33
|
+
values: ['solid', 'dashed', 'dotted', 'sketch', 'fade'],
|
|
34
|
+
default: null,
|
|
35
|
+
optional: true
|
|
36
|
+
},
|
|
37
|
+
weight: {
|
|
38
|
+
type: 'number',
|
|
39
|
+
default: null,
|
|
40
|
+
minimum: 1,
|
|
41
|
+
maximum: 3,
|
|
42
|
+
optional: true
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
var bodiedRule = exports.bodiedRule = (0, _adfSchemaGenerator.adfNode)('bodiedRule').define({
|
|
46
|
+
stage0: true,
|
|
47
|
+
attrs: bodiedRuleAttributes,
|
|
48
|
+
content: [(0, _adfSchemaGenerator.$range)(1, 1, (0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _heading.heading.use('with_no_marks')))],
|
|
49
|
+
marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute]
|
|
50
|
+
})
|
|
51
|
+
// this variant is used to support breakout resizing for bodiedRule nodes at the document root
|
|
52
|
+
.variant('root_only', {
|
|
53
|
+
stage0: true,
|
|
54
|
+
marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
|
|
55
|
+
noExtend: true
|
|
56
|
+
});
|
|
@@ -10,6 +10,7 @@ var _unsupportedMark = require("../marks/unsupportedMark");
|
|
|
10
10
|
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
11
11
|
var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
|
12
12
|
var _blockCard = require("./blockCard");
|
|
13
|
+
var _bodiedRule = require("./bodiedRule");
|
|
13
14
|
var _blockquote = require("./blockquote");
|
|
14
15
|
var _codeBlock = require("./codeBlock");
|
|
15
16
|
var _confluenceUnsupportedBlock = require("./confluenceUnsupportedBlock");
|
|
@@ -43,7 +44,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _adfSchemaGenerator.adfNode)
|
|
|
43
44
|
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList,
|
|
44
45
|
// panel_c1 must precede bare `panel` so the validator's repairing loop reaches it before
|
|
45
46
|
// base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
|
|
46
|
-
_panel.panel.use('c1'), _panel.panel, _rule.rule, _tableNodes.table,
|
|
47
|
+
_panel.panel.use('c1'), _panel.panel, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _tableNodes.table,
|
|
47
48
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
48
49
|
_tableNodes.table.use('with_nested_table'), _task.taskList, _unsupportedBlock.unsupportedBlock))]
|
|
49
50
|
});
|
|
@@ -12,6 +12,7 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
|
12
12
|
var _blockCard = require("./blockCard");
|
|
13
13
|
var _blockquote = require("./blockquote");
|
|
14
14
|
var _bodiedExtension = require("./bodiedExtension");
|
|
15
|
+
var _bodiedRule = require("./bodiedRule");
|
|
15
16
|
var _codeBlock = require("./codeBlock");
|
|
16
17
|
var _decisionList = require("./decisionList");
|
|
17
18
|
var _embedCard = require("./embedCard");
|
|
@@ -36,7 +37,7 @@ var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('
|
|
|
36
37
|
// packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
|
|
37
38
|
marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
|
|
38
39
|
attrs: {},
|
|
39
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
|
|
40
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
|
|
40
41
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
|
41
42
|
_tableNodes.table.use('with_nested_table'), _extension.extension.use('with_marks'), _bodiedExtension.bodiedExtension.use('with_marks'), _unsupportedBlock.unsupportedBlock, _blockCard.blockCard, _embedCard.embedCard))],
|
|
42
43
|
DANGEROUS_MANUAL_OVERRIDE: {
|
|
@@ -8,6 +8,7 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
|
8
8
|
var _unsupportedMark = require("../marks/unsupportedMark");
|
|
9
9
|
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
10
10
|
var _blockquote = require("./blockquote");
|
|
11
|
+
var _bodiedRule = require("./bodiedRule");
|
|
11
12
|
var _codeBlock = require("./codeBlock");
|
|
12
13
|
var _decisionList = require("./decisionList");
|
|
13
14
|
var _extension = require("./extension");
|
|
@@ -20,7 +21,7 @@ var _paragraph = require("./paragraph");
|
|
|
20
21
|
var _rule = require("./rule");
|
|
21
22
|
var _task = require("./task");
|
|
22
23
|
var _unsupportedBlock = require("./unsupportedBlock");
|
|
23
|
-
var nestedExpandContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock];
|
|
24
|
+
var nestedExpandContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock];
|
|
24
25
|
var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nestedExpand').define({
|
|
25
26
|
isolating: true,
|
|
26
27
|
selectable: true,
|
|
@@ -9,6 +9,7 @@ var _breakout = require("../marks/breakout");
|
|
|
9
9
|
var _unsupportedMark = require("../marks/unsupportedMark");
|
|
10
10
|
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
11
11
|
var _blockCard = require("./blockCard");
|
|
12
|
+
var _bodiedRule = require("./bodiedRule");
|
|
12
13
|
var _codeBlock = require("./codeBlock");
|
|
13
14
|
var _decisionList = require("./decisionList");
|
|
14
15
|
var _heading = require("./heading");
|
|
@@ -21,7 +22,7 @@ var _task = require("./task");
|
|
|
21
22
|
var _unsupportedBlock = require("./unsupportedBlock");
|
|
22
23
|
var _extension = require("./extension");
|
|
23
24
|
var _tableStub = require("./tableStub");
|
|
24
|
-
var panelContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _rule.rule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock];
|
|
25
|
+
var panelContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _heading.heading.use('with_no_marks'), _list.bulletList, _list.orderedList, _blockCard.blockCard, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _task.taskList, _rule.rule, _rule.rule.use('with_attrs'), _bodiedRule.bodiedRule, _decisionList.decisionList, _unsupportedBlock.unsupportedBlock];
|
|
25
26
|
var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
|
|
26
27
|
selectable: true,
|
|
27
28
|
marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
|
|
@@ -8,6 +8,32 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
|
|
8
8
|
var _breakout = require("../marks/breakout");
|
|
9
9
|
var _unsupportedMark = require("../marks/unsupportedMark");
|
|
10
10
|
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
11
|
+
var ruleAttributes = {
|
|
12
|
+
localId: {
|
|
13
|
+
type: 'string',
|
|
14
|
+
default: null,
|
|
15
|
+
optional: true
|
|
16
|
+
},
|
|
17
|
+
color: {
|
|
18
|
+
type: 'string',
|
|
19
|
+
default: null,
|
|
20
|
+
optional: true,
|
|
21
|
+
pattern: '^#[0-9a-fA-F]{6}$'
|
|
22
|
+
},
|
|
23
|
+
style: {
|
|
24
|
+
type: 'enum',
|
|
25
|
+
values: ['solid', 'dashed', 'dotted', 'sketch', 'fade'],
|
|
26
|
+
default: null,
|
|
27
|
+
optional: true
|
|
28
|
+
},
|
|
29
|
+
weight: {
|
|
30
|
+
type: 'number',
|
|
31
|
+
default: null,
|
|
32
|
+
minimum: 1,
|
|
33
|
+
maximum: 3,
|
|
34
|
+
optional: true
|
|
35
|
+
}
|
|
36
|
+
};
|
|
11
37
|
var rule = exports.rule = (0, _adfSchemaGenerator.adfNode)('rule').define({
|
|
12
38
|
attrs: {
|
|
13
39
|
localId: {
|
|
@@ -16,9 +42,16 @@ var rule = exports.rule = (0, _adfSchemaGenerator.adfNode)('rule').define({
|
|
|
16
42
|
optional: true
|
|
17
43
|
}
|
|
18
44
|
}
|
|
45
|
+
}).variant('with_attrs', {
|
|
46
|
+
stage0: true,
|
|
47
|
+
attrs: ruleAttributes
|
|
19
48
|
})
|
|
20
49
|
// this variant is used to support breakout resizing for rule nodes at the document root
|
|
21
50
|
.variant('root_only', {
|
|
22
51
|
stage0: true,
|
|
23
52
|
marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute]
|
|
53
|
+
}).variant('with_attrs_root_only', {
|
|
54
|
+
stage0: true,
|
|
55
|
+
attrs: ruleAttributes,
|
|
56
|
+
marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute]
|
|
24
57
|
});
|
|
@@ -8,6 +8,7 @@ exports.getSchemaBasedOnStage = exports.defaultSchemaConfig = exports.defaultSch
|
|
|
8
8
|
var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
9
9
|
var _createSchema = require("./create-schema");
|
|
10
10
|
var _nodes = require("./nodes");
|
|
11
|
+
var _bodiedRule = require("./nodes/bodied-rule");
|
|
11
12
|
var _extendedPanelC1RootOnlyStage = require("./nodes/extended-panel-c1-root-only-stage0");
|
|
12
13
|
var _extendedPanelRootOnlyStage = require("./nodes/extended-panel-root-only-stage0");
|
|
13
14
|
var _rule = require("./nodes/rule");
|
|
@@ -42,7 +43,8 @@ function () {
|
|
|
42
43
|
tableHeader: _nodes.tableHeaderWithNestedTableStage0,
|
|
43
44
|
panel: (0, _extendedPanelRootOnlyStage.extendedPanelRootOnlyStage0)(true),
|
|
44
45
|
panel_c1: (0, _extendedPanelC1RootOnlyStage.extendedPanelC1RootOnlyStage0)(true),
|
|
45
|
-
rule: _rule.
|
|
46
|
+
rule: _rule.ruleWithAttrsRootOnlyStage0,
|
|
47
|
+
bodiedRule: _bodiedRule.bodiedRuleRootOnlyStage0
|
|
46
48
|
};
|
|
47
49
|
}
|
|
48
50
|
return (0, _createSchema.createSchema)(defaultSchemaConfig);
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.bodiedRuleRootOnlyStage0 = exports.bodiedRule = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
+
var _nodeTypes = require("../../next-schema/generated/nodeTypes");
|
|
10
|
+
var _uuid = require("../../utils/uuid");
|
|
11
|
+
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; }
|
|
12
|
+
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) { (0, _defineProperty2.default)(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; }
|
|
13
|
+
/**
|
|
14
|
+
* @name bodiedRule_node
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* @name bodiedRule_root_only_node
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
var getAttrs = function getAttrs(domNode) {
|
|
22
|
+
// eslint-disable-next-line @atlaskit/editor/no-as-casting
|
|
23
|
+
var dom = domNode;
|
|
24
|
+
var weight = dom.getAttribute('data-weight');
|
|
25
|
+
return {
|
|
26
|
+
alignment: dom.getAttribute('data-alignment') || undefined,
|
|
27
|
+
color: dom.getAttribute('data-color') || undefined,
|
|
28
|
+
localId: dom.getAttribute('data-local-id') || _uuid.uuid.generate(),
|
|
29
|
+
style: dom.getAttribute('data-style') || undefined,
|
|
30
|
+
weight: weight === null || weight === '' ? undefined : Number(weight)
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
var bodiedRule = exports.bodiedRule = (0, _nodeTypes.bodiedRuleStage0)({
|
|
34
|
+
parseDOM: [{
|
|
35
|
+
tag: 'div[data-node-type="bodied-rule"]',
|
|
36
|
+
getAttrs: getAttrs
|
|
37
|
+
}],
|
|
38
|
+
toDOM: function toDOM(node) {
|
|
39
|
+
var _node$attrs = node.attrs,
|
|
40
|
+
alignment = _node$attrs.alignment,
|
|
41
|
+
color = _node$attrs.color,
|
|
42
|
+
localId = _node$attrs.localId,
|
|
43
|
+
style = _node$attrs.style,
|
|
44
|
+
weight = _node$attrs.weight;
|
|
45
|
+
return ['div', {
|
|
46
|
+
'data-node-type': 'bodied-rule',
|
|
47
|
+
'data-alignment': alignment || undefined,
|
|
48
|
+
'data-color': color || undefined,
|
|
49
|
+
'data-local-id': localId || undefined,
|
|
50
|
+
'data-style': style || undefined,
|
|
51
|
+
'data-weight': weight !== null && weight !== void 0 ? weight : undefined
|
|
52
|
+
}, 0];
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
var bodiedRuleRootOnlyStage0 = exports.bodiedRuleRootOnlyStage0 = _objectSpread(_objectSpread({}, bodiedRule), {}, {
|
|
56
|
+
marks: 'breakout unsupportedMark unsupportedNodeAttribute'
|
|
57
|
+
});
|