@atlaskit/adf-schema 22.0.0 → 22.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @atlaskit/adf-schema
2
2
 
3
+ ## 22.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`fd5028f6751`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fd5028f6751) - EDM-2873: Promote MediaInline to full schema
8
+
9
+ ## 22.0.2
10
+
11
+ ### Patch Changes
12
+
13
+ - [`03930b9f4c7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/03930b9f4c7) - ED-14253: fixed infinite transaction loop after uploading a file to the editor.
14
+
15
+ - updated ADF for MediaBaseAttributes.\_\_contextId to allow for null value
16
+ - fixed Editor example page 2-comment-jira-bento
17
+
18
+ ## 22.0.1
19
+
20
+ ### Patch Changes
21
+
22
+ - [`c7a3ccf95cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c7a3ccf95cd) - Patching versions to no longer reference localid from adf or smart-cards
23
+
3
24
  ## 22.0.0
4
25
 
5
26
  ### Major Changes
@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.blockCard = void 0;
7
7
 
8
- var _uuid = require("../../utils/uuid");
9
-
8
+ /**
9
+ * @name blockCard_node
10
+ */
10
11
  var blockCard = {
11
12
  inline: false,
12
13
  group: 'block',
@@ -18,9 +19,6 @@ var blockCard = {
18
19
  },
19
20
  data: {
20
21
  default: null
21
- },
22
- localId: {
23
- default: ''
24
22
  }
25
23
  },
26
24
  parseDOM: [{
@@ -32,8 +30,7 @@ var blockCard = {
32
30
  var data = anchor.getAttribute('data-card-data');
33
31
  return {
34
32
  url: anchor.getAttribute('href') || null,
35
- data: data ? JSON.parse(data) : null,
36
- localId: _uuid.uuid.generate()
33
+ data: data ? JSON.parse(data) : null
37
34
  };
38
35
  }
39
36
  }, {
@@ -43,8 +40,7 @@ var blockCard = {
43
40
  var data = anchor.getAttribute('data-card-data');
44
41
  return {
45
42
  url: anchor.getAttribute('data-card-url') || null,
46
- data: data ? JSON.parse(data) : null,
47
- localId: _uuid.uuid.generate()
43
+ data: data ? JSON.parse(data) : null
48
44
  };
49
45
  }
50
46
  }],
@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.embedCard = void 0;
7
7
 
8
- var _uuid = require("../../utils/uuid");
9
-
8
+ /**
9
+ * @name embedCard_node
10
+ */
10
11
  var embedCard = {
11
12
  inline: false,
12
13
  group: 'block',
@@ -26,9 +27,6 @@ var embedCard = {
26
27
  },
27
28
  originalHeight: {
28
29
  default: null
29
- },
30
- localId: {
31
- default: ''
32
30
  }
33
31
  },
34
32
  parseDOM: [{
@@ -39,8 +37,7 @@ var embedCard = {
39
37
  layout: dom.getAttribute('data-layout') || 'center',
40
38
  width: Number(dom.getAttribute('data-width')) || null,
41
39
  originalWidth: Number(dom.getAttribute('data-card-original-width')) || null,
42
- originalHeight: Number(dom.getAttribute('data-card-original-height')) || null,
43
- localId: _uuid.uuid.generate()
40
+ originalHeight: Number(dom.getAttribute('data-card-original-height')) || null
44
41
  };
45
42
  }
46
43
  }],
@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.inlineCard = void 0;
7
7
 
8
- var _uuid = require("../../utils/uuid");
9
-
8
+ /**
9
+ * @name inlineCard_node
10
+ */
10
11
  var inlineCard = {
11
12
  inline: true,
12
13
  group: 'inline',
@@ -18,9 +19,6 @@ var inlineCard = {
18
19
  },
19
20
  data: {
20
21
  default: null
21
- },
22
- localId: {
23
- default: ''
24
22
  }
25
23
  },
