@atlaskit/adf-schema 25.3.1 → 25.4.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/adf-schema
 
+## 25.4.0
+
+### Minor Changes
+
+- [`bf04c417bfd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bf04c417bfd) - Add "border" mark to stage0 ADF schema
+- [`af9a85063e5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/af9a85063e5) - add image border toolbar
+
+### Patch Changes
+
+- Updated dependencies
+
+## 25.3.2
+
+### Patch Changes
+
+- [`2367ba14aa0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2367ba14aa0) - [ux] ED-16758 Added support for theme tokens in table cell background color.
+- [`6b52583b688`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6b52583b688) - ED-15974 Currently nodes are validated against single spec.
+  When a node has multiple specs, like mediaSingle, the first spec is used to validate the node.
+  Therefore, the validation fails with an error `INVALID_CONTENT_LENGTH` when the correct spec is not selected for validation.
+
+  This fix is to re-arrange the specs so that the less restrictive spec is at the top.
+
+- [`e771b41970b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e771b41970b) - Updating test cases for adf-schema json-compatibility-tests
+- Updated dependencies
+
 ## 25.3.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -339,6 +339,18 @@ Object.defineProperty(exports, "bodiedExtension", {
     return _schema.bodiedExtension;
   }
 });
+Object.defineProperty(exports, "border", {
+  enumerable: true,
+  get: function get() {
+    return _schema.border;
+  }
+});
+Object.defineProperty(exports, "borderColorPalette", {
+  enumerable: true,
+  get: function get() {
+    return _schema.borderColorPalette;
+  }
+});
 Object.defineProperty(exports, "breakout", {
   enumerable: true,
   get: function get() {

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

@@ -254,6 +254,9 @@ var marksInOrder = [{
 }, {
   name: 'indentation',
   spec: _marks.indentation
+}, {
+  name: 'border',
+  spec: _marks.border
 }, {
   name: 'unsupportedMark',
   spec: _marks.unsupportedMark

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSchemaBasedOnStage = exports.defaultSchemaConfig = exports.defaultSchema = void 0;
 var _nodes = require("./nodes");
+var _marks = require("./marks");
 var _createSchema = require("./create-schema");
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -24,6 +25,9 @@ var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: _nodes.layoutSectionWithSingleColumn
     };
+    defaultSchemaConfig.customMarkSpecs = {
+      border: _marks.border
+    };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);
 };

package/dist/cjs/schema/index.js

@@ -57,6 +57,18 @@ Object.defineProperty(exports, "bodiedExtension", {
     return _nodes.bodiedExtension;
   }
 });
+Object.defineProperty(exports, "border", {
+  enumerable: true,
+  get: function get() {
+    return _marks.border;
+  }
+});
+Object.defineProperty(exports, "borderColorPalette", {
+  enumerable: true,
+  get: function get() {
+    return _marks.borderColorPalette;
+  }
+});
 Object.defineProperty(exports, "breakout", {
   enumerable: true,
   get: function get() {

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

@@ -0,0 +1,52 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.borderColorPalette = exports.border = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _editorPalette = require("@atlaskit/editor-palette");
+var _colors = require("../../utils/colors");
+var borderColorArrayPalette = [[_colors.N300A, 'Subtle gray'], [_colors.N600, 'Gray'], [_colors.N1000, 'Bold gray']];
+var borderColorPalette = new Map();
+exports.borderColorPalette = borderColorPalette;
+borderColorArrayPalette.forEach(function (_ref) {
+  var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+    color = _ref2[0],
+    label = _ref2[1];
+  return borderColorPalette.set(color.toLowerCase(), label);
+});
+var border = {
+  inclusive: false,
+  parseDOM: [{
+    tag: 'div[data-mark-type="border"]',
+    getAttrs: function getAttrs(domNode) {
+      var _dom$getAttribute, _dom$getAttribute2;
+      var dom = domNode;
+      var color = ((_dom$getAttribute = dom.getAttribute('data-color')) !== null && _dom$getAttribute !== void 0 ? _dom$getAttribute : '').toLowerCase();
+      var size = +((_dom$getAttribute2 = dom.getAttribute('data-size')) !== null && _dom$getAttribute2 !== void 0 ? _dom$getAttribute2 : '0');
+      return {
+        size: size > 3 ? 3 : size < 1 ? false : size,
+        color: borderColorPalette.has(color) ? color : false
+      };
+    }
+  }],
+  attrs: {
+    color: {},
+    size: {}
+  },
+  toDOM: function toDOM(mark) {
+    // 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', {
+      'data-mark-type': 'border',
+      'data-color': mark.attrs.color,
+      'data-size': mark.attrs.size,
+      style: "--custom-palette-color: ".concat(paletteColorValue)
+    }];
+  }
+};
+exports.border = border;

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

@@ -33,6 +33,18 @@ Object.defineProperty(exports, "annotation", {
     return _annotation.annotation;
   }
 });
+Object.defineProperty(exports, "border", {
+  enumerable: true,
+  get: function get() {
+    return _border.border;
+  }
+});
+Object.defineProperty(exports, "borderColorPalette", {
+  enumerable: true,
+  get: function get() {
+    return _border.borderColorPalette;
+  }
+});
 Object.defineProperty(exports, "breakout", {
   enumerable: true,
   get: function get() {
@@ -182,4 +194,5 @@ var _annotation = require("./annotation");
 var _unsupportedMark = require("./unsupported-mark");
 var _unsupportedNodeAttributes = require("./unsupported-node-attributes");
 var _dataConsumer = require("./data-consumer");
-var _fragment = require("./fragment");
+var _fragment = require("./fragment");
+var _border = require("./border");

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

@@ -8,12 +8,15 @@ exports.mediaGroup = void 0;
  * @name mediaGroup_node
  */
 
+// Temporary due to an existing issue in validator below:
+// https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-1429
+// TODO: Remove border and link marks from white list
 var mediaGroup = {
   inline: false,
   group: 'block',
   content: '(media|unsupportedBlock)+',
   attrs: {},
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute border link',
   selectable: false,
   parseDOM: [{
     tag: 'div[data-node-type="mediaGroup"]'

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

@@ -18,7 +18,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 /**
- * @name mediaSingle_full_node
+ * @name mediaSingle_caption_node
  */
 
 /**
@@ -26,7 +26,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 /**
- * @name mediaSingle_caption_node
+ * @name mediaSingle_full_node
  */
 
 var defaultAttrs = {
@@ -46,7 +46,7 @@ var mediaSingle = {
   atom: true,
   content: 'media|unsupportedBlock+|media unsupportedBlock+',
   attrs: defaultAttrs,
-  marks: 'unsupportedMark unsupportedNodeAttribute link',
+  marks: 'unsupportedMark unsupportedNodeAttribute border link',
   parseDOM: [{
     tag: 'div[data-node-type="mediaSingle"]',
     getAttrs: function getAttrs(dom) {

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toJSONTableHeader = exports.toJSONTableCell = exports.tableToJSON = exports.tableRow = exports.tablePrefixSelector = exports.tableHeaderSelector = exports.tableHeader = exports.tableCellSelector = exports.tableCellContentWrapperSelector = exports.tableCellContentDomSelector = exports.tableCell = exports.tableBackgroundColorPalette = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.table = exports.getCellDomAttrs = exports.getCellAttrs = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _editorPalette = require("@atlaskit/editor-palette");
+var _tokens = require("@atlaskit/tokens");
 var _colors = require("../../utils/colors");
 var _uuid = require("../../utils/uuid");
 var tablePrefixSelector = 'pm-table';
@@ -86,7 +88,10 @@ var getCellDomAttrs = function getCellDomAttrs(node) {
       attrs.style = '';
     } else {
       var color = (0, _colors.isRgb)(background) ? (0, _colors.rgbToHex)(background) : background;
-      attrs.style = "".concat(attrs.style || '', "background-color: ").concat(color);
+      var tokenName = (0, _editorPalette.hexToEditorBackgroundPaletteColorTokenName)(color);
+      // eslint-disable-next-line @atlaskit/design-system/no-unsafe-design-token-usage
+      var tokenColor = tokenName ? (0, _tokens.getTokenValue)(tokenName) : color;
+      attrs.style = "".concat(attrs.style || '', "background-color: ").concat(tokenColor, ";");
 
       /**
        * Storing hex code in data-cell-background because

package/dist/cjs/utils/colors.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Y75 = exports.Y500 = exports.Y50 = exports.Y400 = exports.Y200 = exports.T75 = exports.T500 = exports.T50 = exports.T300 = exports.T100 = exports.R75 = exports.R500 = exports.R50 = exports.R400 = exports.R300 = exports.R100 = exports.P75 = exports.P500 = exports.P50 = exports.P400 = exports.P300 = exports.P100 = exports.N90 = exports.N800 = exports.N80 = exports.N60 = exports.N500 = exports.N50 = exports.N40 = exports.N300 = exports.N30 = exports.N200 = exports.N20 = exports.N0 = exports.G75 = exports.G500 = exports.G50 = exports.G400 = exports.G300 = exports.G200 = exports.B75 = exports.B500 = exports.B50 = exports.B400 = exports.B100 = void 0;
+exports.Y75 = exports.Y500 = exports.Y50 = exports.Y400 = exports.Y200 = exports.T75 = exports.T500 = exports.T50 = exports.T300 = exports.T100 = exports.R75 = exports.R500 = exports.R50 = exports.R400 = exports.R300 = exports.R100 = exports.P75 = exports.P500 = exports.P50 = exports.P400 = exports.P300 = exports.P100 = exports.N90 = exports.N800 = exports.N80 = exports.N600 = exports.N60 = exports.N500 = exports.N50 = exports.N40 = exports.N300A = exports.N300 = exports.N30 = exports.N200 = exports.N20 = exports.N1000 = exports.N0 = exports.G75 = exports.G500 = exports.G50 = exports.G400 = exports.G300 = exports.G200 = exports.B75 = exports.B500 = exports.B50 = exports.B400 = exports.B100 = void 0;
 exports.hexToRgb = hexToRgb;
 exports.hexToRgba = hexToRgba;
 exports.isHex = isHex;
@@ -89,10 +89,16 @@ var N200 = '#6B778C';
 exports.N200 = N200;
 var N300 = '#5E6C84';
 exports.N300 = N300;
+var N300A = '#091E4224';
+exports.N300A = N300A;
 var N500 = '#42526E';
 exports.N500 = N500;
+var N600 = '#758195';
+exports.N600 = N600;
 var N800 = '#172B4D';
 exports.N800 = N800;
+var N1000 = '#172B4D';
+exports.N1000 = N1000;
 var P50 = '#EAE6FF';
 exports.P50 = P50;
 var P75 = '#C0B6F2';

package/dist/cjs/version.json

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

package/dist/es2019/index.js

@@ -1,3 +1,3 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @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, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid } from './utils';

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

@@ -1,6 +1,6 @@
 import { Schema } from 'prosemirror-model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
-import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment } from './marks';
+import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
 import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaGroup, mediaSingleWithCaption, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
@@ -239,6 +239,9 @@ const marksInOrder = [{
 }, {
   name: 'indentation',
   spec: indentation
+}, {
+  name: 'border',
+  spec: border
 }, {
   name: 'unsupportedMark',
   spec: unsupportedMark

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

@@ -1,4 +1,5 @@
 import { layoutSectionWithSingleColumn } from './nodes';
+import { border } from './marks';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   let defaultSchemaConfig = {
@@ -16,6 +17,9 @@ export const getSchemaBasedOnStage = (stage = 'final') => {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn
     };
+    defaultSchemaConfig.customMarkSpecs = {
+      border
+    };
   }
   return createSchema(defaultSchemaConfig);
 };

package/dist/es2019/schema/index.js

@@ -1,6 +1,6 @@
 export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
+colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
 export { sanitizeNodes, createSchema } from './create-schema';

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

@@ -0,0 +1,37 @@
+import { hexToEditorBorderPaletteColor } from '@atlaskit/editor-palette';
+import { N300A, N600, N1000 } from '../../utils/colors';
+const borderColorArrayPalette = [[N300A, 'Subtle gray'], [N600, 'Gray'], [N1000, 'Bold gray']];
+export const borderColorPalette = new Map();
+borderColorArrayPalette.forEach(([color, label]) => borderColorPalette.set(color.toLowerCase(), label));
+export const border = {
+  inclusive: false,
+  parseDOM: [{
+    tag: 'div[data-mark-type="border"]',
+    getAttrs: domNode => {
+      var _dom$getAttribute, _dom$getAttribute2;
+      const dom = domNode;
+      const color = ((_dom$getAttribute = dom.getAttribute('data-color')) !== null && _dom$getAttribute !== void 0 ? _dom$getAttribute : '').toLowerCase();
+      const size = +((_dom$getAttribute2 = dom.getAttribute('data-size')) !== null && _dom$getAttribute2 !== void 0 ? _dom$getAttribute2 : '0');
+      return {
+        size: size > 3 ? 3 : size < 1 ? false : size,
+        color: borderColorPalette.has(color) ? color : false
+      };
+    }
+  }],
+  attrs: {
+    color: {},
+    size: {}
+  },
+  toDOM(mark) {
+    // 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', {
+      'data-mark-type': 'border',
+      'data-color': mark.attrs.color,
+      'data-size': mark.attrs.size,
+      style: `--custom-palette-color: ${paletteColorValue}`
+    }];
+  }
+};

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

@@ -15,4 +15,5 @@ export { annotation, AnnotationMarkStates, buildDataAttributes as buildAnnotatio
 export { unsupportedMark } from './unsupported-mark';
 export { unsupportedNodeAttribute } from './unsupported-node-attributes';
 export { dataConsumer, toJSON as dataConsumerToJSON } from './data-consumer';
-export { fragment, toJSON as fragmentToJSON } from './fragment';
+export { fragment, toJSON as fragmentToJSON } from './fragment';
+export { border, borderColorPalette } from './border';

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

@@ -2,12 +2,15 @@
  * @name mediaGroup_node
  */
 
+// Temporary due to an existing issue in validator below:
+// https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-1429
+// TODO: Remove border and link marks from white list
 export const mediaGroup = {
   inline: false,
   group: 'block',
   content: '(media|unsupportedBlock)+',
   attrs: {},
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute border link',
   selectable: false,
   parseDOM: [{
     tag: 'div[data-node-type="mediaGroup"]'

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

@@ -8,7 +8,7 @@
  */
 
 /**
- * @name mediaSingle_full_node
+ * @name mediaSingle_caption_node
  */
 
 /**
@@ -16,7 +16,7 @@
  */
 
 /**
- * @name mediaSingle_caption_node
+ * @name mediaSingle_full_node
  */
 
 export const defaultAttrs = {
@@ -35,7 +35,7 @@ export const mediaSingle = {
   atom: true,
   content: 'media|unsupportedBlock+|media unsupportedBlock+',
   attrs: defaultAttrs,
-  marks: 'unsupportedMark unsupportedNodeAttribute link',
+  marks: 'unsupportedMark unsupportedNodeAttribute border link',
   parseDOM: [{
     tag: 'div[data-node-type="mediaSingle"]',
     getAttrs: dom => ({

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

@@ -1,3 +1,5 @@
+import { hexToEditorBackgroundPaletteColorTokenName } from '@atlaskit/editor-palette';
+import { getTokenValue } from '@atlaskit/tokens';
 import { B100, B50, B75, G200, G50, G75, hexToRgba, isHex, isRgb, N0, N20, N60, N800, P100, P50, P75, R100, R50, R75, rgbToHex, T100, T50, T75, Y200, Y50, Y75 } from '../../utils/colors';
 import { uuid } from '../../utils/uuid';
 export const tablePrefixSelector = 'pm-table';
@@ -73,7 +75,10 @@ export const getCellDomAttrs = node => {
       attrs.style = '';
     } else {
       const color = isRgb(background) ? rgbToHex(background) : background;
-      attrs.style = `${attrs.style || ''}background-color: ${color}`;
+      const tokenName = hexToEditorBackgroundPaletteColorTokenName(color);
+      // eslint-disable-next-line @atlaskit/design-system/no-unsafe-design-token-usage
+      const tokenColor = tokenName ? getTokenValue(tokenName) : color;
+      attrs.style = `${attrs.style || ''}background-color: ${tokenColor};`;
 
       /**
        * Storing hex code in data-cell-background because

package/dist/es2019/utils/colors.js

@@ -39,8 +39,11 @@ export const N80 = '#97A0AF';
 export const N90 = '#8993A4';
 export const N200 = '#6B778C';
 export const N300 = '#5E6C84';
+export const N300A = '#091E4224';
 export const N500 = '#42526E';
+export const N600 = '#758195';
 export const N800 = '#172B4D';
+export const N1000 = '#172B4D';
 export const P50 = '#EAE6FF';
 export const P75 = '#C0B6F2';
 export const P100 = '#998DD9';

package/dist/es2019/version.json

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

package/dist/esm/index.js

@@ -1,3 +1,3 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @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, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid } from './utils';

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

@@ -3,7 +3,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { Schema } from 'prosemirror-model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
-import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment } from './marks';
+import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
 import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaGroup, mediaSingleWithCaption, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -244,6 +244,9 @@ var marksInOrder = [{
 }, {
   name: 'indentation',
   spec: indentation
+}, {
+  name: 'border',
+  spec: border
 }, {
   name: 'unsupportedMark',
   spec: unsupportedMark

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

@@ -1,4 +1,5 @@
 import { layoutSectionWithSingleColumn } from './nodes';
+import { border } from './marks';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -17,6 +18,9 @@ export var getSchemaBasedOnStage = function getSchemaBasedOnStage() {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn
     };
+    defaultSchemaConfig.customMarkSpecs = {
+      border: border
+    };
   }
   return createSchema(defaultSchemaConfig);
 };

package/dist/esm/schema/index.js

@@ -1,6 +1,6 @@
 export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, media, mediaGroup, mediaSingle, mediaInline, mediaSingleWithCaption, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
+colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
 export { sanitizeNodes, createSchema } from './create-schema';

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

@@ -0,0 +1,43 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { hexToEditorBorderPaletteColor } from '@atlaskit/editor-palette';
+import { N300A, N600, N1000 } from '../../utils/colors';
+var borderColorArrayPalette = [[N300A, 'Subtle gray'], [N600, 'Gray'], [N1000, 'Bold gray']];
+export var borderColorPalette = new Map();
+borderColorArrayPalette.forEach(function (_ref) {
+  var _ref2 = _slicedToArray(_ref, 2),
+    color = _ref2[0],
+    label = _ref2[1];
+  return borderColorPalette.set(color.toLowerCase(), label);
+});
+export var border = {
+  inclusive: false,
+  parseDOM: [{
+    tag: 'div[data-mark-type="border"]',
+    getAttrs: function getAttrs(domNode) {
+      var _dom$getAttribute, _dom$getAttribute2;
+      var dom = domNode;
+      var color = ((_dom$getAttribute = dom.getAttribute('data-color')) !== null && _dom$getAttribute !== void 0 ? _dom$getAttribute : '').toLowerCase();
+      var size = +((_dom$getAttribute2 = dom.getAttribute('data-size')) !== null && _dom$getAttribute2 !== void 0 ? _dom$getAttribute2 : '0');
+      return {
+        size: size > 3 ? 3 : size < 1 ? false : size,
+        color: borderColorPalette.has(color) ? color : false
+      };
+    }
+  }],
+  attrs: {
+    color: {},
+    size: {}
+  },
+  toDOM: function toDOM(mark) {
+    // 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', {
+      'data-mark-type': 'border',
+      'data-color': mark.attrs.color,
+      'data-size': mark.attrs.size,
+      style: "--custom-palette-color: ".concat(paletteColorValue)
+    }];
+  }
+};

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

@@ -15,4 +15,5 @@ export { annotation, AnnotationMarkStates, buildDataAttributes as buildAnnotatio
 export { unsupportedMark } from './unsupported-mark';
 export { unsupportedNodeAttribute } from './unsupported-node-attributes';
 export { dataConsumer, toJSON as dataConsumerToJSON } from './data-consumer';
-export { fragment, toJSON as fragmentToJSON } from './fragment';
+export { fragment, toJSON as fragmentToJSON } from './fragment';
+export { border, borderColorPalette } from './border';

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

@@ -2,12 +2,15 @@
  * @name mediaGroup_node
  */
 
+// Temporary due to an existing issue in validator below:
+// https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-1429
+// TODO: Remove border and link marks from white list
 export var mediaGroup = {
   inline: false,
   group: 'block',
   content: '(media|unsupportedBlock)+',
   attrs: {},
-  marks: 'unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute border link',
   selectable: false,
   parseDOM: [{
     tag: 'div[data-node-type="mediaGroup"]'

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

@@ -11,7 +11,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 /**
- * @name mediaSingle_full_node
+ * @name mediaSingle_caption_node
  */
 
 /**
@@ -19,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 /**
- * @name mediaSingle_caption_node
+ * @name mediaSingle_full_node
  */
 
 export var defaultAttrs = {
@@ -38,7 +38,7 @@ export var mediaSingle = {
   atom: true,
   content: 'media|unsupportedBlock+|media unsupportedBlock+',
   attrs: defaultAttrs,
-  marks: 'unsupportedMark unsupportedNodeAttribute link',
+  marks: 'unsupportedMark unsupportedNodeAttribute border link',
   parseDOM: [{
     tag: 'div[data-node-type="mediaSingle"]',
     getAttrs: function getAttrs(dom) {