@atlaskit/adf-schema 30.1.0 → 30.2.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/adf-schema
 
+## 30.2.1
+
+### Patch Changes
+
+- fb8dcc0: Loosen eslint rules and change comments
+- Updated dependencies [fb8dcc0]
+  - @atlaskit/editor-prosemirror@1.1.7
+
+## 30.2.0
+
+### Minor Changes
+
+- 9a8af3a: Promote widthType to full schema
+
 ## 30.1.0
 
 ### Minor Changes

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

@@ -114,7 +114,7 @@ var nodesInOrder = [{
   spec: _nodes.mediaGroup
 }, {
   name: 'mediaSingle',
-  spec: _nodes.mediaSingleWithCaption
+  spec: _nodes.mediaSingleFull
 }, {
   name: 'mediaInline',
   spec: _nodes.mediaInline

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

@@ -24,8 +24,7 @@ var getSchemaBasedOnStage = (0, _memoizeOne.default)(function () {
   var defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      layoutSection: _nodes.layoutSectionWithSingleColumn,
-      mediaSingle: _nodes.mediaSingleFull
+      layoutSection: _nodes.layoutSectionWithSingleColumn
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

package/dist/cjs/schema/nodes/types/rich-media-common.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.WidthType = void 0;
 /**
- * @stage 0
  * @description The widthType attribute is used to support fixed with media single
  */
 var WidthType = /*#__PURE__*/function (WidthType) {

package/dist/cjs/utils/colors.js

@@ -16,8 +16,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var namedColors = _interopRequireWildcard(require("css-color-names"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-// eslint-disable-line import/extensions
-
 /**
  * We're avoding importing these colors from @atlaskit/theme since we
  * do not want to have react as a dependency of this package.

package/dist/cjs/utils/editor-palette.js

@@ -25,9 +25,8 @@ exports.hexToEditorTextPaletteColor = hexToEditorTextPaletteColor;
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color
  */
 function hexToEditorBorderPaletteColor(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   return editorBorderPalette[hexColor.toUpperCase()];
 }
 var editorBorderPalette = {
@@ -58,9 +57,8 @@ var editorBorderPalette = {
  */
 exports.editorBorderPalette = editorBorderPalette;
 function hexToEditorTextPaletteColor(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   return editorTextPalette[hexColor.toUpperCase()];
 }
 var editorTextPalette = {
@@ -123,9 +121,8 @@ var editorTextPalette = {
  */
 exports.editorTextPalette = editorTextPalette;
 function hexToEditorBackgroundPaletteRawValue(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   var tokenData = editorBackgroundPalette[hexColor.toUpperCase()];
   return tokenData ? tokenData.getValue(hexColor) : undefined;
 }

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

@@ -1,7 +1,7 @@
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleWithCaption, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
   if (!config) {
     return {};
@@ -99,7 +99,7 @@ const nodesInOrder = [{
   spec: mediaGroup
 }, {
   name: 'mediaSingle',
-  spec: mediaSingleWithCaption
+  spec: mediaSingleFull
 }, {
   name: 'mediaInline',
   spec: mediaInline

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { mediaSingleFull, layoutSectionWithSingleColumn } from './nodes';
+import { layoutSectionWithSingleColumn } from './nodes';
 import { createSchema } from './create-schema';
 const getDefaultSchemaConfig = () => {
   let defaultSchemaConfig = {
@@ -15,8 +15,7 @@ export const getSchemaBasedOnStage = memoizeOne((stage = 'final') => {
   const defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      layoutSection: layoutSectionWithSingleColumn,
-      mediaSingle: mediaSingleFull
+      layoutSection: layoutSectionWithSingleColumn
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/es2019/schema/nodes/types/rich-media-common.js

@@ -1,5 +1,4 @@
 /**
- * @stage 0
  * @description The widthType attribute is used to support fixed with media single
  */
 

package/dist/es2019/utils/colors.js

@@ -1,4 +1,4 @@
-import * as namedColors from 'css-color-names'; // eslint-disable-line import/extensions
+import * as namedColors from 'css-color-names';
 
 /**
  * We're avoding importing these colors from @atlaskit/theme since we

package/dist/es2019/utils/editor-palette.js

@@ -16,9 +16,8 @@
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color
  */
 export function hexToEditorBorderPaletteColor(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   return editorBorderPalette[hexColor.toUpperCase()];
 }
 export const editorBorderPalette = {
@@ -48,9 +47,8 @@ export const editorBorderPalette = {
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color
  */
 export function hexToEditorTextPaletteColor(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   return editorTextPalette[hexColor.toUpperCase()];
 }
 export const editorTextPalette = {
@@ -112,9 +110,8 @@ export const editorTextPalette = {
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color.
  */
 export function hexToEditorBackgroundPaletteRawValue(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   const tokenData = editorBackgroundPalette[hexColor.toUpperCase()];
   return tokenData ? tokenData.getValue(hexColor) : undefined;
 }

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

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border } from './marks';
-import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleWithCaption, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItem, heading, blockquote, codeBlock, panel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!config) {
@@ -104,7 +104,7 @@ var nodesInOrder = [{
   spec: mediaGroup
 }, {
   name: 'mediaSingle',
-  spec: mediaSingleWithCaption
+  spec: mediaSingleFull
 }, {
   name: 'mediaInline',
   spec: mediaInline

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { mediaSingleFull, layoutSectionWithSingleColumn } from './nodes';
+import { layoutSectionWithSingleColumn } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -16,8 +16,7 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
   var defaultSchemaConfig = getDefaultSchemaConfig();
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
-      layoutSection: layoutSectionWithSingleColumn,
-      mediaSingle: mediaSingleFull
+      layoutSection: layoutSectionWithSingleColumn
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/esm/schema/nodes/types/rich-media-common.js

@@ -1,5 +1,4 @@
 /**
- * @stage 0
  * @description The widthType attribute is used to support fixed with media single
  */
 

package/dist/esm/utils/colors.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import * as namedColors from 'css-color-names'; // eslint-disable-line import/extensions
+import * as namedColors from 'css-color-names';
 
 /**
  * We're avoding importing these colors from @atlaskit/theme since we

package/dist/esm/utils/editor-palette.js

@@ -16,9 +16,8 @@
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color
  */
 export function hexToEditorBorderPaletteColor(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   return editorBorderPalette[hexColor.toUpperCase()];
 }
 export var editorBorderPalette = {
@@ -48,9 +47,8 @@ export var editorBorderPalette = {
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color
  */
 export function hexToEditorTextPaletteColor(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   return editorTextPalette[hexColor.toUpperCase()];
 }
 export var editorTextPalette = {
@@ -112,9 +110,8 @@ export var editorTextPalette = {
  * - **DO**: store the ADF hex color, and use these utilities at render time to display the themed version of the color.
  */
 export function hexToEditorBackgroundPaletteRawValue(hexColor) {
-  // Ts ignore used to allow use of conditional return type
+  // Ts ignore was used to allow use of conditional return type
   // (preferencing better type on consumption over safety in implementation)
-  // @ts-ignore
   var tokenData = editorBackgroundPalette[hexColor.toUpperCase()];
   return tokenData ? tokenData.getValue(hexColor) : undefined;
 }

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

@@ -1243,28 +1243,68 @@
           ]
         },
         "attrs": {
-          "type": "object",
-          "properties": {
-            "width": {
-              "type": "number",
-              "minimum": 0,
-              "maximum": 100
-            },
-            "layout": {
-              "enum": [
-                "wide",
-                "full-width",
-                "center",
-                "wrap-right",
-                "wrap-left",
-                "align-end",
-                "align-start"
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "widthType": {
+                  "enum": [
+                    "percentage"
+                  ]
+                },
+                "width": {
+                  "type": "number",
+                  "minimum": 0,
+                  "maximum": 100
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "additionalProperties": false,
+              "required": [
+                "layout"
               ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "width": {
+                  "type": "number",
+                  "minimum": 0
+                },
+                "widthType": {
+                  "enum": [
+                    "pixel"
+                  ]
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "required": [
+                "width",
+                "widthType",
+                "layout"
+              ],
+              "additionalProperties": false
             }
-          },
-          "additionalProperties": false,
-          "required": [
-            "layout"
           ]
         },
         "marks": {

package/dist/types/schema/nodes/types/rich-media-common.d.ts

@@ -13,13 +13,11 @@ export interface OptionalRichMediaAttributes {
 }
 interface DefaultMediaAttributes extends RichMediaAttributes {
     /**
-     * @stage 0
      * @description optional widthType attribute for media with percentage layout
      */
     widthType?: 'percentage';
 }
 /**
- * @stage 0
  * @description The widthType attribute is used to support fixed with media single
  */
 interface FixedLayoutMediaAttributes {

package/json-schema/v1/full.json

@@ -1243,28 +1243,68 @@
           ]
         },
         "attrs": {
-          "type": "object",
-          "properties": {
-            "width": {
-              "type": "number",
-              "minimum": 0,
-              "maximum": 100
-            },
-            "layout": {
-              "enum": [
-                "wide",
-                "full-width",
-                "center",
-                "wrap-right",
-                "wrap-left",
-                "align-end",
-                "align-start"
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "widthType": {
+                  "enum": [
+                    "percentage"
+                  ]
+                },
+                "width": {
+                  "type": "number",
+                  "minimum": 0,
+                  "maximum": 100
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "additionalProperties": false,
+              "required": [
+                "layout"
               ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "width": {
+                  "type": "number",
+                  "minimum": 0
+                },
+                "widthType": {
+                  "enum": [
+                    "pixel"
+                  ]
+                },
+                "layout": {
+                  "enum": [
+                    "wide",
+                    "full-width",
+                    "center",
+                    "wrap-right",
+                    "wrap-left",
+                    "align-end",
+                    "align-start"
+                  ]
+                }
+              },
+              "required": [
+                "width",
+                "widthType",
+                "layout"
+              ],
+              "additionalProperties": false
             }
-          },
-          "additionalProperties": false,
-          "required": [
-            "layout"
           ]
         },
         "marks": {

package/package.json

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