@atlaskit/adf-schema 57.2.11 → 57.3.2

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

@@ -2,6 +2,7 @@ import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
 import { blockCard } from '../nodes/blockCard';
 import { blockquote } from '../nodes/blockquote';
 import { bodiedExtension } from '../nodes/bodiedExtension';
+import { bodiedRule } from '../nodes/bodiedRule';
 import { codeBlock } from '../nodes/codeBlock';
 import { confluenceUnsupportedBlock } from '../nodes/confluenceUnsupportedBlock';
 import { decisionList } from '../nodes/decisionList';
@@ -18,7 +19,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_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, rule.use('with_attrs'), bodiedRule, 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

@@ -1,5 +1,6 @@
 import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
 import { blockCard } from '../nodes/blockCard';
+import { bodiedRule } from '../nodes/bodiedRule';
 import { blockquote } from '../nodes/blockquote';
 import { codeBlock } from '../nodes/codeBlock';
 import { decisionList } from '../nodes/decisionList';
@@ -19,7 +20,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, rule.use('with_attrs'), bodiedRule, 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

@@ -1,5 +1,6 @@
 import { $onePlus, $or } from '@atlaskit/adf-schema-generator';
 import { blockCard } from '../nodes/blockCard';
+import { bodiedRule } from '../nodes/bodiedRule';
 import { blockquote } from '../nodes/blockquote';
 import { codeBlock } from '../nodes/codeBlock';
 import { decisionList } from '../nodes/decisionList';
@@ -17,7 +18,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, 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, rule.use('with_attrs'), bodiedRule, 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/bodiedRule.js

@@ -0,0 +1,50 @@
+import { $or, $range, adfNode } from '@atlaskit/adf-schema-generator';
+import { breakout } from '../marks/breakout';
+import { unsupportedMark } from '../marks/unsupportedMark';
+import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { heading } from './heading';
+import { paragraph } from './paragraph';
+const bodiedRuleAttributes = {
+  localId: {
+    type: 'string',
+    default: '',
+    minLength: 1
+  },
+  alignment: {
+    type: 'enum',
+    values: ['start', 'center', 'end'],
+    default: null,
+    optional: true
+  },
+  color: {
+    type: 'string',
+    default: null,
+    optional: true,
+    pattern: '^#[0-9a-fA-F]{6}$'
+  },
+  style: {
+    type: 'enum',
+    values: ['solid', 'dashed', 'dotted', 'sketch', 'fade'],
+    default: null,
+    optional: true
+  },
+  weight: {
+    type: 'number',
+    default: null,
+    minimum: 1,
+    maximum: 3,
+    optional: true
+  }
+};
+export const bodiedRule = adfNode('bodiedRule').define({
+  stage0: true,
+  attrs: bodiedRuleAttributes,
+  content: [$range(1, 1, $or(paragraph.use('with_no_marks'), heading.use('with_no_marks')))],
+  marks: [unsupportedMark, unsupportedNodeAttribute]
+})
+// this variant is used to support breakout resizing for bodiedRule nodes at the document root
+.variant('root_only', {
+  stage0: true,
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
+  noExtend: true
+});

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

@@ -4,6 +4,7 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
 import { blockCard } from './blockCard';
+import { bodiedRule } from './bodiedRule';
 import { blockquote } from './blockquote';
 import { codeBlock } from './codeBlock';
 import { confluenceUnsupportedBlock } from './confluenceUnsupportedBlock';
@@ -37,7 +38,7 @@ export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
   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_c1 must precede bare `panel` so the validator's repairing loop reaches it before
   // base `panel` wraps a nested table as `unsupportedBlock`. See full-schema.adf.ts.
-  panel.use('c1'), panel, rule, table,
+  panel.use('c1'), panel, rule, rule.use('with_attrs'), bodiedRule, 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/extensionFrame.js

@@ -6,6 +6,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { blockCard } from './blockCard';
 import { blockquote } from './blockquote';
 import { bodiedExtension } from './bodiedExtension';
+import { bodiedRule } from './bodiedRule';
 import { codeBlock } from './codeBlock';
 import { decisionList } from './decisionList';
 import { embedCard } from './embedCard';
