@atlaskit/adf-schema 35.5.2 → 35.7.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 35.7.0
+
+### Minor Changes
+
+- 1502335: Added annotation mark to media and mediaInline
+
+## 35.6.0
+
+### Minor Changes
+
+- cbc7286: ED-22379 Add annotation mark to inline card
+
 ## 35.5.2
 
 ### Patch Changes

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

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

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

@@ -108,7 +108,7 @@ var mediaSingleSpec = function mediaSingleSpec(_ref) {
         default: null
       }
     }) : defaultAttrs,
-    marks: 'unsupportedMark unsupportedNodeAttribute border link',
+    marks: 'unsupportedMark unsupportedNodeAttribute annotation border link',
     parseDOM: [{
       tag: 'div[data-node-type="mediaSingle"]',
       getAttrs: getAttrs

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

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

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

@@ -102,7 +102,7 @@ export const mediaSingleSpec = ({
         default: null
       }
     } : defaultAttrs,
-    marks: 'unsupportedMark unsupportedNodeAttribute border link',
+    marks: 'unsupportedMark unsupportedNodeAttribute annotation border link',
     parseDOM: [{
       tag: 'div[data-node-type="mediaSingle"]',
       getAttrs

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

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

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

@@ -101,7 +101,7 @@ export var mediaSingleSpec = function mediaSingleSpec(_ref) {
         default: null
       }
     }) : defaultAttrs,
-    marks: 'unsupportedMark unsupportedNodeAttribute border link',
+    marks: 'unsupportedMark unsupportedNodeAttribute annotation border link',
     parseDOM: [{
       tag: 'div[data-node-type="mediaSingle"]',
       getAttrs: getAttrs

package/dist/json-schema/v1/full.json

@@ -983,6 +983,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }
@@ -1049,6 +1052,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }

package/dist/json-schema/v1/stage-0.json

@@ -847,6 +847,12 @@
               "additionalProperties": false
             }
           ]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -983,6 +989,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }
@@ -1049,6 +1058,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }

package/dist/types/schema/nodes/inline-card.d.ts

@@ -1,10 +1,15 @@
 import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { CardAttributes } from './block-card';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 /**
  * @name inlineCard_node
  */
 export interface InlineCardDefinition {
     type: 'inlineCard';
     attrs: CardAttributes;
+    /**
+     * @stage 0
+     */
+    marks?: Array<AnnotationMarkDefinition>;
 }
 export declare const inlineCard: NodeSpec;

package/dist/types/schema/nodes/media-inline.d.ts

@@ -2,6 +2,7 @@ import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 import { LinkDefinition } from '../marks/link';
 import { MediaBaseAttributes } from './media';
 import { BorderMarkDefinition } from '../marks/border';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 export interface MediaInlineAttributes extends MediaBaseAttributes {
     data?: object;
     type?: 'file' | 'link' | 'image';
@@ -12,6 +13,6 @@ export interface MediaInlineAttributes extends MediaBaseAttributes {
 export interface MediaInlineDefinition {
     type: 'mediaInline';
     attrs: MediaInlineAttributes;
-    marks?: Array<LinkDefinition | BorderMarkDefinition>;
+    marks?: Array<LinkDefinition | BorderMarkDefinition | AnnotationMarkDefinition>;
 }
 export declare const mediaInline: NodeSpec;

package/dist/types/schema/nodes/media.d.ts

@@ -1,6 +1,7 @@
 import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { BorderMarkDefinition } from '../marks/border';
 import { LinkDefinition } from '../marks/link';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 export type MediaType = 'file' | 'link' | 'external';
 export type DisplayType = 'file' | 'thumbnail';
 export type DefaultAttributes<T> = {
@@ -17,7 +18,7 @@ export interface MediaDefinition {
      * @minItems 1
      */
     attrs: MediaADFAttrs;
-    marks?: Array<LinkDefinition | BorderMarkDefinition>;
+    marks?: Array<LinkDefinition | BorderMarkDefinition | AnnotationMarkDefinition>;
 }
 export interface MediaBaseAttributes {
     /**

package/json-schema/v1/full.json

@@ -983,6 +983,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }
@@ -1049,6 +1052,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }

package/json-schema/v1/stage-0.json

@@ -847,6 +847,12 @@
               "additionalProperties": false
             }
           ]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -983,6 +989,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }
@@ -1049,6 +1058,9 @@
               {
                 "$ref": "#/definitions/link_mark"
               },
+              {
+                "$ref": "#/definitions/annotation_mark"
+              },
               {
                 "$ref": "#/definitions/border_mark"
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "35.5.2",
+  "version": "35.7.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
-    "@atlassian/adf-schema-json": "^1.5.1",
+    "@atlassian/adf-schema-json": "^1.7.0",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",