@atlaskit/adf-schema 25.10.0 → 26.0.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 (41) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/index.js +18 -0
  3. package/dist/cjs/schema/default-schema.js +2 -1
  4. package/dist/cjs/schema/index.js +18 -0
  5. package/dist/cjs/schema/nodes/block-card.js +2 -2
  6. package/dist/cjs/schema/nodes/index.js +18 -0
  7. package/dist/cjs/schema/nodes/media-single.js +69 -23
  8. package/dist/cjs/version.json +1 -1
  9. package/dist/es2019/index.js +1 -1
  10. package/dist/es2019/schema/create-schema.js +1 -1
  11. package/dist/es2019/schema/default-schema.js +3 -2
  12. package/dist/es2019/schema/index.js +1 -1
  13. package/dist/es2019/schema/nodes/block-card.js +2 -2
  14. package/dist/es2019/schema/nodes/index.js +1 -1
  15. package/dist/es2019/schema/nodes/media-single.js +69 -21
  16. package/dist/es2019/version.json +1 -1
  17. package/dist/esm/index.js +1 -1
  18. package/dist/esm/schema/create-schema.js +1 -1
  19. package/dist/esm/schema/default-schema.js +3 -2
  20. package/dist/esm/schema/index.js +1 -1
  21. package/dist/esm/schema/nodes/block-card.js +2 -2
  22. package/dist/esm/schema/nodes/index.js +1 -1
  23. package/dist/esm/schema/nodes/media-single.js +65 -22
  24. package/dist/esm/version.json +1 -1
  25. package/dist/json-schema/v1/stage-0.json +82 -42
  26. package/dist/types/index.d.ts +2 -2
  27. package/dist/types/schema/index.d.ts +2 -2
  28. package/dist/types/schema/nodes/block-card.d.ts +1 -1
  29. package/dist/types/schema/nodes/index.d.ts +2 -2
  30. package/dist/types/schema/nodes/media-single.d.ts +10 -4
  31. package/dist/types/schema/nodes/types/rich-media-common.d.ts +21 -0
  32. package/dist/types-ts4.5/index.d.ts +2 -2
  33. package/dist/types-ts4.5/schema/index.d.ts +2 -2
  34. package/dist/types-ts4.5/schema/nodes/block-card.d.ts +1 -1
  35. package/dist/types-ts4.5/schema/nodes/index.d.ts +2 -2
  36. package/dist/types-ts4.5/schema/nodes/media-single.d.ts +10 -4
  37. package/dist/types-ts4.5/schema/nodes/types/rich-media-common.d.ts +21 -0
  38. package/json-schema/v1/stage-0.json +82 -42
  39. package/package.json +2 -2
  40. package/report.api.md +36 -1
  41. package/tmp/api-report-tmp.d.ts +31 -1
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "25.10.0",
3
+ "version": "26.0.0",
4
4
  "sideEffects": false
5
5
  }
@@ -725,28 +725,6 @@
725
725
  },
726
726
  "attrs": {
727
727
  "anyOf": [
728
- {
729
- "type": "object",
730
- "properties": {
731
- "url": {
732
- "type": "string"
733
- }
734
- },
735
- "required": [
736
- "url"
737
- ],
738
- "additionalProperties": false
739
- },
740
- {
741
- "type": "object",
742
- "properties": {
743
- "data": {}
744
- },
745
- "required": [
746
- "data"
747
- ],
748
- "additionalProperties": false
749
- },
750
728
  {
751
729
  "type": "object",
752
730
  "properties": {
@@ -804,6 +782,28 @@
804
782
  "required": [
805
783
  "datasource"
806
784
  ]
785
+ },
786
+ {
787
+ "type": "object",
788
+ "properties": {
789
+ "url": {
790
+ "type": "string"
791
+ }
792
+ },
793
+ "required": [
794
+ "url"
795
+ ],
796
+ "additionalProperties": false
797
+ },
798
+ {
799
+ "type": "object",
800
+ "properties": {
801
+ "data": {}
802
+ },
803
+ "required": [
804
+ "data"
805
+ ],
806
+ "additionalProperties": false
807
807
  }
808
808
  ]
809
809
  }
@@ -1301,28 +1301,68 @@
1301
1301
  ]
