@atlaskit/adf-schema 37.2.0 → 38.0.0

package/dist/es2019/schema/marks/confluence-inline-comment.js

@@ -1,16 +1,11 @@
+import { confluenceInlineComment as confluenceInlineCommentFactory } from '../../next-schema/generated/markTypes';
+
 /**
  * @name inline_comment_marker
  * @description This temporary mark represents a Confluence-backed inline comment that wraps a piece of text. It will be replaced with a cross-product inline comment solution at later date.
  */
 
-export const confluenceInlineComment = {
-  inclusive: false,
-  excludes: '',
-  attrs: {
-    reference: {
-      default: ''
-    }
-  },
+export const confluenceInlineComment = confluenceInlineCommentFactory({
   parseDOM: [{
     tag: 'span[data-mark-type="confluenceInlineComment"]'
   }],
@@ -20,4 +15,4 @@ export const confluenceInlineComment = {
       'data-reference': node.attrs.reference
     }];
   }
-};
+});

package/dist/es2019/schema/marks/data-consumer.js

@@ -1,3 +1,4 @@
+import { dataConsumer as dataConsumerFactory } from '../../next-schema/generated/markTypes';
 import { isDOMElement } from '../../utils/parseDOM';
 
 /**
@@ -27,12 +28,7 @@ const parseDataConsumer = maybeValue => {
     return false;
   }
 };
-export const dataConsumer = {
-  attrs: {
-    sources: {
-      default: []
-    }
-  },
+export const dataConsumer = dataConsumerFactory({
   parseDOM: [{
     tag: '[data-mark-type="dataConsumer"]',
     getAttrs: maybeValue => parseDataConsumer(maybeValue)
@@ -44,7 +40,7 @@ export const dataConsumer = {
       'data-sources': JSON.stringify(mark.attrs.sources)
     }];
   }
-};
+});
 
 /**
  * We want to ensure any "invalid ADF" doesn't get serialised, but the entire

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

@@ -1,13 +1,11 @@
-import { FONT_STYLE } from '../groups';
+import { em as emFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name em_mark
  */
 
 const emDOM = ['em'];
