@atlaskit/adf-schema 40.5.0 → 40.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/index.js +8 -2
  3. package/dist/cjs/next-schema/generated/nodeTypes.js +29 -6
  4. package/dist/cjs/next-schema/groups/blockGroup.js +1 -1
  5. package/dist/cjs/next-schema/nodes/expand.js +4 -5
  6. package/dist/cjs/next-schema/nodes/panel.js +5 -0
  7. package/dist/cjs/schema/create-schema.js +1 -1
  8. package/dist/cjs/schema/default-schema.js +3 -2
  9. package/dist/cjs/schema/index.js +8 -2
  10. package/dist/cjs/schema/nodes/expand.js +3 -3
  11. package/dist/cjs/schema/nodes/index.js +8 -2
  12. package/dist/cjs/schema/nodes/panel.js +19 -1
  13. package/dist/cjs/validator-schema/generated/validatorSpec.js +15 -4
  14. package/dist/es2019/index.js +1 -1
  15. package/dist/es2019/next-schema/generated/nodeTypes.js +28 -5
  16. package/dist/es2019/next-schema/groups/blockGroup.js +1 -1
  17. package/dist/es2019/next-schema/nodes/expand.js +4 -5
  18. package/dist/es2019/next-schema/nodes/panel.js +5 -0
  19. package/dist/es2019/schema/create-schema.js +2 -2
  20. package/dist/es2019/schema/default-schema.js +4 -3
  21. package/dist/es2019/schema/index.js +1 -1
  22. package/dist/es2019/schema/nodes/expand.js +3 -3
  23. package/dist/es2019/schema/nodes/index.js +2 -2
  24. package/dist/es2019/schema/nodes/panel.js +17 -1
  25. package/dist/es2019/validator-schema/generated/validatorSpec.js +13 -3
  26. package/dist/esm/index.js +1 -1
  27. package/dist/esm/next-schema/generated/nodeTypes.js +28 -5
  28. package/dist/esm/next-schema/groups/blockGroup.js +1 -1
  29. package/dist/esm/next-schema/nodes/expand.js +4 -5
  30. package/dist/esm/next-schema/nodes/panel.js +5 -0
  31. package/dist/esm/schema/create-schema.js +2 -2
  32. package/dist/esm/schema/default-schema.js +4 -3
  33. package/dist/esm/schema/index.js +1 -1
  34. package/dist/esm/schema/nodes/expand.js +3 -3
  35. package/dist/esm/schema/nodes/index.js +2 -2
  36. package/dist/esm/schema/nodes/panel.js +19 -1
  37. package/dist/esm/validator-schema/generated/validatorSpec.js +13 -3
  38. package/dist/json-schema/v1/full.json +8 -1
  39. package/dist/json-schema/v1/stage-0.json +101 -40
  40. package/dist/types/index.d.ts +1 -1
  41. package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
  42. package/dist/types/next-schema/generated/nodeTypes.d.ts +23 -9
  43. package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts +5 -1
  44. package/dist/types/next-schema/nodes/expand.d.ts +2 -3
  45. package/dist/types/next-schema/nodes/panel.d.ts +5 -1
  46. package/dist/types/schema/index.d.ts +1 -1
  47. package/dist/types/schema/nodes/expand.d.ts +1 -1
  48. package/dist/types/schema/nodes/index.d.ts +2 -2
  49. package/dist/types/schema/nodes/panel.d.ts +1 -0
  50. package/dist/types/validator-schema/generated/validatorSpec.d.ts +13 -3
  51. package/json-schema/v1/full.json +8 -1
  52. package/json-schema/v1/stage-0.json +101 -40
  53. package/package.json +2 -2
@@ -219,7 +219,7 @@ export type EmojiStage0Node = PMNode & EmojiStage0Definition;
219
219
  export declare const emojiStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<EmojiStage0Node>) => import("prosemirror-model").NodeSpec;
