@atlaskit/adf-schema 51.3.1 → 51.4.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 51.4.0
+
+### Minor Changes
+
+- b76eeec: EDITOR-2752 update BodiedSyncBlockDefinition to be an isolating node
+
+## 51.3.2
+
+### Patch Changes
+
+- fbb3b5f: EDITOR-2443 Fix order of node types under bodied sync block to ensure paragraph is first
+
 ## 51.3.1
 
 ### Patch Changes

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

@@ -130,7 +130,7 @@ var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _createPMS
   isolating: true
 });
 var bodiedSyncBlockStage0 = exports.bodiedSyncBlockStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | paragraph | rule | table | taskList | unsupportedBlock)+',
+  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 breakout link fragment',
   attrs: {
     resourceId: {
@@ -140,7 +140,8 @@ var bodiedSyncBlockStage0 = exports.bodiedSyncBlockStage0 = (0, _createPMSpecFac
       default: ''
     }
   },
-  selectable: true
+  selectable: true,
+  isolating: true
 });
 var bulletList = exports.bulletList = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'listItem+',

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

@@ -29,6 +29,7 @@ var _layoutSection = require("./layoutSection");
 var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _adfSchemaGenerator.adfNode)('bodiedSyncBlock').define({
   stage0: true,
   selectable: true,
+  isolating: true,
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   attrs: {
     resourceId: {
@@ -40,7 +41,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _adfSchemaGenerator.adfNode)
       default: ''
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList, _panel.panel, _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _rule.rule, _tableNodes.table,
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList, _panel.panel, _rule.rule, _tableNodes.table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   _tableNodes.table.use('with_nested_table'), _task.taskList, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -258,7 +258,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       allowUnsupportedBlock: true
     },

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

@@ -124,7 +124,7 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedSyncBlockStage0 = createPMNodeSpecFactory({
-  content: '(blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | paragraph | rule | table | taskList | unsupportedBlock)+',
+  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 breakout link fragment',
   attrs: {
     resourceId: {
@@ -134,7 +134,8 @@ export const bodiedSyncBlockStage0 = createPMNodeSpecFactory({
       default: ''
     }
   },
-  selectable: true
+  selectable: true,
+  isolating: true
 });
 export const bulletList = createPMNodeSpecFactory({
   content: 'listItem+',

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

@@ -23,6 +23,7 @@ import { layoutSection } from './layoutSection';
 export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
   stage0: true,
   selectable: true,
+  isolating: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     resourceId: {
@@ -34,7 +35,7 @@ export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(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, mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), 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, 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/validator-schema/generated/validatorSpec.js

@@ -252,7 +252,7 @@ export const bodiedSyncBlock = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       allowUnsupportedBlock: true
     },

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

@@ -124,7 +124,7 @@ export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export var bodiedSyncBlockStage0 = createPMNodeSpecFactory({
-  content: '(blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | paragraph | rule | table | taskList | unsupportedBlock)+',
+  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 breakout link fragment',
   attrs: {
     resourceId: {
@@ -134,7 +134,8 @@ export var bodiedSyncBlockStage0 = createPMNodeSpecFactory({
       default: ''
     }
   },
-  selectable: true
+  selectable: true,
+  isolating: true
 });
 export var bulletList = createPMNodeSpecFactory({
   content: 'listItem+',

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

@@ -23,6 +23,7 @@ import { layoutSection } from './layoutSection';
 export var bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
   stage0: true,
   selectable: true,
+  isolating: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   attrs: {
     resourceId: {
@@ -34,7 +35,7 @@ export var bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(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, mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), 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, 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/esm/validator-schema/generated/validatorSpec.js

@@ -252,7 +252,7 @@ export var bodiedSyncBlock = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'rule', 'table', 'taskList']],
+      items: [['paragraph', 'paragraph_with_alignment', 'paragraph_with_indentation', 'paragraph_with_no_marks', 'blockCard', 'blockquote', 'bulletList', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'heading', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'layoutSection', 'mediaGroup', 'mediaSingle', 'mediaSingle_caption', 'mediaSingle_full', 'mediaSingle_width_type', 'orderedList', 'panel', 'rule', 'table', 'taskList']],
       minItems: 1,
       allowUnsupportedBlock: true
     },

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

@@ -432,6 +432,18 @@
           "type": "array",
           "items": {
             "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_node"
+              },
+              {
+                "$ref": "#/definitions/paragraph_with_alignment_node"
+              },
+              {
+                "$ref": "#/definitions/paragraph_with_indentation_node"
+              },
+              {
+                "$ref": "#/definitions/paragraph_with_no_marks_node"
+              },
               {
                 "$ref": "#/definitions/blockCard_node"
               },
@@ -486,18 +498,6 @@
               {
                 "$ref": "#/definitions/panel_node"
               },
-              {
-                "$ref": "#/definitions/paragraph_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_alignment_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_indentation_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_no_marks_node"
-              },
               {
                 "$ref": "#/definitions/rule_node"
               },

package/dist/types/schema/nodes/bodied-sync-block.d.ts

@@ -39,6 +39,6 @@ export interface BodiedSyncBlockDefinition {
      * @minItems 1
      * @allowUnsupportedBlock true
      */
-    content: Array<BlockCard | Blockquote | BulletList | CodeBlock | DecisionList | EmbedCard | Expand | Heading | HeadingWithMarks | LayoutSection | MediaGroup | MediaSingle | OrderedList | Panel | Paragraph | ParagraphWithMarks | Rule | Table | TaskList>;
+    content: Array<Paragraph | ParagraphWithMarks | BlockCard | Blockquote | BulletList | CodeBlock | DecisionList | EmbedCard | Expand | Heading | HeadingWithMarks | LayoutSection | MediaGroup | MediaSingle | OrderedList | Panel | Rule | Table | TaskList>;
 }
 export declare const bodiedSyncBlock: import("prosemirror-model").NodeSpec;

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

@@ -432,6 +432,18 @@
           "type": "array",
           "items": {
             "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_node"
+              },
+              {
+                "$ref": "#/definitions/paragraph_with_alignment_node"
+              },
+              {
+                "$ref": "#/definitions/paragraph_with_indentation_node"
+              },
+              {
+                "$ref": "#/definitions/paragraph_with_no_marks_node"
+              },
               {
                 "$ref": "#/definitions/blockCard_node"
               },
@@ -486,18 +498,6 @@
               {
                 "$ref": "#/definitions/panel_node"
               },
-              {
-                "$ref": "#/definitions/paragraph_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_alignment_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_indentation_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_no_marks_node"
-              },
               {
                 "$ref": "#/definitions/rule_node"
               },

package/package.json

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