@atlaskit/adf-schema 29.1.2 → 30.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 30.0.0
+
+### Major Changes
+
+- a20ef7f: Remove editor-tables
+
+## 29.2.0
+
+### Minor Changes
+
+- e5770f4: Promote table width attribute to full schema
+
 ## 29.1.2
 
 ### Patch Changes

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

@@ -25,7 +25,6 @@ var getSchemaBasedOnStage = (0, _memoizeOne.default)(function () {
   if (stage === 'stage0') {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: _nodes.layoutSectionWithSingleColumn,
-      table: _nodes.tableWithCustomWidth,
       mediaSingle: _nodes.mediaSingleFull
     };
   }

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

@@ -159,7 +159,6 @@ exports.tableBackgroundColorNames = tableBackgroundColorNames;
 
 // TODO: Fix any, potential issue. ED-5048
 var createTableSpec = function createTableSpec() {
-  var allowCustomWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -172,16 +171,14 @@ var createTableSpec = function createTableSpec() {
     },
     localId: {
       default: ''
-    }
-  };
-  var finalAttrs = allowCustomWidth ? _objectSpread(_objectSpread({}, attrs), {}, {
+    },
     width: {
       default: null
     }
-  }) : attrs;
+  };
   var tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -218,9 +215,13 @@ var createTableSpec = function createTableSpec() {
   };
   return tableNodeSpec;
 };
-var table = createTableSpec(false);
+
+// TODO: assuming breaking changes aren't allowed, so retaining both exports
+/** Includes table width attribute */
+var table = createTableSpec();
+/** @deprecated Do not use, instead use the regular `table` export */
 exports.table = table;
-var tableWithCustomWidth = createTableSpec(true);
+var tableWithCustomWidth = createTableSpec();
 exports.tableWithCustomWidth = tableWithCustomWidth;
 var shouldIncludeAttribute = function shouldIncludeAttribute(key, value) {
   return !key.startsWith('__') && (key !== 'localId' || !!value);

package/dist/cjs/steps.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "AddColumnStep", {
-  enumerable: true,
-  get: function get() {
-    return _addColumn.AddColumnStep;
-  }
-});
 Object.defineProperty(exports, "AnalyticsStep", {
   enumerable: true,
   get: function get() {
@@ -45,22 +39,7 @@ Object.defineProperty(exports, "SetAttrsStep", {
     return _setAttrs.SetAttrsStep;
   }
 });
-Object.defineProperty(exports, "TableSortOrder", {
-  enumerable: true,
-  get: function get() {
-    return _constants.SortOrder;
-  }
-});
-Object.defineProperty(exports, "TableSortStep", {
-  enumerable: true,
-  get: function get() {
-    return _sortColumn.TableSortStep;
-  }
-});
-var _constants = require("./steps/table/constants");
-var _sortColumn = require("./steps/table/sort-column");
 var _typeAhead = require("./steps/type-ahead");
-var _addColumn = require("./steps/table/add-column");
 var _setAttrs = require("./steps/set-attrs");
 var _analytics = require("./steps/analytics");
 var _linkMetaStep = require("./steps/link-meta-step");

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

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

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

@@ -135,7 +135,7 @@ export const tableBackgroundColorNames = new Map();
  */
 
 // TODO: Fix any, potential issue. ED-5048
-const createTableSpec = (allowCustomWidth = false) => {
+const createTableSpec = () => {
   const attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -148,17 +148,14 @@ const createTableSpec = (allowCustomWidth = false) => {
     },
     localId: {
       default: ''
-    }
-  };
-  const finalAttrs = allowCustomWidth ? {
-    ...attrs,
+    },
     width: {
       default: null
     }
-  } : attrs;
+  };
   const tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -195,8 +192,12 @@ const createTableSpec = (allowCustomWidth = false) => {
   };
   return tableNodeSpec;
 };
-export const table = createTableSpec(false);
-export const tableWithCustomWidth = createTableSpec(true);
+
+// TODO: assuming breaking changes aren't allowed, so retaining both exports
+/** Includes table width attribute */
+export const table = createTableSpec();
+/** @deprecated Do not use, instead use the regular `table` export */
+export const tableWithCustomWidth = 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/es2019/steps.js

@@ -1,7 +1,4 @@
-export { SortOrder as TableSortOrder } from './steps/table/constants';
-export { TableSortStep } from './steps/table/sort-column';
 export { InsertTypeAheadStages, InsertTypeAheadStep } from './steps/type-ahead';
-export { AddColumnStep } from './steps/table/add-column';
 export { SetAttrsStep } from './steps/set-attrs';
 export { AnalyticsStep } from './steps/analytics';
 export { LinkMetaStep } from './steps/link-meta-step';

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

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

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

