feat: reintroducing table cell schema changes [TOL-2249]

packages/rich-text-types/README.md

@@ -1,3 +1,17 @@
 # rich-text-types
 
 Type definitions and constants for the Contentful rich text field type.
+
+## Updating test snapshots
+
+If you want to update the test snapshots simply run
+
+```properties
+npm run test:update-snapshots
+```
+
+or
+
+```properties
+yarn test:update-snapshots
+```

packages/rich-text-types/package.json

@@ -23,7 +23,8 @@
     "build": "yarn generate-json-schema && tsc --module commonjs && rollup -c --bundleConfigAsCjs rollup.config.js",
     "start": "tsc && rollup -c --bundleConfigAsCjs rollup.config.js -w",
     "generate-json-schema": "ts-node -O '{\"module\": \"commonjs\"}' ./tools/jsonSchemaGen",
-    "test": "jest"
+    "test": "jest",
+    "test:update-snapshots": "jest -u"
   },
   "devDependencies": {
     "@cspotcode/source-map-consumer": "^0.8.0",

packages/rich-text-types/src/nodeTypes.ts

@@ -1,6 +1,14 @@
 import { BLOCKS } from './blocks';
 import { INLINES } from './inlines';
-import { Block, Inline, ListItemBlock, Text } from './types';
+import {
+  Block,
+  Inline,
+  ListItemBlock,
+  TableCellBlock,
+  TableHeaderCellBlock,
+  TableRowBlock,
+  Text,
+} from './types';
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type EmptyNodeData = {};
@@ -198,7 +206,7 @@ export interface ResourceHyperlink extends Inline {
 }
 
 export interface TableCell extends Block {
-  nodeType: BLOCKS.TABLE_HEADER_CELL | BLOCKS.TABLE_CELL;
+  nodeType: BLOCKS.TABLE_CELL;
   data: {
     colspan?: number;
     rowspan?: number;
@@ -207,11 +215,20 @@ export interface TableCell extends Block {
   /**
    * @minItems 1
    */
-  content: Paragraph[];
+  content: TableCellBlock[];
 }
 
-export interface TableHeaderCell extends TableCell {
+export interface TableHeaderCell extends Block {
   nodeType: BLOCKS.TABLE_HEADER_CELL;
+  data: {
+    colspan?: number;
+    rowspan?: number;
+  };
+
+  /**
+   * @minItems 1
+   */
+  content: TableHeaderCellBlock[];
 }
 
 // An abstract table row can have both table cell types
@@ -223,7 +240,7 @@ export interface TableRow extends Block {
   /**
    * @minItems 1
    */
-  content: TableCell[];
+  content: TableRowBlock[];
 }
 
 export interface Table extends Block {

packages/rich-text-types/src/schemaConstraints.ts

@@ -57,6 +57,12 @@ export type ListItemBlockEnum =
   | BLOCKS.EMBEDDED_ASSET
   | BLOCKS.EMBEDDED_RESOURCE;
 
+export type TableRowBlockEnum = BLOCKS.TABLE_CELL | BLOCKS.TABLE_HEADER_CELL;
+
+export type TableCellEnum = BLOCKS.PARAGRAPH | BLOCKS.UL_LIST | BLOCKS.OL_LIST;
+
+export type TableHeaderCellEnum = BLOCKS.PARAGRAPH;
+
 /**
  * Array of all allowed block types inside list items
  */