@atlaskit/adf-schema 36.6.0 → 36.8.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 36.8.0
+
+### Minor Changes
+
+- e71ebfd: ED-23361 Introduce support for annotations on emojis, dates, statuses and mentions.
+
+## 36.7.0
+
+### Minor Changes
+
+- b6349e2: ED-21680:Promoted displayMode table node attr to full schema
+
 ## 36.6.0
 
 ### Minor Changes

package/dist/cjs/schema/default-schema.js

@@ -26,7 +26,6 @@ var getSchemaBasedOnStage = exports.getSchemaBasedOnStage = (0, _memoizeOne.defa
       layoutSection: _nodes.layoutSectionWithSingleColumn,
       multiBodiedExtension: _nodes.multiBodiedExtension,
       extensionFrame: _nodes.extensionFrame,
-      table: _nodes.tableStage0,
       heading: (0, _nodes.headingNodeSpec)('stage0'),
       paragraph: (0, _nodes.paragraphNodeSpec)('stage0')
     };

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

@@ -203,7 +203,6 @@ var tableBackgroundColorNames = exports.tableBackgroundColorNames = new Map();
 
 // TODO: Fix any, potential issue. ED-5048
 var createTableSpec = function createTableSpec() {
-  var allowPreserveTableWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -219,16 +218,14 @@ var createTableSpec = function createTableSpec() {
     },
     width: {
       default: null
-    }
-  };
-  var finalAttrs = allowPreserveTableWidth ? _objectSpread(_objectSpread({}, attrs), {}, {
+    },
     displayMode: {
       default: null
     }
-  }) : attrs;
+  };
   var tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -273,7 +270,7 @@ var createTableSpec = function createTableSpec() {
 var table = exports.table = createTableSpec();
 /** @deprecated Do not use, instead use the regular `table` export */
 var tableWithCustomWidth = exports.tableWithCustomWidth = createTableSpec();
-var tableStage0 = exports.tableStage0 = createTableSpec(true);
+var tableStage0 = exports.tableStage0 = createTableSpec();
 var shouldIncludeAttribute = function shouldIncludeAttribute(key, value) {
   return !key.startsWith('__') && (key !== 'localId' || !!value);
 };

package/dist/es2019/schema/default-schema.js

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, headingNodeSpec, layoutSectionWithSingleColumn, multiBodiedExtension, paragraphNodeSpec, tableStage0 } from './nodes';
+import { extensionFrame, headingNodeSpec, layoutSectionWithSingleColumn, multiBodiedExtension, paragraphNodeSpec } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   const defaultSchemaConfig = {
@@ -18,7 +18,6 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
       layoutSection: layoutSectionWithSingleColumn,
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
-      table: tableStage0,
       heading: headingNodeSpec('stage0'),
       paragraph: paragraphNodeSpec('stage0')
     };

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

@@ -189,7 +189,7 @@ export const tableBackgroundColorNames = new Map();
  */
 
 // TODO: Fix any, potential issue. ED-5048
-const createTableSpec = (allowPreserveTableWidth = false) => {
+const createTableSpec = () => {
   const attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -205,17 +205,14 @@ const createTableSpec = (allowPreserveTableWidth = false) => {
     },
     width: {
       default: null
-    }
-  };
-  const finalAttrs = allowPreserveTableWidth ? {
-    ...attrs,
+    },
     displayMode: {
       default: null
     }
-  } : attrs;
+  };
   const tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -260,7 +257,7 @@ const createTableSpec = (allowPreserveTableWidth = false) => {
 export const table = createTableSpec();
 /** @deprecated Do not use, instead use the regular `table` export */
 export const tableWithCustomWidth = createTableSpec();
-export const tableStage0 = createTableSpec(true);
+export const tableStage0 = createTableSpec();
 const shouldIncludeAttribute = (key, value) => !key.startsWith('__') && (key !== 'localId' || !!value);
 export const tableToJSON = node => ({
   attrs: Object.keys(node.attrs).filter(key => shouldIncludeAttribute(key, node.attrs[key])).reduce((obj, key) => {

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, headingNodeSpec, layoutSectionWithSingleColumn, multiBodiedExtension, paragraphNodeSpec, tableStage0 } from './nodes';
+import { extensionFrame, headingNodeSpec, layoutSectionWithSingleColumn, multiBodiedExtension, paragraphNodeSpec } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -19,7 +19,6 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
       layoutSection: layoutSectionWithSingleColumn,
       multiBodiedExtension: multiBodiedExtension,
       extensionFrame: extensionFrame,
-      table: tableStage0,
       heading: headingNodeSpec('stage0'),
       paragraph: paragraphNodeSpec('stage0')
     };

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

@@ -196,7 +196,6 @@ export var tableBackgroundColorNames = new Map();
 
 // TODO: Fix any, potential issue. ED-5048
 var createTableSpec = function createTableSpec() {
-  var allowPreserveTableWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -212,16 +211,14 @@ var createTableSpec = function createTableSpec() {
     },
     width: {
       default: null
-    }
-  };
-  var finalAttrs = allowPreserveTableWidth ? _objectSpread(_objectSpread({}, attrs), {}, {
+    },
     displayMode: {
       default: null
     }
-  }) : attrs;
+  };
   var tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -266,7 +263,7 @@ var createTableSpec = function createTableSpec() {
 export var table = createTableSpec();
 /** @deprecated Do not use, instead use the regular `table` export */
 export var tableWithCustomWidth = createTableSpec();
-export var tableStage0 = createTableSpec(true);
+export var tableStage0 = createTableSpec();
 var shouldIncludeAttribute = function shouldIncludeAttribute(key, value) {
   return !key.startsWith('__') && (key !== 'localId' || !!value);
 };

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

@@ -2255,6 +2255,12 @@
             },
             "width": {
               "type": "number"
+            },
+            "displayMode": {
+              "enum": [
+                "default",
+                "fixed"
+              ]
             }
           },
           "additionalProperties": false

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