@@ -30,7 +31,7 @@ export const extensionFrame = adfNode('extensionFrame').define({
   // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
   marks: [dataConsumer, fragment, unsupportedMark, unsupportedNodeAttribute],
   attrs: {},
-  content: [$onePlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
+  content: [$onePlus($or(paragraph.use('with_no_marks'), paragraph.use('with_font_size'), panel, blockquote, orderedList, bulletList, rule, rule.use('with_attrs'), bodiedRule, heading.use('with_no_marks'), codeBlock, mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), extension.use('with_marks'), bodiedExtension.use('with_marks'), unsupportedBlock, blockCard, embedCard))],
   DANGEROUS_MANUAL_OVERRIDE: {

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

@@ -2,6 +2,7 @@ import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { blockquote } from './blockquote';
+import { bodiedRule } from './bodiedRule';
 import { codeBlock } from './codeBlock';
 import { decisionList } from './decisionList';
 import { extension } from './extension';
@@ -14,7 +15,7 @@ import { paragraph } from './paragraph';
 import { rule } from './rule';
 import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
-const nestedExpandContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote, unsupportedBlock];
+const nestedExpandContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, rule.use('with_attrs'), bodiedRule, panel, blockquote, unsupportedBlock];
 export const nestedExpand = adfNode('nestedExpand').define({
   isolating: true,
   selectable: true,

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

@@ -3,6 +3,7 @@ import { breakout } from '../marks/breakout';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { blockCard } from './blockCard';
+import { bodiedRule } from './bodiedRule';
 import { codeBlock } from './codeBlock';
 import { decisionList } from './decisionList';
 import { heading } from './heading';
@@ -15,7 +16,7 @@ import { taskList } from './task';
 import { unsupportedBlock } from './unsupportedBlock';
 import { extension } from './extension';
 import { table } from './tableStub';
-const panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, decisionList, unsupportedBlock];
+const panelContent = [paragraph.use('with_no_marks'), paragraph.use('with_font_size'), heading.use('with_no_marks'), bulletList, orderedList, blockCard, mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, rule, rule.use('with_attrs'), bodiedRule, decisionList, unsupportedBlock];
 export const panel = adfNode('panel').define({
   selectable: true,
   marks: [unsupportedMark, unsupportedNodeAttribute],

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

@@ -2,6 +2,32 @@ import { adfNode } from '@atlaskit/adf-schema-generator';
 import { breakout } from '../marks/breakout';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+const ruleAttributes = {
+  localId: {
+    type: 'string',
+    default: null,
+    optional: true
+  },
+  color: {
+    type: 'string',
+    default: null,
+    optional: true,
+    pattern: '^#[0-9a-fA-F]{6}$'
+  },
+  style: {
+    type: 'enum',
+    values: ['solid', 'dashed', 'dotted', 'sketch', 'fade'],
+    default: null,
+    optional: true
+  },
+  weight: {
+    type: 'number',
+    default: null,
+    minimum: 1,
+    maximum: 3,
+    optional: true
+  }
+};
 export const rule = adfNode('rule').define({
   attrs: {
     localId: {
@@ -10,9 +36,16 @@ export const rule = adfNode('rule').define({
       optional: true
     }
   }
+}).variant('with_attrs', {
+  stage0: true,
+  attrs: ruleAttributes
 })
 // this variant is used to support breakout resizing for rule nodes at the document root
 .variant('root_only', {
   stage0: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute]
+}).variant('with_attrs_root_only', {
+  stage0: true,
+  attrs: ruleAttributes,
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute]
 });

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

@@ -1,9 +1,10 @@
 import memoizeOne from 'memoize-one';
 import { createSchema } from './create-schema';
 import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtensionRootOnlyStage0, bodiedExtensionRootOnlyStage0, extensionRootOnlyStage0, expandWithNestedExpand, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTableStage0, tableHeaderWithNestedTableStage0 } from './nodes';
+import { bodiedRuleRootOnlyStage0 } from './nodes/bodied-rule';
 import { extendedPanelC1RootOnlyStage0 } from './nodes/extended-panel-c1-root-only-stage0';
 import { extendedPanelRootOnlyStage0 } from './nodes/extended-panel-root-only-stage0';
-import { ruleRootOnlyStage0 } from './nodes/rule';
+import { ruleWithAttrsRootOnlyStage0 } from './nodes/rule';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
     nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'panel', 'panel_c1', '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'],
@@ -34,7 +35,8 @@ export const getSchemaBasedOnStage = memoizeOne(
       tableHeader: tableHeaderWithNestedTableStage0,
       panel: extendedPanelRootOnlyStage0(true),
       panel_c1: extendedPanelC1RootOnlyStage0(true),
-      rule: ruleRootOnlyStage0
+      rule: ruleWithAttrsRootOnlyStage0,
+      bodiedRule: bodiedRuleRootOnlyStage0
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/es2019/schema/nodes/bodied-rule.js

@@ -0,0 +1,50 @@
+import { bodiedRuleStage0 as bodiedRuleFactory } from '../../next-schema/generated/nodeTypes';
+import { uuid } from '../../utils/uuid';
+
+/**
+ * @name bodiedRule_node
+ */
+
+/**
+ * @name bodiedRule_root_only_node
+ */
+
+const getAttrs = domNode => {
+  // eslint-disable-next-line @atlaskit/editor/no-as-casting
+  const dom = domNode;
+  const weight = dom.getAttribute('data-weight');
+  return {
+    alignment: dom.getAttribute('data-alignment') || undefined,
+    color: dom.getAttribute('data-color') || undefined,
+    localId: dom.getAttribute('data-local-id') || uuid.generate(),
+    style: dom.getAttribute('data-style') || undefined,
+    weight: weight === null || weight === '' ? undefined : Number(weight)
+  };
+};
+export const bodiedRule = bodiedRuleFactory({
+  parseDOM: [{
+    tag: 'div[data-node-type="bodied-rule"]',
+    getAttrs
+  }],
+  toDOM(node) {
+    const {
+      alignment,
+      color,
+      localId,
+      style,
+      weight
+    } = node.attrs;
+    return ['div', {
+      'data-node-type': 'bodied-rule',
+      'data-alignment': alignment || undefined,
+      'data-color': color || undefined,
+      'data-local-id': localId || undefined,
+      'data-style': style || undefined,
+      'data-weight': weight !== null && weight !== void 0 ? weight : undefined
+    }, 0];
+  }
+});
+export const bodiedRuleRootOnlyStage0 = {
+  ...bodiedRule,
+  marks: 'breakout unsupportedMark unsupportedNodeAttribute'
+};

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

@@ -9,6 +9,14 @@ import { uuid } from '../../utils/uuid';
  * @name rule_root_only_node
  */
 
+/**
+ * @name rule_with_attrs_node
+ */
+
+/**
+ * @name rule_with_attrs_root_only_node
+ */
+
 const hrDOM = ['hr'];
 export const rule = ruleFactory({
   parseDOM: [{
@@ -32,7 +40,55 @@ export const ruleWithLocalId = ruleFactory({
     }];
   }
 });
+const getAttrs = domNode => {
+  // eslint-disable-next-line @atlaskit/editor/no-as-casting
+  const dom = domNode;
+  const weight = dom.getAttribute('data-weight');
+  return {
+    color: dom.getAttribute('data-color') || undefined,
+    localId: dom.getAttribute('data-local-id') || undefined,
+    style: dom.getAttribute('data-style') || undefined,
+    weight: weight === null || weight === '' ? undefined : Number(weight)
+  };
+};
+export const ruleWithAttrs = {
+  ...ruleWithLocalId,
+  attrs: {
+    ...ruleWithLocalId.attrs,
+    color: {
+      default: null
+    },
+    style: {
+      default: null
+    },
+    weight: {
+      default: null
+    }
+  },
+  parseDOM: [{
+    tag: 'hr',
+    getAttrs
+  }],
+  toDOM(node) {
+    const {
+      color,
+      localId,
+      style,
+      weight
+    } = node.attrs;
+    return ['hr', {
+      'data-color': color || undefined,
+      'data-local-id': localId || undefined,
+      'data-style': style || undefined,
+      'data-weight': weight !== null && weight !== void 0 ? weight : undefined
+    }];
+  }
+};
 export const ruleRootOnlyStage0 = {
   ...ruleWithLocalId,
   marks: 'breakout unsupportedMark unsupportedNodeAttribute'
+};
+export const ruleWithAttrsRootOnlyStage0 = {
+  ...ruleWithAttrs,
+  marks: 'breakout unsupportedMark unsupportedNodeAttribute'
 };

package/dist/es2019/schema/nodes-in-order.js

@@ -1,4 +1,5 @@
 import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, codeBlock, extendedPanel, extendedPanelC1, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, blockTaskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expandWithNestedExpand, nestedExpand, embedCard, caption, extendedBlockquote, syncBlock, bodiedSyncBlock } from './nodes';
+import { bodiedRule } from './nodes/bodied-rule';
 export const nodesInOrder = [{
   name: 'doc',
   spec: doc
@@ -35,6 +36,9 @@ export const nodesInOrder = [{
 }, {
   name: 'rule',
   spec: rule
+}, {
+  name: 'bodiedRule',
+  spec: bodiedRule
 }, {
   name: 'image',
   spec: image