@atlaskit/adf-schema 52.16.6 → 53.0.1

package/dist/es2019/entry-points/code-block.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';
+export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';

package/dist/es2019/entry-points/schema-code-block.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';
+export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';

package/dist/es2019/entry-points/schema-next-nodeTypes.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, codeBlockRootOnlyWithExtendedAttributesStage0, codeBlockWithExtendedAttributesStage0, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';
+export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';

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, codeBlockWithExtendedAttributes, codeBlockToJSON, colorPalette,
+export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockCardWithLocalId, blockquote, extendedBlockquote, extendedBlockquoteWithLocalId, bodiedExtension, fontSize, breakout, bulletList, bulletListSelector, bulletListWithLocalId, caption, captionWithLocalId, code, codeBlock, codeBlockWithLocalId, 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, layoutColumnStage0, 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, extendedPanelC1, extendedPanelC1WithLocalId, 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, tableCellStage0, tableHeaderStage0, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, tableRowWithLocalId, tableCellWithLocalId, tableHeaderWithLocalId, tableRowWithNestedTableWithLocalId, tableCellWithNestedTableWithLocalId, tableHeaderWithNestedTableWithLocalId } from './schema';

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

@@ -16,7 +16,7 @@ panel.use('c1').addContent(table);
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  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))],
+  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))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

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

@@ -163,40 +163,6 @@ export const codeBlock = createPMNodeSpecFactory({
   content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
-  attrs: {
-    language: {
-      default: null
-    },
-    uniqueId: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  code: true,
-  defining: true
-});
-export const codeBlockRootOnly = createPMNodeSpecFactory({
-  content: '(text | unsupportedInline)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    language: {
-      default: null
-    },
-    uniqueId: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  code: true,
-  defining: true
-});
-export const codeBlockRootOnlyWithExtendedAttributesStage0 = createPMNodeSpecFactory({
-  content: '(text | unsupportedInline)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     language: {
       default: null
@@ -217,10 +183,9 @@ export const codeBlockRootOnlyWithExtendedAttributesStage0 = createPMNodeSpecFac
   code: true,
   defining: true
 });
-export const codeBlockWithExtendedAttributesStage0 = createPMNodeSpecFactory({
+export const codeBlockRootOnly = createPMNodeSpecFactory({
   content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
   attrs: {
     language: {
       default: null

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'), 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,
+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, 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, 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, panel.use('c1'), table,
+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_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, panel.use('c1'), 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, codeBlock.use('with_extended_attributes'), 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, 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'), 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')];
+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, 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/nodes/codeBlock.js

@@ -7,34 +7,6 @@ import { unsupportedInline } from './unsupportedInline';
 export const codeBlock = adfNode('codeBlock').define({
   code: true,
   defining: true,
-  attrs: {
-    language: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    uniqueId: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    localId: {
-      type: 'string',
-      default: null,
-      optional: true
-    }
-  },
-  noMarks: true,
-  content: [$zeroPlus($or(text.use('with_no_marks'), unsupportedInline))]
-})
-// Variant used root scenario where we have breakout
-.variant('root_only', {
-  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',
@@ -62,39 +34,12 @@ export const codeBlock = adfNode('codeBlock').define({
       optional: true
     }
   },
-  stage0: true
+  noMarks: true,
+  content: [$zeroPlus($or(text.use('with_no_marks'), unsupportedInline))]
 })
-// Stage-0 variant: root_only marks + extended attributes (ADF Change 101)
-.variant('root_only_with_extended_attributes', {
+// Variant used root scenario where we have breakout
+.variant('root_only', {
   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: null,
-      optional: true
-    },
-    hideLineNumbers: {
-      type: 'boolean',
-      default: false,
-      optional: true
-    }
-  },
-  stage0: true
+  noExtend: true
 });

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, layoutColumnStage0, codeBlockWithExtendedAttributes } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, layoutColumnStage0 } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -27,8 +27,7 @@ export const getSchemaBasedOnStage = memoizeOne(
       table: tableWithNestedTable,
       tableRow: tableRowWithNestedTable,
       tableCell: tableCellWithNestedTableStage0,
-      tableHeader: tableHeaderWithNestedTableStage0,
-      codeBlock: codeBlockWithExtendedAttributes
+      tableHeader: tableHeaderWithNestedTableStage0
     };
   }
   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, 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, layoutColumnStage0, 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, extendedPanelC1, extendedPanelC1WithLocalId, 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, tableCellStage0, tableHeaderStage0, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, tableRowWithLocalId, tableCellWithLocalId, tableHeaderWithLocalId, tableRowWithNestedTableWithLocalId, tableCellWithNestedTableWithLocalId, tableHeaderWithNestedTableWithLocalId } from './nodes';
