@atlaskit/adf-schema 40.0.2 → 40.1.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/adf-schema
 
+## 40.1.0
+
+### Minor Changes
+
+- 5288c99: update prosemirror dependencies
+
+### Patch Changes
+
+- Updated dependencies [5288c99]
+  - @atlaskit/editor-prosemirror@5.0.0
+
+## 40.0.3
+
+### Patch Changes
+
+- d425c19: Remove redundant tests
+
 ## 40.0.2
 
 ### Patch Changes

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

@@ -10,13 +10,15 @@ var _markTypes = require("../../next-schema/generated/markTypes");
  */
 
 function getAttrFromVerticalAlign(node) {
-  if (node.style.verticalAlign) {
-    var type = node.style.verticalAlign.slice(0, 3);
-    if (type === 'sub' || type === 'sup') {
-      return {
-        type: type
-      };
-    }
+  if (node === 'sub') {
+    return {
+      type: 'sub'
+    };
+  }
+  if (node === 'super') {
+    return {
+      type: 'sup'
+    };
   }
   return false;
 }
@@ -34,13 +36,11 @@ var subsup = exports.subsup = (0, _markTypes.subsup)({
   }, {
     // Special case for pasting from Google Docs
     // Google Docs uses vertical align to denote subscript and super script
-    tag: 'span',
     style: 'vertical-align=super',
     getAttrs: function getAttrs(node) {
       return getAttrFromVerticalAlign(node);
     }
   }, {
-    tag: 'span',
     style: 'vertical-align=sub',
     getAttrs: function getAttrs(node) {
       return getAttrFromVerticalAlign(node);

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

@@ -49,22 +49,6 @@ var createMediaSpec = exports.createMediaSpec = function createMediaSpec(attribu
     tag: 'img[src^="data:image"]',
     ignore: true
   }];
-
-  // media-inline.ts uses this same function to generate the nodespec
-  // this ensures that we don't make a media inline out of a copied image
-  // https://product-fabric.atlassian.net/browse/EDM-2996
-  if (!inline) {
-    parseDOM.push({
-      tag: 'img:not(.smart-link-icon)',
-      getAttrs: function getAttrs(dom) {
-        return {
-          type: 'external',
-          url: dom.getAttribute('src') || '',
-          alt: dom.getAttribute('alt') || ''
-        };
-      }
-    });
-  }
   var toDOM = function toDOM(node) {
     var attrs = {
       'data-id': node.attrs.id,
@@ -96,7 +80,19 @@ var createMediaSpec = exports.createMediaSpec = function createMediaSpec(attribu
     });
   }
   return (0, _nodeTypes.media)({
-    parseDOM: parseDOM,
+    parseDOM: [].concat(parseDOM, [{
+      // media-inline.ts uses this same function to generate the nodespec
+      // this ensures that we don't make a media inline out of a copied image
+      // https://product-fabric.atlassian.net/browse/EDM-2996
+      tag: 'img:not(.smart-link-icon)',
+      getAttrs: function getAttrs(dom) {
+        return {
+          type: 'external',
+          url: dom.getAttribute('src') || '',
+          alt: dom.getAttribute('alt') || ''
+        };
+      }
+    }]),
     toDOM: toDOM
   });
 };

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

@@ -5,13 +5,15 @@ import { subsup as subsupFactory } from '../../next-schema/generated/markTypes';
  */
 
 function getAttrFromVerticalAlign(node) {
-  if (node.style.verticalAlign) {
-    const type = node.style.verticalAlign.slice(0, 3);
-    if (type === 'sub' || type === 'sup') {
-      return {
-        type
-      };
-    }
+  if (node === 'sub') {
+    return {
+      type: 'sub'
+    };
+  }
+  if (node === 'super') {
+    return {
+      type: 'sup'
+    };
   }
   return false;
 }
@@ -29,11 +31,9 @@ export const subsup = subsupFactory({
   }, {
     // Special case for pasting from Google Docs
     // Google Docs uses vertical align to denote subscript and super script
-    tag: 'span',
     style: 'vertical-align=super',
     getAttrs: node => getAttrFromVerticalAlign(node)
   }, {
-    tag: 'span',
     style: 'vertical-align=sub',
     getAttrs: node => getAttrFromVerticalAlign(node)
   }],

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

@@ -44,22 +44,6 @@ export const createMediaSpec = (attributes, inline = false) => {
     tag: 'img[src^="data:image"]',
     ignore: true
   }];
-
-  // media-inline.ts uses this same function to generate the nodespec
-  // this ensures that we don't make a media inline out of a copied image
-  // https://product-fabric.atlassian.net/browse/EDM-2996
-  if (!inline) {
-    parseDOM.push({
-      tag: 'img:not(.smart-link-icon)',
-      getAttrs: dom => {
-        return {
-          type: 'external',
-          url: dom.getAttribute('src') || '',
-          alt: dom.getAttribute('alt') || ''
-        };
-      }
-    });
-  }
   const toDOM = node => {
     const attrs = {
       'data-id': node.attrs.id,
@@ -89,7 +73,19 @@ export const createMediaSpec = (attributes, inline = false) => {
     });
   }
   return mediaFactory({
-    parseDOM,
+    parseDOM: [...parseDOM, {
+      // media-inline.ts uses this same function to generate the nodespec
+      // this ensures that we don't make a media inline out of a copied image
+      // https://product-fabric.atlassian.net/browse/EDM-2996
+      tag: 'img:not(.smart-link-icon)',
+      getAttrs: dom => {
+        return {
+          type: 'external',
+          url: dom.getAttribute('src') || '',
+          alt: dom.getAttribute('alt') || ''
+        };
+      }
+    }],
     toDOM
   });
 };

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

@@ -5,13 +5,15 @@ import { subsup as subsupFactory } from '../../next-schema/generated/markTypes';
  */
 
 function getAttrFromVerticalAlign(node) {
-  if (node.style.verticalAlign) {
-    var type = node.style.verticalAlign.slice(0, 3);
-    if (type === 'sub' || type === 'sup') {
-      return {
-        type: type
-      };
-    }
+  if (node === 'sub') {
+    return {
+      type: 'sub'
+    };
+  }
+  if (node === 'super') {
+    return {
+      type: 'sup'
+    };
   }
   return false;
 }
@@ -29,13 +31,11 @@ export var subsup = subsupFactory({
   }, {
     // Special case for pasting from Google Docs
     // Google Docs uses vertical align to denote subscript and super script
-    tag: 'span',
     style: 'vertical-align=super',
     getAttrs: function getAttrs(node) {
       return getAttrFromVerticalAlign(node);
     }
   }, {
-    tag: 'span',
     style: 'vertical-align=sub',
     getAttrs: function getAttrs(node) {
       return getAttrFromVerticalAlign(node);

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

@@ -45,22 +45,6 @@ export var createMediaSpec = function createMediaSpec(attributes) {
     tag: 'img[src^="data:image"]',
     ignore: true
   }];
-
-  // media-inline.ts uses this same function to generate the nodespec
-  // this ensures that we don't make a media inline out of a copied image
-  // https://product-fabric.atlassian.net/browse/EDM-2996
-  if (!inline) {
-    parseDOM.push({
-      tag: 'img:not(.smart-link-icon)',
-      getAttrs: function getAttrs(dom) {
-        return {
-          type: 'external',
-          url: dom.getAttribute('src') || '',
-          alt: dom.getAttribute('alt') || ''
-        };
-      }
-    });
-  }
   var toDOM = function toDOM(node) {
     var attrs = {
       'data-id': node.attrs.id,
@@ -92,7 +76,19 @@ export var createMediaSpec = function createMediaSpec(attributes) {
     });
   }
   return mediaFactory({
-    parseDOM: parseDOM,
+    parseDOM: [].concat(parseDOM, [{
+      // media-inline.ts uses this same function to generate the nodespec
+      // this ensures that we don't make a media inline out of a copied image
+      // https://product-fabric.atlassian.net/browse/EDM-2996
+      tag: 'img:not(.smart-link-icon)',
+      getAttrs: function getAttrs(dom) {
+        return {
+          type: 'external',
+          url: dom.getAttribute('src') || '',
+          alt: dom.getAttribute('alt') || ''
+        };
+      }
+    }]),
     toDOM: toDOM
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "40.0.2",
+  "version": "40.1.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -49,7 +49,6 @@
     "@atlassian/adf-schema-json": "^1.16.0",
     "@atlassian/feature-flags-test-utils": "^0.2.0",
     "@atlaskit/adf-schema-generator": "^1.28.1",
-    "@atlaskit/adf-utils": "^19.2.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",

package/schema-generators/__tests__/unit/adfToValidatorSpecValidation.unit.ts

@@ -1,20 +0,0 @@
-import { adfToValidatorSpec } from '@atlaskit/adf-schema-generator';
-import * as currentSpecs from '@atlaskit/adf-utils/dist/cjs/validator/specs';
-import adfNode from '../../../src/next-schema/full-schema.adf';
-import { sortNestedArrays } from '../../../src/validator-schema/utils/sortNestedArrays';
-
-const newSpecs = sortNestedArrays(adfToValidatorSpec(adfNode));
-
-const testCases = Object.entries(currentSpecs).map(([key, value]) => {
-  return {
-    name: key,
-    currentSpec: sortNestedArrays(value),
-    newSpec: sortNestedArrays(newSpecs[key]?.json),
-  };
-});
-
-testCases.forEach(({ name, currentSpec, newSpec }) => {
-  it(`should be able to handle ${name}`, () => {
-    expect(newSpec).toEqual(currentSpec);
-  });
-});