26
24
  parseDOM: [{
@@ -34,8 +32,7 @@ var inlineCard = {
34
32
 
35
33
  return {
36
34
  url: anchor.getAttribute('href') || anchor.getAttribute('data-card-url') || null,
37
- data: data ? JSON.parse(data) : null,
38
- localId: _uuid.uuid.generate()
35
+ data: data ? JSON.parse(data) : null
39
36
  };
40
37
  }
41
38
  }, // for renderer
@@ -46,8 +43,7 @@ var inlineCard = {
46
43
  var data = anchor.getAttribute('data-card-data');
47
44
  return {
48
45
  url: anchor.getAttribute('data-card-url'),
49
- data: data ? JSON.parse(data) : null,
50
- localId: _uuid.uuid.generate()
46
+ data: data ? JSON.parse(data) : null
51
47
  };
52
48
  }
53
49
  }],
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "22.0.0",
3
+ "version": "22.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,4 +1,6 @@
1
- import { uuid } from '../../utils/uuid';
1
+ /**
2
+ * @name blockCard_node
3
+ */
2
4
  export const blockCard = {
3
5
  inline: false,
4
6
  group: 'block',
@@ -10,9 +12,6 @@ export const blockCard = {
10
12
  },
11
13
  data: {
12
14
  default: null
13
- },
14
- localId: {
15
- default: ''
16
15
  }
17
16
  },
18
17
  parseDOM: [{
@@ -24,8 +23,7 @@ export const blockCard = {
24
23
  const data = anchor.getAttribute('data-card-data');
25
24
  return {
26
25
  url: anchor.getAttribute('href') || null,
27
- data: data ? JSON.parse(data) : null,
28
- localId: uuid.generate()
26
+ data: data ? JSON.parse(data) : null
29
27
  };
30
28
  }
31
29
  }, {
@@ -35,8 +33,7 @@ export const blockCard = {
35
33
  const data = anchor.getAttribute('data-card-data');
36
34
  return {
37
35
  url: anchor.getAttribute('data-card-url') || null,
38
- data: data ? JSON.parse(data) : null,
39
- localId: uuid.generate()
36
+ data: data ? JSON.parse(data) : null
40
37
  };
41
38
  }
42
39
  }],
@@ -1,4 +1,6 @@
1
- import { uuid } from '../../utils/uuid';
1
+ /**
2
+ * @name embedCard_node
3
+ */
2
4
  export const embedCard = {
3
5
  inline: false,
4
6
  group: 'block',
@@ -18,9 +20,6 @@ export const embedCard = {
18
20
  },
19
21
  originalHeight: {
20
22
  default: null
21
- },
22
- localId: {
23
- default: ''
24
23
  }
25
24
  },
26
25
  parseDOM: [{
@@ -30,8 +29,7 @@ export const embedCard = {
30
29
  layout: dom.getAttribute('data-layout') || 'center',
31
30
  width: Number(dom.getAttribute('data-width')) || null,
32
31
  originalWidth: Number(dom.getAttribute('data-card-original-width')) || null,
33
- originalHeight: Number(dom.getAttribute('data-card-original-height')) || null,
34
- localId: uuid.generate()
32
+ originalHeight: Number(dom.getAttribute('data-card-original-height')) || null
35
33
  })
36
34
  }],
37
35
 
@@ -1,8 +1,6 @@
1
- import { uuid } from '../../utils/uuid';
2
1
  /**
3
2
  * @name inlineCard_node
4
3
  */
5
-
6
4
  export const inlineCard = {
7
5
  inline: true,
8
6
  group: 'inline',
@@ -14,9 +12,6 @@ export const inlineCard = {
14
12
  },
15
13
  data: {
16
14
  default: null
17
- },
18
- localId: {
19
- default: ''
20
15
  }
21
16
  },
22
17
  parseDOM: [{
@@ -30,8 +25,7 @@ export const inlineCard = {
30
25
 
31
26
  return {
32
27
  url: anchor.getAttribute('href') || anchor.getAttribute('data-card-url') || null,
33
- data: data ? JSON.parse(data) : null,
34
- localId: uuid.generate()
28
+ data: data ? JSON.parse(data) : null
35
29
  };
36
30
  }
37
31
  }, // for renderer
@@ -42,8 +36,7 @@ export const inlineCard = {
42
36
  const data = anchor.getAttribute('data-card-data');
43
37
  return {
44
38
  url: anchor.getAttribute('data-card-url'),
45
- data: data ? JSON.parse(data) : null,
46
- localId: uuid.generate()
39
+ data: data ? JSON.parse(data) : null
47
40
  };
48
41
  }
49
42
  }],
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "22.0.0",
3
+ "version": "22.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,4 +1,6 @@
1
- import { uuid } from '../../utils/uuid';
1
+ /**
2
+ * @name blockCard_node
3
+ */
2
4
  export var blockCard = {
3
5
  inline: false,
4
6
  group: 'block',
@@ -10,9 +12,6 @@ export var blockCard = {
10
12
  },
11
13
  data: {
12
14
  default: null
13
- },
14
- localId: {
15
- default: ''
16
15
  }
17
16
  },
