@atlaskit/adf-schema 20.1.3 → 20.1.4

package/dist/cjs/schema/nodes/emoji.js

@@ -22,7 +22,11 @@ var emoji = {
       default: ''
     }
   },
-  parseDOM: [{
+  parseDOM: [// Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon span',
+    ignore: true
+  }, {
     tag: 'span[data-emoji-short-name]',
     getAttrs: function getAttrs(domNode) {
       var dom = domNode;
@@ -32,10 +36,6 @@ var emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
-  }, // Handle copy/paste beautiful panel from renderer />
-  {
-    tag: 'div.ak-editor-panel__icon',
-    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',

package/dist/cjs/schema/nodes/panel.js

@@ -34,6 +34,12 @@ var getDefaultAttrs = function getDefaultAttrs() {
     panelIcon: {
       default: null
     },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
     panelColor: {
       default: null
     }
@@ -45,6 +51,8 @@ var getDomAttrs = function getDomAttrs(nodeAttrs) {
   var attrs = {
     'data-panel-type': nodeAttrs.panelType,
     'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-icon-id': nodeAttrs.panelIconId,
+    'data-panel-icon-text': nodeAttrs.panelIconText,
     'data-panel-color': nodeAttrs.panelColor
   };
   return attrs;
@@ -58,6 +66,8 @@ var getParseDOMAttrs = function getParseDOMAttrs(allowCustomPanel, dom) {
   if (allowCustomPanel) {
     parseDOMAttrs = _objectSpread(_objectSpread({}, parseDOMAttrs), {}, {
       panelIcon: dom.getAttribute('data-panel-icon'),
+      panelIconId: dom.getAttribute('data-panel-icon-id'),
+      panelIconText: dom.getAttribute('data-panel-icon-text'),
       panelColor: dom.getAttribute('data-panel-color')
     });
   } else {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "20.1.3",
+	"version": "20.1.4",
 	"sideEffects": false
 }

package/dist/es2019/schema/nodes/emoji.js

@@ -18,7 +18,11 @@ export const emoji = {
       default: ''
     }
   },
-  parseDOM: [{
+  parseDOM: [// Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon span',
+    ignore: true
+  }, {
     tag: 'span[data-emoji-short-name]',
     getAttrs: domNode => {
       const dom = domNode;
@@ -28,10 +32,6 @@ export const emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
-  }, // Handle copy/paste beautiful panel from renderer />
-  {
-    tag: 'div.ak-editor-panel__icon',
-    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',

package/dist/es2019/schema/nodes/panel.js

@@ -18,6 +18,12 @@ const getDefaultAttrs = () => {
     panelIcon: {
       default: null
     },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
     panelColor: {
       default: null
     }
@@ -29,6 +35,8 @@ const getDomAttrs = nodeAttrs => {
   let attrs = {
     'data-panel-type': nodeAttrs.panelType,
     'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-icon-id': nodeAttrs.panelIconId,
+    'data-panel-icon-text': nodeAttrs.panelIconText,
     'data-panel-color': nodeAttrs.panelColor
   };
   return attrs;
@@ -42,6 +50,8 @@ const getParseDOMAttrs = (allowCustomPanel, dom) => {
   if (allowCustomPanel) {
     parseDOMAttrs = { ...parseDOMAttrs,
       panelIcon: dom.getAttribute('data-panel-icon'),
+      panelIconId: dom.getAttribute('data-panel-icon-id'),
+      panelIconText: dom.getAttribute('data-panel-icon-text'),
       panelColor: dom.getAttribute('data-panel-color')
     };
   } else {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "20.1.3",
+	"version": "20.1.4",
 	"sideEffects": false
 }

package/dist/esm/schema/nodes/emoji.js

@@ -18,7 +18,11 @@ export var emoji = {
       default: ''
     }
   },
-  parseDOM: [{
+  parseDOM: [// Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon span',
+    ignore: true
+  }, {
     tag: 'span[data-emoji-short-name]',
     getAttrs: function getAttrs(domNode) {
       var dom = domNode;
@@ -28,10 +32,6 @@ export var emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
-  }, // Handle copy/paste beautiful panel from renderer />
-  {
-    tag: 'div.ak-editor-panel__icon',
-    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',

package/dist/esm/schema/nodes/panel.js

@@ -24,6 +24,12 @@ var getDefaultAttrs = function getDefaultAttrs() {
     panelIcon: {
       default: null
     },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
     panelColor: {
       default: null
     }
@@ -35,6 +41,8 @@ var getDomAttrs = function getDomAttrs(nodeAttrs) {
   var attrs = {
     'data-panel-type': nodeAttrs.panelType,
     'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-icon-id': nodeAttrs.panelIconId,
+    'data-panel-icon-text': nodeAttrs.panelIconText,
     'data-panel-color': nodeAttrs.panelColor
   };
   return attrs;
@@ -48,6 +56,8 @@ var getParseDOMAttrs = function getParseDOMAttrs(allowCustomPanel, dom) {
   if (allowCustomPanel) {
     parseDOMAttrs = _objectSpread(_objectSpread({}, parseDOMAttrs), {}, {
       panelIcon: dom.getAttribute('data-panel-icon'),
+      panelIconId: dom.getAttribute('data-panel-icon-id'),
+      panelIconText: dom.getAttribute('data-panel-icon-text'),
       panelColor: dom.getAttribute('data-panel-color')
     });
   } else {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "20.1.3",
+	"version": "20.1.4",
 	"sideEffects": false
 }

package/dist/json-schema/v1/full.json

@@ -427,6 +427,37 @@
       ],
       "additionalProperties": false
     },
+    "fragment_mark": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": [
+            "fragment"
+          ]
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "localId": {
+              "type": "string",
+              "minLength": 1
+            },
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "localId"
+          ],
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "type",
+        "attrs"
+      ],
+      "additionalProperties": false
+    },
     "hardBreak_node": {
       "type": "object",
       "properties": {
@@ -580,7 +611,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -1426,6 +1464,12 @@
             "panelIcon": {
               "type": "string"
             },
+            "panelIconId": {
+              "type": "string"
+            },
+            "panelIconText": {
+              "type": "string"
+            },
             "panelColor": {
               "type": "string"
             }
@@ -1745,7 +1789,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -1905,6 +1956,12 @@
             "$ref": "#/definitions/table_row_node"
           },
           "minItems": 1
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/fragment_mark"
+          }
         }
       },
       "required": [
@@ -2283,7 +2340,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },

package/dist/json-schema/v1/stage-0.json

@@ -611,26 +611,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "inlineExtension_with_experimental_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/inlineExtension_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/fragment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -1048,9 +1036,6 @@
         {
           "$ref": "#/definitions/inlineExtension_with_marks_node"
         },
-        {
-          "$ref": "#/definitions/inlineExtension_with_experimental_marks_node"
-        },
         {
           "$ref": "#/definitions/date_node"
         },
@@ -1534,6 +1519,12 @@
             "panelIcon": {
               "type": "string"
             },
+            "panelIconId": {
+              "type": "string"
+            },
+            "panelIconText": {
+              "type": "string"
+            },
             "panelColor": {
               "type": "string"
             }
@@ -1853,26 +1844,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "extension_with_experimental_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/extension_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/fragment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -2032,6 +2011,12 @@
             "$ref": "#/definitions/table_row_node"
           },
           "minItems": 1
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/fragment_mark"
+          }
         }
       },
       "required": [
@@ -2126,9 +2111,6 @@
           {
             "$ref": "#/definitions/extension_with_marks_node"
           },
-          {
-            "$ref": "#/definitions/extension_with_experimental_marks_node"
-          },
           {
             "$ref": "#/definitions/embedCard_node"
           },
@@ -2264,9 +2246,6 @@
         {
           "$ref": "#/definitions/extension_with_marks_node"
         },
-        {
-          "$ref": "#/definitions/extension_with_experimental_marks_node"
-        },
         {
           "$ref": "#/definitions/embedCard_node"
         },
@@ -2416,26 +2395,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "bodiedExtension_with_experimental_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/bodiedExtension_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/fragment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -2499,9 +2466,6 @@
         {
           "$ref": "#/definitions/extension_with_marks_node"
         },
-        {
-          "$ref": "#/definitions/extension_with_experimental_marks_node"
-        },
         {
           "$ref": "#/definitions/embedCard_node"
         },
@@ -2513,9 +2477,6 @@
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
-        },
-        {
-          "$ref": "#/definitions/bodiedExtension_with_experimental_marks_node"
         }
       ]
     },
@@ -2732,9 +2693,6 @@
               {
                 "$ref": "#/definitions/extension_with_marks_node"
               },
-              {
-                "$ref": "#/definitions/extension_with_experimental_marks_node"
-              },
               {
                 "$ref": "#/definitions/embedCard_node"
               },
@@ -2750,9 +2708,6 @@
               {
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
-              {
-                "$ref": "#/definitions/bodiedExtension_with_experimental_marks_node"
-              },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
               },

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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, } from './schema';
-export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, 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, } from './schema';
+export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, 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, } from './schema';
 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';
 export type { Match, NameToEmoji } from './utils';

package/dist/types/schema/index.d.ts

@@ -1,5 +1,5 @@
 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, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, } from './nodes';
-export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, 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';
+export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, 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';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, } from './marks';
 export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, CodeDefinition, EmDefinition, FragmentAttributes, FragmentDefinition, IndentationMarkAttributes, IndentationMarkDefinition, LinkAttributes, LinkDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TextColorAttributes, TextColorDefinition, UnderlineDefinition, AnnotationId, AnnotationDataAttributes, DataConsumerAttributes, DataConsumerDefinition, } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';