@@ -580,6 +580,12 @@
             "id"
           ],
           "additionalProperties": false
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -613,6 +619,12 @@
           "required": [
             "shortName"
           ]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -711,6 +723,12 @@
             "timestamp"
           ],
           "additionalProperties": false
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -929,6 +947,12 @@
             "color"
           ],
           "additionalProperties": false
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [

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

@@ -1,4 +1,5 @@
 import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 /**
  * @name date_node
  */
@@ -10,5 +11,9 @@ export interface DateDefinition {
          */
         timestamp: string;
     };
+    /**
+     * @stage 0
+     */
+    marks?: Array<AnnotationMarkDefinition>;
 }
 export declare const date: NodeSpec;

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

@@ -1,10 +1,15 @@
 import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 /**
  * @name emoji_node
  */
 export interface EmojiDefinition {
     type: 'emoji';
     attrs: EmojiAttributes;
+    /**
+     * @stage 0
+     */
+    marks?: Array<AnnotationMarkDefinition>;
 }
 export interface EmojiAttributes {
     id?: string;

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

@@ -1,4 +1,5 @@
 import { NodeSpec, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 export declare enum USER_TYPES {
     DEFAULT = "DEFAULT",
     SPECIAL = "SPECIAL",
@@ -18,6 +19,10 @@ export interface MentionAttributes {
 export interface MentionDefinition {
     type: 'mention';
     attrs: MentionAttributes;
+    /**
+     * @stage 0
+     */
+    marks?: Array<AnnotationMarkDefinition>;
 }
 export declare const mention: NodeSpec;
 export declare const toJSON: (node: PMNode) => {

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

@@ -1,4 +1,5 @@
 import { NodeSpec } from '@atlaskit/editor-prosemirror/model';
+import { AnnotationMarkDefinition } from '../marks/annotation';
 /**
  * @name status_node
  */
@@ -16,5 +17,9 @@ export interface StatusDefinition {
          */
         style?: string;
     };
+    /**
+     * @stage 0
+     */
+    marks?: Array<AnnotationMarkDefinition>;
 }
 export declare const status: NodeSpec;

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

@@ -62,9 +62,6 @@ export interface TableAttributes {
      */
     localId?: string;
     width?: number;
-    /**
-     * @stage 0
-     */
     displayMode?: DisplayMode;
 }
 /**

package/json-schema/v1/full.json

@@ -2255,6 +2255,12 @@
             },
             "width": {
               "type": "number"
+            },
+            "displayMode": {
+              "enum": [
+                "default",
+                "fixed"
+              ]
             }
           },
           "additionalProperties": false

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

@@ -580,6 +580,12 @@
             "id"
           ],
           "additionalProperties": false
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -613,6 +619,12 @@
           "required": [
             "shortName"
           ]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -711,6 +723,12 @@
             "timestamp"
           ],
           "additionalProperties": false
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [
@@ -929,6 +947,12 @@
             "color"
           ],
           "additionalProperties": false
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/annotation_mark"
+          }
         }
       },
       "required": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.6.0",
+  "version": "36.8.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -42,7 +42,7 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
-    "@atlassian/adf-schema-json": "^1.14.0",
+    "@atlassian/adf-schema-json": "^1.15.0",
     "@atlaskit/adf-schema-generator": "^1.6.0",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",