1302
1302
  },
1303
1303
  "attrs": {
1304
- "type": "object",
1305
- "properties": {
1306
- "width": {
1307
- "type": "number",
1308
- "minimum": 0,
1309
- "maximum": 100
1310
- },
1311
- "layout": {
1312
- "enum": [
1313
- "wide",
1314
- "full-width",
1315
- "center",
1316
- "wrap-right",
1317
- "wrap-left",
1318
- "align-end",
1319
- "align-start"
1304
+ "anyOf": [
1305
+ {
1306
+ "type": "object",
1307
+ "properties": {
1308
+ "widthType": {
1309
+ "enum": [
1310
+ "percentage"
1311
+ ]
1312
+ },
1313
+ "width": {
1314
+ "type": "number",
1315
+ "minimum": 0,
1316
+ "maximum": 100
1317
+ },
1318
+ "layout": {
1319
+ "enum": [
1320
+ "wide",
1321
+ "full-width",
1322
+ "center",
1323
+ "wrap-right",
1324
+ "wrap-left",
1325
+ "align-end",
1326
+ "align-start"
1327
+ ]
1328
+ }
1329
+ },
1330
+ "additionalProperties": false,
1331
+ "required": [
1332
+ "layout"
1320
1333
  ]
1334
+ },
1335
+ {
1336
+ "type": "object",
1337
+ "properties": {
1338
+ "width": {
1339
+ "type": "number",
1340
+ "minimum": 0
1341
+ },
1342
+ "widthType": {
1343
+ "enum": [
1344
+ "pixel"
1345
+ ]
1346
+ },
1347
+ "layout": {
1348
+ "enum": [
1349
+ "wide",
1350
+ "full-width",
1351
+ "center",
1352
+ "wrap-right",
1353
+ "wrap-left",
1354
+ "align-end",
1355
+ "align-start"
1356
+ ]
1357
+ }
1358
+ },
1359
+ "required": [
1360
+ "width",
1361
+ "widthType",
1362
+ "layout"
1363
+ ],
1364
+ "additionalProperties": false
1321
1365
  }
1322
- },
1323
- "additionalProperties": false,
1324
- "required": [
1325
- "layout"
1326
1366
  ]
1327
1367
  },
1328
1368
  "marks": {
@@ -1,6 +1,6 @@
1
1
  export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './schema';
4
- export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, 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, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, } 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './schema';
4
+ export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, 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, } 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, } from './utils';
6
6
  export type { Match, NameToEmoji } from './utils';
@@ -1,5 +1,5 @@
1
- export { PanelType, blockCard, blockquote, 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, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './nodes';
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, RichMediaLayout, CellDomAttrs, } from './nodes';
1
+ export { PanelType, blockCard, blockquote, 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, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './nodes';
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, } 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. */
5
5
  colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, } from './marks';
@@ -39,6 +39,6 @@ export type CardAttributes = UrlType | DataType;
39
39
  */
40
40
  export interface BlockCardDefinition {
41
41
  type: 'blockCard';
42
- attrs: CardAttributes | DatasourceAttributes;
42
+ attrs: DatasourceAttributes | CardAttributes;
43
43
  }
44
44
  export declare const blockCard: NodeSpec;
@@ -41,7 +41,7 @@ export { mediaGroup } from './media-group';
41
41
  export { mediaInline } from './media-inline';
42
42
  export type { MediaInlineAttributes, MediaInlineDefinition, } from './media-inline';
43
43
  export type { MediaGroupDefinition } from './media-group';
44
- export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON, } from './media-single';
44
+ export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON, } from './media-single';
45
45
  export type { MediaSingleDefinition } from './media-single';
46
46
  export { table, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector, } from './tableNodes';
47
47
  export type { TableAttributes, CellAttributes, Layout as TableLayout, TableDefinition, TableCell as TableCellDefinition, TableHeader as TableHeaderDefinition, TableRow as TableRowDefinition, CellDomAttrs, } from './tableNodes';
@@ -90,4 +90,4 @@ export type { NestedExpandContent } from './nested-expand';
90
90
  export type { Layout as ExtensionLayout } from './types/extensions';