+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, layoutColumnStage0, 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, extendedPanelC1, extendedPanelC1WithLocalId, 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, tableCellStage0, tableHeaderStage0, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0, 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, codeBlockWithExtendedAttributesStage0 as codeBlockWithExtendedAttributesStage0Factory } from '../../next-schema/generated/nodeTypes';
+import { codeBlock as codeBlockFactory } from '../../next-schema/generated/nodeTypes';
 import { uuid } from '../../utils';
 
 /**
@@ -87,8 +87,17 @@ export const codeBlock = codeBlockFactory({
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       dom.getAttribute('data-language');
       dom = removeLastNewLine(dom);
+      const wrapAttr = dom.getAttribute('data-wrap');
+      const isCopiedFromEditor = Boolean(dom.closest('[data-pm-slice]') || dom.hasAttribute('data-pm-slice'));
+      // Default external HTML paste to wrapped when data-wrap is absent, but preserve
+      // unwrapped editor-origin paste when copied content has data-pm-slice.
+      const wrap = wrapAttr === null ? !isCopiedFromEditor : wrapAttr !== 'false';
+      const hideLineNumbers = dom.getAttribute('data-hide-line-numbers') === 'true';
       return {
-        language
+        language,
+        wrap,
+        hideLineNumbers,
+        localId: uuid.generate()
       };
     }
   },
@@ -101,7 +110,9 @@ export const codeBlock = codeBlockFactory({
       // 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 {
+          wrap: true
+        };
       }
       return false;
     },
@@ -117,7 +128,9 @@ export const codeBlock = codeBlockFactory({
     getAttrs: dom => {
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       if (dom.querySelector('td[class*="blob-code"]')) {
-        return {};
+        return {
+          wrap: true
+        };
       }
       return false;
     }
@@ -135,11 +148,26 @@ export const codeBlock = codeBlockFactory({
         // `react-syntax-highlighter-line-number` check, so that we don't remove real code
         lineNumber.forEach(line => line.remove());
       }
-      return {};
+      return {
+        wrap: true
+      };
     }
   }],
   toDOM(node) {
-    return ['pre', ['code', {
+    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;
+    }
+
+    // Always serialize data-wrap explicitly (both true and false) so that
+    // editor-to-editor paste can distinguish intentional wrap:false from
+    // absent data-wrap (which parseDOM defaults to wrap:true for external HTML).
+    attrs['data-wrap'] = node.attrs.wrap ? 'true' : 'false';
+    if (node.attrs.hideLineNumbers) {
+      attrs['data-hide-line-numbers'] = 'true';
+    }
+    return ['pre', attrs, ['code', {
       'data-language': node.attrs.language
     }, 0]];
   }
@@ -163,116 +191,6 @@ export const toJSON = node => ({
     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 wrapAttr = dom.getAttribute('data-wrap');
-        const isCopiedFromEditor = Boolean(dom.closest('[data-pm-slice]') || dom.hasAttribute('data-pm-slice'));
-        // Default external HTML paste to wrapped when data-wrap is absent, but preserve
-        // unwrapped editor-origin paste when copied content has data-pm-slice.
-        const wrap = wrapAttr === null ? !isCopiedFromEditor : wrapAttr !== 'false';
-        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 {
-            wrap: true
-          };
-        }
-        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 {
-            wrap: true
-          };
-        }
-        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 {
-          wrap: true
-        };
-      }
-    }],
-    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;
-      }
-
-      // Always serialize data-wrap explicitly (both true and false) so that
-      // editor-to-editor paste can distinguish intentional wrap:false from
-      // absent data-wrap (which parseDOM defaults to wrap:true for external HTML).
-      attrs['data-wrap'] = node.attrs.wrap ? 'true' : 'false';
-      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',

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, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from './code-block';
+export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';
 export { heading } from './heading';
 export { rule, ruleWithLocalId } from './rule';

package/dist/es2019/validator-schema/generated/validatorSpec.js

@@ -49,7 +49,7 @@ export const backgroundColor = {
     }
   }
 };
-export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
+export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 export const blockCard = {
   props: {
     attrs: [{
@@ -362,6 +362,10 @@ export const codeBlock = {
     attrs: {
       optional: true,
       props: {
+        hideLineNumbers: {
+          optional: true,
+          type: 'boolean'
+        },
         language: {
           optional: true,
           type: 'string'
@@ -373,6 +377,10 @@ export const codeBlock = {
         uniqueId: {
           optional: true,
           type: 'string'
+        },
+        wrap: {
+          optional: true,
+          type: 'boolean'
         }
       }
     },
@@ -397,69 +405,6 @@ export const codeBlock_root_only = ['codeBlock', {
     }
   }
 }];
-export const codeBlock_root_only_with_extended_attributes = ['codeBlock', {
-  props: {
-    attrs: {
-      optional: true,
-      props: {
-        hideLineNumbers: {
-          optional: true,
-          type: 'boolean'
-        },
-        language: {
-          optional: true,
-          type: 'string'
-        },
-        localId: {
-          optional: true,
-          type: 'string'
-        },
-        uniqueId: {
-          optional: true,
-          type: 'string'
-        },
-        wrap: {
-          optional: true,
-          type: 'boolean'
-        }
-      }
-    },
-    marks: {
-      items: ['breakout'],
-      optional: true,
-      type: 'array'
-    }
-  }
-}];
-export const codeBlock_with_extended_attributes = ['codeBlock', {
-  props: {
-    attrs: {
-      optional: true,
-      props: {
-        hideLineNumbers: {
-          optional: true,
-          type: 'boolean'
-        },
-        language: {
-          optional: true,
-          type: 'string'
-        },
-        localId: {
-          optional: true,
-          type: 'string'
-        },
-        uniqueId: {
-          optional: true,
-          type: 'string'
-        },
-        wrap: {
-          optional: true,
-          type: 'boolean'
-        }
-      }
-    }
-  }
-}];
 export const confluenceInlineComment = {
   props: {
     attrs: {
@@ -568,7 +513,7 @@ export const doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'codeBlock_root_only_with_extended_attributes', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -676,7 +621,7 @@ export const expand = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1505,7 +1450,7 @@ export const nestedExpand_with_no_marks = ['nestedExpand', {
     }
   }
 }];
-export const non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
+export const non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 export const orderedList = {
   props: {
     attrs: {
@@ -1847,7 +1792,7 @@ export const tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1894,7 +1839,7 @@ export const tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

package/dist/esm/entry-points/code-block.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';
+export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';

package/dist/esm/entry-points/schema-code-block.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';
+export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';

package/dist/esm/entry-points/schema-next-nodeTypes.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, codeBlockRootOnlyWithExtendedAttributesStage0, codeBlockWithExtendedAttributesStage0, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';
+export { blockCard, blockquote, blockquoteLegacy, blockTaskItem, bodiedExtension, bodiedExtensionWithMarks, bodiedSyncBlock, bulletList, caption, codeBlock, codeBlockRootOnly, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, date, dateStage0, decisionItem, decisionList, doc, embedCard, emoji, emojiStage0, expand, expandRootOnly, extension, extensionWithMarks, extensionFrameStage0, hardBreak, heading, headingWithAlignment, headingWithIndentation, headingWithNoMarks, image, inlineCard, inlineCardStage0, inlineExtension, inlineExtensionWithMarks, layoutColumn, layoutColumnStage0, layoutSection, layoutSectionFull, layoutSectionWithSingleColumnStage0, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingleCaption, mediaSingleFull, mediaSingleWidthType, mention, mentionStage0, multiBodiedExtensionStage0, nestedExpand, nestedExpandWithNoMarks, orderedList, panel, paragraph, paragraphWithAlignment, paragraphWithFontSize, paragraphWithIndentation, paragraphWithNoMarks, placeholder, rule, status, statusStage0, syncBlock, table, tableWithNestedTable, tableCell, tableCellStage0, tableCellWithNestedTable, tableCellWithNestedTableStage0, tableHeader, tableHeaderStage0, tableHeaderWithNestedTable, tableHeaderWithNestedTableStage0, tableRow, tableRowWithNestedTable, taskItem, taskList, text, textCodeInline, textFormatted, textWithNoMarks, unsupportedBlock, unsupportedInline } from '../next-schema/generated/nodeTypes';