@atlaskit/adf-schema 24.0.3 → 25.0.0

package/dist/es2019/schema/nodes/bullet-list.js

@@ -1,8 +1,3 @@
-// eslint-disable-next-line import/no-cycle
-
-/**
- * @name bulletList_node
- */
 export const bulletListSelector = '.ak-ul';
 export const bulletList = {
   group: 'block',

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

@@ -9,7 +9,7 @@ export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';
 export { heading } from './heading';
 export { rule } from './rule';
-export { orderedList, orderedListSelector } from './ordered-list';
+export { orderedList, orderedListSelector, orderedListWithOrder } from './ordered-list';
 export { paragraph } from './paragraph';
 export { emoji } from './emoji';
 export { image } from './image';

package/dist/es2019/schema/nodes/list-item.js

@@ -1,9 +1,3 @@
-// eslint-disable-next-line import/no-cycle
-// eslint-disable-next-line import/no-cycle
-
-/**
- * @name listItem_node
- */
 export const listItem = {
   content: '(paragraph | mediaSingle | codeBlock) (paragraph | bulletList | orderedList | mediaSingle | codeBlock)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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

@@ -39,6 +39,9 @@ export const defaultAttrs = {
   __contextId: {
     default: null
   },
+  __mediaTraceId: {
+    default: null
+  },
   __external: {
     default: false
   }

package/dist/es2019/schema/nodes/ordered-list.js

@@ -1,11 +1,11 @@
-// eslint-disable-next-line import/no-cycle
-
-/**
- * @name orderedList_node
- */
 export const orderedListSelector = '.ak-ol';
 export const orderedList = {
   group: 'block',
+  attrs: {
+    order: {
+      default: 1
+    }
+  },
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
@@ -20,4 +20,54 @@ export const orderedList = {
     return ['ol', attrs, 0];
   }
 
+}; // resolve "start" to a safe, 0+ integer, otherwise return undefined
+// Note: Any changes to this function should also be made to "resolveOrder"
+// in packages/editor/editor-common/src/utils/list.ts
+
+const resolveStart = start => {
+  const num = Number(start);
+
+  if (Number.isNaN(num)) {
+    return;
+  }
+
+  if (num < 0) {
+    return;
+  }
+
+  return Math.floor(Math.max(num, 0));
+};
+
+export const orderedListWithOrder = { ...orderedList,
+  parseDOM: [{
+    tag: 'ol',
+    getAttrs: domNode => {
+      const dom = domNode;
+      let startDOMAttr = dom.getAttribute('start');
+
+      if (startDOMAttr) {
+        const start = resolveStart(startDOMAttr);
+
+        if (typeof start === 'number') {
+          return {
+            order: start
+          };
+        }
+      }
+
+      return null;
+    }
+  }],
+
+  toDOM(node) {
+    var _node$attrs;
+
+    const start = resolveStart(node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order);
+    const attrs = {
+      start: typeof start === 'number' ? String(start) : undefined,
+      class: orderedListSelector.substr(1)
+    };
+    return ['ol', attrs, 0];
+  }
+
 };

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

@@ -12,13 +12,17 @@ export const getCellAttrs = (dom, defaultValues = {}) => {
   const colspan = Number(dom.getAttribute('colspan') || 1);
   let {
     backgroundColor
-  } = dom.style;
+  } = dom.style; // ignore setting background attr if ds neutral token is detected
 
-  if (backgroundColor && isRgb(backgroundColor)) {
-    const result = rgbToHex(backgroundColor);
+  if (backgroundColor.includes('--ds-background-neutral')) {
+    backgroundColor = '';
+  } else {
+    if (backgroundColor && isRgb(backgroundColor)) {
+      const result = rgbToHex(backgroundColor);
 
-    if (result !== null) {
-      backgroundColor = result;
+      if (result !== null) {
+        backgroundColor = result;
+      }
     }
   }
 
@@ -56,8 +60,9 @@ export const getCellDomAttrs = node => {
     } = node.attrs; // to ensure that we don't overwrite product's style:
     // - it clears background color for <th> if its set to gray
     // - it clears background color for <td> if its set to white
+    // - it clears background color for <th> if ds neutral token is detected
 
-    const ignored = nodeType === 'tableHeader' && background === tableBackgroundColorNames.get('light gray') || nodeType === 'tableCell' && background === tableBackgroundColorNames.get('white');
+    const ignored = nodeType === 'tableHeader' && background === tableBackgroundColorNames.get('light gray') || nodeType === 'tableCell' && background === tableBackgroundColorNames.get('white') || nodeType === 'tableHeader' && background.includes('--ds-background-neutral');
 
     if (ignored) {
       attrs.style = '';

package/dist/es2019/schema/nodes/types/list.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/utils/url.js

@@ -1,5 +1,9 @@
+/**
+ * This file has been duplicated in packages/linking-platform/link-picker/src/common/utils/url.ts
+ * Any changes made here should be mirrored there.
+ */
 import LinkifyIt from 'linkify-it';
-const whitelistedURLPatterns = [/^https?:\/\//im, /^ftps?:\/\//im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:/im, /^facetime:/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^#/im];
+const whitelistedURLPatterns = [/^https?:\/\//im, /^ftps?:\/\//im, /^jamfselfservice:\/\//im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:/im, /^facetime:/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^#/im];
 /**
  * Please notify the Editor Mobile team (Slack: #help-mobilekit) if the logic for this changes.
  */
@@ -15,11 +19,12 @@ export const isSafeUrl = url => {
 };
 export const linkify = LinkifyIt();
 linkify.add('sourcetree:', 'http:');
+linkify.add('jamfselfservice:', 'http:');
 const tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
 const tlds2Char = 'a[cdefgilmnoqrtuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrtuvwxyz]|n[acefgilopruz]|om|p[aefghkmnrtw]|qa|r[eosuw]|s[abcdegijklmnrtuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
 tlds.push(tlds2Char);
 linkify.tlds(tlds, false);
-export const LINK_REGEXP = /(https?|ftp):\/\/[^\s]+/;
+export const LINK_REGEXP = /(https?|ftp|jamfselfservice):\/\/[^\s]+/;
 export const linkifyMatch = text => {
   const matches = [];
 

package/dist/es2019/version.json

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

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, 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, 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';
+export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, 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';
 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/bitbucket-schema.js

@@ -1,4 +1,8 @@
 import { createSchema } from './create-schema';
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export var bitbucketSchema = createSchema({
   nodes: ['doc', 'caption', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'hardBreak', 'rule', 'image', 'media', 'mediaSingle', 'mention', 'emoji', 'table', 'tableCell', 'tableHeader', 'tableRow', 'inlineCard', 'unsupportedBlock', 'unsupportedInline'],
   marks: ['em', 'strong', 'strike', 'link', 'code', 'unsupportedMark', 'unsupportedNodeAttribute']

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

@@ -1,10 +1,18 @@
 import { createSchema } from './create-schema';
 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'];
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export var confluenceSchema = createSchema({
   nodes: nodes,
   marks: marks
 });
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export var confluenceSchemaWithMediaSingle = createSchema({
   nodes: nodes.concat('mediaSingle'),
   marks: marks

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

@@ -7,7 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedList, 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';
+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] : {};
@@ -78,7 +78,7 @@ var nodesInOrder = [{
   spec: bulletList
 }, {
   name: 'orderedList',
-  spec: orderedList
+  spec: orderedListWithOrder
 }, {
   name: 'listItem',
   spec: listItem

package/dist/esm/schema/index.js

@@ -1,4 +1,4 @@
-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, 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 { 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, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';

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

@@ -1,4 +1,8 @@
 import { createSchema } from './create-schema';
+
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
 export default function makeSchema(config) {
   var nodes = ['doc', 'paragraph', 'text', 'hardBreak', 'heading', 'rule'];
   var marks = ['strong', 'em', 'underline', 'typeAheadQuery', 'unsupportedMark', 'unsupportedNodeAttribute'];
@@ -53,36 +57,80 @@ export default function makeSchema(config) {
     marks: marks
   });
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithLists(schema) {
   return !!schema.nodes.bulletList;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithMentions(schema) {
   return !!schema.nodes.mention;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithEmojis(schema) {
   return !!schema.nodes.emoji;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithLinks(schema) {
   return !!schema.marks.link;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithAdvancedTextFormattingMarks(schema) {
   return !!schema.marks.code && !!schema.marks.strike;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithSubSupMark(schema) {
   return !!schema.marks.subsup;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithCodeBlock(schema) {
   return !!schema.nodes.codeBlock;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithBlockQuotes(schema) {
   return !!schema.nodes.blockquote;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithMedia(schema) {
   return !!schema.nodes.mediaGroup && !!schema.nodes.media && !!schema.nodes.mediaInline;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithTextColor(schema) {
   return !!schema.marks.textColor;
 }
+/**
+ * @deprecated [ED-15676] We have stopped supporting product specific schemas. Use `@atlaskit/adf-schema/schema-default` instead.
+ **/
+
 export function isSchemaWithTables(schema) {
   return !!schema.nodes.table && !!schema.nodes.tableCell && !!schema.nodes.tableHeader && !!schema.nodes.tableRow;
 }

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

@@ -23,7 +23,7 @@ export var alignment = {
   }],
   toDOM: function toDOM(mark) {
     return ['div', {
-      class: "fabric-editor-block-mark fabric-editor-align-".concat(mark.attrs.align),
+      class: "fabric-editor-block-mark fabric-editor-alignment fabric-editor-align-".concat(mark.attrs.align),
       'data-align': mark.attrs.align
     }, 0];
   }

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

@@ -39,7 +39,7 @@ export function buildDataAttributes(_ref) {
   return data;
 }
 export var annotation = {
-  inclusive: false,
+  inclusive: true,
   group: 'annotation',
   excludes: '',
   attrs: {

package/dist/esm/schema/nodes/bullet-list.js

@@ -1,8 +1,3 @@
-// eslint-disable-next-line import/no-cycle
-
-/**
- * @name bulletList_node
- */
 export var bulletListSelector = '.ak-ul';
 export var bulletList = {
   group: 'block',

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

@@ -9,7 +9,7 @@ export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';
 export { heading } from './heading';
 export { rule } from './rule';
-export { orderedList, orderedListSelector } from './ordered-list';
+export { orderedList, orderedListSelector, orderedListWithOrder } from './ordered-list';
 export { paragraph } from './paragraph';
 export { emoji } from './emoji';
 export { image } from './image';

package/dist/esm/schema/nodes/list-item.js

@@ -1,9 +1,3 @@
-// eslint-disable-next-line import/no-cycle
-// eslint-disable-next-line import/no-cycle
-
-/**
- * @name listItem_node
- */
 export var listItem = {
   content: '(paragraph | mediaSingle | codeBlock) (paragraph | bulletList | orderedList | mediaSingle | codeBlock)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',

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

@@ -39,6 +39,9 @@ export var defaultAttrs = {
   __contextId: {
     default: null
   },
+  __mediaTraceId: {
+    default: null
+  },
   __external: {
     default: false
   }

package/dist/esm/schema/nodes/ordered-list.js

@@ -1,11 +1,17 @@
-// eslint-disable-next-line import/no-cycle
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+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; }
 
-/**
- * @name orderedList_node
- */
 export var orderedListSelector = '.ak-ol';
 export var orderedList = {
   group: 'block',
+  attrs: {
+    order: {
+      default: 1
+    }
+  },
   content: 'listItem+',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
@@ -18,4 +24,52 @@ export var orderedList = {
     };
     return ['ol', attrs, 0];
   }
-};
+}; // resolve "start" to a safe, 0+ integer, otherwise return undefined
+// Note: Any changes to this function should also be made to "resolveOrder"
+// in packages/editor/editor-common/src/utils/list.ts
+
+var resolveStart = function resolveStart(start) {
+  var num = Number(start);
+
+  if (Number.isNaN(num)) {
+    return;
+  }
+
+  if (num < 0) {
+    return;
+  }
+
+  return Math.floor(Math.max(num, 0));
+};
+
+export var orderedListWithOrder = _objectSpread(_objectSpread({}, orderedList), {}, {
+  parseDOM: [{
+    tag: 'ol',
+    getAttrs: function getAttrs(domNode) {
+      var dom = domNode;
+      var startDOMAttr = dom.getAttribute('start');
+
+      if (startDOMAttr) {
+        var start = resolveStart(startDOMAttr);
+
+        if (typeof start === 'number') {
+          return {
+            order: start
+          };
+        }
+      }
+
+      return null;
+    }
+  }],
+  toDOM: function toDOM(node) {
+    var _node$attrs;
+
+    var start = resolveStart(node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order);
+    var attrs = {
+      start: typeof start === 'number' ? String(start) : undefined,
+      class: orderedListSelector.substr(1)
+    };
+    return ['ol', attrs, 0];
+  }
+});

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

@@ -14,13 +14,17 @@ export var getCellAttrs = function getCellAttrs(dom) {
     return Number(str);
   }) : null;
   var colspan = Number(dom.getAttribute('colspan') || 1);
-  var backgroundColor = dom.style.backgroundColor;
+  var backgroundColor = dom.style.backgroundColor; // ignore setting background attr if ds neutral token is detected
 
-  if (backgroundColor && isRgb(backgroundColor)) {
-    var result = rgbToHex(backgroundColor);
+  if (backgroundColor.includes('--ds-background-neutral')) {
+    backgroundColor = '';
+  } else {
+    if (backgroundColor && isRgb(backgroundColor)) {
+      var result = rgbToHex(backgroundColor);
 
-    if (result !== null) {
-      backgroundColor = result;
+      if (result !== null) {
+        backgroundColor = result;
+      }
     }
   }
 
@@ -56,8 +60,9 @@ export var getCellDomAttrs = function getCellDomAttrs(node) {
     var background = node.attrs.background; // to ensure that we don't overwrite product's style:
     // - it clears background color for <th> if its set to gray
     // - it clears background color for <td> if its set to white
+    // - it clears background color for <th> if ds neutral token is detected
 
-    var ignored = nodeType === 'tableHeader' && background === tableBackgroundColorNames.get('light gray') || nodeType === 'tableCell' && background === tableBackgroundColorNames.get('white');
+    var ignored = nodeType === 'tableHeader' && background === tableBackgroundColorNames.get('light gray') || nodeType === 'tableCell' && background === tableBackgroundColorNames.get('white') || nodeType === 'tableHeader' && background.includes('--ds-background-neutral');
 
     if (ignored) {
       attrs.style = '';

package/dist/esm/schema/nodes/types/list.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/utils/url.js

@@ -1,5 +1,9 @@
+/**
+ * This file has been duplicated in packages/linking-platform/link-picker/src/common/utils/url.ts
+ * Any changes made here should be mirrored there.
+ */
 import LinkifyIt from 'linkify-it';
-var whitelistedURLPatterns = [/^https?:\/\//im, /^ftps?:\/\//im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:/im, /^facetime:/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^#/im];
+var whitelistedURLPatterns = [/^https?:\/\//im, /^ftps?:\/\//im, /^jamfselfservice:\/\//im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:/im, /^facetime:/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^#/im];
 /**
  * Please notify the Editor Mobile team (Slack: #help-mobilekit) if the logic for this changes.
  */
@@ -17,11 +21,12 @@ export var isSafeUrl = function isSafeUrl(url) {
 };
 export var linkify = LinkifyIt();
 linkify.add('sourcetree:', 'http:');
+linkify.add('jamfselfservice:', 'http:');
 var tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
 var tlds2Char = 'a[cdefgilmnoqrtuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrtuvwxyz]|n[acefgilopruz]|om|p[aefghkmnrtw]|qa|r[eosuw]|s[abcdegijklmnrtuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
 tlds.push(tlds2Char);
 linkify.tlds(tlds, false);
-export var LINK_REGEXP = /(https?|ftp):\/\/[^\s]+/;
+export var LINK_REGEXP = /(https?|ftp|jamfselfservice):\/\/[^\s]+/;
 export var linkifyMatch = function linkifyMatch(text) {
   var matches = [];
 

package/dist/esm/version.json

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