91
91
  export { embedCard } from './embed-card';
92
92
  export type { EmbedCardDefinition, EmbedCardAttributes } from './embed-card';
93
- export type { RichMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';
93
+ export type { RichMediaAttributes, ExtendedMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';
@@ -1,7 +1,7 @@
1
- import { NodeSpec, Node } from 'prosemirror-model';
1
+ import { NodeSpec, Node as PMNode } from 'prosemirror-model';
2
2
  import { MediaDefinition as Media } from './media';
3
3
  import { LinkDefinition } from '../marks/link';
4
- import { RichMediaAttributes } from './types/rich-media-common';
4
+ import { ExtendedMediaAttributes } from './types/rich-media-common';
5
5
  import { CaptionDefinition as Caption } from './caption';
6
6
  export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithCaptionDefinition;
7
7
  /**
@@ -10,7 +10,7 @@ export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithC
10
10
  */
11
11
  export interface MediaSingleBaseDefinition {
12
12
  type: 'mediaSingle';
13
- attrs?: RichMediaAttributes;
13
+ attrs?: ExtendedMediaAttributes;
14
14
  marks?: Array<LinkDefinition>;
15
15
  }
16
16
  /**
@@ -51,8 +51,14 @@ export declare const defaultAttrs: {
51
51
  default: string;
52
52
  };
53
53
  };
54
+ export declare const mediaSingleSpec: ({ withCaption, withExtendedWidthTypes, }: {
55
+ withCaption?: boolean | undefined;
56
+ withExtendedWidthTypes?: boolean | undefined;
57
+ }) => NodeSpec;
54
58
  export declare const mediaSingle: NodeSpec;
55
59
  export declare const mediaSingleWithCaption: NodeSpec;
56
- export declare const toJSON: (node: Node) => {
60
+ export declare const mediaSingleWithWidthType: NodeSpec;
61
+ export declare const mediaSingleFull: NodeSpec;
62
+ export declare const toJSON: (node: PMNode) => {
57
63
  attrs: any;
58
64
  };
@@ -11,3 +11,24 @@ export interface OptionalRichMediaAttributes {
11
11
  width?: number;
12
12
  layout?: Layout;
13
13
  }
14
+ interface DefaultMediaAttributes extends RichMediaAttributes {
15
+ /**
16
+ * @stage 0
17
+ * @description optional widthType attribute for media with percentage layout
18
+ */
19
+ widthType?: 'percentage';
20
+ }
21
+ /**
22
+ * @stage 0
23
+ * @description The widthType attribute is used to support fixed with media single
24
+ */
25
+ interface FixedLayoutMediaAttributes {
26
+ /**
27
+ * @minimum 0
28
+ */
29
+ width: number;
30
+ widthType: 'pixel';
31
+ layout: Layout;
32
+ }
33
+ export type ExtendedMediaAttributes = DefaultMediaAttributes | FixedLayoutMediaAttributes;
34
+ export {};
@@ -1,6 +1,6 @@
1
1
  export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './schema';
4
- export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, 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, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, } 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, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './schema';
4
+ export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, 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, } 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, } from './utils';
6
6
  export type { Match, NameToEmoji } from './utils';
@@ -1,5 +1,5 @@
1
- export { PanelType, blockCard, blockquote, 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, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './nodes';
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, RichMediaLayout, CellDomAttrs, } from './nodes';
1
+ export { PanelType, blockCard, blockquote, 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, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, 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, } from './nodes';
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, } 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. */
5
5
  colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, } from './marks';
@@ -39,6 +39,6 @@ export type CardAttributes = UrlType | DataType;
39
39
  */
40
40
  export interface BlockCardDefinition {
41
41
  type: 'blockCard';
42
- attrs: CardAttributes | DatasourceAttributes;
42
+ attrs: DatasourceAttributes | CardAttributes;
43
43
  }
44
44
  export declare const blockCard: NodeSpec;
@@ -41,7 +41,7 @@ export { mediaGroup } from './media-group';
41
41
  export { mediaInline } from './media-inline';
42
42
  export type { MediaInlineAttributes, MediaInlineDefinition, } from './media-inline';
43
43
  export type { MediaGroupDefinition } from './media-group';
