@atlaskit/adf-schema 20.1.3 → 22.0.1

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @atlaskit/adf-schema
 
+## 22.0.1
+
+### Patch Changes
+
+- [`c7a3ccf95cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c7a3ccf95cd) - Patching versions to no longer reference localid from adf or smart-cards
+
+## 22.0.0
+
+### Major Changes
+
+- [`439cf07029a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/439cf07029a) - ED-13881 Move @atlaskit/adf-schema test helpers to @atlaskit/editor-test-helpers
+
+  A new entry point for @atlaskit/editor-test-helpers/adf-schema has been
+  introduced. All test helpers that previously lived under @atlaskit/adf-schema
+  have been moved there instead.
+
+  Imports inside @atlaskit/adf-schema that previously relied on relative paths, or
+  imports from other packages that referred to @atlaskit/adf-schema/test-helpers,
+  should be updated to reference @atlaskit/editor-test-helpers/adf-schema instead.
+
+  Old usages:
+
+  ```
+  import { schema } from '../relative/path/to/test-helpers';
+  import { schema } from '@atlaskit/adf-schema/test-helpers';
+  ```
+
+  New usage:
+
+  ```
+  import { schema } from '@atlaskit/editor-test-helpers/adf-schema';
+  ```
+
+- [`a86ac5fa763`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a86ac5fa763) - ED-13881 Migrate @atlaskit/adf-schema to declarative entry points
+
+  We are now explicitly declaring entry points as public API. Since some consumers
+  may have previously relied on file-based entry points for the generated JSON
+  schema outputs, this is considered a breaking change.
+
+  Old usage:
+
+  ```
+  import * as fullSchema from '@atlaskit/adf-schema/json-schema/v1/full.json';
+  import * as stageZeroSchema from '@atlaskit/adf-schema/json-schema/v1/stage-0.json';
+  ```
+
+  New usage:
+
+  ```
+  import { fullSchema } from '@atlaskit/adf-schema/json-schema';
+  import { stageZeroSchema } from '@atlaskit/adf-schema/json-schema';
+  ```
+
+- [`304351e4b1e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/304351e4b1e) - CETI-241 - Added additional panel ADF attributes (panelIconId, panelIconText) to uniquely identify custom panel emojis. The change has been categorised as major since it is a change to the full-schema ADF. However, the custom panel feature is behind a feature flag, has not yet been released to production, and is only currently planned for release to Confluence. See ADF change #61 for further details.
+- [`3b49ff824ec`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3b49ff824ec) - ED-14043 update prosemirror schema to only allow link mark on children of paragraph and mediaSingle
+
+### Minor Changes
+
+- [`e9aea0f4191`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e9aea0f4191) - CETI-243 Handling Duplicate Emoji Issue When Copying From Renderer
+
+### Patch Changes
+
+- [`7f8be1a6a30`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7f8be1a6a30) - clean stage0 artefacts from dataConsumer mark
+- [`783bda0d683`](https://bitbucket.org/atlassian/atlassian-frontend/commits/783bda0d683) - Extra information added to analytics for toolbar change view options
+
+## 21.0.0
+
+### Major Changes
+
+- [`5af69bfe9be`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5af69bfe9be) - CETI-241 - Added additional panel ADF attributes (panelIconId, panelIconText) to uniquely identify custom panel emojis. The change has been categorised as major since it is a change to the full-schema ADF. However, the custom panel feature is behind a feature flag, has not yet been released to production, and is only currently planned for release to Confluence. See ADF change #61 for further details.
+
+### Minor Changes
+
+- [`f110cbb7218`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f110cbb7218) - CETI-243 Handling Duplicate Emoji Issue When Copying From Renderer
+- [`19d72473dfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/19d72473dfb) - - Allow `table` nodes to have `fragment` marks
+  - Promote `fragment` mark to "full" ADF schema
+
 ## 20.1.3
 
 ### Patch Changes

package/dist/cjs/json-schema/index.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "fullSchema", {
+  enumerable: true,
+  get: function get() {
+    return _full.default;
+  }
+});
+Object.defineProperty(exports, "stageZeroSchema", {
+  enumerable: true,
+  get: function get() {
+    return _stage.default;
+  }
+});
+
+var _full = _interopRequireDefault(require("../../json-schema/v1/full.json"));
+
+var _stage = _interopRequireDefault(require("../../json-schema/v1/stage-0.json"));

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

