@atlaskit/adf-schema 28.1.8 → 28.1.9

package/src/steps/table/__tests__/add-column-merge-rows.ts

@@ -166,7 +166,9 @@ describe('AddColumnStep', () => {
             addColumnAtFactory('table', column)(editorState, refs),
           );
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -184,7 +186,9 @@ describe('AddColumnStep', () => {
             removeColumnAtFactory('table', column)(editorState, refs),
           );
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -214,7 +218,9 @@ describe('AddColumnStep', () => {
           transaction,
           editorState,
         );
-        expect(editorState.doc).toEqualDocument(originalDoc);
+        expect(editorState.doc.toJSON()).toEqual(
+          originalDoc(defaultSchema).toJSON(),
+        );
       });
     });
 
@@ -323,7 +329,9 @@ describe('AddColumnStep', () => {
 
           editorState = editorState.apply(editorState.tr.step(addColumnStep!));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -343,7 +351,9 @@ describe('AddColumnStep', () => {
           const addColumnStep = Step.fromJSON(defaultSchema, jsonStep);
           editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
 
@@ -361,7 +371,9 @@ describe('AddColumnStep', () => {
           const addColumnStep = Step.fromJSON(defaultSchema, jsonStep);
           editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
 
@@ -376,7 +388,9 @@ describe('AddColumnStep', () => {
           const addColumnStep = Step.fromJSON(defaultSchema, jsonStep);
           editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
 
@@ -393,7 +407,9 @@ describe('AddColumnStep', () => {
           const addColumnStep = Step.fromJSON(defaultSchema, jsonStep);
           editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });

package/src/steps/table/__tests__/add-column.ts

@@ -119,7 +119,9 @@ describe('AddColumnStep', () => {
         removeColumnAtFactory('table', 0)(editorState, refs),
       );
 
-      expect(editorState.doc).toEqualDocument(doc(p('')));
+      expect(editorState.doc.toJSON()).toEqual(
+        doc(p(''))(defaultSchema).toJSON(),
+      );
     });
 
     it('should add the table after been removed it for a remove column', () => {
@@ -127,7 +129,9 @@ describe('AddColumnStep', () => {
         removeColumnAtFactory('table', 0)(editorState, refs),
         editorState,
       );
-      expect(editorState.doc).toEqualDocument(threeByOne);
+      expect(editorState.doc.toJSON()).toEqual(
+        threeByOne(defaultSchema).toJSON(),
+      );
     });
 
     it('should remove the table after undoing the last column ', function () {
@@ -137,7 +141,9 @@ describe('AddColumnStep', () => {
         [removeColumnAtFactory('table', 1)],
       );
 
-      expect(editorState.doc).toEqualDocument(doc(p('')));
+      expect(editorState.doc.toJSON()).toEqual(
+        doc(p(''))(defaultSchema).toJSON(),
+      );
     });
 
     it('should drop add column step when I remove the column', function () {
@@ -176,10 +182,14 @@ describe('AddColumnStep', () => {
 
       editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
+      const expectedDoc = doc(
+        p(''),
+        '{table}',
+        table()(tr(tdEmpty), tr(tdEmpty), tr(tdEmpty)),
+      )(defaultSchema).toJSON();
+
       // Should keep the new created single column and remove the old one
-      expect(editorState.doc).toEqualDocument(
-        doc(p(''), '{table}', table()(tr(tdEmpty), tr(tdEmpty), tr(tdEmpty))),
-      );
+      expect(editorState.doc.toJSON()).toEqual(expectedDoc);
     });
 
     it('should parse a json that we just generate', function () {
@@ -216,7 +226,9 @@ describe('AddColumnStep', () => {
         editorState.tr.step(removeLastRowInverted),
       );
 
-      expect(editorState.doc).toEqualDocument(threeByOne);
+      expect(editorState.doc.toJSON()).toEqual(
+        threeByOne(defaultSchema).toJSON(),
+      );
     });
 
     it('should remove the table when I received a JSON', () => {
@@ -229,7 +241,9 @@ describe('AddColumnStep', () => {
         editorState.tr.step(removeLastRowInverted),
       );
 
-      expect(editorState.doc).toEqualDocument(doc(p('')));
+      expect(editorState.doc.toJSON()).toEqual(
+        doc(p(''))(defaultSchema).toJSON(),
+      );
     });
   });
 
@@ -313,7 +327,9 @@ describe('AddColumnStep', () => {
             addColumnAtFactory('table', column)(editorState, refs),
           );
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -331,7 +347,9 @@ describe('AddColumnStep', () => {
             removeColumnAtFactory('table', column)(editorState, refs),
           );
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -363,7 +381,9 @@ describe('AddColumnStep', () => {
             addColumnAtFactory('table', column)(editorState, refs),
           );
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -381,7 +401,9 @@ describe('AddColumnStep', () => {
             removeColumnAtFactory('table', column)(editorState, refs),
           );
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -432,7 +454,7 @@ describe('AddColumnStep', () => {
           transaction,
           editorState,
         );
-        expect(editorState.doc).toEqualDocument(originalDoc);
+        expect(editorState.doc.toJSON()).toEqual(originalDoc.toJSON());
       });
     });
 
@@ -496,7 +518,9 @@ describe('AddColumnStep', () => {
 
           editorState = editorState.apply(editorState.tr.step(addColumnStep!));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });
@@ -509,13 +533,13 @@ describe('AddColumnStep', () => {
           [addColumnAtFactory('table', 1), addColumnAtFactory('table', 1)],
         );
 
-        expect(editorState.doc).toEqualDocument(
+        expect(editorState.doc.toJSON()).toEqual(
           doc(
             table()(
               tr(tdColorA, tdEmpty, tdEmpty, tdColorB, tdColorC),
               tr(tdColorA, tdEmpty, tdEmpty, tdColorB, tdColorC),
             ),
-          ),
+          )(defaultSchema).toJSON(),
         );
       });
     });
@@ -533,7 +557,9 @@ describe('AddColumnStep', () => {
           const addColumnStep = Step.fromJSON(defaultSchema, jsonStep);
           editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
 
@@ -548,7 +574,9 @@ describe('AddColumnStep', () => {
           const addColumnStep = Step.fromJSON(defaultSchema, jsonStep);
           editorState = editorState.apply(editorState.tr.step(addColumnStep));
 
-          expect(editorState.doc).toEqualDocument(expectedDoc);
+          expect(editorState.doc.toJSON()).toEqual(
+            expectedDoc(defaultSchema).toJSON(),
+          );
         },
       );
     });

package/src/steps/table/add-column.ts

@@ -1,4 +1,7 @@
-import { Node as ProseMirrorNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import {
+  Node as ProseMirrorNode,
+  Schema,
+} from '@atlaskit/editor-prosemirror/model';
 import {
   Mappable,
   Step,

package/src/steps/table/utils/cells-at-column.ts

@@ -21,7 +21,10 @@ export interface Cell {
  * @param rect
  * @param col
  */
-export function* cellsAtColumn(rect: TableRect, col: number): Generator<Cell, void, number | undefined> {
+export function* cellsAtColumn(
+  rect: TableRect,
+  col: number,
+): Generator<Cell, void, number | undefined> {
   const { map, tableStart, table } = rect;
 
   let refColumn: number | null = col > 0 ? -1 : 0;

package/src/utils/colors.ts

@@ -89,7 +89,7 @@ export function normalizeHexColor(
     // http://dev.w3.org/csswg/css-color/#named-colors
     if (color === 'default') {
       return null;
-    } else if ((namedColors).default && (namedColors as any).default[color]) {
+    } else if (namedColors.default && (namedColors as any).default[color]) {
       color = (namedColors as any).default[color];
     } else if (namedColors && namedColors[color]) {
       color = namedColors[color];