220
220
  export interface ExpandDefinition {
221
221
  type: 'expand';
222
- content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
222
+ content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
223
223
  marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
224
224
  attrs: {
225
225
  title?: string;
@@ -228,26 +228,26 @@ export interface ExpandDefinition {
228
228
  }
229
229
  export type ExpandNode = PMNode & ExpandDefinition;
230
230
  export declare const expand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandNode>) => import("prosemirror-model").NodeSpec;
231
- export interface ExpandWithNestedExpandStage0Definition {
231
+ export interface ExpandWithNoMarkDefinition {
232
232
  type: 'expand';
233
- content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | NestedExpandWithNoMarksDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
234
- marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
235
233
  attrs: {
236
234
  title?: string;
237
235
  __expanded?: boolean;
238
236
  };
239
237
  }
240
- export type ExpandWithNestedExpandStage0Node = PMNode & ExpandWithNestedExpandStage0Definition;
241
- export declare const expandWithNestedExpandStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNestedExpandStage0Node>) => import("prosemirror-model").NodeSpec;
242
- export interface ExpandWithNoMarkDefinition {
238
+ export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
239
+ export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
240
+ export interface ExpandWithoutNestedExpandDefinition {
243
241
  type: 'expand';
242
+ content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
243
+ marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
244
244
  attrs: {
245
245
  title?: string;
246
246
  __expanded?: boolean;
247
247
  };
248
248
  }
249
- export type ExpandWithNoMarkNode = PMNode & ExpandWithNoMarkDefinition;
250
- export declare const expandWithNoMark: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithNoMarkNode>) => import("prosemirror-model").NodeSpec;
249
+ export type ExpandWithoutNestedExpandNode = PMNode & ExpandWithoutNestedExpandDefinition;
250
+ export declare const expandWithoutNestedExpand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithoutNestedExpandNode>) => import("prosemirror-model").NodeSpec;
251
251
  export interface ExtensionDefinition {
252
252
  type: 'extension';
253
253
  marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
@@ -674,6 +674,20 @@ export interface PanelLegacyDefinition {
674
674
  }
675
675
  export type PanelLegacyNode = PMNode & PanelLegacyDefinition;
676
676
  export declare const panelLegacy: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<PanelLegacyNode>) => import("prosemirror-model").NodeSpec;
677
+ export interface PanelWithNestedBlockquoteStage0Definition {
678
+ type: 'panel';
679
+ content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
680
+ marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
681
+ attrs: {
682
+ panelType: 'info' | 'note' | 'tip' | 'warning' | 'error' | 'success' | 'custom';
683
+ panelIcon?: string;
684
+ panelIconId?: string;
685
+ panelIconText?: string;
686
+ panelColor?: string;
687
+ };
688
+ }
689
+ export type PanelWithNestedBlockquoteStage0Node = PMNode & PanelWithNestedBlockquoteStage0Definition;
690
+ export declare const panelWithNestedBlockquoteStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<PanelWithNestedBlockquoteStage0Node>) => import("prosemirror-model").NodeSpec;
677
691
  export interface ParagraphDefinition {
678
692
  type: 'paragraph';
679
693
  content: Array<InlineDefinition>;
@@ -60,9 +60,13 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
60
60
  * Pseudo group used to match existing validator and json schema specs.
61
61
  */
62
62
  ignore: ("json-schema" | "validator-spec")[];
63
- }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
63
+ }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
64
64
  content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
65
65
  ignore: ("json-schema" | "validator-spec")[];
66
+ } & {
67
+ content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
68
+ noExtend: true;
69
+ stage0: true;
66
70
  }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<any, import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
67
71
  marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
68
72
  ignore: any[];
@@ -1,7 +1,6 @@
1
- export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_nested_expand", "with_breakout_mark", "with_no_mark"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
1
+ export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "without_nested_expand", "with_breakout_mark", "with_no_mark"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
2
2
  content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