package/dist/types/schema/marks/fragment.d.ts

@@ -8,7 +8,6 @@ export interface FragmentAttributes {
     name?: string;
 }
 /**
- * @stage 0
  * @name fragment_mark
  * @description Indicates that the elements decorated with this mark belong to a "fragment" entity, which represents a collection of ADF nodes.
  * This entity can be referred to later by its `localId` attribute.

package/dist/types/schema/nodes/bodied-extension.d.ts

@@ -20,10 +20,5 @@ export interface BodiedExtensionBaseDefinition {
 /**
  * @name bodiedExtension_with_marks_node
  */
-export declare type BodiedExtensionDefinition = BodiedExtensionBaseDefinition & MarksObject<DataConsumerDefinition>;
-/**
- * @stage 0
- * @name bodiedExtension_with_experimental_marks_node
- */
-export declare type BodiedExtensionWithMarksDefinition = BodiedExtensionBaseDefinition & MarksObject<FragmentDefinition>;
+export declare type BodiedExtensionDefinition = BodiedExtensionBaseDefinition & MarksObject<DataConsumerDefinition | FragmentDefinition>;
 export declare const bodiedExtension: NodeSpec;

package/dist/types/schema/nodes/extension.d.ts

@@ -14,10 +14,5 @@ export interface ExtensionBaseDefinition {
 /**
  * @name extension_with_marks_node
  */
-export declare type ExtensionDefinition = ExtensionBaseDefinition & MarksObject<DataConsumerDefinition>;
-/**
- * @stage 0
- * @name extension_with_experimental_marks_node
- */
-export declare type ExtensionWithMarksDefinition = ExtensionBaseDefinition & MarksObject<FragmentDefinition>;
+export declare type ExtensionDefinition = ExtensionBaseDefinition & MarksObject<DataConsumerDefinition | FragmentDefinition>;
 export declare const extension: NodeSpec;

package/dist/types/schema/nodes/index.d.ts

@@ -54,11 +54,11 @@ export type { TaskListDefinition, TaskListContent } from './task-list';
 export { taskItem } from './task-item';
 export type { TaskItemDefinition } from './task-item';
 export { extension } from './extension';
-export type { ExtensionDefinition, ExtensionWithMarksDefinition, } from './extension';
+export type { ExtensionDefinition } from './extension';
 export { inlineExtension } from './inline-extension';
-export type { InlineExtensionDefinition, InlineExtensionWithMarksDefinition, } from './inline-extension';
+export type { InlineExtensionDefinition } from './inline-extension';
 export { bodiedExtension } from './bodied-extension';
-export type { BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, } from './bodied-extension';
+export type { BodiedExtensionDefinition } from './bodied-extension';
 export { date } from './date';
 export type { DateDefinition } from './date';
 export { placeholder } from './placeholder';

package/dist/types/schema/nodes/inline-extension.d.ts

@@ -14,10 +14,5 @@ export interface InlineExtensionBaseDefinition {
 /**
  * @name inlineExtension_with_marks_node
  */
-export declare type InlineExtensionDefinition = InlineExtensionBaseDefinition & MarksObject<DataConsumerDefinition>;
-/**
- * @stage 0
- * @name inlineExtension_with_experimental_marks_node
- */
-export declare type InlineExtensionWithMarksDefinition = InlineExtensionBaseDefinition & MarksObject<FragmentDefinition>;
+export declare type InlineExtensionDefinition = InlineExtensionBaseDefinition & MarksObject<DataConsumerDefinition | FragmentDefinition>;
 export declare const inlineExtension: NodeSpec;

package/dist/types/schema/nodes/media.d.ts

@@ -35,7 +35,7 @@ export interface MediaBaseAttributes {
     __fileSize?: number | null;
     __fileMimeType?: string | null;
     __displayType?: DisplayType | null;
-    __contextId?: string;
+    __contextId?: string | null;
     __external?: boolean;
 }
 export interface MediaAttributes extends MediaBaseAttributes {

package/dist/types/schema/nodes/panel.d.ts

@@ -16,6 +16,8 @@ export declare enum PanelType {
 export interface PanelAttributes {
     panelType: PanelType;
     panelIcon?: string;
+    panelIconId?: string;
+    panelIconText?: string;
     panelColor?: string;
 }
 /**

package/dist/types/schema/nodes/tableNodes.d.ts

@@ -12,10 +12,11 @@ import { MediaGroupDefinition as MediaGroup } from './media-group';
 import { MediaSingleDefinition as MediaSingle } from './media-single';
 import { DecisionListDefinition as DecisionList } from './decision-list';
 import { TaskListDefinition as TaskList } from './task-list';
-import { ExtensionDefinition as Extension, ExtensionWithMarksDefinition as ExtensionWithMarks } from './extension';
+import { ExtensionDefinition as Extension } from './extension';
 import { BlockCardDefinition as BlockCard } from './block-card';
 import { EmbedCardDefinition as EmbedCard } from './embed-card';
 import { NestedExpandDefinition as NestedExpand } from './nested-expand';
+import { FragmentDefinition } from '../marks/fragment';
 export type { CellAttributes };
 export declare const tablePrefixSelector = "pm-table";
 export declare const tableCellSelector: string;
@@ -64,6 +65,7 @@ export interface TableDefinition {
      * @minItems 1
      */
     content: Array<TableRow>;
+    marks?: Array<FragmentDefinition>;
 }
 /**
  * @name table_row_node
@@ -77,7 +79,7 @@ export interface TableRow {
  * @minItems 1
  * @allowUnsupportedBlock true
  */
-export declare type TableCellContent = Array<Panel | Paragraph | ParagraphWithMarks | Blockquote | OrderedList | BulletList | Rule | Heading | HeadingWithMarks | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Extension | ExtensionWithMarks | BlockCard | NestedExpand | EmbedCard>;
+export declare type TableCellContent = Array<Panel | Paragraph | ParagraphWithMarks | Blockquote | OrderedList | BulletList | Rule | Heading | HeadingWithMarks | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Extension | BlockCard | NestedExpand | EmbedCard>;
 /**
  * @name table_cell_node
  */

package/dist/types/schema/nodes/types/block-content.d.ts

@@ -1,5 +1,5 @@
 import { ExpandDefinition as Expand } from '../expand';
-import { BodiedExtensionDefinition as BodiedExtension, BodiedExtensionWithMarksDefinition as BodiedExtensionWithMarks } from '../bodied-extension';
+import { BodiedExtensionDefinition as BodiedExtension } from '../bodied-extension';
 import { PanelDefinition as Panel } from '../panel';
 import { ParagraphDefinition as Paragraph, ParagraphWithAlignmentDefinition as ParagraphWithMarks } from '../paragraph';
 import { BlockQuoteDefinition as Blockquote } from '../blockquote';
@@ -13,10 +13,10 @@ import { MediaSingleDefinition as MediaSingle } from '../media-single';
 import { DecisionListDefinition as DecisionList } from '../decision-list';
 import { TaskListDefinition as TaskList } from '../task-list';
 import { TableDefinition as Table } from '../tableNodes';
-import { ExtensionDefinition as Extension, ExtensionWithMarksDefinition as ExtensionWithMarks } from '../extension';
+import { ExtensionDefinition as Extension } from '../extension';
 import { BlockCardDefinition as BlockCard } from '../block-card';
 import { EmbedCardDefinition as EmbedCard } from '../embed-card';
 /**
  * @name block_content
  */
-export declare type BlockContent = Panel | Paragraph | ParagraphWithMarks | Blockquote | OrderedList | BulletList | Rule | Heading | HeadingWithMarks | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Table | Expand | Extension | ExtensionWithMarks | BodiedExtension | BodiedExtensionWithMarks | BlockCard | EmbedCard;
+export declare type BlockContent = Panel | Paragraph | ParagraphWithMarks | Blockquote | OrderedList | BulletList | Rule | Heading | HeadingWithMarks | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Table | Expand | Extension | BodiedExtension | BlockCard | EmbedCard;

package/dist/types/schema/nodes/types/inline-content.d.ts

@@ -1,7 +1,7 @@
 import { HardBreakDefinition as HardBreak } from '../hard-break';
 import { MentionDefinition as Mention } from '../mention';
 import { EmojiDefinition as Emoji } from '../emoji';
-import { InlineExtensionDefinition as InlineExtensionWithoutMark, InlineExtensionWithMarksDefinition as InlineExtensionWithMark } from '../inline-extension';
+import { InlineExtensionDefinition } from '../inline-extension';
 import { DateDefinition as Date } from '../date';
 import { PlaceholderDefinition as Placeholder } from '../placeholder';
 import { InlineCardDefinition as InlineCard } from '../inline-card';
@@ -25,8 +25,8 @@ export declare type InlineCode = Text & MarksObject<Code | Link | Annotation>;
 /**
  * @name atomic_inline_node
  */
-export declare type InlineAtomic = HardBreak | Mention | Emoji | InlineExtensionWithoutMark | Date | Placeholder | InlineCard | Status | MediaInlineDefinition;
+export declare type InlineAtomic = HardBreak | Mention | Emoji | InlineExtensionDefinition | Date | Placeholder | InlineCard | Status | MediaInlineDefinition;
 /**
  * @name inline_node
  */
-export declare type Inline = InlineFormattedText | InlineCode | InlineExtensionWithMark | InlineAtomic;
+export declare type Inline = InlineFormattedText | InlineCode | InlineAtomic;

package/dist/types/schema/nodes/types/non-nestable-block-content.d.ts

@@ -11,10 +11,10 @@ import { MediaSingleDefinition as MediaSingle } from '../media-single';
 import { DecisionListDefinition as DecisionList } from '../decision-list';
 import { TaskListDefinition as TaskList } from '../task-list';
 import { TableDefinition as Table } from '../tableNodes';
-import { ExtensionDefinition as Extension, ExtensionWithMarksDefinition as ExtensionWithMarks } from '../extension';
+import { ExtensionDefinition as Extension } from '../extension';
 import { BlockCardDefinition as BlockCard } from '../block-card';
 import { EmbedCardDefinition as EmbedCard } from '../embed-card';
 /**
  * @name non_nestable_block_content
  */
-export declare type NonNestableBlockContent = Panel | Paragraph | Blockquote | OrderedList | BulletList | Rule | Heading | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Table | Extension | ExtensionWithMarks | BlockCard | EmbedCard;
+export declare type NonNestableBlockContent = Panel | Paragraph | Blockquote | OrderedList | BulletList | Rule | Heading | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Table | Extension | BlockCard | EmbedCard;

package/json-schema/v1/full.json

@@ -427,6 +427,37 @@
       ],
       "additionalProperties": false
     },
+    "fragment_mark": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": [
+            "fragment"
+          ]
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "localId": {
+              "type": "string",
+              "minLength": 1
+            },
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "localId"
+          ],
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "type",
+        "attrs"
+      ],
+      "additionalProperties": false
+    },
     "hardBreak_node": {
       "type": "object",
       "properties": {
@@ -580,7 +611,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -1426,6 +1464,12 @@
             "panelIcon": {
               "type": "string"
             },
+            "panelIconId": {
+              "type": "string"
+            },
+            "panelIconText": {
+              "type": "string"
+            },
             "panelColor": {
               "type": "string"
             }
@@ -1745,7 +1789,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -1905,6 +1956,12 @@
             "$ref": "#/definitions/table_row_node"
           },
           "minItems": 1
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/fragment_mark"
+          }
         }
       },
       "required": [
@@ -2283,7 +2340,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },

package/json-schema/v1/stage-0.json

@@ -611,26 +611,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "inlineExtension_with_experimental_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/inlineExtension_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/fragment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -1048,9 +1036,6 @@
         {
           "$ref": "#/definitions/inlineExtension_with_marks_node"
         },
-        {
-          "$ref": "#/definitions/inlineExtension_with_experimental_marks_node"
-        },
         {
           "$ref": "#/definitions/date_node"
         },
@@ -1534,6 +1519,12 @@
             "panelIcon": {
               "type": "string"
             },
+            "panelIconId": {
+              "type": "string"
+            },
+            "panelIconText": {
+              "type": "string"
+            },
             "panelColor": {
               "type": "string"
             }
@@ -1853,26 +1844,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "extension_with_experimental_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/extension_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/fragment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -2032,6 +2011,12 @@
             "$ref": "#/definitions/table_row_node"
           },
           "minItems": 1
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/fragment_mark"
+          }
         }
       },
       "required": [
@@ -2126,9 +2111,6 @@
           {
             "$ref": "#/definitions/extension_with_marks_node"
           },
-          {
-            "$ref": "#/definitions/extension_with_experimental_marks_node"
-          },
           {
             "$ref": "#/definitions/embedCard_node"
           },
@@ -2264,9 +2246,6 @@
         {
           "$ref": "#/definitions/extension_with_marks_node"
         },
-        {
-          "$ref": "#/definitions/extension_with_experimental_marks_node"
-        },
         {
           "$ref": "#/definitions/embedCard_node"
         },
@@ -2416,26 +2395,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/dataConsumer_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "bodiedExtension_with_experimental_marks_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/bodiedExtension_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/fragment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/dataConsumer_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/fragment_mark"
+                  }
+                ]
               }
             }
           },
@@ -2499,9 +2466,6 @@
         {
           "$ref": "#/definitions/extension_with_marks_node"
         },
-        {
-          "$ref": "#/definitions/extension_with_experimental_marks_node"
-        },
         {
           "$ref": "#/definitions/embedCard_node"
         },
@@ -2513,9 +2477,6 @@
         },
         {
           "$ref": "#/definitions/bodiedExtension_with_marks_node"
-        },
-        {
-          "$ref": "#/definitions/bodiedExtension_with_experimental_marks_node"
         }
       ]
     },
@@ -2732,9 +2693,6 @@
               {
                 "$ref": "#/definitions/extension_with_marks_node"
               },
-              {
-                "$ref": "#/definitions/extension_with_experimental_marks_node"
-              },
               {
                 "$ref": "#/definitions/embedCard_node"
               },
@@ -2750,9 +2708,6 @@
               {
                 "$ref": "#/definitions/bodiedExtension_with_marks_node"
               },
-              {
-                "$ref": "#/definitions/bodiedExtension_with_experimental_marks_node"
-              },
               {
                 "$ref": "#/definitions/layoutSection_full_node"
               },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "20.1.3",
+  "version": "20.1.4",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"