-export const em = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const em = emFactory({
   parseDOM: [{
     tag: 'i'
   }, {
@@ -18,4 +16,4 @@ export const em = {
   toDOM() {
     return emDOM;
   }
-};
+});

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

@@ -1,3 +1,4 @@
+import { fragment as fragmentFactory } from '../../next-schema/generated/markTypes';
 import { isDOMElement } from '../../utils/parseDOM';
 
 /**
@@ -21,17 +22,7 @@ const parseFragment = maybeValue => {
     name
   };
 };
-export const fragment = {
-  inclusive: false,
-  excludes: '',
-  attrs: {
-    localId: {
-      default: ''
-    },
-    name: {
-      default: null
-    }
-  },
+export const fragment = fragmentFactory({
   parseDOM: [{
     tag: '[data-mark-type="fragment"]',
     getAttrs: maybeValue => parseFragment(maybeValue)
@@ -44,7 +35,7 @@ export const fragment = {
       'data-localId': mark.attrs.localId
     }];
   }
-};
+});
 export const toJSON = mark => {
   return {
     type: mark.type.name,

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

@@ -1,15 +1,10 @@
-import { ALIGNMENT, INDENTATION } from '../groups';
+import { indentation as indentationFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name indentation_mark
  */
 
-export const indentation = {
-  excludes: `indentation ${ALIGNMENT}`,
-  group: INDENTATION,
-  attrs: {
-    level: {}
-  },
+export const indentation = indentationFactory({
   parseDOM: [{
     tag: 'div.fabric-editor-indentation-mark',
     getAttrs(dom) {
@@ -25,4 +20,4 @@ export const indentation = {
       'data-level': mark.attrs.level
     }, 0];
   }
-};
+});

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

@@ -1,4 +1,4 @@
-import { LINK } from '../groups';
+import { link as linkFactory } from '../../next-schema/generated/markTypes';
 import { isRootRelative, isSafeUrl, normalizeUrl } from '../../utils/url';
 
 /**
@@ -21,17 +21,7 @@ const getLinkAttrs = attribute => domNode => {
   attrs.href = normalizeUrl(href);
   return attrs;
 };
-export const link = {
-  excludes: `${LINK}`,
-  // ED-5844 No multiple links in media node
-  group: LINK,
-  attrs: {
-    href: {},
-    __confluenceMetadata: {
-      default: null
-    }
-  },
-  inclusive: false,
+export const link = linkFactory({
   parseDOM: [{
     tag: '[data-block-link]',
     getAttrs: getLinkAttrs('data-block-link'),
@@ -69,7 +59,7 @@ export const link = {
       class: 'blockLink'
     }, 0];
   }
-};
+});
 const OPTIONAL_ATTRS = ['title', 'id', 'collection', 'occurrenceKey', '__confluenceMetadata'];
 export const toJSON = mark => ({
   type: mark.type.name,

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

@@ -1,12 +1,10 @@
-import { FONT_STYLE } from '../groups';
+import { strike as strikeFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name strike_mark
  */
 
-export const strike = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const strike = strikeFactory({
   parseDOM: [{
     tag: 'strike'
   }, {
@@ -20,4 +18,4 @@ export const strike = {
   toDOM() {
     return ['s'];
   }
-};
+});

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

@@ -1,13 +1,11 @@
-import { FONT_STYLE } from '../groups';
+import { strong as strongFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name strong_mark
  */
 
 const strongDOM = ['strong'];
-export const strong = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const strong = strongFactory({
   parseDOM: [{
     tag: 'strong'
   },
@@ -33,4 +31,4 @@ export const strong = {
   toDOM() {
     return strongDOM;
   }
-};
+});

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

@@ -1,4 +1,4 @@
-import { FONT_STYLE } from '../groups';
+import { subsup as subsupFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name subsup_mark
@@ -15,14 +15,7 @@ function getAttrFromVerticalAlign(node) {
   }
   return false;
 }
-export const subsup = {
-  inclusive: true,
-  group: FONT_STYLE,
-  attrs: {
-    type: {
-      default: 'sub'
-    }
-  },
+export const subsup = subsupFactory({
   parseDOM: [{
     tag: 'sub',
     attrs: {
@@ -47,4 +40,4 @@ export const subsup = {
   toDOM(mark) {
     return [mark.attrs.type];
   }
-};
+});

package/dist/es2019/schema/marks/text-color.js

@@ -1,5 +1,5 @@
+import { textColor as textColorFactory } from '../../next-schema/generated/markTypes';
 import { hexToEditorTextPaletteColor } from '../../utils/editor-palette';
-import { COLOR } from '../groups';
 import { rgbToHex, N0, N80, P50, P300, P500, T75, T300, T500, G75, G300, G500, R75, R300, R500, Y75, Y200, Y400, B75, B100, B500 } from '../../utils/colors';
 import { getDarkModeLCHColor } from '../../utils/lch-color-inversion';
 
@@ -81,12 +81,7 @@ export const getGlobalTheme = () => {
     colorMode
   };
 };
-export const textColor = {
-  attrs: {
-    color: {}
-  },
-  inclusive: true,
-  group: COLOR,
+export const textColor = textColorFactory({
   parseDOM: [{
     style: 'color',
     getAttrs: maybeValue => {
@@ -166,4 +161,4 @@ export const textColor = {
       ['data-text-custom-color']: mark.attrs.color
     }];
   }
-};
+});

package/dist/es2019/schema/marks/type-ahead-query.js

@@ -1,8 +1,6 @@
-import { SEARCH_QUERY } from '../groups';
+import { typeAheadQuery as typeAheadQueryFactory } from '../../next-schema/generated/markTypes';
 import { B400 } from '../../utils/colors';
-export const typeAheadQuery = {
-  inclusive: true,
-  group: SEARCH_QUERY,
+export const typeAheadQuery = typeAheadQueryFactory({
   parseDOM: [{
     tag: 'span[data-type-ahead-query]'
   }],
@@ -12,10 +10,5 @@ export const typeAheadQuery = {
       'data-trigger': node.attrs.trigger,
       style: `color: ${B400}`
     }];
-  },
-  attrs: {
-    trigger: {
-      default: ''
-    }
   }
-};
+});

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

@@ -1,12 +1,10 @@
-import { FONT_STYLE } from '../groups';
+import { underline as underlineFactory } from '../../next-schema/generated/markTypes';
 
 /**
  * @name underline_mark
  */
 
-export const underline = {
-  inclusive: true,
-  group: FONT_STYLE,
+export const underline = underlineFactory({
   parseDOM: [{
     tag: 'u'
   }, {
@@ -16,4 +14,4 @@ export const underline = {
   toDOM() {
     return ['u'];
   }
-};
+});

package/dist/es2019/schema/marks/unsupported-mark.js

@@ -1,9 +1,6 @@
-export const unsupportedMark = {
+import { unsupportedMark as unsupportedMarkFactory } from '../../next-schema/generated/markTypes';
+export const unsupportedMark = unsupportedMarkFactory({
   toDOM() {
     return ['span'];
-  },
-  excludes: '',
-  attrs: {
-    originalValue: {}
   }
-};
+});

package/dist/es2019/schema/marks/unsupported-node-attributes.js

@@ -1,9 +1,6 @@
-export const unsupportedNodeAttribute = {
+import { unsupportedNodeAttribute as unsupportedNodeAttributeFactory } from '../../next-schema/generated/markTypes';
+export const unsupportedNodeAttribute = unsupportedNodeAttributeFactory({
   toDOM() {
     return ['span'];
-  },
-  attrs: {
-    type: {},
-    unsupported: {}
   }
-};
+});

package/dist/es2019/schema/nodes/block-card.js

@@ -1,3 +1,5 @@
+import { blockCard as blockCardFactory } from '../../next-schema/generated/nodeTypes';
+
 /**
  * @name blockCard_node
  */
@@ -13,28 +15,7 @@ const getCommonAttributesFromDom = dom => {
     datasource: datasource ? JSON.parse(datasource) : undefined
   };
 };
-export const blockCard = {
-  inline: false,
-  group: 'block',
-  draggable: true,
-  selectable: true,
-  attrs: {
-    url: {
-      default: null
-    },
-    data: {
-      default: null
-    },
-    datasource: {
-      default: null
-    },
-    width: {
-      default: null
-    },
-    layout: {
-      default: null
-    }
-  },
+export const blockCard = blockCardFactory({
   parseDOM: [{
     tag: 'a[data-block-card]',
     // bump priority higher than hyperlink
@@ -79,4 +60,4 @@ export const blockCard = {
     };
     return ['a', attrs, (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) || ' '];
   }
-};
+});

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

@@ -1,28 +1,27 @@
+import { blockquote as blockquoteFactory } from '../../next-schema/generated/nodeTypes';
+import { blockquoteLegacy as blockquoteLegacyFactory } from '../../next-schema/generated/nodeTypes';
+
 /**
  * @name blockquote_node
  */
 
-const createBlockquoteSpec = allowList => {
-  const blockquoteSpec = {
-    group: 'block',
-    defining: true,
-    selectable: false,
-    parseDOM: [{
-      tag: 'blockquote'
-    }],
-    toDOM() {
-      return ['blockquote', 0];
-    }
-  };
-  if (allowList) {
-    blockquoteSpec.content = '(paragraph | orderedList | bulletList | unsupportedBlock)+';
-  } else {
-    blockquoteSpec.content = '(paragraph | unsupportedBlock)+';
+export const blockquote = blockquoteLegacyFactory({
+  parseDOM: [{
+    tag: 'blockquote'
+  }],
+  toDOM() {
+    return ['blockquote', 0];
   }
-  return blockquoteSpec;
-};
-export const blockquote = createBlockquoteSpec(false);
+});
+
 /**
  * @name blockquote_with_list_node
  */
-export const blockquoteWithList = createBlockquoteSpec(true);
+export const blockquoteWithList = blockquoteFactory({
+  parseDOM: [{
+    tag: 'blockquote'
+  }],
+  toDOM() {
+    return ['blockquote', 0];
+  }
+});

package/dist/es2019/schema/nodes/bodied-extension.js

@@ -1,4 +1,5 @@
 import { getExtensionAttrs } from '../../utils/extensions';
+import { bodiedExtension as bodiedExtensionFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name bodiedExtension_node
@@ -8,56 +9,25 @@ import { getExtensionAttrs } from '../../utils/extensions';
  * @name bodiedExtension_with_marks_node
  */
 
-const createBodiedExtensionNodeSpec = () => {
-  const nodeSpec = {
-    inline: false,
-    group: 'block',
-    marks: 'dataConsumer fragment',
-    content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | extension | unsupportedBlock | embedCard)+',
-    defining: true,
-    selectable: true,
-    isolating: true,
-    attrs: {
-      extensionType: {
-        default: ''
-      },
-      extensionKey: {
-        default: ''
-      },
-      parameters: {
-        default: null
-      },
-      text: {
-        default: null
-      },
-      layout: {
-        default: 'default'
-      },
-      localId: {
-        default: null
-      }
-    },
-    parseDOM: [{
-      context: 'bodiedExtension//',
-      tag: '[data-node-type="bodied-extension"]',
-      skip: true
-    }, {
-      tag: '[data-node-type="bodied-extension"]',
-      getAttrs: domNode => getExtensionAttrs(domNode)
-    }],
-    toDOM(node) {
-      const attrs = {
-        'data-node-type': 'bodied-extension',
-        'data-extension-type': node.attrs.extensionType,
-        'data-extension-key': node.attrs.extensionKey,
-        'data-text': node.attrs.text,
-        'data-parameters': JSON.stringify(node.attrs.parameters),
-        'data-layout': node.attrs.layout,
-        'data-local-id:': node.attrs.localId
-      };
-      return ['div', attrs, 0];
-    }
-  };
-  return nodeSpec;
-};
-export const bodiedExtension = createBodiedExtensionNodeSpec();
+export const bodiedExtension = bodiedExtensionFactory({
+  parseDOM: [{
+    context: 'bodiedExtension//',
+    tag: '[data-node-type="bodied-extension"]',
+    skip: true
+  }, {
+    tag: '[data-node-type="bodied-extension"]',
+    getAttrs: domNode => getExtensionAttrs(domNode)
+  }],
+  toDOM(node) {
+    const attrs = {
+      'data-node-type': 'bodied-extension',
+      'data-extension-type': node.attrs.extensionType,
+      'data-extension-key': node.attrs.extensionKey,
+      'data-text': node.attrs.text,
+      'data-parameters': JSON.stringify(node.attrs.parameters),
+      'data-layout': node.attrs.layout,
+      'data-local-id:': node.attrs.localId
+    };
+    return ['div', attrs, 0];
+  }
+});

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

@@ -1,16 +1,13 @@
+import { bulletList as bulletListFactory } from '../../next-schema/generated/nodeTypes';
 export const bulletListSelector = '.ak-ul';
-export const bulletList = {
-  group: 'block',
-  content: 'listItem+',
-  selectable: false,
+export const bulletList = bulletListFactory({
   parseDOM: [{
     tag: 'ul'
   }],
-  marks: 'unsupportedMark unsupportedNodeAttribute',
   toDOM() {
     const attrs = {
       class: bulletListSelector.substr(1)
     };
     return ['ul', attrs, 0];
   }
-};
+});

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

@@ -1,12 +1,10 @@
+import { caption as captionFactory } from '../../next-schema/generated/nodeTypes';
+
 /**
  * @name caption_node
  */
 
-export const caption = {
-  content: '(text|hardBreak|mention|emoji|date|placeholder|inlineCard|status|unsupportedInline)*',
-  isolating: true,
-  marks: '_',
-  selectable: false,
+export const caption = captionFactory({
   parseDOM: [{
     tag: 'figcaption[data-caption]'
   }],
@@ -16,4 +14,4 @@ export const caption = {
     };
     return ['figcaption', attrs, 0];
   }
-};
+});

package/dist/es2019/schema/nodes/code-block.js

@@ -1,4 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { codeBlock as codeBlockFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
  * @name codeBlock_node
@@ -48,20 +50,30 @@ const removeLastNewLine = dom => {
   }
   return dom;
 };
-export const codeBlock = {
-  attrs: {
-    language: {
-      default: null
-    },
-    uniqueId: {
-      default: null
+function parseCodeFromHtml(node) {
+  let code = '';
+  node.childNodes.forEach(child => {
+    if (child.nodeType === Node.TEXT_NODE) {
+      // append text
+      code += child.nodeValue;
+    } else if (child.nodeType === Node.ELEMENT_NODE && child instanceof Element) {
+      const tagName = child.tagName.toLowerCase();
+      if (tagName === 'div' || tagName === 'p') {
+        // add a newline before its content, unless it's the first child to avoid leading newlines
+        if (child.previousElementSibling !== null) {
+          code += '\n';
+        }
+      }
+      if (tagName === 'br') {
+        code += '\n';
+      } else {
+        code += parseCodeFromHtml(child);
+      }
     }
-  },
-  content: '(text | unsupportedInline)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
-  code: true,
-  defining: true,
+  });
+  return code;
+}
+export const codeBlock = codeBlockFactory({
   parseDOM: [{
     tag: 'pre',
     preserveWhitespace: 'full',
@@ -74,7 +86,7 @@ export const codeBlock = {
       };
     }
   },
-  // Handle VSCode paste
+  // Handle VSCode, Android Studio paste
   // Checking `white-space: pre-wrap` is too aggressive @see ED-2627
   {
     tag: 'div[style]',
@@ -86,8 +98,11 @@ export const codeBlock = {
       }
       return false;
     },
-    // @see ED-5682
     getContent: (domNode, schema) => {
+      if (getBooleanFF('platform.editor.codeblock.parsedom-divstyle-improve_5ib4n')) {
+        const code = parseCodeFromHtml(domNode);
+        return code ? Fragment.from(schema.text(code)) : Fragment.empty;
+      }
       const dom = domNode;
       const code = Array.from(dom.children).map(child => child.textContent).filter(x => x !== undefined).join('\n');
       return code ? Fragment.from(schema.text(code)) : Fragment.empty;
@@ -124,7 +139,7 @@ export const codeBlock = {
       'data-language': node.attrs.language
     }, 0]];
   }
-};
+});
 export const toJSON = node => ({
   attrs: Object.keys(node.attrs).reduce((memo, key) => {
     if (key === 'uniqueId') {

package/dist/es2019/schema/nodes/confluence-jira-issue.js

@@ -1,25 +1,6 @@
+import { confluenceJiraIssue as confluenceJiraIssueFactory } from '../../next-schema/generated/nodeTypes';
 const name = 'confluenceJiraIssue';
-export const confluenceJiraIssue = {
-  group: 'inline',
-  inline: true,
-  atom: true,
-  attrs: {
-    issueKey: {
-      default: ''
-    },
-    macroId: {
-      default: null
-    },
-    schemaVersion: {
-      default: null
-    },
-    server: {
-      default: null
-    },
-    serverId: {
-      default: null
-    }
-  },
+export const confluenceJiraIssue = confluenceJiraIssueFactory({
   parseDOM: [{
     tag: `span[data-node-type="${name}"]`,
     getAttrs: domNode => {
@@ -44,4 +25,4 @@ export const confluenceJiraIssue = {
     };
     return ['span', attrs, node.attrs.issueKey];
   }
-};
+});