18
17
  parseDOM: [{
@@ -24,8 +23,7 @@ export var blockCard = {
24
23
  var data = anchor.getAttribute('data-card-data');
25
24
  return {
26
25
  url: anchor.getAttribute('href') || null,
27
- data: data ? JSON.parse(data) : null,
28
- localId: uuid.generate()
26
+ data: data ? JSON.parse(data) : null
29
27
  };
30
28
  }
31
29
  }, {
@@ -35,8 +33,7 @@ export var blockCard = {
35
33
  var data = anchor.getAttribute('data-card-data');
36
34
  return {
37
35
  url: anchor.getAttribute('data-card-url') || null,
38
- data: data ? JSON.parse(data) : null,
39
- localId: uuid.generate()
36
+ data: data ? JSON.parse(data) : null
40
37
  };
41
38
  }
42
39
  }],
@@ -1,4 +1,6 @@
1
- import { uuid } from '../../utils/uuid';
1
+ /**
2
+ * @name embedCard_node
3
+ */
2
4
  export var embedCard = {
3
5
  inline: false,
4
6
  group: 'block',
@@ -18,9 +20,6 @@ export var embedCard = {
18
20
  },
19
21
  originalHeight: {
20
22
  default: null
21
- },
22
- localId: {
23
- default: ''
24
23
  }
25
24
  },
26
25
  parseDOM: [{
@@ -31,8 +30,7 @@ export var embedCard = {
31
30
  layout: dom.getAttribute('data-layout') || 'center',
32
31
  width: Number(dom.getAttribute('data-width')) || null,
33
32
  originalWidth: Number(dom.getAttribute('data-card-original-width')) || null,
34
- originalHeight: Number(dom.getAttribute('data-card-original-height')) || null,
35
- localId: uuid.generate()
33
+ originalHeight: Number(dom.getAttribute('data-card-original-height')) || null
36
34
  };
37
35
  }
38
36
  }],
@@ -1,8 +1,6 @@
1
- import { uuid } from '../../utils/uuid';
2
1
  /**
3
2
  * @name inlineCard_node
4
3
  */
5
-
6
4
  export var inlineCard = {
7
5
  inline: true,
8
6
  group: 'inline',
@@ -14,9 +12,6 @@ export var inlineCard = {
14
12
  },
15
13
  data: {
16
14
  default: null
17
- },
18
- localId: {
19
- default: ''
20
15
  }
21
16
  },
22
17
  parseDOM: [{
@@ -30,8 +25,7 @@ export var inlineCard = {
30
25
 
31
26
  return {
32
27
  url: anchor.getAttribute('href') || anchor.getAttribute('data-card-url') || null,
33
- data: data ? JSON.parse(data) : null,
34
- localId: uuid.generate()
28
+ data: data ? JSON.parse(data) : null
35
29
  };
36
30
  }
37
31
  }, // for renderer
@@ -42,8 +36,7 @@ export var inlineCard = {
42
36
  var data = anchor.getAttribute('data-card-data');
43
37
  return {
44
38
  url: anchor.getAttribute('data-card-url'),
45
- data: data ? JSON.parse(data) : null,
46
- localId: uuid.generate()
39
+ data: data ? JSON.parse(data) : null
47
40
  };
48
41
  }
49
42
  }],
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "22.0.0",
3
+ "version": "22.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -897,6 +897,58 @@
897
897
  ],
898
898
  "additionalProperties": false
899
899
  },
