@atlaskit/adf-schema 52.7.1 → 52.9.0

package/dist/es2019/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockCardWithLocalId, blockquote, extendedBlockquote, extendedBlockquoteWithLocalId, bodiedExtension, fontSize, breakout, bulletList, bulletListSelector, bulletListWithLocalId, caption, captionWithLocalId, code, codeBlock, codeBlockWithLocalId, codeBlockToJSON, colorPalette,
+export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockCardWithLocalId, blockquote, extendedBlockquote, extendedBlockquoteWithLocalId, bodiedExtension, fontSize, breakout, bulletList, bulletListSelector, bulletListWithLocalId, caption, captionWithLocalId, code, codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, codeBlockToJSON, colorPalette,
 // eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, dateWithLocalId, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, embedCardWithLocalId, emoji, emojiWithLocalId, expandWithNestedExpand, expandWithNestedExpandLocalId, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineCardWithLocalId, inlineExtension, inlineNodes, layoutColumn, layoutColumnWithLocalId, layoutSection, layoutSectionWithLocalId, layoutSectionWithSingleColumn, layoutSectionWithSingleColumnLocalId, link, linkToJSON, listItem, listItemWithLocalId, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleFullWithLocalId, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithLocalId, orderedList, orderedListSelector, orderedListWithLocalId, orderedListWithOrder, orderedListWithOrderAndLocalId, extendedPanel, extendedPanelWithLocalId, paragraph, placeholder, placeholderWithLocalId, rule, ruleWithLocalId, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, blockTaskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, syncBlock, bodiedSyncBlock, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, tableRowWithLocalId, tableCellWithLocalId, tableHeaderWithLocalId, tableRowWithNestedTableWithLocalId, tableCellWithNestedTableWithLocalId, tableHeaderWithNestedTableWithLocalId } from './schema';

package/dist/es2019/next-schema/full-schema.adf.js