@@ -142,7 +142,6 @@ export var tableBackgroundColorNames = new Map();
 
 // TODO: Fix any, potential issue. ED-5048
 var createTableSpec = function createTableSpec() {
-  var allowCustomWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var attrs = {
     isNumberColumnEnabled: {
       default: false
@@ -155,16 +154,14 @@ var createTableSpec = function createTableSpec() {
     },
     localId: {
       default: ''
-    }
-  };
-  var finalAttrs = allowCustomWidth ? _objectSpread(_objectSpread({}, attrs), {}, {
+    },
     width: {
       default: null
     }
-  }) : attrs;
+  };
   var tableNodeSpec = {
     content: 'tableRow+',
-    attrs: finalAttrs,
+    attrs: attrs,
     marks: 'unsupportedMark unsupportedNodeAttribute',
     tableRole: 'table',
     isolating: true,
@@ -201,8 +198,12 @@ var createTableSpec = function createTableSpec() {
   };
   return tableNodeSpec;
 };
-export var table = createTableSpec(false);
-export var tableWithCustomWidth = createTableSpec(true);
+
+// TODO: assuming breaking changes aren't allowed, so retaining both exports
+/** Includes table width attribute */
+export var table = createTableSpec();
+/** @deprecated Do not use, instead use the regular `table` export */
+export var tableWithCustomWidth = createTableSpec();
 var shouldIncludeAttribute = function shouldIncludeAttribute(key, value) {
   return !key.startsWith('__') && (key !== 'localId' || !!value);
 };

package/dist/esm/steps.js

@@ -1,7 +1,4 @@
-export { SortOrder as TableSortOrder } from './steps/table/constants';
-export { TableSortStep } from './steps/table/sort-column';
 export { InsertTypeAheadStages, InsertTypeAheadStep } from './steps/type-ahead';
-export { AddColumnStep } from './steps/table/add-column';
 export { SetAttrsStep } from './steps/set-attrs';
 export { AnalyticsStep } from './steps/analytics';
 export { LinkMetaStep } from './steps/link-meta-step';

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

@@ -2045,6 +2045,9 @@
             "localId": {
               "type": "string",
               "minLength": 1
+            },
+            "width": {
+              "type": "number"
             }
           },
           "additionalProperties": false

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

@@ -1,5 +1,4 @@
 import { Node as PmNode, NodeSpec } from '@atlaskit/editor-prosemirror/model';
-import { CellAttributes } from '@atlaskit/editor-tables/types';
 import { PanelDefinition as Panel } from './panel';
 import { ParagraphDefinition as Paragraph, ParagraphWithAlignmentDefinition as ParagraphWithMarks } from './paragraph';
 import { BlockQuoteDefinition as Blockquote } from './blockquote';
@@ -17,7 +16,12 @@ import { BlockCardDefinition as BlockCard } from './block-card';
 import { EmbedCardDefinition as EmbedCard } from './embed-card';
 import { NestedExpandDefinition as NestedExpand } from './nested-expand';
 import { FragmentDefinition } from '../marks/fragment';
-export type { CellAttributes };
+export interface CellAttributes {
+    colspan?: number;
+    rowspan?: number;
+    colwidth?: number[];
+    background?: string;
+}
 export declare const tablePrefixSelector = "pm-table";
 export declare const tableCellSelector: string;
 export declare const tableHeaderSelector: string;
@@ -55,9 +59,6 @@ export interface TableAttributes {
      * @minLength 1
      */
     localId?: string;
-    /**
-     * @stage 0
-     */
     width?: number;
 }
 /**
@@ -101,7 +102,9 @@ export interface TableHeader {
     attrs?: CellAttributes;
     content: TableCellContent;
 }
+/** Includes table width attribute */
 export declare const table: NodeSpec;
+/** @deprecated Do not use, instead use the regular `table` export */
 export declare const tableWithCustomWidth: NodeSpec;
 export declare const tableToJSON: (node: PmNode) => {
     attrs: import("prosemirror-model").Attrs;

package/dist/types/steps.d.ts

@@ -1,10 +1,6 @@
-export { SortOrder as TableSortOrder } from './steps/table/constants';
-export { TableSortStep } from './steps/table/sort-column';
 export { InsertTypeAheadStages, InsertTypeAheadStep } from './steps/type-ahead';
-export { AddColumnStep } from './steps/table/add-column';
 export { SetAttrsStep } from './steps/set-attrs';
 export { AnalyticsStep } from './steps/analytics';
-export type { TableColumnOrdering } from './steps/table/types';
 export type { AnalyticsInvertStep, AnalyticsWithChannel, AnalyticsPayload, } from './steps/analytics';
 export { LinkMetaStep } from './steps/link-meta-step';
 export type { LinkStepMetadata } from './steps/link-meta-step';

package/json-schema/v1/full.json

@@ -2045,6 +2045,9 @@
             "localId": {
               "type": "string",
               "minLength": 1
+            },
+            "width": {
+              "type": "number"
             }
           },
           "additionalProperties": false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "29.1.2",
+  "version": "30.0.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -33,7 +33,6 @@
   "dependencies": {
     "@atlaskit/codemod-utils": "^4.2.0",
     "@atlaskit/editor-prosemirror": "*",
-    "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/json-schema-generator": "^3.3.6",
     "@babel/runtime": "^7.0.0",
     "css-color-names": "0.0.4",