@atlaskit/adf-schema 23.3.1 → 24.0.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/adf-schema
 
+## 24.0.0
+
+### Major Changes
+
+- [`bd524db3926`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bd524db3926) - ED-15380 Update fragment prosemirror-schema to match ADF schema
+
+### Minor Changes
+
+- [`1f99f6b79d3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1f99f6b79d3) - Support media inline for jira transformer and minor schema changes
+
 ## 23.3.1
 
 ### Patch Changes

package/dist/cjs/schema/confluence-schema.js

@@ -7,7 +7,7 @@ exports.confluenceSchemaWithMediaSingle = exports.confluenceSchema = void 0;
 
 var _createSchema = require("./create-schema");
 
-var nodes = ['doc', 'paragraph', 'blockquote', 'codeBlock', 'panel', 'hardBreak', 'orderedList', 'bulletList', 'heading', 'mediaGroup', 'mediaSingle', 'media', 'caption', 'confluenceUnsupportedBlock', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'listItem', 'mention', 'text', 'confluenceUnsupportedInline', 'media', 'rule', 'table', 'tableCell', 'tableHeader', 'tableRow', 'emoji', 'taskList', 'taskItem', 'date', 'placeholder', 'decisionList', 'decisionItem', 'layoutSection', 'layoutColumn', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'];
+var nodes = ['doc', 'paragraph', 'blockquote', 'codeBlock', 'panel', 'hardBreak', 'orderedList', 'bulletList', 'heading', 'mediaInline', 'mediaGroup', 'mediaSingle', 'media', 'caption', 'confluenceUnsupportedBlock', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'listItem', 'mention', 'text', 'confluenceUnsupportedInline', 'media', 'rule', 'table', 'tableCell', 'tableHeader', 'tableRow', 'emoji', 'taskList', 'taskItem', 'date', 'placeholder', 'decisionList', 'decisionItem', 'layoutSection', 'layoutColumn', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'];
 var marks = ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'mentionQuery', 'code', 'textColor', 'confluenceInlineComment', 'annotation', 'unsupportedMark', 'unsupportedNodeAttribute'];
 var confluenceSchema = (0, _createSchema.createSchema)({
   nodes: nodes,

package/dist/cjs/schema/jira-schema.js

@@ -56,7 +56,7 @@ function makeSchema(config) {
   }
 
   if (config.allowMedia) {
-    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption');
+    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption', 'mediaInline');
   }
 
   if (config.allowTextColor) {
@@ -106,7 +106,7 @@ function isSchemaWithBlockQuotes(schema) {
 }
 
 function isSchemaWithMedia(schema) {
-  return !!schema.nodes.mediaGroup && !!schema.nodes.media;
+  return !!schema.nodes.mediaGroup && !!schema.nodes.media && !!schema.nodes.mediaInline;
 }
 
 function isSchemaWithTextColor(schema) {

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

@@ -179,7 +179,8 @@ var externalOnlyAttributes = ['type', 'url', 'width', 'height', 'alt'];
 
 var toJSON = function toJSON(node) {
   return {
-    attrs: Object.keys(node.attrs).filter(function (key) {
+    attrs: Object.keys(node.attrs) // Strip private attributes e.g. __fileName, __fileSize, __fileMimeType, etc.
+    .filter(function (key) {
       return !(key[0] === '_' && key[1] === '_');
     }).reduce(function (obj, key) {
       if (node.attrs.type === 'external' && externalOnlyAttributes.indexOf(key) === -1) {

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

@@ -135,7 +135,7 @@ var createTableSpec = function createTableSpec() {
   var tableNodeSpec = {
     content: 'tableRow+',
     attrs: attrs,
-    marks: 'fragment unsupportedMark unsupportedNodeAttribute',
+    marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
     selectable: false,

package/dist/cjs/version.json

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

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

@@ -1,5 +1,5 @@
 import { createSchema } from './create-schema';
-const nodes = ['doc', 'paragraph', 'blockquote', 'codeBlock', 'panel', 'hardBreak', 'orderedList', 'bulletList', 'heading', 'mediaGroup', 'mediaSingle', 'media', 'caption', 'confluenceUnsupportedBlock', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'listItem', 'mention', 'text', 'confluenceUnsupportedInline', 'media', 'rule', 'table', 'tableCell', 'tableHeader', 'tableRow', 'emoji', 'taskList', 'taskItem', 'date', 'placeholder', 'decisionList', 'decisionItem', 'layoutSection', 'layoutColumn', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'];
+const nodes = ['doc', 'paragraph', 'blockquote', 'codeBlock', 'panel', 'hardBreak', 'orderedList', 'bulletList', 'heading', 'mediaInline', 'mediaGroup', 'mediaSingle', 'media', 'caption', 'confluenceUnsupportedBlock', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'listItem', 'mention', 'text', 'confluenceUnsupportedInline', 'media', 'rule', 'table', 'tableCell', 'tableHeader', 'tableRow', 'emoji', 'taskList', 'taskItem', 'date', 'placeholder', 'decisionList', 'decisionItem', 'layoutSection', 'layoutColumn', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'];
 const marks = ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'mentionQuery', 'code', 'textColor', 'confluenceInlineComment', 'annotation', 'unsupportedMark', 'unsupportedNodeAttribute'];
 export const confluenceSchema = createSchema({
   nodes,

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

@@ -37,7 +37,7 @@ export default function makeSchema(config) {
   }
 
   if (config.allowMedia) {
-    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption');
+    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption', 'mediaInline');
   }
 
   if (config.allowTextColor) {
@@ -78,7 +78,7 @@ export function isSchemaWithBlockQuotes(schema) {
   return !!schema.nodes.blockquote;
 }
 export function isSchemaWithMedia(schema) {
-  return !!schema.nodes.mediaGroup && !!schema.nodes.media;
+  return !!schema.nodes.mediaGroup && !!schema.nodes.media && !!schema.nodes.mediaInline;
 }
 export function isSchemaWithTextColor(schema) {
   return !!schema.marks.textColor;

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

@@ -153,7 +153,8 @@ export const copyPrivateAttributes = (from, to, map) => {
 const optionalAttributes = ['occurrenceKey', 'width', 'height', 'url', 'alt'];
 const externalOnlyAttributes = ['type', 'url', 'width', 'height', 'alt'];
 export const toJSON = node => ({
-  attrs: Object.keys(node.attrs).filter(key => !(key[0] === '_' && key[1] === '_')).reduce((obj, key) => {
+  attrs: Object.keys(node.attrs) // Strip private attributes e.g. __fileName, __fileSize, __fileMimeType, etc.
+  .filter(key => !(key[0] === '_' && key[1] === '_')).reduce((obj, key) => {
     if (node.attrs.type === 'external' && externalOnlyAttributes.indexOf(key) === -1) {
       return obj;
     }

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

@@ -103,7 +103,7 @@ const createTableSpec = () => {
   const tableNodeSpec = {
     content: 'tableRow+',
     attrs: attrs,
-    marks: 'fragment unsupportedMark unsupportedNodeAttribute',
+    marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
     selectable: false,

package/dist/es2019/version.json

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

package/dist/esm/schema/confluence-schema.js

@@ -1,5 +1,5 @@
 import { createSchema } from './create-schema';
-var nodes = ['doc', 'paragraph', 'blockquote', 'codeBlock', 'panel', 'hardBreak', 'orderedList', 'bulletList', 'heading', 'mediaGroup', 'mediaSingle', 'media', 'caption', 'confluenceUnsupportedBlock', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'listItem', 'mention', 'text', 'confluenceUnsupportedInline', 'media', 'rule', 'table', 'tableCell', 'tableHeader', 'tableRow', 'emoji', 'taskList', 'taskItem', 'date', 'placeholder', 'decisionList', 'decisionItem', 'layoutSection', 'layoutColumn', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'];
+var nodes = ['doc', 'paragraph', 'blockquote', 'codeBlock', 'panel', 'hardBreak', 'orderedList', 'bulletList', 'heading', 'mediaInline', 'mediaGroup', 'mediaSingle', 'media', 'caption', 'confluenceUnsupportedBlock', 'confluenceJiraIssue', 'expand', 'nestedExpand', 'extension', 'inlineExtension', 'bodiedExtension', 'listItem', 'mention', 'text', 'confluenceUnsupportedInline', 'media', 'rule', 'table', 'tableCell', 'tableHeader', 'tableRow', 'emoji', 'taskList', 'taskItem', 'date', 'placeholder', 'decisionList', 'decisionItem', 'layoutSection', 'layoutColumn', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'];
 var marks = ['link', 'em', 'strong', 'strike', 'subsup', 'underline', 'mentionQuery', 'code', 'textColor', 'confluenceInlineComment', 'annotation', 'unsupportedMark', 'unsupportedNodeAttribute'];
 export var confluenceSchema = createSchema({
   nodes: nodes,

package/dist/esm/schema/jira-schema.js

@@ -37,7 +37,7 @@ export default function makeSchema(config) {
   }
 
   if (config.allowMedia) {
-    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption');
+    nodes.push('mediaGroup', 'mediaSingle', 'media', 'caption', 'mediaInline');
   }
 
   if (config.allowTextColor) {
@@ -78,7 +78,7 @@ export function isSchemaWithBlockQuotes(schema) {
   return !!schema.nodes.blockquote;
 }
 export function isSchemaWithMedia(schema) {
-  return !!schema.nodes.mediaGroup && !!schema.nodes.media;
+  return !!schema.nodes.mediaGroup && !!schema.nodes.media && !!schema.nodes.mediaInline;
 }
 export function isSchemaWithTextColor(schema) {
   return !!schema.marks.textColor;

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

@@ -159,7 +159,8 @@ var optionalAttributes = ['occurrenceKey', 'width', 'height', 'url', 'alt'];
 var externalOnlyAttributes = ['type', 'url', 'width', 'height', 'alt'];
 export var toJSON = function toJSON(node) {
   return {
-    attrs: Object.keys(node.attrs).filter(function (key) {
+    attrs: Object.keys(node.attrs) // Strip private attributes e.g. __fileName, __fileSize, __fileMimeType, etc.
+    .filter(function (key) {
       return !(key[0] === '_' && key[1] === '_');
     }).reduce(function (obj, key) {
       if (node.attrs.type === 'external' && externalOnlyAttributes.indexOf(key) === -1) {

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

@@ -107,7 +107,7 @@ var createTableSpec = function createTableSpec() {
   var tableNodeSpec = {
     content: 'tableRow+',
     attrs: attrs,
-    marks: 'fragment unsupportedMark unsupportedNodeAttribute',
+    marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
     selectable: false,

package/dist/esm/version.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "23.3.1",
+  "version": "24.0.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@atlaskit/adf-utils": "^17.1.0",
-    "@atlaskit/editor-json-transformer": "^8.7.0",
+    "@atlaskit/editor-json-transformer": "^8.8.0",
     "@atlaskit/editor-test-helpers": "^17.1.0",
     "@atlaskit/json-schema-generator": "^3.2.0",
     "@atlassian/adf-sample": "^1.1.0",