@@ -10,7 +10,7 @@ import { bodiedSyncBlock } from './nodes/bodiedSyncBlock';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
+  content: [$onePlus($or(blockGroup, blockContentGroup, codeBlock.use('root_only'), codeBlock.use('root_only_with_extended_attributes'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), blockRootOnlyGroup, expand.use('root_only'), syncBlock, bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -125,7 +125,7 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
 });
 export const bodiedSyncBlock = createPMNodeSpecFactory({
   content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | rule | table | taskList | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation fontSize breakout link fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {
       default: ''
@@ -194,6 +194,53 @@ export const codeBlockRootOnly = createPMNodeSpecFactory({
   code: true,
   defining: true
 });
+export const codeBlockRootOnlyWithExtendedAttributesStage0 = createPMNodeSpecFactory({
+  content: '(text | unsupportedInline)*',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    language: {
+      default: null
+    },
+    uniqueId: {
+      default: null
+    },
+    localId: {
+      default: null
+    },
+    wrap: {
+      default: false
+    },
+    hideLineNumbers: {
+      default: false
+    }
+  },
+  code: true,
+  defining: true
+});
+export const codeBlockWithExtendedAttributesStage0 = createPMNodeSpecFactory({
+  content: '(text | unsupportedInline)*',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
+  group: 'block',
+  attrs: {
+    language: {
+      default: null
+    },
+    uniqueId: {
+      default: null
+    },
+    localId: {
+      default: null
+    },
+    wrap: {
+      default: false
+    },
+    hideLineNumbers: {
+      default: false
+    }
+  },
+  code: true,
+  defining: true
+});
 export const confluenceJiraIssue = createPMNodeSpecFactory({
   group: 'inline',
   inline: true,
@@ -287,7 +334,7 @@ export const decisionList = createPMNodeSpecFactory({
 });
 export const doc = createPMNodeSpecFactory({
   content: '(block | codeBlock | layoutSection | blockRootOnly | expand | syncBlock | bodiedSyncBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation fontSize dataConsumer fragment breakout'
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment breakout'
 });
 export const embedCard = createPMNodeSpecFactory({
   group: 'block',
@@ -609,7 +656,7 @@ export const inlineExtensionWithMarks = createPMNodeSpecFactory({
 });
 export const layoutColumn = createPMNodeSpecFactory({
   content: '(block | unsupportedBlock)+',
-  marks: 'unsupportedMark unsupportedNodeAttribute alignment indentation fontSize dataConsumer fragment',
+  marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation dataConsumer fragment',
   attrs: {
     width: {
       default: undefined
@@ -1015,25 +1062,7 @@ export const paragraphWithAlignment = createPMNodeSpecFactory({
   },
   selectable: false
 });
-export const paragraphWithFontSizeAndAlignmentStage0 = createPMNodeSpecFactory({
-  group: 'block',
-  attrs: {
-    localId: {
-      default: null
-    }
-  },
-  selectable: false
-});
-export const paragraphWithFontSizeAndIndentationStage0 = createPMNodeSpecFactory({
-  group: 'block',
-  attrs: {
-    localId: {
-      default: null
-    }
-  },
-  selectable: false
-});
-export const paragraphWithFontSizeStage0 = createPMNodeSpecFactory({
+export const paragraphWithFontSize = createPMNodeSpecFactory({
   attrs: {
     localId: {
       default: null
@@ -1188,7 +1217,7 @@ export const tableWithNestedTable = createPMNodeSpecFactory({
 });
 export const tableCell = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1212,7 +1241,7 @@ export const tableCell = createPMNodeSpecFactory({
 });
 export const tableCellWithNestedTable = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock | table)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1236,7 +1265,7 @@ export const tableCellWithNestedTable = createPMNodeSpecFactory({
 });
 export const tableHeader = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1
@@ -1260,7 +1289,7 @@ export const tableHeader = createPMNodeSpecFactory({
 });
 export const tableHeaderWithNestedTable = createPMNodeSpecFactory({
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle | mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | table)+',
-  marks: 'alignment unsupportedMark unsupportedNodeAttribute fontSize dataConsumer fragment',
+  marks: 'fontSize alignment unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   attrs: {
     colspan: {
       default: 1

package/dist/es2019/next-schema/groups/blockContentGroup.js

@@ -31,7 +31,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base mediaSingle
  * - no base heading
  */
-export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_font_size_and_alignment'), paragraph.use('with_font_size_and_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table,
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, codeBlock.use('with_extended_attributes'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec']

package/dist/es2019/next-schema/groups/blockGroup.js

@@ -18,7 +18,7 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/tableNodes';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_font_size_and_alignment'), paragraph.use('with_font_size_and_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, table,
+export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, codeBlock.use('with_extended_attributes'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
   // @DSLCompatibilityException

package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js

@@ -19,7 +19,7 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: ED-29537 - make it an actual group
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
+export const nonNestableBlockContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, codeBlock.use('with_extended_attributes'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 table.use('with_nested_table'), blockCard, embedCard, extension.use('with_marks'), unsupportedBlock];
 

package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js

@@ -17,7 +17,7 @@ import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_font_size_and_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
+export const tableCellContentNodes = [paragraph.use('with_no_marks'), paragraph.use('with_alignment'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, codeBlock.use('with_extended_attributes'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, decisionList, taskList, blockCard, embedCard, extension.use('with_marks'), nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

package/dist/es2019/next-schema/marks/fontSize.js

@@ -21,6 +21,5 @@ export const fontSize = adfMark('fontSize').define({
       type: 'enum',
       values: ['small']
     }
-  },
-  stage0: true
+  }
 });

package/dist/es2019/next-schema/nodes/bodiedSyncBlock.js

@@ -34,7 +34,7 @@ export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_font_size_and_alignment'), paragraph.use('with_font_size_and_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, rule, table,
+  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, rule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

package/dist/es2019/next-schema/nodes/codeBlock.js

@@ -32,4 +32,69 @@ export const codeBlock = adfNode('codeBlock').define({
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   noMarks: false,
   noExtend: true
+})
+// Stage-0 variant: adds wrap and hideLineNumbers attributes (ADF Change 101)
+.variant('with_extended_attributes', {
+  attrs: {
+    language: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    uniqueId: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    localId: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    wrap: {
+      type: 'boolean',
+      default: false,
+      optional: true
+    },
+    hideLineNumbers: {
+      type: 'boolean',
+      default: false,
+      optional: true
+    }
+  },
+  stage0: true
+})
+// Stage-0 variant: root_only marks + extended attributes (ADF Change 101)
+.variant('root_only_with_extended_attributes', {
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
+  noMarks: false,
+  noExtend: true,
+  attrs: {
+    language: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    uniqueId: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    localId: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    wrap: {
+      type: 'boolean',
+      default: false,
+      optional: true
+    },
+    hideLineNumbers: {
+      type: 'boolean',
+      default: false,
+      optional: true
+    }
+  },
+  stage0: true
 });

package/dist/es2019/next-schema/nodes/paragraph.js

@@ -18,11 +18,11 @@ export const paragraph = adfNode('paragraph').define({
   hasEmptyMarks: true,
   content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
-  marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
+  marks: [fontSize, alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_indentation', {
-  marks: [indentation, unsupportedMark, unsupportedNodeAttribute],
+  marks: [fontSize, indentation, unsupportedMark, unsupportedNodeAttribute],
   content: [],
   ignore: []
 }).variant('with_marks', {
@@ -37,16 +37,5 @@ export const paragraph = adfNode('paragraph').define({
 }).variant('with_font_size', {
   marks: [fontSize, unsupportedMark, unsupportedNodeAttribute],
   content: [],
-  ignore: [],
-  stage0: true
-}).variant('with_font_size_and_alignment', {
-  marks: [fontSize, alignment, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: [],
-  stage0: true
-}).variant('with_font_size_and_indentation', {
-  marks: [fontSize, indentation, unsupportedMark, unsupportedNodeAttribute],
-  content: [],
-  ignore: [],
-  stage0: true
+  ignore: []
 });

package/dist/es2019/schema/createPMSpecFactory.js

@@ -1,3 +1,7 @@
+/** Result of calling {@link createPMMarkSpecFactory} with a concrete mark spec (for isolated declarations). */
+
+/** Result of calling {@link createPMNodeSpecFactory} with a concrete node spec (for isolated declarations). */
+
 /**
  * Factory method to attach custom parseDOM and/or toDOM for nodeSpec
  *

package/dist/es2019/schema/default-schema.js

@@ -1,11 +1,10 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, codeBlockWithExtendedAttributes } from './nodes';
 import { createSchema } from './create-schema';
-import { fontSize } from './marks/font-size';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
     nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'rule', 'image', 'caption', 'mention', 'media', 'mediaGroup', 'mediaSingle', 'mediaInline', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'hardBreak', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'decisionList', 'decisionItem', 'taskList', 'taskItem', 'blockTaskItem', 'unknownBlock', 'date', 'status', 'placeholder', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard', 'syncBlock', 'bodiedSyncBlock', 'unsupportedBlock', 'unsupportedInline'],
-    marks: ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'code', 'textColor', 'backgroundColor', 'confluenceInlineComment', 'breakout', 'alignment', 'indentation', 'annotation', 'dataConsumer', 'border', 'unsupportedMark', 'unsupportedNodeAttribute', 'typeAheadQuery',
+    marks: ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'code', 'textColor', 'backgroundColor', 'confluenceInlineComment', 'breakout', 'alignment', 'indentation', 'annotation', 'fontSize', 'dataConsumer', 'border', 'unsupportedMark', 'unsupportedNodeAttribute', 'typeAheadQuery',
     // https://product-fabric.atlassian.net/browse/ED-10214,
     'fragment']
   };
@@ -27,10 +26,8 @@ export const getSchemaBasedOnStage = memoizeOne(
       table: tableWithNestedTable,
       tableRow: tableRowWithNestedTable,
       tableCell: tableCellWithNestedTable,
-      tableHeader: tableHeaderWithNestedTable
-    };
-    defaultSchemaConfig.customMarkSpecs = {
-      fontSize: fontSize
+      tableHeader: tableHeaderWithNestedTable,
+      codeBlock: codeBlockWithExtendedAttributes
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/es2019/schema/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { PanelType, blockCard, blockCardWithLocalId, blockquote, extendedBlockquote, extendedBlockquoteWithLocalId, bodiedExtension, bulletList, bulletListSelector, bulletListWithLocalId, caption, captionWithLocalId, codeBlock, codeBlockWithLocalId, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, dateWithLocalId, decisionItem, decisionList, decisionListSelector, doc, embedCard, embedCardWithLocalId, emoji, emojiWithLocalId, expandWithNestedExpand, expandWithNestedExpandLocalId, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineCardWithLocalId, inlineExtension, layoutColumn, layoutColumnWithLocalId, layoutSection, layoutSectionWithLocalId, layoutSectionWithSingleColumn, layoutSectionWithSingleColumnLocalId, listItem, listItemWithLocalId, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleFullWithLocalId, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithLocalId, orderedList, orderedListSelector, orderedListWithLocalId, orderedListWithOrder, orderedListWithOrderAndLocalId, extendedPanel, extendedPanelWithLocalId, paragraph, placeholder, placeholderWithLocalId, rule, ruleWithLocalId, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, blockTaskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, syncBlock, bodiedSyncBlock, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, tableRowWithLocalId, tableCellWithLocalId, tableHeaderWithLocalId, tableRowWithNestedTableWithLocalId, tableCellWithNestedTableWithLocalId, tableHeaderWithNestedTableWithLocalId } from './nodes';
+export { PanelType, blockCard, blockCardWithLocalId, blockquote, extendedBlockquote, extendedBlockquoteWithLocalId, bodiedExtension, bulletList, bulletListSelector, bulletListWithLocalId, caption, captionWithLocalId, codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, dateWithLocalId, decisionItem, decisionList, decisionListSelector, doc, embedCard, embedCardWithLocalId, emoji, emojiWithLocalId, expandWithNestedExpand, expandWithNestedExpandLocalId, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineCardWithLocalId, inlineExtension, layoutColumn, layoutColumnWithLocalId, layoutSection, layoutSectionWithLocalId, layoutSectionWithSingleColumn, layoutSectionWithSingleColumnLocalId, listItem, listItemWithLocalId, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleFullWithLocalId, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithLocalId, orderedList, orderedListSelector, orderedListWithLocalId, orderedListWithOrder, orderedListWithOrderAndLocalId, extendedPanel, extendedPanelWithLocalId, paragraph, placeholder, placeholderWithLocalId, rule, ruleWithLocalId, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, blockTaskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, syncBlock, bodiedSyncBlock, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, tableRowWithLocalId, tableCellWithLocalId, tableHeaderWithLocalId, tableRowWithNestedTableWithLocalId, tableCellWithNestedTableWithLocalId, tableHeaderWithNestedTableWithLocalId } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, fontSize, breakout, code, colorPalette,
 // eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */

package/dist/es2019/schema/nodes/code-block.js

@@ -1,5 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { codeBlock as codeBlockFactory } from '../../next-schema/generated/nodeTypes';
+import { codeBlock as codeBlockFactory, codeBlockWithExtendedAttributesStage0 as codeBlockWithExtendedAttributesStage0Factory } from '../../next-schema/generated/nodeTypes';
 import { uuid } from '../../utils';
 
 /**
@@ -153,10 +153,114 @@ export const toJSON = node => ({
     if (key === 'language' && node.attrs.language === null) {
       return memo;
     }
+    if (key === 'wrap' && !node.attrs.wrap) {
+      return memo;
+    }
+    if (key === 'hideLineNumbers' && !node.attrs.hideLineNumbers) {
+      return memo;
+    }
     memo[key] = node.attrs[key];
     return memo;
   }, {})
 });
+
+/**
+ * @name codeBlock_with_extended_attributes
+ * @description stage-0 codeBlock variant with wrap and hideLineNumbers attributes (ADF Change 101)
+ *
+ * Stage-0 variant: adds wrap and hideLineNumbers attributes (ADF Change 101).
+ * The DSL variant includes all attrs (base + new), so the generated factory provides the full set.
+ */
+export const codeBlockWithExtendedAttributes = {
+  ...codeBlockWithExtendedAttributesStage0Factory({
+    parseDOM: [{
+      tag: 'pre',
+      preserveWhitespace: 'full',
+      getAttrs: domNode => {
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
+        let dom = domNode;
+        const language =
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        getLanguageFromBitbucketStyle(dom.parentElement) ||
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        getLanguageFromEditorStyle(dom.parentElement) || getLanguageFromCode(dom) ||
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        dom.getAttribute('data-language');
+        dom = removeLastNewLine(dom);
+        const wrap = dom.getAttribute('data-wrap') === 'true';
+        const hideLineNumbers = dom.getAttribute('data-hide-line-numbers') === 'true';
+        return {
+          language,
+          wrap,
+          hideLineNumbers,
+          localId: uuid.generate()
+        };
+      }
+    },
+    // Handle VSCode, Android Studio paste
+    // Checking `white-space: pre-wrap` is too aggressive @see ED-2627
+    {
+      tag: 'div[style]',
+      preserveWhitespace: 'full',
+      getAttrs: domNode => {
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
+        const dom = domNode;
+        if (dom.style.whiteSpace === 'pre' || dom.style.fontFamily && dom.style.fontFamily.toLowerCase().indexOf('monospace') > -1) {
+          return {};
+        }
+        return false;
+      },
+      getContent: (domNode, schema) => {
+        const code = parseCodeFromHtml(domNode);
+        return code ? Fragment.from(schema.text(code)) : Fragment.empty;
+      }
+    },
+    // Handle GitHub/Gist paste
+    {
+      tag: 'table[style]',
+      preserveWhitespace: 'full',
+      getAttrs: dom => {
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
+        if (dom.querySelector('td[class*="blob-code"]')) {
+          return {};
+        }
+        return false;
+      }
+    }, {
+      tag: 'div.code-block',
+      preserveWhitespace: 'full',
+      getAttrs: domNode => {
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
+        const dom = domNode;
+        // TODO: ED-5604 - Fix it inside `react-syntax-highlighter`
+        // Remove line numbers
+        const lineNumber = dom.querySelectorAll('.react-syntax-highlighter-line-number');
+        if (lineNumber.length > 0) {
+          // It's possible to copy without the line numbers too hence this
+          // `react-syntax-highlighter-line-number` check, so that we don't remove real code
+          lineNumber.forEach(line => line.remove());
+        }
+        return {};
+      }
+    }],
+    toDOM(node) {
+      var _node$attrs;
+      const attrs = {};
+      if ((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) !== undefined) {
+        attrs['data-local-id'] = node.attrs.localId;
+      }
+      if (node.attrs.wrap) {
+        attrs['data-wrap'] = 'true';
+      }
+      if (node.attrs.hideLineNumbers) {
+        attrs['data-hide-line-numbers'] = 'true';
+      }
+      return ['pre', attrs, ['code', {
+        'data-language': node.attrs.language
+      }, 0]];
+    }
+  })
+};
 export const codeBlockWithLocalId = codeBlockFactory({
   parseDOM: [{
     tag: 'pre',
@@ -225,9 +329,9 @@ export const codeBlockWithLocalId = codeBlockFactory({
     }
   }],
   toDOM(node) {
-    var _node$attrs;
+    var _node$attrs2;
     const attrs = {};
-    if ((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) !== undefined) {
+    if ((node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) !== undefined) {
       attrs['data-local-id'] = node.attrs.localId;
     }
     return ['pre', attrs, ['code', {

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

@@ -6,7 +6,7 @@ export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
 export { doc } from './doc';
 export { blockquote, extendedBlockquote, extendedBlockquoteWithLocalId } from './blockquote';
 export { bulletList, bulletListSelector, bulletListWithLocalId } from './bullet-list';
-export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from './code-block';
+export { codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';
 export { heading } from './heading';
 export { rule, ruleWithLocalId } from './rule';