44
- export { mediaSingle, mediaSingleWithCaption, toJSON as mediaSingleToJSON, } from './media-single';
44
+ export { mediaSingle, mediaSingleSpec, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, toJSON as mediaSingleToJSON, } from './media-single';
45
45
  export type { MediaSingleDefinition } from './media-single';
46
46
  export { table, tableWithCustomWidth, tableToJSON, tableCell, toJSONTableCell, tableHeader, toJSONTableHeader, tableRow, tableBackgroundColorPalette, tableBackgroundBorderColor, tableBackgroundColorNames, getCellAttrs, getCellDomAttrs, tablePrefixSelector, tableCellSelector, tableHeaderSelector, tableCellContentWrapperSelector, tableCellContentDomSelector, } from './tableNodes';
47
47
  export type { TableAttributes, CellAttributes, Layout as TableLayout, TableDefinition, TableCell as TableCellDefinition, TableHeader as TableHeaderDefinition, TableRow as TableRowDefinition, CellDomAttrs, } from './tableNodes';
@@ -90,4 +90,4 @@ export type { NestedExpandContent } from './nested-expand';
90
90
  export type { Layout as ExtensionLayout } from './types/extensions';
91
91
  export { embedCard } from './embed-card';
92
92
  export type { EmbedCardDefinition, EmbedCardAttributes } from './embed-card';
93
- export type { RichMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';
93
+ export type { RichMediaAttributes, ExtendedMediaAttributes, Layout as RichMediaLayout, } from './types/rich-media-common';
@@ -1,7 +1,7 @@
1
- import { NodeSpec, Node } from 'prosemirror-model';
1
+ import { NodeSpec, Node as PMNode } from 'prosemirror-model';
2
2
  import { MediaDefinition as Media } from './media';
3
3
  import { LinkDefinition } from '../marks/link';
4
- import { RichMediaAttributes } from './types/rich-media-common';
4
+ import { ExtendedMediaAttributes } from './types/rich-media-common';
5
5
  import { CaptionDefinition as Caption } from './caption';
6
6
  export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithCaptionDefinition;
7
7
  /**
@@ -10,7 +10,7 @@ export type MediaSingleDefinition = MediaSingleFullDefinition | MediaSingleWithC
10
10
  */
11
11
  export interface MediaSingleBaseDefinition {
12
12
  type: 'mediaSingle';
13
- attrs?: RichMediaAttributes;
13
+ attrs?: ExtendedMediaAttributes;
14
14
  marks?: Array<LinkDefinition>;
15
15
  }
16
16
  /**
@@ -54,8 +54,14 @@ export declare const defaultAttrs: {
54
54
  default: string;
55
55
  };
56
56
  };
57
+ export declare const mediaSingleSpec: ({ withCaption, withExtendedWidthTypes, }: {
58
+ withCaption?: boolean | undefined;
59
+ withExtendedWidthTypes?: boolean | undefined;
60
+ }) => NodeSpec;
57
61
  export declare const mediaSingle: NodeSpec;
58
62
  export declare const mediaSingleWithCaption: NodeSpec;
59
- export declare const toJSON: (node: Node) => {
63
+ export declare const mediaSingleWithWidthType: NodeSpec;
64
+ export declare const mediaSingleFull: NodeSpec;
65
+ export declare const toJSON: (node: PMNode) => {
60
66
  attrs: any;
61
67
  };
@@ -11,3 +11,24 @@ export interface OptionalRichMediaAttributes {
11
11
  width?: number;
12
12
  layout?: Layout;
13
13
  }
14
+ interface DefaultMediaAttributes extends RichMediaAttributes {
15
+ /**
16
+ * @stage 0
17
+ * @description optional widthType attribute for media with percentage layout
18
+ */
19
+ widthType?: 'percentage';
20
+ }
21
+ /**
22
+ * @stage 0
23
+ * @description The widthType attribute is used to support fixed with media single
24
+ */
25
+ interface FixedLayoutMediaAttributes {
26
+ /**
27
+ * @minimum 0
28
+ */
29
+ width: number;
30
+ widthType: 'pixel';
31
+ layout: Layout;
32
+ }
33
+ export type ExtendedMediaAttributes = DefaultMediaAttributes | FixedLayoutMediaAttributes;
34
+ export {};
@@ -725,28 +725,6 @@
725
725
  },
