@atlaskit/adf-schema 35.4.0 → 35.5.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 CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/adf-schema
2
2
 
3
+ ## 35.5.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 49b81f8: Adding node-nesting rules for list, codeblock, actions, divider, decision, panel, quote inside nestedExpand
8
+
3
9
  ## 35.4.0
4
10
 
5
11
  ### Minor Changes
package/dist/cjs/index.js CHANGED
@@ -531,6 +531,12 @@ Object.defineProperty(exports, "expandToJSON", {
531
531
  return _schema.expandToJSON;
532
532
  }
533
533
  });
534
+ Object.defineProperty(exports, "extendedNestedExpand", {
535
+ enumerable: true,
536
+ get: function get() {
537
+ return _schema.extendedNestedExpand;
538
+ }
539
+ });
534
540
  Object.defineProperty(exports, "extendedPanel", {
535
541
  enumerable: true,
536
542
  get: function get() {
@@ -177,7 +177,7 @@ var nodesInOrder = [{
177
177
  spec: _nodes.expand
178
178
  }, {
179
179
  name: 'nestedExpand',
180
- spec: _nodes.nestedExpand
180
+ spec: _nodes.extendedNestedExpand
181
181
  }, {
182
182
  name: 'extension',
183
183
  spec: _nodes.extension
@@ -243,6 +243,12 @@ Object.defineProperty(exports, "expandToJSON", {
243
243
  return _nodes.expandToJSON;
244
244
  }
245
245
  });
246
+ Object.defineProperty(exports, "extendedNestedExpand", {
247
+ enumerable: true,
248
+ get: function get() {
249
+ return _nodes.extendedNestedExpand;
250
+ }
251
+ });
246
252
  Object.defineProperty(exports, "extendedPanel", {
247
253
  enumerable: true,
248
254
  get: function get() {
@@ -142,6 +142,12 @@ Object.defineProperty(exports, "expandToJSON", {
142
142
  return _expand.toJSON;
143
143
  }
144
144
  });
145
+ Object.defineProperty(exports, "extendedNestedExpand", {
146
+ enumerable: true,
147
+ get: function get() {
148
+ return _nestedExpand.extendedNestedExpand;
149
+ }
150
+ });
145
151
  Object.defineProperty(exports, "extendedPanel", {
146
152
  enumerable: true,
147
153
  get: function get() {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.nestedExpand = void 0;
6
+ exports.nestedExpand = exports.extendedNestedExpand = void 0;
7
7
  /**
8
8
  * @name nestedExpand_content
9
9
  * @minItems 1
@@ -18,47 +18,64 @@ exports.nestedExpand = void 0;
18
18
  * @name nestedExpand_with_no_marks_node
19
19
  */
20
20
 
21
- var nestedExpand = {
22
- inline: false,
23
- marks: 'unsupportedMark unsupportedNodeAttribute',
24
- content: '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+',
25
- isolating: true,
26
- selectable: true,
27
- attrs: {
28
- title: {
29
- default: ''
21
+ var createNestedExpandSpec = function createNestedExpandSpec(isExtended) {
22
+ var nestedExpandSpec = {
23
+ inline: false,
24
+ marks: 'unsupportedMark unsupportedNodeAttribute',
25
+ isolating: true,
26
+ selectable: true,
27
+ attrs: {
28
+ title: {
29
+ default: ''
30
+ },
31
+ __expanded: {
32
+ default: true
33
+ }
30
34
  },
31
- __expanded: {
32
- default: true
33
- }
34
- },
35
- parseDOM: [{
36
- context: 'nestedExpand//',
37
- tag: '[data-node-type="nestedExpand"]',
38
- skip: true
39
- }, {
40
- tag: '[data-node-type="nestedExpand"] button',
41
- ignore: true
42
- }, {
43
- tag: '[data-node-type="expand"] button',
44
- ignore: true
45
- }, {
46
- tag: 'div[data-node-type="nestedExpand"]',
47
- getAttrs: function getAttrs(domNode) {
48
- var dom = domNode;
49
- return {
50
- title: dom.getAttribute('data-title'),
51
- __expanded: true
35
+ parseDOM: [{
36
+ context: 'nestedExpand//',
37
+ tag: '[data-node-type="nestedExpand"]',
38
+ skip: true
39
+ }, {
40
+ tag: '[data-node-type="nestedExpand"] button',
41
+ ignore: true
42
+ }, {
43
+ tag: '[data-node-type="expand"] button',
44
+ ignore: true
45
+ }, {
46
+ tag: 'div[data-node-type="nestedExpand"]',
47
+ getAttrs: function getAttrs(domNode) {
48
+ var dom = domNode;
49
+ return {
50
+ title: dom.getAttribute('data-title'),
51
+ __expanded: true
52
+ };
53
+ }
54
+ }],
55
+ toDOM: function toDOM(node) {
56
+ var attrs = {
57
+ 'data-node-type': 'nestedExpand',
58
+ 'data-title': node.attrs.title,
59
+ 'data-expanded': node.attrs.__expanded
52
60
  };
61
+ return ['div', attrs, 0];
53
62
  }
54
- }],
55
- toDOM: function toDOM(node) {
56
- var attrs = {
57
- 'data-node-type': 'nestedExpand',
58
- 'data-title': node.attrs.title,
59
- 'data-expanded': node.attrs.__expanded
60
- };
61
- return ['div', attrs, 0];
63
+ };
64
+ if (isExtended) {
65
+ nestedExpandSpec.content = '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+';
66
+ } else {
67
+ nestedExpandSpec.content = '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+';
62
68
  }
69
+ return nestedExpandSpec;
63
70
  };
64
- exports.nestedExpand = nestedExpand;
71
+ var nestedExpand = createNestedExpandSpec(false);
72
+
73
+ /**
74
+ * @name extended_nestedExpand
75
+ * @description it allows more type of content to be part of the nestedExpand.
76
+ * Specifically, it allows codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote nodes in
77
+ * addition to content allowed inside nestedExpand
78
+ */
79
+ exports.nestedExpand = nestedExpand;
80
+ var extendedNestedExpand = createNestedExpandSpec(true);
81
+ exports.extendedNestedExpand = extendedNestedExpand;
@@ -1,3 +1,3 @@
1
1
  export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, 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, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } from './schema';
2
+ colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, extendedNestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } 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';
@@ -1,7 +1,7 @@
1
1
  import { Schema } from '@atlaskit/editor-prosemirror/model';
2
2
  import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
3
3
  import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
4
- import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
4
+ import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, extendedNestedExpand, embedCard, caption } from './nodes';
5
5
  function addItems(builtInItems, config, customSpecs = {}) {
6
6
  if (!config) {
7
7
  return {};
@@ -162,7 +162,7 @@ const nodesInOrder = [{
162
162
  spec: expand
163
163
  }, {
164
164
  name: 'nestedExpand',
165
- spec: nestedExpand
165
+ spec: extendedNestedExpand
166
166
  }, {
167
167
  name: 'extension',
168
168
  spec: extension
@@ -1,4 +1,4 @@
1
- export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, 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, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, extendedNestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, 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 } from './marks';
4
4
  export { unsupportedNodeTypesForMediaCards } from './unsupported';
@@ -38,7 +38,7 @@ export { blockCard } from './block-card';
38
38
  export { unsupportedBlock } from './unsupported-block';
39
39
  export { unsupportedInline } from './unsupported-inline';
40
40
  export { status } from './status';
41
- export { nestedExpand } from './nested-expand';
41
+ export { nestedExpand, extendedNestedExpand } from './nested-expand';
42
42
  export { embedCard } from './embed-card';
43
43
  // Extensions
44
44
  export { extension } from './extension';
@@ -12,46 +12,62 @@
12
12
  * @name nestedExpand_with_no_marks_node
13
13
  */
14
14
 
15
- export const nestedExpand = {
16
- inline: false,
17
- marks: 'unsupportedMark unsupportedNodeAttribute',
18
- content: '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+',
19
- isolating: true,
20
- selectable: true,
21
- attrs: {
22
- title: {
23
- default: ''
15
+ const createNestedExpandSpec = isExtended => {
16
+ const nestedExpandSpec = {
17
+ inline: false,
18
+ marks: 'unsupportedMark unsupportedNodeAttribute',
19
+ isolating: true,
20
+ selectable: true,
21
+ attrs: {
22
+ title: {
23
+ default: ''
24
+ },
25
+ __expanded: {
26
+ default: true
27
+ }
24
28
  },
25
- __expanded: {
26
- default: true
27
- }
28
- },
29
- parseDOM: [{
30
- context: 'nestedExpand//',
31
- tag: '[data-node-type="nestedExpand"]',
32
- skip: true
33
- }, {
34
- tag: '[data-node-type="nestedExpand"] button',
35
- ignore: true
36
- }, {
37
- tag: '[data-node-type="expand"] button',
38
- ignore: true
39
- }, {
40
- tag: 'div[data-node-type="nestedExpand"]',
41
- getAttrs: domNode => {
42
- const dom = domNode;
43
- return {
44
- title: dom.getAttribute('data-title'),
45
- __expanded: true
29
+ parseDOM: [{
30
+ context: 'nestedExpand//',
31
+ tag: '[data-node-type="nestedExpand"]',
32
+ skip: true
33
+ }, {
34
+ tag: '[data-node-type="nestedExpand"] button',
35
+ ignore: true
36
+ }, {
37
+ tag: '[data-node-type="expand"] button',
38
+ ignore: true
39
+ }, {
40
+ tag: 'div[data-node-type="nestedExpand"]',
41
+ getAttrs: domNode => {
42
+ const dom = domNode;
43
+ return {
44
+ title: dom.getAttribute('data-title'),
45
+ __expanded: true
46
+ };
47
+ }
48
+ }],
49
+ toDOM(node) {
50
+ const attrs = {
51
+ 'data-node-type': 'nestedExpand',
52
+ 'data-title': node.attrs.title,
53
+ 'data-expanded': node.attrs.__expanded
46
54
  };
55
+ return ['div', attrs, 0];
47
56
  }
48
- }],
49
- toDOM(node) {
50
- const attrs = {
51
- 'data-node-type': 'nestedExpand',
52
- 'data-title': node.attrs.title,
53
- 'data-expanded': node.attrs.__expanded
54
- };
55
- return ['div', attrs, 0];
57
+ };
58
+ if (isExtended) {
59
+ nestedExpandSpec.content = '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+';
60
+ } else {
61
+ nestedExpandSpec.content = '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+';
56
62
  }
57
- };
63
+ return nestedExpandSpec;
64
+ };
65
+ export const nestedExpand = createNestedExpandSpec(false);
66
+
67
+ /**
68
+ * @name extended_nestedExpand
69
+ * @description it allows more type of content to be part of the nestedExpand.
70
+ * Specifically, it allows codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote nodes in
71
+ * addition to content allowed inside nestedExpand
72
+ */
73
+ export const extendedNestedExpand = createNestedExpandSpec(true);
package/dist/esm/index.js CHANGED
@@ -1,3 +1,3 @@
1
1
  export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, 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, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } from './schema';
2
+ colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, extendedNestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } 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,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  import { Schema } from '@atlaskit/editor-prosemirror/model';
5
5
  import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
6
6
  import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
7
- import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
7
+ import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, extendedNestedExpand, embedCard, caption } from './nodes';
8
8
  function addItems(builtInItems, config) {
9
9
  var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
10
10
  if (!config) {
@@ -167,7 +167,7 @@ var nodesInOrder = [{
167
167
  spec: expand
168
168
  }, {
169
169
  name: 'nestedExpand',
170
- spec: nestedExpand
170
+ spec: extendedNestedExpand
171
171
  }, {
172
172
  name: 'extension',
173
173
  spec: extension
@@ -1,4 +1,4 @@
1
- export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, 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, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, extendedNestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, 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 } from './marks';
4
4
  export { unsupportedNodeTypesForMediaCards } from './unsupported';
@@ -38,7 +38,7 @@ export { blockCard } from './block-card';
38
38
  export { unsupportedBlock } from './unsupported-block';
39
39
  export { unsupportedInline } from './unsupported-inline';
40
40
  export { status } from './status';
41
- export { nestedExpand } from './nested-expand';
41
+ export { nestedExpand, extendedNestedExpand } from './nested-expand';
42
42
  export { embedCard } from './embed-card';
43
43
  // Extensions
44
44
  export { extension } from './extension';
@@ -12,46 +12,62 @@
12
12
  * @name nestedExpand_with_no_marks_node
13
13
  */
14
14
 
15
- export var nestedExpand = {
16
- inline: false,
17
- marks: 'unsupportedMark unsupportedNodeAttribute',
18
- content: '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+',
19
- isolating: true,
20
- selectable: true,
21
- attrs: {
22
- title: {
23
- default: ''
15
+ var createNestedExpandSpec = function createNestedExpandSpec(isExtended) {
16
+ var nestedExpandSpec = {
17
+ inline: false,
18
+ marks: 'unsupportedMark unsupportedNodeAttribute',
19
+ isolating: true,
20
+ selectable: true,
21
+ attrs: {
22
+ title: {
23
+ default: ''
24
+ },
25
+ __expanded: {
26
+ default: true
27
+ }
24
28
  },
25
- __expanded: {
26
- default: true
27
- }
28
- },
29
- parseDOM: [{
30
- context: 'nestedExpand//',
31
- tag: '[data-node-type="nestedExpand"]',
32
- skip: true
33
- }, {
34
- tag: '[data-node-type="nestedExpand"] button',
35
- ignore: true
36
- }, {
37
- tag: '[data-node-type="expand"] button',
38
- ignore: true
39
- }, {
40
- tag: 'div[data-node-type="nestedExpand"]',
41
- getAttrs: function getAttrs(domNode) {
42
- var dom = domNode;
43
- return {
44
- title: dom.getAttribute('data-title'),
45
- __expanded: true
29
+ parseDOM: [{
30
+ context: 'nestedExpand//',
31
+ tag: '[data-node-type="nestedExpand"]',
32
+ skip: true
33
+ }, {
34
+ tag: '[data-node-type="nestedExpand"] button',
35
+ ignore: true
36
+ }, {
37
+ tag: '[data-node-type="expand"] button',
38
+ ignore: true
39
+ }, {
40
+ tag: 'div[data-node-type="nestedExpand"]',
41
+ getAttrs: function getAttrs(domNode) {
42
+ var dom = domNode;
43
+ return {
44
+ title: dom.getAttribute('data-title'),
45
+ __expanded: true
46
+ };
47
+ }
48
+ }],
49
+ toDOM: function toDOM(node) {
50
+ var attrs = {
51
+ 'data-node-type': 'nestedExpand',
52
+ 'data-title': node.attrs.title,
53
+ 'data-expanded': node.attrs.__expanded
46
54
  };
55
+ return ['div', attrs, 0];
47
56
  }
48
- }],
49
- toDOM: function toDOM(node) {
50
- var attrs = {
51
- 'data-node-type': 'nestedExpand',
52
- 'data-title': node.attrs.title,
53
- 'data-expanded': node.attrs.__expanded
54
- };
55
- return ['div', attrs, 0];
57
+ };
58
+ if (isExtended) {
59
+ nestedExpandSpec.content = '(paragraph | heading | mediaSingle | mediaGroup | codeBlock | bulletList | orderedList | taskList | decisionList | rule | panel | blockquote | unsupportedBlock)+';
60
+ } else {
61
+ nestedExpandSpec.content = '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+';
56
62
  }
57
- };
63
+ return nestedExpandSpec;
64
+ };
65
+ export var nestedExpand = createNestedExpandSpec(false);
66
+
67
+ /**
68
+ * @name extended_nestedExpand
69
+ * @description it allows more type of content to be part of the nestedExpand.
70
+ * Specifically, it allows codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote nodes in
71
+ * addition to content allowed inside nestedExpand
72
+ */
73
+ export var extendedNestedExpand = createNestedExpandSpec(true);
@@ -2097,6 +2097,9 @@
2097
2097
  "type": "array",
2098
2098
  "items": {
2099
2099
  "anyOf": [
2100
+ {
2101
+ "$ref": "#/definitions/codeBlock_with_no_marks_node"
2102
+ },
2100
2103
  {
2101
2104
  "$ref": "#/definitions/paragraph_with_no_marks_node"
2102
2105
  },
@@ -2106,11 +2109,32 @@
2106
2109
  {
2107
2110
  "$ref": "#/definitions/mediaSingle_full_node"
2108
2111
  },
2112
+ {
2113
+ "$ref": "#/definitions/taskList_node"
2114
+ },
2115
+ {
2116
+ "$ref": "#/definitions/bulletList_node"
2117
+ },
2118
+ {
2119
+ "$ref": "#/definitions/orderedList_node"
2120
+ },
2109
2121
  {
2110
2122
  "$ref": "#/definitions/heading_with_no_marks_node"
2111
2123
  },
2112
2124
  {
2113
2125
  "$ref": "#/definitions/mediaGroup_node"
2126
+ },
2127
+ {
2128
+ "$ref": "#/definitions/decisionList_node"
2129
+ },
2130
+ {
2131
+ "$ref": "#/definitions/rule_node"
2132
+ },
2133
+ {
2134
+ "$ref": "#/definitions/panel_node"
2135
+ },
2136
+ {
2137
+ "$ref": "#/definitions/blockquote_node"
2114
2138
  }
2115
2139
  ]
2116
2140
  },
@@ -2097,6 +2097,9 @@
2097
2097
  "type": "array",
2098
2098
  "items": {
2099
2099
  "anyOf": [
2100
+ {
2101
+ "$ref": "#/definitions/codeBlock_with_no_marks_node"
2102
+ },
2100
2103
  {
2101
2104
  "$ref": "#/definitions/paragraph_with_no_marks_node"
2102
2105
  },
@@ -2106,11 +2109,32 @@
2106
2109
  {
2107
2110
  "$ref": "#/definitions/mediaSingle_full_node"
2108
2111
  },
2112
+ {
2113
+ "$ref": "#/definitions/taskList_node"
2114
+ },
2115
+ {
2116
+ "$ref": "#/definitions/bulletList_node"
2117
+ },
2118
+ {
2119
+ "$ref": "#/definitions/orderedList_node"
2120
+ },
2109
2121
  {
2110
2122
  "$ref": "#/definitions/heading_with_no_marks_node"
2111
2123
  },
2112
2124
  {
2113
2125
  "$ref": "#/definitions/mediaGroup_node"
2126
+ },
2127
+ {
2128
+ "$ref": "#/definitions/decisionList_node"
2129
+ },
2130
+ {
2131
+ "$ref": "#/definitions/rule_node"
2132
+ },
2133
+ {
2134
+ "$ref": "#/definitions/panel_node"
2135
+ },
2136
+ {
2137
+ "$ref": "#/definitions/blockquote_node"
2114
2138
  }
2115
2139
  ]
2116
2140
  },
@@ -1,6 +1,6 @@
1
1
  export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, 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, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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, } from './schema';
3
+ colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, extendedNestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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, } 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, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, MultiBodiedExtensionDefinition, ExtensionFrameDefinition, } 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';
@@ -1,4 +1,4 @@
1
- export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, 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, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, extendedNestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, 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, 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. */
@@ -70,7 +70,7 @@ export { unsupportedBlock } from './unsupported-block';
70
70
  export { unsupportedInline } from './unsupported-inline';
71
71
  export { status } from './status';
72
72
  export type { StatusDefinition } from './status';
73
- export { nestedExpand } from './nested-expand';
73
+ export { nestedExpand, extendedNestedExpand } from './nested-expand';
74
74
  export type { NestedExpandDefinition } from './nested-expand';
75
75
  export type { NoMark } from './types/mark';
76
76
  export type { MarksObject } from './types/mark';
@@ -4,12 +4,19 @@ import { ParagraphDefinition as Paragraph } from './paragraph';
4
4
  import { HeadingDefinition as Heading } from './heading';
5
5
  import { MediaSingleDefinition as MediaSingle } from './media-single';
6
6
  import { MediaGroupDefinition as MediaGroup } from './media-group';
7
+ import { CodeBlockDefinition as CodeBlock } from './code-block';
8
+ import { BulletListDefinition as BulletList, OrderedListDefinition as OrderedList } from './types/list';
9
+ import { TaskListDefinition as TaskList } from './task-list';
10
+ import { DecisionListDefinition as DecisionList } from './decision-list';
11
+ import { RuleDefinition as Rule } from './rule';
12
+ import { PanelDefinition as Panel } from './panel';
13
+ import { BlockQuoteDefinition as BlockQuote } from './blockquote';
7
14
  /**
8
15
  * @name nestedExpand_content
9
16
  * @minItems 1
10
17
  * @allowUnsupportedBlock true
11
18
  */
12
- export type NestedExpandContent = Array<Paragraph | Heading | MediaSingle | MediaGroup>;
19
+ export type NestedExpandContent = Array<Paragraph | Heading | MediaSingle | MediaGroup | CodeBlock | BulletList | OrderedList | TaskList | DecisionList | Rule | Panel | BlockQuote>;
13
20
  /**
14
21
  * @name nestedExpand_node
15
22
  */
@@ -25,3 +32,10 @@ export interface NestedExpandBaseDefinition {
25
32
  */
26
33
  export type NestedExpandDefinition = NestedExpandBaseDefinition & NoMark;
27
34
  export declare const nestedExpand: NodeSpec;
35
+ /**
36
+ * @name extended_nestedExpand
37
+ * @description it allows more type of content to be part of the nestedExpand.
38
+ * Specifically, it allows codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote nodes in
39
+ * addition to content allowed inside nestedExpand
40
+ */
41
+ export declare const extendedNestedExpand: NodeSpec;
@@ -2097,6 +2097,9 @@
2097
2097
  "type": "array",
2098
2098
  "items": {
2099
2099
  "anyOf": [
2100
+ {
2101
+ "$ref": "#/definitions/codeBlock_with_no_marks_node"
2102
+ },
2100
2103
  {
2101
2104
  "$ref": "#/definitions/paragraph_with_no_marks_node"
2102
2105
  },
@@ -2106,11 +2109,32 @@
2106
2109
  {
2107
2110
  "$ref": "#/definitions/mediaSingle_full_node"
2108
2111
  },
2112
+ {
2113
+ "$ref": "#/definitions/taskList_node"
2114
+ },
2115
+ {
2116
+ "$ref": "#/definitions/bulletList_node"
2117
+ },
2118
+ {
2119
+ "$ref": "#/definitions/orderedList_node"
2120
+ },
2109
2121
  {
2110
2122
  "$ref": "#/definitions/heading_with_no_marks_node"
2111
2123
  },
2112
2124
  {
2113
2125
  "$ref": "#/definitions/mediaGroup_node"
2126
+ },
2127
+ {
2128
+ "$ref": "#/definitions/decisionList_node"
2129
+ },
2130
+ {
2131
+ "$ref": "#/definitions/rule_node"
2132
+ },
2133
+ {
2134
+ "$ref": "#/definitions/panel_node"
2135
+ },
2136
+ {
2137
+ "$ref": "#/definitions/blockquote_node"
2114
2138
  }
2115
2139
  ]
2116
2140
  },
@@ -2097,6 +2097,9 @@
2097
2097
  "type": "array",
2098
2098
  "items": {
2099
2099
  "anyOf": [
2100
+ {
2101
+ "$ref": "#/definitions/codeBlock_with_no_marks_node"
2102
+ },
2100
2103
  {
2101
2104
  "$ref": "#/definitions/paragraph_with_no_marks_node"
2102
2105
  },
@@ -2106,11 +2109,32 @@
2106
2109
  {
2107
2110
  "$ref": "#/definitions/mediaSingle_full_node"
2108
2111
  },
2112
+ {
2113
+ "$ref": "#/definitions/taskList_node"
2114
+ },
2115
+ {
2116
+ "$ref": "#/definitions/bulletList_node"
2117
+ },
2118
+ {
2119
+ "$ref": "#/definitions/orderedList_node"
2120
+ },
2109
2121
  {
2110
2122
  "$ref": "#/definitions/heading_with_no_marks_node"
2111
2123
  },
2112
2124
  {
2113
2125
  "$ref": "#/definitions/mediaGroup_node"
2126
+ },
2127
+ {
2128
+ "$ref": "#/definitions/decisionList_node"
2129
+ },
2130
+ {
2131
+ "$ref": "#/definitions/rule_node"
2132
+ },
2133
+ {
2134
+ "$ref": "#/definitions/panel_node"
2135
+ },
2136
+ {
2137
+ "$ref": "#/definitions/blockquote_node"
2114
2138
  }
2115
2139
  ]
2116
2140
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "35.4.0",
3
+ "version": "35.5.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/"
@@ -41,7 +41,7 @@
41
41
  "memoize-one": "^6.0.0"
42
42
  },
43
43
  "devDependencies": {
44
- "@atlassian/adf-schema-json": "^1.4.0",
44
+ "@atlassian/adf-schema-json": "^1.5.0",
45
45
  "@babel/cli": "^7.22.9",
46
46
  "@babel/core": "^7.22.9",
47
47
  "@babel/plugin-proposal-class-properties": "^7.18.6",