3
- noExtend: true;
4
- stage0: true;
3
+ ignore: ("json-schema" | "validator-spec")[];
5
4
  } & {
6
5
  marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
7
6
  content: any[];
@@ -1,4 +1,8 @@
1
- export declare const panel: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
1
+ export declare const panel: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "legacy", "with_nested_blockquote"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
2
2
  content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
3
3
  ignore: ("json-schema" | "validator-spec")[];
4
+ } & {
5
+ content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
6
+ noExtend: true;
7
+ stage0: true;
4
8
  }>;
@@ -1,4 +1,4 @@
1
- export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpandStage0, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, } from './nodes';
1
+ export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithBlockquoteStage0, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, } from './nodes';
2
2
  export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, ExtensionFrameDefinition, MultiBodiedExtensionDefinition, } from './nodes';
3
3
  export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette,
4
4
  /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
@@ -27,7 +27,7 @@ export type ExpandDefinition = ExpandBaseDefinition & NoMark;
27
27
  */
28
28
  export type ExpandWithBreakoutDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
29
29
  export declare const expand: import("prosemirror-model").NodeSpec;
30
- export declare const expandWithNestedExpandStage0: import("prosemirror-model").NodeSpec;
30
+ export declare const expandWithNestedExpand: import("prosemirror-model").NodeSpec;
31
31
  export declare const toJSON: (node: PMNode) => {
32
32
  attrs: import("prosemirror-model").Attrs;
33
33
  };
@@ -1,4 +1,4 @@
1
- export { expand, expandWithNestedExpandStage0, toJSON as expandToJSON, } from './expand';
1
+ export { expand, expandWithNestedExpand, toJSON as expandToJSON, } from './expand';
2
2
  export type { ExpandDefinition } from './expand';
3
3
  export { confluenceJiraIssue } from './confluence-jira-issue';
4
4
  export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
@@ -28,7 +28,7 @@ export { mention, toJSON as mentionToJSON } from './mention';
28
28
  export type { MentionAttributes, UserType as MentionUserType, MentionDefinition, } from './mention';
29
29
  export { listItem, listItemWithTask, listItemWithDecisionStage0, } from './list-item';
30
30
  export type { ListItemArray, ListItemDefinition } from './types/list';
31
- export { extendedPanel, PanelType } from './panel';
31
+ export { extendedPanel, PanelType, panelWithBlockquoteStage0 } from './panel';
32
32
  export type { PanelAttributes, PanelDefinition } from './panel';
33
33
  export { text } from './text';
34
34
  export type { TextDefinition } from './text';
@@ -47,3 +47,4 @@ export interface DOMAttributes {
47
47
  * addition to content allowed inside panel
48
48
  */
49
49
  export declare const extendedPanel: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;
50
+ export declare const panelWithBlockquoteStage0: (allowCustomPanel: boolean) => import("prosemirror-model").NodeSpec;
@@ -1369,6 +1369,16 @@ export declare const panel_legacy: (string | {
1369
1369
  };
1370
1370
  };
1371
1371
  })[];
1372
+ export declare const panel_with_nested_blockquote: (string | {
1373
+ props: {
1374
+ content: {
1375
+ type: string;
1376
+ items: string[][];
1377
+ minItems: number;
1378
+ allowUnsupportedBlock: boolean;
1379
+ };
1380
+ };
1381
+ })[];
1372
1382
  export declare const nestedExpand_content: {
1373
1383
  type: string;
1374
1384
  items: string[][];
@@ -1682,7 +1692,7 @@ export declare const expand: {
1682
1692
  };
1683
1693
  content: {
1684
1694
  type: string;
1685
- items: string[];
1695
+ items: string[][];
1686
1696
  minItems: number;
1687
1697
  allowUnsupportedBlock: boolean;
1688
1698
  };
@@ -1712,11 +1722,11 @@ export declare const expand_with_breakout_mark: (string | {
1712
1722
  };
1713
1723
  };
1714
1724
  })[];