@@ -11,7 +11,7 @@ var createBodiedExtensionNodeSpec = function createBodiedExtensionNodeSpec() {
   var nodeSpec = {
     inline: false,
     group: 'block',
-    marks: 'link dataConsumer fragment',
+    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,

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

@@ -10,6 +10,6 @@ exports.doc = void 0;
  */
 var doc = {
   content: '(block|layoutSection)+',
-  marks: 'alignment breakout dataConsumer fragment indentation link unsupportedMark unsupportedNodeAttribute'
+  marks: 'alignment breakout dataConsumer fragment indentation unsupportedMark unsupportedNodeAttribute'
 };
 exports.doc = doc;

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

@@ -22,7 +22,11 @@ var emoji = {
       default: ''
     }
   },
-  parseDOM: [{
+  parseDOM: [// Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon span',
+    ignore: true
+  }, {
     tag: 'span[data-emoji-short-name]',
     getAttrs: function getAttrs(domNode) {
       var dom = domNode;
@@ -32,10 +36,6 @@ var emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
-  }, // Handle copy/paste beautiful panel from renderer />
-  {
-    tag: 'div.ak-editor-panel__icon',
-    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',

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

@@ -27,7 +27,7 @@ function getExpandAttrs(domNode) {
 var expand = {
   inline: false,
   group: 'block',
-  marks: 'link dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   isolating: true,
   selectable: true,

package/dist/cjs/schema/nodes/layout-column.js

@@ -11,7 +11,7 @@ exports.layoutColumn = void 0;
 var layoutColumn = {
   content: '(block|unsupportedBlock)+',
   isolating: true,
-  marks: 'link alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   attrs: {
     width: {

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

@@ -12,7 +12,7 @@ exports.listItem = void 0;
  */
 var listItem = {
   content: '(paragraph | mediaSingle | codeBlock) (paragraph | bulletList | orderedList | mediaSingle | codeBlock)*',
-  marks: 'link unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   defining: true,
   selectable: false,
   parseDOM: [{

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

@@ -13,7 +13,7 @@ var mediaGroup = {
   group: 'block',
   content: '(media|unsupportedBlock)+',
   attrs: {},
-  marks: 'unsupportedMark unsupportedNodeAttribute link',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   parseDOM: [{
     tag: 'div[data-node-type="mediaGroup"]'

package/dist/cjs/schema/nodes/nested-expand.js

@@ -20,7 +20,7 @@ exports.nestedExpand = void 0;
  */
 var nestedExpand = {
   inline: false,
-  marks: 'link unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+',
   isolating: true,
   selectable: true,

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

@@ -34,6 +34,12 @@ var getDefaultAttrs = function getDefaultAttrs() {
     panelIcon: {
       default: null
     },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
     panelColor: {
       default: null
     }
@@ -45,6 +51,8 @@ var getDomAttrs = function getDomAttrs(nodeAttrs) {
   var attrs = {
     'data-panel-type': nodeAttrs.panelType,
     'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-icon-id': nodeAttrs.panelIconId,
+    'data-panel-icon-text': nodeAttrs.panelIconText,
     'data-panel-color': nodeAttrs.panelColor
   };
   return attrs;
@@ -58,6 +66,8 @@ var getParseDOMAttrs = function getParseDOMAttrs(allowCustomPanel, dom) {
   if (allowCustomPanel) {
     parseDOMAttrs = _objectSpread(_objectSpread({}, parseDOMAttrs), {}, {
       panelIcon: dom.getAttribute('data-panel-icon'),
+      panelIconId: dom.getAttribute('data-panel-icon-id'),
+      panelIconText: dom.getAttribute('data-panel-icon-text'),
       panelColor: dom.getAttribute('data-panel-color')
     });
   } else {

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

@@ -5,72 +5,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.paragraph = void 0;
 
-var _prosemirrorModel = require("prosemirror-model");
-
-var _url = require("../../utils/url");
-
-var getLinkContent = function getLinkContent(node, schema) {
-  if (!(node instanceof HTMLAnchorElement)) {
-    return _prosemirrorModel.Fragment.empty;
-  }
-
-  var href = node.getAttribute('href') || '';
-  var text = node.innerText;
-
-  if (!text || text.length === 0) {
-    return _prosemirrorModel.Fragment.empty;
-  }
-
-  var marks = (0, _url.isSafeUrl)(href) ? [schema.marks.link.create({
-    href: href
-  })] : [];
-  var textNode = schema.text(text, marks);
-  return _prosemirrorModel.Fragment.from(textNode);
-};
-
-var blockTags = {
-  address: true,
-  article: true,
-  aside: true,
-  blockquote: true,
-  canvas: true,
-  dd: true,
-  div: true,
-  dl: true,
-  fieldset: true,
-  figcaption: true,
-  figure: true,
-  footer: true,
-  form: true,
-  h1: true,
-  h2: true,
-  h3: true,
-  h4: true,
-  h5: true,
-  h6: true,
-  header: true,
-  hgroup: true,
-  hr: true,
-  li: true,
-  noscript: true,
-  ol: true,
-  output: true,
-  p: true,
-  pre: true,
-  section: true,
-  table: true,
-  tfoot: true,
-  ul: true
-};
-
-var isListItemNode = function isListItemNode(node) {
-  return Boolean(node && node.nodeName.toLowerCase() === 'li');
-};
-
-var isTextNode = function isTextNode(node) {
-  return Boolean(node && node.nodeType === Node.TEXT_NODE);
-};
-
+/**
+ * @name paragraph_node
+ */
+
+/**
+ * @name paragraph_with_no_marks_node
+ */
+
+/**
+ * NOTE: Need this because TS is too smart and inline everything.
+ * So we need to give them separate identity.
+ * Probably there's a way to solve it but that will need time and exploration.
+ * // http://bit.ly/2raXFX5
+ * type T1 = X | Y
+ * type T2 = A | T1 | B // T2 = A | X | Y | B
+ */
+
+/**
+ * @name paragraph_with_alignment_node
+ */
+
+/**
+ * @name paragraph_with_indentation_node
+ */
 var isImageNode = function isImageNode(node) {
   return Boolean(node && node.nodeName.toLowerCase() === 'img');
 };
@@ -93,21 +51,6 @@ var hasInlineImage = function hasInlineImage(node) {
   });
 };
 
-var hasWhiteSpacePre = function hasWhiteSpacePre(node) {
-  return Boolean(node instanceof HTMLElement && node.style.whiteSpace === 'pre');
-};
-
-var hasFontFamilyMonospace = function hasFontFamilyMonospace(node) {
-  return Boolean(node instanceof HTMLElement && node.style.fontFamily.includes('monospace'));
-};
-
-var isBlockLevelNode = function isBlockLevelNode(node) {
-  return Boolean(node && blockTags.hasOwnProperty(node.nodeName.toLowerCase()));
-};
-
-var NOT_INTERNAL_LINKS = [':not([data-inline-card])', ':not([data-block-card])', ':not([data-block-link])', ':not([data-skip-paste])'].join('');
-var ANCHOR_LINK = "a[href]".concat(NOT_INTERNAL_LINKS);
-var NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-task-local-id])', ':not([data-task-state])', ':not([data-pm-slice])', ':not([data-mark-type])', ':not([data-layout-content])', ':not([data-panel-content])'].join('');
 var pDOM = ['p', 0];
 var paragraph = {
   selectable: false,
@@ -116,70 +59,6 @@ var paragraph = {
   marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p'
-  }, {
-    tag: "div".concat(NOT_INTERNAL_ELEMENTS, ", li:not([data-pm-slice])"),
-    priority: 100,
-    getAttrs: function getAttrs(node) {
-      if (!(node instanceof Node)) {
-        return false;
-      }
-
-      var isCodeBlock = hasWhiteSpacePre(node) || hasFontFamilyMonospace(node);
-
-      if (isCodeBlock || !node.hasChildNodes()) {
-        return false;
-      }
-
-      var hasInlineChildren = Array.from(node.childNodes).every(function (child) {
-        return !isBlockLevelNode(child) && // IMG is considered block for mediaSingle
-        !isImageNode(child);
-      });
-
-      if (!hasInlineChildren) {
-        return false;
-      }
-
-      if ( // We can skip this rule for pure list items
-      isListItemNode(node) && Array.from(node.childNodes).every(isTextNode)) {
-        return false;
-      }
-
-      return null;
-    }
-  }, {
-    tag: ":not(span) + ".concat(ANCHOR_LINK),
-    priority: 100,
-    getContent: getLinkContent
-  }, {
-    tag: ":not(span) > ".concat(ANCHOR_LINK, ":first-child"),
-    getAttrs: function getAttrs(node) {
-      if (!(node instanceof Node)) {
-        return false;
-      }
-
-      if (isBlockLevelNode(node.firstChild)) {
-        return null;
-      }
-
-      if (hasInlineImage(node)) {
-        return false;
-      }
-
-      var isNextSiblingValid = node.nextSibling === null || node.nextSibling instanceof Text && (node.nextSibling.textContent || '').trim().length === 0;
-
-      if (isNextSiblingValid) {
-        return null;
-      } // This rule should not match when there is any sibling after the anchor
-
-
-      if (!isBlockLevelNode(node.nextSibling)) {
-        return false;
-      }
-
-      return null;
-    },
-    priority: 100,
-    getContent: getLinkContent
   }],
   toDOM: function toDOM() {
     return pDOM;

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

@@ -221,7 +221,7 @@ var tableCell = {
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle |  mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   attrs: cellAttrs,
   tableRole: 'cell',
-  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [// Ignore number cell copied from renderer
   {
@@ -258,7 +258,7 @@ var tableHeader = {
   attrs: cellAttrs,
   tableRole: 'header_cell',
   isolating: true,
-  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   parseDOM: [{
     tag: 'th',
     getAttrs: function getAttrs(dom) {

package/dist/cjs/version.json

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

package/dist/es2019/json-schema/index.js

@@ -0,0 +1,2 @@
+export { default as fullSchema } from '../../json-schema/v1/full.json';
+export { default as stageZeroSchema } from '../../json-schema/v1/stage-0.json';

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

@@ -1,6 +1,13 @@
 import { isDOMElement } from '../../utils/parseDOM';
 /**
- * @minLength 1
+ * This annotation is purely for reference, & does _nothing_ given annotating
+ * `minLength` on an array of strings is not supported with our schema+spec
+ * generator.
+ *
+ * We're keeping it to signal that data consumer `sources` shouldn't be empty
+ * strings
+ *
+ * // @minLength 1
  */
 
 const parseDataConsumer = maybeValue => {

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

@@ -4,7 +4,7 @@ const createBodiedExtensionNodeSpec = () => {
   const nodeSpec = {
     inline: false,
     group: 'block',
-    marks: 'link dataConsumer fragment',
+    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,

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

@@ -3,5 +3,5 @@
  */
 export const doc = {
   content: '(block|layoutSection)+',
-  marks: 'alignment breakout dataConsumer fragment indentation link unsupportedMark unsupportedNodeAttribute'
+  marks: 'alignment breakout dataConsumer fragment indentation unsupportedMark unsupportedNodeAttribute'
 };

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

@@ -18,7 +18,11 @@ export const emoji = {
       default: ''
     }
   },
-  parseDOM: [{
+  parseDOM: [// Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon span',
+    ignore: true
+  }, {
     tag: 'span[data-emoji-short-name]',
     getAttrs: domNode => {
       const dom = domNode;
@@ -28,10 +32,6 @@ export const emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
-  }, // Handle copy/paste beautiful panel from renderer />
-  {
-    tag: 'div.ak-editor-panel__icon',
-    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',

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

@@ -20,7 +20,7 @@ function getExpandAttrs(domNode) {
 export const expand = {
   inline: false,
   group: 'block',
-  marks: 'link dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   isolating: true,
   selectable: true,

package/dist/es2019/schema/nodes/layout-column.js

@@ -4,7 +4,7 @@
 export const layoutColumn = {
   content: '(block|unsupportedBlock)+',
   isolating: true,
-  marks: 'link alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   attrs: {
     width: {

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

@@ -6,7 +6,7 @@
  */
 export const listItem = {
   content: '(paragraph | mediaSingle | codeBlock) (paragraph | bulletList | orderedList | mediaSingle | codeBlock)*',
-  marks: 'link unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   defining: true,
   selectable: false,
   parseDOM: [{

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

@@ -6,7 +6,7 @@ export const mediaGroup = {
   group: 'block',
   content: '(media|unsupportedBlock)+',
   attrs: {},
-  marks: 'unsupportedMark unsupportedNodeAttribute link',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   parseDOM: [{
     tag: 'div[data-node-type="mediaGroup"]'

package/dist/es2019/schema/nodes/nested-expand.js

@@ -13,7 +13,7 @@
  */
 export const nestedExpand = {
   inline: false,
-  marks: 'link unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+',
   isolating: true,
   selectable: true,

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

@@ -18,6 +18,12 @@ const getDefaultAttrs = () => {
     panelIcon: {
       default: null
     },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
     panelColor: {
       default: null
     }
@@ -29,6 +35,8 @@ const getDomAttrs = nodeAttrs => {
   let attrs = {
     'data-panel-type': nodeAttrs.panelType,
     'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-icon-id': nodeAttrs.panelIconId,
+    'data-panel-icon-text': nodeAttrs.panelIconText,
     'data-panel-color': nodeAttrs.panelColor
   };
   return attrs;
@@ -42,6 +50,8 @@ const getParseDOMAttrs = (allowCustomPanel, dom) => {
   if (allowCustomPanel) {
     parseDOMAttrs = { ...parseDOMAttrs,
       panelIcon: dom.getAttribute('data-panel-icon'),
+      panelIconId: dom.getAttribute('data-panel-icon-id'),
+      panelIconText: dom.getAttribute('data-panel-icon-text'),
       panelColor: dom.getAttribute('data-panel-color')
     };
   } else {