900
+ "mediaInline_node": {
901
+ "type": "object",
902
+ "properties": {
903
+ "type": {
904
+ "enum": [
905
+ "mediaInline"
906
+ ]
907
+ },
908
+ "attrs": {
909
+ "type": "object",
910
+ "properties": {
911
+ "data": {},
912
+ "id": {
913
+ "type": "string",
914
+ "minLength": 1
915
+ },
916
+ "collection": {
917
+ "type": "string"
918
+ },
919
+ "height": {
920
+ "type": "number"
921
+ },
922
+ "width": {
923
+ "type": "number"
924
+ },
925
+ "occurrenceKey": {
926
+ "type": "string",
927
+ "minLength": 1
928
+ },
929
+ "alt": {
930
+ "type": "string"
931
+ }
932
+ },
933
+ "additionalProperties": false,
934
+ "required": [
935
+ "id",
936
+ "collection"
937
+ ]
938
+ },
939
+ "marks": {
940
+ "type": "array",
941
+ "items": {
942
+ "$ref": "#/definitions/link_mark"
943
+ }
944
+ }
945
+ },
946
+ "required": [
947
+ "type",
948
+ "attrs"
949
+ ],
950
+ "additionalProperties": false
951
+ },
900
952
  "formatted_text_inline_node": {
901
953
  "allOf": [
902
954
  {
@@ -996,6 +1048,9 @@
996
1048
  {
997
1049
  "$ref": "#/definitions/status_node"
998
1050
  },
1051
+ {
1052
+ "$ref": "#/definitions/mediaInline_node"
1053
+ },
999
1054
  {
1000
1055
  "$ref": "#/definitions/formatted_text_inline_node"
1001
1056
  },
@@ -4,14 +4,12 @@ export interface UrlType {
4
4
  * @validatorFn safeUrl
5
5
  */
6
6
  url: string;
7
- localId?: string;
8
7
  }
9
8
  export interface DataType {
10
9
  /**
11
10
  * @additionalProperties true
12
11
  */
13
12
  data: object;
14
- localId?: string;
15
13
  }
16
14
  export declare type CardAttributes = UrlType | DataType;
17
15
  /**
@@ -7,7 +7,6 @@ export interface EmbedCardAttributes extends RichMediaAttributes {
7
7
  * @validatorFn safeUrl
8
8
  */
9
9
  url: string;
10
- localId?: string;
11
10
  }
12
11
  /**
13
12
  * @name embedCard_node
@@ -5,7 +5,6 @@ export interface MediaInlineAttributes extends MediaBaseAttributes {
5
5
  data?: object;
6
6
  }
7
7
  /**
8
- * @stage 0
9
8
  * @name mediaInline_node
10
9
  */
11
10
  export interface MediaInlineDefinition {
@@ -35,7 +35,7 @@ export interface MediaBaseAttributes {
35
35
  __fileSize?: number | null;
36
36
  __fileMimeType?: string | null;
37
37
  __displayType?: DisplayType | null;
38
- __contextId?: string;
38
+ __contextId?: string | null;
39
39
  __external?: boolean;
40
40
  }
41
41
  export interface MediaAttributes extends MediaBaseAttributes {
@@ -897,6 +897,58 @@
897
897
  ],
898
898
  "additionalProperties": false
899
899
  },
900
+ "mediaInline_node": {
901
+ "type": "object",
902
+ "properties": {
903
+ "type": {
904
+ "enum": [
905
+ "mediaInline"
906
+ ]
907
+ },
908
+ "attrs": {
909
+ "type": "object",
910
+ "properties": {
911
+ "data": {},
912
+ "id": {
913
+ "type": "string",
914
+ "minLength": 1
915
+ },
916
+ "collection": {
917
+ "type": "string"
918
+ },
919
+ "height": {
920
+ "type": "number"
921
+ },
922
+ "width": {
923
+ "type": "number"
924
+ },
925
+ "occurrenceKey": {
926
+ "type": "string",
927
+ "minLength": 1
928
+ },
929
+ "alt": {
930
+ "type": "string"
931
+ }
932
+ },
933
+ "additionalProperties": false,
934
+ "required": [
935
+ "id",
936
+ "collection"
937
+ ]
938
+ },
939
+ "marks": {
940
+ "type": "array",
941
+ "items": {
942
+ "$ref": "#/definitions/link_mark"
943
+ }
944
+ }
945
+ },
946
+ "required": [
947
+ "type",
948
+ "attrs"
949
+ ],
950
+ "additionalProperties": false
951
+ },
900
952
  "formatted_text_inline_node": {
901
953
  "allOf": [
902
954
  {
@@ -996,6 +1048,9 @@
996
1048
  {
997
1049
  "$ref": "#/definitions/status_node"
998
1050
  },
1051
+ {
1052
+ "$ref": "#/definitions/mediaInline_node"
1053
+ },
999
1054
  {
1000
1055
  "$ref": "#/definitions/formatted_text_inline_node"
1001
1056
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/adf-schema",
3
- "version": "22.0.0",
3
+ "version": "22.1.0",
4
4
  "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -48,7 +48,7 @@
48
48
  "devDependencies": {
49
49
  "@atlaskit/adf-utils": "^16.0.0",
50
50
  "@atlaskit/editor-json-transformer": "^8.7.0",
51
- "@atlaskit/editor-test-helpers": "^16.1.0",
51
+ "@atlaskit/editor-test-helpers": "^17.0.0",
52
52
  "@atlaskit/json-schema-generator": "^3.2.0",
53
53
  "@atlassian/adf-sample": "^1.0.0",
54
54
  "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",