@atlaskit/adf-schema 25.3.1 → 25.3.2
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 +14 -0
- package/dist/cjs/schema/nodes/media-single.js +2 -2
- package/dist/cjs/schema/nodes/tableNodes.js +6 -1
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/schema/nodes/media-single.js +2 -2
- package/dist/es2019/schema/nodes/tableNodes.js +6 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/schema/nodes/media-single.js +2 -2
- package/dist/esm/schema/nodes/tableNodes.js +6 -1
- package/dist/esm/version.json +1 -1
- package/dist/json-schema/v1/full.json +29 -29
- package/dist/json-schema/v1/stage-0.json +29 -29
- package/dist/types/schema/nodes/media-single.d.ts +10 -10
- package/json-schema/v1/full.json +29 -29
- package/json-schema/v1/stage-0.json +29 -29
- package/package.json +4 -3
- package/report.api.md +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/adf-schema
|
|
2
2
|
|
|
3
|
+
## 25.3.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`2367ba14aa0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2367ba14aa0) - [ux] ED-16758 Added support for theme tokens in table cell background color.
|
|
8
|
+
- [`6b52583b688`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6b52583b688) - ED-15974 Currently nodes are validated against single spec.
|
|
9
|
+
When a node has multiple specs, like mediaSingle, the first spec is used to validate the node.
|
|
10
|
+
Therefore, the validation fails with an error `INVALID_CONTENT_LENGTH` when the correct spec is not selected for validation.
|
|
11
|
+
|
|
12
|
+
This fix is to re-arrange the specs so that the less restrictive spec is at the top.
|
|
13
|
+
|
|
14
|
+
- [`e771b41970b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e771b41970b) - Updating test cases for adf-schema json-compatibility-tests
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 25.3.1
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -18,7 +18,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
18
18
|
*/
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
|
-
* @name
|
|
21
|
+
* @name mediaSingle_caption_node
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
24
|
/**
|
|
@@ -26,7 +26,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
26
26
|
*/
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
|
-
* @name
|
|
29
|
+
* @name mediaSingle_full_node
|
|
30
30
|
*/
|
|
31
31
|
|
|
32
32
|
var defaultAttrs = {
|
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.toJSONTableHeader = exports.toJSONTableCell = exports.tableToJSON = exports.tableRow = exports.tablePrefixSelector = exports.tableHeaderSelector = exports.tableHeader = exports.tableCellSelector = exports.tableCellContentWrapperSelector = exports.tableCellContentDomSelector = exports.tableCell = exports.tableBackgroundColorPalette = exports.tableBackgroundColorNames = exports.tableBackgroundBorderColor = exports.table = exports.getCellDomAttrs = exports.getCellAttrs = void 0;
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
|
+
var _editorPalette = require("@atlaskit/editor-palette");
|
|
10
|
+
var _tokens = require("@atlaskit/tokens");
|
|
9
11
|
var _colors = require("../../utils/colors");
|
|
10
12
|
var _uuid = require("../../utils/uuid");
|
|
11
13
|
var tablePrefixSelector = 'pm-table';
|
|
@@ -86,7 +88,10 @@ var getCellDomAttrs = function getCellDomAttrs(node) {
|
|
|
86
88
|
attrs.style = '';
|
|
87
89
|
} else {
|
|
88
90
|
var color = (0, _colors.isRgb)(background) ? (0, _colors.rgbToHex)(background) : background;
|
|
89
|
-
|
|
91
|
+
var tokenName = (0, _editorPalette.hexToEditorBackgroundPaletteColorTokenName)(color);
|
|
92
|
+
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-design-token-usage
|
|
93
|
+
var tokenColor = tokenName ? (0, _tokens.getTokenValue)(tokenName) : color;
|
|
94
|
+
attrs.style = "".concat(attrs.style || '', "background-color: ").concat(tokenColor, ";");
|
|
90
95
|
|
|
91
96
|
/**
|
|
92
97
|
* Storing hex code in data-cell-background because
|
package/dist/cjs/version.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
* @name
|
|
11
|
+
* @name mediaSingle_caption_node
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
/**
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
|
-
* @name
|
|
19
|
+
* @name mediaSingle_full_node
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
22
|
export const defaultAttrs = {
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { hexToEditorBackgroundPaletteColorTokenName } from '@atlaskit/editor-palette';
|
|
2
|
+
import { getTokenValue } from '@atlaskit/tokens';
|
|
1
3
|
import { B100, B50, B75, G200, G50, G75, hexToRgba, isHex, isRgb, N0, N20, N60, N800, P100, P50, P75, R100, R50, R75, rgbToHex, T100, T50, T75, Y200, Y50, Y75 } from '../../utils/colors';
|
|
2
4
|
import { uuid } from '../../utils/uuid';
|
|
3
5
|
export const tablePrefixSelector = 'pm-table';
|
|
@@ -73,7 +75,10 @@ export const getCellDomAttrs = node => {
|
|
|
73
75
|
attrs.style = '';
|
|
74
76
|
} else {
|
|
75
77
|
const color = isRgb(background) ? rgbToHex(background) : background;
|
|
76
|
-
|
|
78
|
+
const tokenName = hexToEditorBackgroundPaletteColorTokenName(color);
|
|
79
|
+
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-design-token-usage
|
|
80
|
+
const tokenColor = tokenName ? getTokenValue(tokenName) : color;
|
|
81
|
+
attrs.style = `${attrs.style || ''}background-color: ${tokenColor};`;
|
|
77
82
|
|
|
78
83
|
/**
|
|
79
84
|
* Storing hex code in data-cell-background because
|
package/dist/es2019/version.json
CHANGED
|
@@ -11,7 +11,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
|
-
* @name
|
|
14
|
+
* @name mediaSingle_caption_node
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
/**
|
|
@@ -19,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
19
19
|
*/
|
|
20
20
|
|
|
21
21
|
/**
|
|
22
|
-
* @name
|
|
22
|
+
* @name mediaSingle_full_node
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
export var defaultAttrs = {
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
|
+
import { hexToEditorBackgroundPaletteColorTokenName } from '@atlaskit/editor-palette';
|
|
3
|
+
import { getTokenValue } from '@atlaskit/tokens';
|
|
2
4
|
import { B100, B50, B75, G200, G50, G75, hexToRgba, isHex, isRgb, N0, N20, N60, N800, P100, P50, P75, R100, R50, R75, rgbToHex, T100, T50, T75, Y200, Y50, Y75 } from '../../utils/colors';
|
|
3
5
|
import { uuid } from '../../utils/uuid';
|
|
4
6
|
export var tablePrefixSelector = 'pm-table';
|
|
@@ -73,7 +75,10 @@ export var getCellDomAttrs = function getCellDomAttrs(node) {
|
|
|
73
75
|
attrs.style = '';
|
|
74
76
|
} else {
|
|
75
77
|
var color = isRgb(background) ? rgbToHex(background) : background;
|
|
76
|
-
|
|
78
|
+
var tokenName = hexToEditorBackgroundPaletteColorTokenName(color);
|
|
79
|
+
// eslint-disable-next-line @atlaskit/design-system/no-unsafe-design-token-usage
|
|
80
|
+
var tokenColor = tokenName ? getTokenValue(tokenName) : color;
|
|
81
|
+
attrs.style = "".concat(attrs.style || '', "background-color: ").concat(tokenColor, ";");
|
|
77
82
|
|
|
78
83
|
/**
|
|
79
84
|
* Storing hex code in data-cell-background because
|
package/dist/esm/version.json
CHANGED
|
@@ -1238,7 +1238,7 @@
|
|
|
1238
1238
|
],
|
|
1239
1239
|
"additionalProperties": true
|
|
1240
1240
|
},
|
|
1241
|
-
"
|
|
1241
|
+
"mediaSingle_caption_node": {
|
|
1242
1242
|
"allOf": [
|
|
1243
1243
|
{
|
|
1244
1244
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1248,11 +1248,16 @@
|
|
|
1248
1248
|
"properties": {
|
|
1249
1249
|
"content": {
|
|
1250
1250
|
"type": "array",
|
|
1251
|
-
"items":
|
|
1252
|
-
|
|
1253
|
-
|
|
1251
|
+
"items": [
|
|
1252
|
+
{
|
|
1253
|
+
"$ref": "#/definitions/media_node"
|
|
1254
|
+
},
|
|
1255
|
+
{
|
|
1256
|
+
"$ref": "#/definitions/caption_node"
|
|
1257
|
+
}
|
|
1258
|
+
],
|
|
1254
1259
|
"minItems": 1,
|
|
1255
|
-
"maxItems":
|
|
1260
|
+
"maxItems": 2
|
|
1256
1261
|
}
|
|
1257
1262
|
},
|
|
1258
1263
|
"required": [
|
|
@@ -1262,7 +1267,7 @@
|
|
|
1262
1267
|
}
|
|
1263
1268
|
]
|
|
1264
1269
|
},
|
|
1265
|
-
"
|
|
1270
|
+
"mediaSingle_full_node": {
|
|
1266
1271
|
"allOf": [
|
|
1267
1272
|
{
|
|
1268
1273
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1272,16 +1277,11 @@
|
|
|
1272
1277
|
"properties": {
|
|
1273
1278
|
"content": {
|
|
1274
1279
|
"type": "array",
|
|
1275
|
-
"items":
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
},
|
|
1279
|
-
{
|
|
1280
|
-
"$ref": "#/definitions/caption_node"
|
|
1281
|
-
}
|
|
1282
|
-
],
|
|
1280
|
+
"items": {
|
|
1281
|
+
"$ref": "#/definitions/media_node"
|
|
1282
|
+
},
|
|
1283
1283
|
"minItems": 1,
|
|
1284
|
-
"maxItems":
|
|
1284
|
+
"maxItems": 1
|
|
1285
1285
|
}
|
|
1286
1286
|
},
|
|
1287
1287
|
"required": [
|
|
@@ -1311,10 +1311,10 @@
|
|
|
1311
1311
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1312
1312
|
},
|
|
1313
1313
|
{
|
|
1314
|
-
"$ref": "#/definitions/
|
|
1314
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1315
1315
|
},
|
|
1316
1316
|
{
|
|
1317
|
-
"$ref": "#/definitions/
|
|
1317
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1318
1318
|
}
|
|
1319
1319
|
]
|
|
1320
1320
|
},
|
|
@@ -1327,10 +1327,10 @@
|
|
|
1327
1327
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1328
1328
|
},
|
|
1329
1329
|
{
|
|
1330
|
-
"$ref": "#/definitions/
|
|
1330
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1331
1331
|
},
|
|
1332
1332
|
{
|
|
1333
|
-
"$ref": "#/definitions/
|
|
1333
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1334
1334
|
},
|
|
1335
1335
|
{
|
|
1336
1336
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -1920,10 +1920,10 @@
|
|
|
1920
1920
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1921
1921
|
},
|
|
1922
1922
|
{
|
|
1923
|
-
"$ref": "#/definitions/
|
|
1923
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1924
1924
|
},
|
|
1925
1925
|
{
|
|
1926
|
-
"$ref": "#/definitions/
|
|
1926
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1927
1927
|
},
|
|
1928
1928
|
{
|
|
1929
1929
|
"$ref": "#/definitions/heading_with_no_marks_node"
|
|
@@ -2073,10 +2073,10 @@
|
|
|
2073
2073
|
"$ref": "#/definitions/paragraph_with_alignment_node"
|
|
2074
2074
|
},
|
|
2075
2075
|
{
|
|
2076
|
-
"$ref": "#/definitions/
|
|
2076
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2077
2077
|
},
|
|
2078
2078
|
{
|
|
2079
|
-
"$ref": "#/definitions/
|
|
2079
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2080
2080
|
},
|
|
2081
2081
|
{
|
|
2082
2082
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2214,10 +2214,10 @@
|
|
|
2214
2214
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
2215
2215
|
},
|
|
2216
2216
|
{
|
|
2217
|
-
"$ref": "#/definitions/
|
|
2217
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2218
2218
|
},
|
|
2219
2219
|
{
|
|
2220
|
-
"$ref": "#/definitions/
|
|
2220
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2221
2221
|
},
|
|
2222
2222
|
{
|
|
2223
2223
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2431,10 +2431,10 @@
|
|
|
2431
2431
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2432
2432
|
},
|
|
2433
2433
|
{
|
|
2434
|
-
"$ref": "#/definitions/
|
|
2434
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2435
2435
|
},
|
|
2436
2436
|
{
|
|
2437
|
-
"$ref": "#/definitions/
|
|
2437
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2438
2438
|
},
|
|
2439
2439
|
{
|
|
2440
2440
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2622,10 +2622,10 @@
|
|
|
2622
2622
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2623
2623
|
},
|
|
2624
2624
|
{
|
|
2625
|
-
"$ref": "#/definitions/
|
|
2625
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2626
2626
|
},
|
|
2627
2627
|
{
|
|
2628
|
-
"$ref": "#/definitions/
|
|
2628
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2629
2629
|
},
|
|
2630
2630
|
{
|
|
2631
2631
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -1238,7 +1238,7 @@
|
|
|
1238
1238
|
],
|
|
1239
1239
|
"additionalProperties": true
|
|
1240
1240
|
},
|
|
1241
|
-
"
|
|
1241
|
+
"mediaSingle_caption_node": {
|
|
1242
1242
|
"allOf": [
|
|
1243
1243
|
{
|
|
1244
1244
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1248,11 +1248,16 @@
|
|
|
1248
1248
|
"properties": {
|
|
1249
1249
|
"content": {
|
|
1250
1250
|
"type": "array",
|
|
1251
|
-
"items":
|
|
1252
|
-
|
|
1253
|
-
|
|
1251
|
+
"items": [
|
|
1252
|
+
{
|
|
1253
|
+
"$ref": "#/definitions/media_node"
|
|
1254
|
+
},
|
|
1255
|
+
{
|
|
1256
|
+
"$ref": "#/definitions/caption_node"
|
|
1257
|
+
}
|
|
1258
|
+
],
|
|
1254
1259
|
"minItems": 1,
|
|
1255
|
-
"maxItems":
|
|
1260
|
+
"maxItems": 2
|
|
1256
1261
|
}
|
|
1257
1262
|
},
|
|
1258
1263
|
"required": [
|
|
@@ -1262,7 +1267,7 @@
|
|
|
1262
1267
|
}
|
|
1263
1268
|
]
|
|
1264
1269
|
},
|
|
1265
|
-
"
|
|
1270
|
+
"mediaSingle_full_node": {
|
|
1266
1271
|
"allOf": [
|
|
1267
1272
|
{
|
|
1268
1273
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1272,16 +1277,11 @@
|
|
|
1272
1277
|
"properties": {
|
|
1273
1278
|
"content": {
|
|
1274
1279
|
"type": "array",
|
|
1275
|
-
"items":
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
},
|
|
1279
|
-
{
|
|
1280
|
-
"$ref": "#/definitions/caption_node"
|
|
1281
|
-
}
|
|
1282
|
-
],
|
|
1280
|
+
"items": {
|
|
1281
|
+
"$ref": "#/definitions/media_node"
|
|
1282
|
+
},
|
|
1283
1283
|
"minItems": 1,
|
|
1284
|
-
"maxItems":
|
|
1284
|
+
"maxItems": 1
|
|
1285
1285
|
}
|
|
1286
1286
|
},
|
|
1287
1287
|
"required": [
|
|
@@ -1311,10 +1311,10 @@
|
|
|
1311
1311
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1312
1312
|
},
|
|
1313
1313
|
{
|
|
1314
|
-
"$ref": "#/definitions/
|
|
1314
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1315
1315
|
},
|
|
1316
1316
|
{
|
|
1317
|
-
"$ref": "#/definitions/
|
|
1317
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1318
1318
|
}
|
|
1319
1319
|
]
|
|
1320
1320
|
},
|
|
@@ -1327,10 +1327,10 @@
|
|
|
1327
1327
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1328
1328
|
},
|
|
1329
1329
|
{
|
|
1330
|
-
"$ref": "#/definitions/
|
|
1330
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1331
1331
|
},
|
|
1332
1332
|
{
|
|
1333
|
-
"$ref": "#/definitions/
|
|
1333
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1334
1334
|
},
|
|
1335
1335
|
{
|
|
1336
1336
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -1920,10 +1920,10 @@
|
|
|
1920
1920
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1921
1921
|
},
|
|
1922
1922
|
{
|
|
1923
|
-
"$ref": "#/definitions/
|
|
1923
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1924
1924
|
},
|
|
1925
1925
|
{
|
|
1926
|
-
"$ref": "#/definitions/
|
|
1926
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1927
1927
|
},
|
|
1928
1928
|
{
|
|
1929
1929
|
"$ref": "#/definitions/heading_with_no_marks_node"
|
|
@@ -2073,10 +2073,10 @@
|
|
|
2073
2073
|
"$ref": "#/definitions/paragraph_with_alignment_node"
|
|
2074
2074
|
},
|
|
2075
2075
|
{
|
|
2076
|
-
"$ref": "#/definitions/
|
|
2076
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2077
2077
|
},
|
|
2078
2078
|
{
|
|
2079
|
-
"$ref": "#/definitions/
|
|
2079
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2080
2080
|
},
|
|
2081
2081
|
{
|
|
2082
2082
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2214,10 +2214,10 @@
|
|
|
2214
2214
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
2215
2215
|
},
|
|
2216
2216
|
{
|
|
2217
|
-
"$ref": "#/definitions/
|
|
2217
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2218
2218
|
},
|
|
2219
2219
|
{
|
|
2220
|
-
"$ref": "#/definitions/
|
|
2220
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2221
2221
|
},
|
|
2222
2222
|
{
|
|
2223
2223
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2431,10 +2431,10 @@
|
|
|
2431
2431
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2432
2432
|
},
|
|
2433
2433
|
{
|
|
2434
|
-
"$ref": "#/definitions/
|
|
2434
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2435
2435
|
},
|
|
2436
2436
|
{
|
|
2437
|
-
"$ref": "#/definitions/
|
|
2437
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2438
2438
|
},
|
|
2439
2439
|
{
|
|
2440
2440
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2658,10 +2658,10 @@
|
|
|
2658
2658
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2659
2659
|
},
|
|
2660
2660
|
{
|
|
2661
|
-
"$ref": "#/definitions/
|
|
2661
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2662
2662
|
},
|
|
2663
2663
|
{
|
|
2664
|
-
"$ref": "#/definitions/
|
|
2664
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2665
2665
|
},
|
|
2666
2666
|
{
|
|
2667
2667
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -16,33 +16,33 @@ export interface MediaSingleBaseDefinition {
|
|
|
16
16
|
/**
|
|
17
17
|
* @additionalProperties true
|
|
18
18
|
*/
|
|
19
|
-
export interface
|
|
19
|
+
export interface MediaCaptionContent {
|
|
20
20
|
/**
|
|
21
21
|
* @minItems 1
|
|
22
|
-
* @maxItems
|
|
22
|
+
* @maxItems 2
|
|
23
23
|
* @allowUnsupportedBlock true
|
|
24
24
|
*/
|
|
25
|
-
content:
|
|
25
|
+
content: [Media, Caption?];
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
|
-
* @name
|
|
28
|
+
* @name mediaSingle_caption_node
|
|
29
29
|
*/
|
|
30
|
-
export declare type
|
|
30
|
+
export declare type MediaSingleWithCaptionDefinition = MediaSingleBaseDefinition & MediaCaptionContent;
|
|
31
31
|
/**
|
|
32
32
|
* @additionalProperties true
|
|
33
33
|
*/
|
|
34
|
-
export interface
|
|
34
|
+
export interface MediaSingleFullContent {
|
|
35
35
|
/**
|
|
36
36
|
* @minItems 1
|
|
37
|
-
* @maxItems
|
|
37
|
+
* @maxItems 1
|
|
38
38
|
* @allowUnsupportedBlock true
|
|
39
39
|
*/
|
|
40
|
-
content:
|
|
40
|
+
content: Array<Media>;
|
|
41
41
|
}
|
|
42
42
|
/**
|
|
43
|
-
* @name
|
|
43
|
+
* @name mediaSingle_full_node
|
|
44
44
|
*/
|
|
45
|
-
export declare type
|
|
45
|
+
export declare type MediaSingleFullDefinition = MediaSingleBaseDefinition & MediaSingleFullContent;
|
|
46
46
|
export declare const defaultAttrs: {
|
|
47
47
|
width: {
|
|
48
48
|
default: null;
|
package/json-schema/v1/full.json
CHANGED
|
@@ -1238,7 +1238,7 @@
|
|
|
1238
1238
|
],
|
|
1239
1239
|
"additionalProperties": true
|
|
1240
1240
|
},
|
|
1241
|
-
"
|
|
1241
|
+
"mediaSingle_caption_node": {
|
|
1242
1242
|
"allOf": [
|
|
1243
1243
|
{
|
|
1244
1244
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1248,11 +1248,16 @@
|
|
|
1248
1248
|
"properties": {
|
|
1249
1249
|
"content": {
|
|
1250
1250
|
"type": "array",
|
|
1251
|
-
"items":
|
|
1252
|
-
|
|
1253
|
-
|
|
1251
|
+
"items": [
|
|
1252
|
+
{
|
|
1253
|
+
"$ref": "#/definitions/media_node"
|
|
1254
|
+
},
|
|
1255
|
+
{
|
|
1256
|
+
"$ref": "#/definitions/caption_node"
|
|
1257
|
+
}
|
|
1258
|
+
],
|
|
1254
1259
|
"minItems": 1,
|
|
1255
|
-
"maxItems":
|
|
1260
|
+
"maxItems": 2
|
|
1256
1261
|
}
|
|
1257
1262
|
},
|
|
1258
1263
|
"required": [
|
|
@@ -1262,7 +1267,7 @@
|
|
|
1262
1267
|
}
|
|
1263
1268
|
]
|
|
1264
1269
|
},
|
|
1265
|
-
"
|
|
1270
|
+
"mediaSingle_full_node": {
|
|
1266
1271
|
"allOf": [
|
|
1267
1272
|
{
|
|
1268
1273
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1272,16 +1277,11 @@
|
|
|
1272
1277
|
"properties": {
|
|
1273
1278
|
"content": {
|
|
1274
1279
|
"type": "array",
|
|
1275
|
-
"items":
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
},
|
|
1279
|
-
{
|
|
1280
|
-
"$ref": "#/definitions/caption_node"
|
|
1281
|
-
}
|
|
1282
|
-
],
|
|
1280
|
+
"items": {
|
|
1281
|
+
"$ref": "#/definitions/media_node"
|
|
1282
|
+
},
|
|
1283
1283
|
"minItems": 1,
|
|
1284
|
-
"maxItems":
|
|
1284
|
+
"maxItems": 1
|
|
1285
1285
|
}
|
|
1286
1286
|
},
|
|
1287
1287
|
"required": [
|
|
@@ -1311,10 +1311,10 @@
|
|
|
1311
1311
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1312
1312
|
},
|
|
1313
1313
|
{
|
|
1314
|
-
"$ref": "#/definitions/
|
|
1314
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1315
1315
|
},
|
|
1316
1316
|
{
|
|
1317
|
-
"$ref": "#/definitions/
|
|
1317
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1318
1318
|
}
|
|
1319
1319
|
]
|
|
1320
1320
|
},
|
|
@@ -1327,10 +1327,10 @@
|
|
|
1327
1327
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1328
1328
|
},
|
|
1329
1329
|
{
|
|
1330
|
-
"$ref": "#/definitions/
|
|
1330
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1331
1331
|
},
|
|
1332
1332
|
{
|
|
1333
|
-
"$ref": "#/definitions/
|
|
1333
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1334
1334
|
},
|
|
1335
1335
|
{
|
|
1336
1336
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -1920,10 +1920,10 @@
|
|
|
1920
1920
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1921
1921
|
},
|
|
1922
1922
|
{
|
|
1923
|
-
"$ref": "#/definitions/
|
|
1923
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1924
1924
|
},
|
|
1925
1925
|
{
|
|
1926
|
-
"$ref": "#/definitions/
|
|
1926
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1927
1927
|
},
|
|
1928
1928
|
{
|
|
1929
1929
|
"$ref": "#/definitions/heading_with_no_marks_node"
|
|
@@ -2073,10 +2073,10 @@
|
|
|
2073
2073
|
"$ref": "#/definitions/paragraph_with_alignment_node"
|
|
2074
2074
|
},
|
|
2075
2075
|
{
|
|
2076
|
-
"$ref": "#/definitions/
|
|
2076
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2077
2077
|
},
|
|
2078
2078
|
{
|
|
2079
|
-
"$ref": "#/definitions/
|
|
2079
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2080
2080
|
},
|
|
2081
2081
|
{
|
|
2082
2082
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2214,10 +2214,10 @@
|
|
|
2214
2214
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
2215
2215
|
},
|
|
2216
2216
|
{
|
|
2217
|
-
"$ref": "#/definitions/
|
|
2217
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2218
2218
|
},
|
|
2219
2219
|
{
|
|
2220
|
-
"$ref": "#/definitions/
|
|
2220
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2221
2221
|
},
|
|
2222
2222
|
{
|
|
2223
2223
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2431,10 +2431,10 @@
|
|
|
2431
2431
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2432
2432
|
},
|
|
2433
2433
|
{
|
|
2434
|
-
"$ref": "#/definitions/
|
|
2434
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2435
2435
|
},
|
|
2436
2436
|
{
|
|
2437
|
-
"$ref": "#/definitions/
|
|
2437
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2438
2438
|
},
|
|
2439
2439
|
{
|
|
2440
2440
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2622,10 +2622,10 @@
|
|
|
2622
2622
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2623
2623
|
},
|
|
2624
2624
|
{
|
|
2625
|
-
"$ref": "#/definitions/
|
|
2625
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2626
2626
|
},
|
|
2627
2627
|
{
|
|
2628
|
-
"$ref": "#/definitions/
|
|
2628
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2629
2629
|
},
|
|
2630
2630
|
{
|
|
2631
2631
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -1238,7 +1238,7 @@
|
|
|
1238
1238
|
],
|
|
1239
1239
|
"additionalProperties": true
|
|
1240
1240
|
},
|
|
1241
|
-
"
|
|
1241
|
+
"mediaSingle_caption_node": {
|
|
1242
1242
|
"allOf": [
|
|
1243
1243
|
{
|
|
1244
1244
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1248,11 +1248,16 @@
|
|
|
1248
1248
|
"properties": {
|
|
1249
1249
|
"content": {
|
|
1250
1250
|
"type": "array",
|
|
1251
|
-
"items":
|
|
1252
|
-
|
|
1253
|
-
|
|
1251
|
+
"items": [
|
|
1252
|
+
{
|
|
1253
|
+
"$ref": "#/definitions/media_node"
|
|
1254
|
+
},
|
|
1255
|
+
{
|
|
1256
|
+
"$ref": "#/definitions/caption_node"
|
|
1257
|
+
}
|
|
1258
|
+
],
|
|
1254
1259
|
"minItems": 1,
|
|
1255
|
-
"maxItems":
|
|
1260
|
+
"maxItems": 2
|
|
1256
1261
|
}
|
|
1257
1262
|
},
|
|
1258
1263
|
"required": [
|
|
@@ -1262,7 +1267,7 @@
|
|
|
1262
1267
|
}
|
|
1263
1268
|
]
|
|
1264
1269
|
},
|
|
1265
|
-
"
|
|
1270
|
+
"mediaSingle_full_node": {
|
|
1266
1271
|
"allOf": [
|
|
1267
1272
|
{
|
|
1268
1273
|
"$ref": "#/definitions/mediaSingle_node"
|
|
@@ -1272,16 +1277,11 @@
|
|
|
1272
1277
|
"properties": {
|
|
1273
1278
|
"content": {
|
|
1274
1279
|
"type": "array",
|
|
1275
|
-
"items":
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
},
|
|
1279
|
-
{
|
|
1280
|
-
"$ref": "#/definitions/caption_node"
|
|
1281
|
-
}
|
|
1282
|
-
],
|
|
1280
|
+
"items": {
|
|
1281
|
+
"$ref": "#/definitions/media_node"
|
|
1282
|
+
},
|
|
1283
1283
|
"minItems": 1,
|
|
1284
|
-
"maxItems":
|
|
1284
|
+
"maxItems": 1
|
|
1285
1285
|
}
|
|
1286
1286
|
},
|
|
1287
1287
|
"required": [
|
|
@@ -1311,10 +1311,10 @@
|
|
|
1311
1311
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1312
1312
|
},
|
|
1313
1313
|
{
|
|
1314
|
-
"$ref": "#/definitions/
|
|
1314
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1315
1315
|
},
|
|
1316
1316
|
{
|
|
1317
|
-
"$ref": "#/definitions/
|
|
1317
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1318
1318
|
}
|
|
1319
1319
|
]
|
|
1320
1320
|
},
|
|
@@ -1327,10 +1327,10 @@
|
|
|
1327
1327
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1328
1328
|
},
|
|
1329
1329
|
{
|
|
1330
|
-
"$ref": "#/definitions/
|
|
1330
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1331
1331
|
},
|
|
1332
1332
|
{
|
|
1333
|
-
"$ref": "#/definitions/
|
|
1333
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1334
1334
|
},
|
|
1335
1335
|
{
|
|
1336
1336
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -1920,10 +1920,10 @@
|
|
|
1920
1920
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
1921
1921
|
},
|
|
1922
1922
|
{
|
|
1923
|
-
"$ref": "#/definitions/
|
|
1923
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
1924
1924
|
},
|
|
1925
1925
|
{
|
|
1926
|
-
"$ref": "#/definitions/
|
|
1926
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
1927
1927
|
},
|
|
1928
1928
|
{
|
|
1929
1929
|
"$ref": "#/definitions/heading_with_no_marks_node"
|
|
@@ -2073,10 +2073,10 @@
|
|
|
2073
2073
|
"$ref": "#/definitions/paragraph_with_alignment_node"
|
|
2074
2074
|
},
|
|
2075
2075
|
{
|
|
2076
|
-
"$ref": "#/definitions/
|
|
2076
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2077
2077
|
},
|
|
2078
2078
|
{
|
|
2079
|
-
"$ref": "#/definitions/
|
|
2079
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2080
2080
|
},
|
|
2081
2081
|
{
|
|
2082
2082
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2214,10 +2214,10 @@
|
|
|
2214
2214
|
"$ref": "#/definitions/paragraph_with_no_marks_node"
|
|
2215
2215
|
},
|
|
2216
2216
|
{
|
|
2217
|
-
"$ref": "#/definitions/
|
|
2217
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2218
2218
|
},
|
|
2219
2219
|
{
|
|
2220
|
-
"$ref": "#/definitions/
|
|
2220
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2221
2221
|
},
|
|
2222
2222
|
{
|
|
2223
2223
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2431,10 +2431,10 @@
|
|
|
2431
2431
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2432
2432
|
},
|
|
2433
2433
|
{
|
|
2434
|
-
"$ref": "#/definitions/
|
|
2434
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2435
2435
|
},
|
|
2436
2436
|
{
|
|
2437
|
-
"$ref": "#/definitions/
|
|
2437
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2438
2438
|
},
|
|
2439
2439
|
{
|
|
2440
2440
|
"$ref": "#/definitions/bulletList_node"
|
|
@@ -2658,10 +2658,10 @@
|
|
|
2658
2658
|
"$ref": "#/definitions/paragraph_with_indentation_node"
|
|
2659
2659
|
},
|
|
2660
2660
|
{
|
|
2661
|
-
"$ref": "#/definitions/
|
|
2661
|
+
"$ref": "#/definitions/mediaSingle_caption_node"
|
|
2662
2662
|
},
|
|
2663
2663
|
{
|
|
2664
|
-
"$ref": "#/definitions/
|
|
2664
|
+
"$ref": "#/definitions/mediaSingle_full_node"
|
|
2665
2665
|
},
|
|
2666
2666
|
{
|
|
2667
2667
|
"$ref": "#/definitions/bulletList_node"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/adf-schema",
|
|
3
|
-
"version": "25.3.
|
|
3
|
+
"version": "25.3.2",
|
|
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/"
|
|
@@ -40,8 +40,9 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@atlaskit/codemod-utils": "^4.1.0",
|
|
43
|
-
"@atlaskit/editor-palette": "1.
|
|
43
|
+
"@atlaskit/editor-palette": "1.1.0",
|
|
44
44
|
"@atlaskit/editor-tables": "^2.2.0",
|
|
45
|
+
"@atlaskit/tokens": "^1.2.1",
|
|
45
46
|
"@babel/runtime": "^7.0.0",
|
|
46
47
|
"@types/linkify-it": "^2.0.4",
|
|
47
48
|
"@types/prosemirror-model": "^1.11.0",
|
|
@@ -55,7 +56,7 @@
|
|
|
55
56
|
"devDependencies": {
|
|
56
57
|
"@atlaskit/adf-utils": "^18.0.0",
|
|
57
58
|
"@atlaskit/editor-json-transformer": "^8.8.0",
|
|
58
|
-
"@atlaskit/editor-test-helpers": "^18.
|
|
59
|
+
"@atlaskit/editor-test-helpers": "^18.1.0",
|
|
59
60
|
"@atlaskit/json-schema-generator": "^3.3.0",
|
|
60
61
|
"@atlassian/adf-sample": "^1.1.0",
|
|
61
62
|
"@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
|