726
726
  "attrs": {
727
727
  "anyOf": [
728
- {
729
- "type": "object",
730
- "properties": {
731
- "url": {
732
- "type": "string"
733
- }
734
- },
735
- "required": [
736
- "url"
737
- ],
738
- "additionalProperties": false
739
- },
740
- {
741
- "type": "object",
742
- "properties": {
743
- "data": {}
744
- },
745
- "required": [
746
- "data"
747
- ],
748
- "additionalProperties": false
749
- },
750
728
  {
751
729
  "type": "object",
752
730
  "properties": {
@@ -804,6 +782,28 @@
804
782
  "required": [
805
783
  "datasource"
806
784
  ]
785
+ },
786
+ {
787
+ "type": "object",
788
+ "properties": {
789
+ "url": {
790
+ "type": "string"
791
+ }
792
+ },
793
+ "required": [
794
+ "url"
795
+ ],
796
+ "additionalProperties": false
797
+ },
798
+ {
799
+ "type": "object",
800
+ "properties": {
801
+ "data": {}
802
+ },
803
+ "required": [
804
+ "data"
805
+ ],
806
+ "additionalProperties": false
807
807
  }
808
808
  ]
809
809
  }
@@ -1301,28 +1301,68 @@
1301
1301
  ]
1302
1302
  },
1303
1303
  "attrs": {
1304
- "type": "object",
1305
- "properties": {
1306
- "width": {
1307
- "type": "number",
1308
- "minimum": 0,
1309
- "maximum": 100
1310
- },
1311
- "layout": {
1312
- "enum": [
1313
- "wide",
1314
- "full-width",
1315
- "center",
1316
- "wrap-right",
1317
- "wrap-left",
1318
- "align-end",
1319
- "align-start"
1304
+ "anyOf": [
1305
+ {
1306
+ "type": "object",
1307
+ "properties": {
1308
+ "widthType": {
1309
+ "enum": [
1310
+ "percentage"
1311
+ ]
1312
+ },
1313
+ "width": {
1314
+ "type": "number",
1315
+ "minimum": 0,
1316
+ "maximum": 100
1317
+ },
1318
+ "layout": {
1319
+ "enum": [
1320
+ "wide",
1321
+ "full-width",
1322
+ "center",
1323
+ "wrap-right",
1324
+ "wrap-left",
1325
+ "align-end",
1326
+ "align-start"
1327
+ ]
1328
+ }
1329
+ },
1330
+ "additionalProperties": false,
1331
+ "required": [
1332
+ "layout"
1320
1333
  ]
1334
+ },
1335
+ {
1336
+ "type": "object",
1337
+ "properties": {
1338
+ "width": {
1339
+ "type": "number",
1340
+ "minimum": 0
1341
+ },
1342
+ "widthType": {
1343
+ "enum": [
1344
+ "pixel"
1345
+ ]
1346
+ },
1347
+ "layout": {
1348
+ "enum": [
1349
+ "wide",
1350
+ "full-width",
1351
+ "center",
1352
+ "wrap-right",
1353
+ "wrap-left",
1354
+ "align-end",
1355
+ "align-start"
1356
+ ]
1357
+ }
1358
+ },
1359
+ "required": [
1360
+ "width",
1361
+ "widthType",
1362
+ "layout"
1363
+ ],
1364
+ "additionalProperties": false
1321
1365
  }
1322
- },
1323
- "additionalProperties": false,
1324
- "required": [
1325
- "layout"
1326
1366
  ]
1327
1367
  },
1328
1368
  "marks": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "25.10.0",
3
+ "version": "26.0.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/"
@@ -58,7 +58,7 @@
58
58
  "prosemirror-transform": "1.3.2"
59
59
  },
60
60
  "devDependencies": {
61
- "@atlaskit/editor-test-helpers": "^18.7.0",
61
+ "@atlaskit/editor-test-helpers": "^18.8.0",
62
62
  "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
63
63
  "@types/linkify-it": "^2.0.4",
64
64
  "@types/prosemirror-history": "^1.0.1",