1715
- export declare const expand_with_nested_expand: (string | {
1725
+ export declare const expand_without_nested_expand: (string | {
1716
1726
  props: {
1717
1727
  content: {
1718
1728
  type: string;
1719
- items: string[][];
1729
+ items: string[];
1720
1730
  minItems: number;
1721
1731
  allowUnsupportedBlock: boolean;
1722
1732
  };
@@ -2241,7 +2241,14 @@
2241
2241
  "content": {
2242
2242
  "type": "array",
2243
2243
  "items": {
2244
- "$ref": "#/definitions/non_nestable_block_content"
2244
+ "anyOf": [
2245
+ {
2246
+ "$ref": "#/definitions/non_nestable_block_content"
2247
+ },
2248
+ {
2249
+ "$ref": "#/definitions/nestedExpand_with_no_marks_node"
2250
+ }
2251
+ ]
2245
2252
  },
2246
2253
  "minItems": 1
2247
2254
  }
@@ -1903,6 +1903,93 @@
1903
1903
  "additionalProperties": false,
1904
1904
  "required": ["type", "attrs", "content"]
1905
1905
  },
1906
+ "panel_with_nested_blockquote_node": {
1907
+ "type": "object",
1908
+ "properties": {
1909
+ "type": {
1910
+ "enum": ["panel"]
1911
+ },
1912
+ "attrs": {
1913
+ "type": "object",
1914
+ "properties": {
1915
+ "panelType": {
1916
+ "enum": [
1917
+ "info",
1918
+ "note",
1919
+ "tip",
1920
+ "warning",
1921
+ "error",
1922
+ "success",
1923
+ "custom"
1924
+ ]
1925
+ },
1926
+ "panelIcon": {
1927
+ "type": "string"
1928
+ },
1929
+ "panelIconId": {
1930
+ "type": "string"
1931
+ },
1932
+ "panelIconText": {
1933
+ "type": "string"
1934
+ },
1935
+ "panelColor": {
1936
+ "type": "string"
1937
+ }
1938
+ },
1939
+ "required": ["panelType"],
1940
+ "additionalProperties": false
1941
+ },
1942
+ "content": {
1943
+ "type": "array",
1944
+ "items": {
1945
+ "anyOf": [
1946
+ {
1947
+ "$ref": "#/definitions/paragraph_with_no_marks_node"
1948
+ },
1949
+ {
1950
+ "$ref": "#/definitions/heading_with_no_marks_node"
1951
+ },
1952
+ {
1953
+ "$ref": "#/definitions/bulletList_node"
1954
+ },
1955
+ {
1956
+ "$ref": "#/definitions/orderedList_node"
1957
+ },
1958
+ {
1959
+ "$ref": "#/definitions/blockCard_node"
1960
+ },
1961
+ {
1962
+ "$ref": "#/definitions/mediaGroup_node"
1963
+ },
1964
+ {
1965
+ "$ref": "#/definitions/mediaSingle_caption_node"
1966
+ },
1967
+ {
1968
+ "$ref": "#/definitions/mediaSingle_full_node"
1969
+ },
1970
+ {
1971
+ "$ref": "#/definitions/codeBlock_with_no_marks_node"
1972
+ },
1973
+ {
1974
+ "$ref": "#/definitions/taskList_node"
1975
+ },
1976
+ {
1977
+ "$ref": "#/definitions/rule_node"
1978
+ },
1979
+ {
1980
+ "$ref": "#/definitions/decisionList_node"
1981
+ },
1982
+ {
1983
+ "$ref": "#/definitions/blockquote_node"
1984
+ }
1985
+ ]
1986
+ },
1987
+ "minItems": 1
1988
+ }
1989
+ },
1990
+ "additionalProperties": false,
1991
+ "required": ["type", "attrs", "content"]
1992
+ },
1906
1993
  "nestedExpand_content": {
1907
1994
  "type": "array",
1908
1995
  "items": {
@@ -2348,7 +2435,14 @@
2348
2435
  "content": {
2349
2436
  "type": "array",
2350
2437
  "items": {
2351
- "$ref": "#/definitions/non_nestable_block_content"
2438
+ "anyOf": [
2439
+ {
2440
+ "$ref": "#/definitions/non_nestable_block_content"
2441
+ },
2442
+ {
2443
+ "$ref": "#/definitions/nestedExpand_with_no_marks_node"
2444
+ }
2445
+ ]
2352
2446
  },
2353
2447
  "minItems": 1
2354
2448
  }
@@ -2392,39 +2486,6 @@
2392
2486
  }
2393
2487
  ]
2394
2488
  },
2395
- "expand_with_nested_expand_node": {
2396
- "type": "object",
2397
- "properties": {
2398
- "type": {
2399
- "enum": ["expand"]
2400
- },
2401
- "attrs": {
2402
- "type": "object",
2403
- "properties": {
2404
- "title": {
2405
- "type": "string"
2406
- }
2407
- },
2408
- "additionalProperties": false
2409
- },
2410
- "content": {
2411
- "type": "array",
2412
- "items": {
2413
- "anyOf": [
2414
- {
2415
- "$ref": "#/definitions/non_nestable_block_content"
2416
- },
2417
- {
2418
- "$ref": "#/definitions/nestedExpand_with_no_marks_node"
2419
- }
2420
- ]
2421
- },
2422
- "minItems": 1
2423
- }
2424
- },
2425
- "additionalProperties": false,
2426
- "required": ["type", "content"]
2427
- },
2428
2489
  "block_content": {
2429
2490
  "anyOf": [
2430
2491
  {
@@ -2487,6 +2548,9 @@
2487
2548
  {
2488
2549
  "$ref": "#/definitions/panel_node"
2489
2550
  },
2551
+ {
2552
+ "$ref": "#/definitions/panel_with_nested_blockquote_node"
2553
+ },
2490
2554
  {
2491
2555
  "$ref": "#/definitions/table_node"
2492
2556
  },
@@ -2495,9 +2559,6 @@
2495
2559
  },
2496
2560
  {
2497
2561
  "$ref": "#/definitions/expand_with_no_mark_node"
2498
- },
2499
- {
2500
- "$ref": "#/definitions/expand_with_nested_expand_node"
2501
2562
  }
2502
2563
  ]
2503
2564
  },
@@ -2817,6 +2878,9 @@
2817
2878
  {
2818
2879
  "$ref": "#/definitions/panel_node"
2819
2880
  },
2881
+ {
2882
+ "$ref": "#/definitions/panel_with_nested_blockquote_node"
2883
+ },
2820
2884
  {
2821
2885
  "$ref": "#/definitions/table_node"
2822
2886
  },
@@ -2829,9 +2893,6 @@
2829
2893
  {
2830
2894
  "$ref": "#/definitions/expand_with_breakout_mark_node"
2831
2895
  },
2832
- {
2833
- "$ref": "#/definitions/expand_with_nested_expand_node"
2834
- },
2835
2896
  {
2836
2897
  "$ref": "#/definitions/layoutSection_full_node"
2837
2898
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "40.5.0",
3
+ "version": "40.7.0",
4
4
  "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
46
46
  "memoize-one": "^6.0.0"
47
47
  },
48
48
  "devDependencies": {
49
- "@atlassian/adf-schema-json": "^1.20.0",
49
+ "@atlassian/adf-schema-json": "^1.22.0",
50
50
  "@atlassian/feature-flags-test-utils": "^0.2.0",
51
51
  "@atlaskit/adf-schema-generator": "^1.30.0",
52
52
  "@atlaskit/codemod-utils": "^4.2.4",