@atlaskit/adf-schema 35.1.0 → 35.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 35.2.0
+
+### Minor Changes
+
+- b241b07: Add inline support for border mark
+
+## 35.1.1
+
+### Patch Changes
+
+- 2023f5a: ED-20070: Added multiBodiedExtension and extensionFrame as defaultSchema customNodeSpecs for stage-0
+
 ## 35.1.0
 
 ### Minor Changes

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

@@ -24,7 +24,9 @@ var getSchemaBasedOnStage = (0, _memoizeOne.default)(function () {
   var defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      layoutSection: _nodes.layoutSectionWithSingleColumn
+      layoutSection: _nodes.layoutSectionWithSingleColumn,
+      multiBodiedExtension: _nodes.multiBodiedExtension,
+      extensionFrame: _nodes.extensionFrame
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

package/dist/cjs/schema/marks/border.js

@@ -25,7 +25,7 @@ borderColorArrayPalette.forEach(function (_ref) {
 var border = {
   inclusive: false,
   parseDOM: [{
-    tag: 'div[data-mark-type="border"]',
+    tag: '[data-mark-type="border"]',
     getAttrs: function getAttrs(domNode) {
       var _dom$getAttribute, _dom$getAttribute2;
       var dom = domNode;
@@ -41,12 +41,14 @@ var border = {
     color: {},
     size: {}
   },
-  toDOM: function toDOM(mark) {
+  toDOM: function toDOM(mark, isInline) {
+    var wrapperStyle = isInline ? 'span' : 'div';
+
     // Note -- while there is no way to create custom colors using default tooling
     // the editor does supported ad hoc color values -- and there may be content
     // which has been migrated or created via apis which use such values.
     var paletteColorValue = (0, _editorPalette.hexToEditorBorderPaletteColor)(mark.attrs.color) || mark.attrs.color;
-    return ['div', {
+    return [wrapperStyle, {
       'data-mark-type': 'border',
       'data-color': mark.attrs.color,
       'data-size': mark.attrs.size,

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { layoutSectionWithSingleColumn } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -15,7 +15,9 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
   const defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      layoutSection: layoutSectionWithSingleColumn
+      layoutSection: layoutSectionWithSingleColumn,
+      multiBodiedExtension: multiBodiedExtension,
+      extensionFrame: extensionFrame
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/es2019/schema/marks/border.js

@@ -12,7 +12,7 @@ borderColorArrayPalette.forEach(([color, label]) => borderColorPalette.set(color
 export const border = {
   inclusive: false,
   parseDOM: [{
-    tag: 'div[data-mark-type="border"]',
+    tag: '[data-mark-type="border"]',
     getAttrs: domNode => {
       var _dom$getAttribute, _dom$getAttribute2;
       const dom = domNode;
@@ -28,12 +28,14 @@ export const border = {
     color: {},
     size: {}
   },
-  toDOM(mark) {
+  toDOM(mark, isInline) {
+    const wrapperStyle = isInline ? 'span' : 'div';
+
     // Note -- while there is no way to create custom colors using default tooling
     // the editor does supported ad hoc color values -- and there may be content
     // which has been migrated or created via apis which use such values.
     const paletteColorValue = hexToEditorBorderPaletteColor(mark.attrs.color) || mark.attrs.color;
-    return ['div', {
+    return [wrapperStyle, {
       'data-mark-type': 'border',
       'data-color': mark.attrs.color,
       'data-size': mark.attrs.size,

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { layoutSectionWithSingleColumn } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -16,7 +16,9 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
   var defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      layoutSection: layoutSectionWithSingleColumn
+      layoutSection: layoutSectionWithSingleColumn,
+      multiBodiedExtension: multiBodiedExtension,
+      extensionFrame: extensionFrame
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/esm/schema/marks/border.js

@@ -18,7 +18,7 @@ borderColorArrayPalette.forEach(function (_ref) {
 export var border = {
   inclusive: false,
   parseDOM: [{
-    tag: 'div[data-mark-type="border"]',
+    tag: '[data-mark-type="border"]',
     getAttrs: function getAttrs(domNode) {
       var _dom$getAttribute, _dom$getAttribute2;
       var dom = domNode;
@@ -34,12 +34,14 @@ export var border = {
     color: {},
     size: {}
   },
-  toDOM: function toDOM(mark) {
+  toDOM: function toDOM(mark, isInline) {
+    var wrapperStyle = isInline ? 'span' : 'div';
+
     // Note -- while there is no way to create custom colors using default tooling
     // the editor does supported ad hoc color values -- and there may be content
     // which has been migrated or created via apis which use such values.
     var paletteColorValue = hexToEditorBorderPaletteColor(mark.attrs.color) || mark.attrs.color;
-    return ['div', {
+    return [wrapperStyle, {
       'data-mark-type': 'border',
       'data-color': mark.attrs.color,
       'data-size': mark.attrs.size,

package/package.json

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