@atlaskit/editor-plugin-table 2.0.1 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-table
 
+## 2.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.0
+
+### Minor Changes
+
+- [`48ebe1fa732`](https://bitbucket.org/atlassian/atlassian-frontend/commits/48ebe1fa732) - [ED-18895] Moved table integration tests to dedicated editor plugin test package to avoid circular dependencies
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "2.0.1",
+	"version": "2.1.1",
 	"sideEffects": false
 }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "2.0.1",
+	"version": "2.1.1",
 	"sideEffects": false
 }

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "2.0.1",
+	"version": "2.1.1",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -27,11 +27,11 @@
     "releaseModel": "continuous"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^26.1.0",
-    "@atlaskit/editor-common": "^74.18.0",
+    "@atlaskit/adf-schema": "^26.2.0",
+    "@atlaskit/editor-common": "^74.19.0",
     "@atlaskit/editor-palette": "1.5.1",
-    "@atlaskit/editor-plugin-analytics": "^0.0.5",
-    "@atlaskit/editor-plugin-content-insertion": "^0.0.5",
+    "@atlaskit/editor-plugin-analytics": "^0.1.0",
+    "@atlaskit/editor-plugin-content-insertion": "^0.0.6",
     "@atlaskit/editor-shared-styles": "^2.4.0",
     "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/icon": "^21.12.0",
@@ -61,7 +61,6 @@
   },
   "devDependencies": {
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-core": "^185.11.0",
     "@atlaskit/editor-plugin-decorations": "^0.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^0.1.0",
     "@atlaskit/editor-plugin-grid": "^0.1.0",

package/src/__tests__/integration/layout.ts

@@ -22,8 +22,6 @@ import {
   mountEditor,
 } from '@atlaskit/editor-test-helpers/testing-example-page';
 
-import messages from '@atlaskit/editor-core/src/messages';
-
 BrowserTestCase(
   'Avoid overflow when table scale to wide',
   { skip: ['safari', 'firefox'] },
@@ -175,10 +173,7 @@ BrowserTestCase(
 
     await page.waitForSelector('.extension-container p');
     await page.click('.extension-container p');
-    await changeSelectedNodeLayout(
-      page,
-      messages.layoutFixedWidth.defaultMessage,
-    );
+    await changeSelectedNodeLayout(page, 'Back to center');
     await animationFrame(page);
 
     const doc = await page.$eval(editable, getDocFromElement);

package/src/__tests__/unit/analytics.ts

@@ -41,8 +41,6 @@ import { pluginKey } from '../../plugins/table/pm-plugins/plugin-key';
 import { replaceSelectedTable } from '../../plugins/table/transforms';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import tablePlugin from '../../plugins/table-plugin';
-import typeAheadPlugin from '@atlaskit/editor-core/src/plugins/type-ahead';
-import quickInsertPlugin from '@atlaskit/editor-core/src/plugins/quick-insert';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
@@ -97,9 +95,7 @@ describe('Table analytic events', () => {
           analyticsPluginFake as unknown as typeof analyticsPlugin,
           { createAnalyticsEvent: jest.fn() },
         ])
-        .add(typeAheadPlugin)
         .add(contentInsertionPlugin)
-        .add(quickInsertPlugin)
         .add(widthPlugin)
         .add([tablePlugin, { tableOptions }]),
       pluginKey,
@@ -108,23 +104,6 @@ describe('Table analytic events', () => {
     return _editor;
   };
 
-  describe('table inserted via quickInsert', () => {
-    beforeEach(async () => {
-      const { typeAheadTool } = editor(doc(p('{<>}')));
-      typeAheadTool.searchQuickInsert('Table').insert({ index: 0 });
-    });
-
-    it('should fire v3 analytics', () => {
-      expect(mockAttachPayload).toBeCalledWith({
-        action: 'inserted',
-        actionSubject: 'document',
-        actionSubjectId: 'table',
-        attributes: expect.objectContaining({ inputMethod: 'quickInsert' }),
-        eventType: 'track',
-      });
-    });
-  });
-
   describe('table deleted', () => {
     beforeEach(() => {
       const { editorView } = editor(defaultTableDoc);

package/src/__tests__/unit/commands/misc.ts

@@ -14,7 +14,6 @@ import {
   LightEditorPlugin,
   createProsemirrorEditorFactory,
 } from '@atlaskit/editor-test-helpers/create-prosemirror-editor';
-import panelPlugin from '@atlaskit/editor-core/src/plugins/panel';
 import {
   selectColumn,
   moveCursorBackward,
@@ -39,7 +38,6 @@ describe('table plugin: commands', () => {
     .add([featureFlagsPlugin, {}])
     .add([analyticsPlugin, {}])
     .add(decorationsPlugin)
-    .add(panelPlugin)
     .add(contentInsertionPlugin)
     .add(widthPlugin)
     .add([

package/src/__tests__/unit/commands/sort.ts

@@ -10,21 +10,11 @@ import {
   td,
   th,
   tr,
-  mention,
-  date,
-  a,
-  status,
 } from '@atlaskit/editor-test-helpers/doc-builder';
-import { EditorView } from 'prosemirror-view';
 import { sortByColumn } from '../../../plugins/table/commands/sort';
 import { uuid } from '@atlaskit/adf-schema';
 import { TableSortOrder as SortOrder } from '@atlaskit/adf-schema/steps';
 import tablePlugin from '../../../plugins/table-plugin';
-import statusPlugin from '@atlaskit/editor-core/src/plugins/status';
-import mentionsPlugin from '@atlaskit/editor-core/src/plugins/mentions';
-import editorDisabledPlugin from '@atlaskit/editor-core/src/plugins/editor-disabled';
-import hyperlinkPlugin from '@atlaskit/editor-core/src/plugins/hyperlink';
-import datePlugin from '@atlaskit/editor-core/src/plugins/date';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
@@ -122,125 +112,4 @@ describe('Sort Table', () => {
       ),
     );
   });
-
-  describe('mixed content ordering', () => {
-    let editorView: EditorView;
-
-    beforeEach(() => {
-      ({ editorView } = createEditor({
-        preset: new Preset<LightEditorPlugin>()
-          .add([featureFlagsPlugin, {}])
-          .add([analyticsPlugin, {}])
-          .add(contentInsertionPlugin)
-          .add(editorDisabledPlugin)
-          .add(widthPlugin)
-          .add([tablePlugin, { tableOptions: { allowHeaderRow: true } }])
-          .add([statusPlugin, { menuDisabled: false }])
-          .add(mentionsPlugin)
-          .add(hyperlinkPlugin)
-          .add(datePlugin),
-        doc: doc(
-          table()(
-            tr(th({})(p('Mixed{<>}'))),
-            tr(td({})(p(a({ href: '' })('LinkB')))),
-            tr(td({})(p('a1'))),
-            tr(
-              td({})(
-                p(status({ text: 'statusB', color: '#FFF', localId: 'a' })),
-              ),
-            ),
-            tr(td({})(p('10'))),
-            tr(td({})(p('b1'))),
-            tr(td({})(p(mention({ id: 'a', text: 'MentionA' })()))),
-            tr(td({})(p('20'))),
-            tr(
-              td({})(p(date({ timestamp: new Date('2019-01-01').getTime() }))),
-            ),
-            tr(td({})(p(a({ href: '' })('LinkA')))),
-            tr(td({})(p(mention({ id: 'a', text: 'MentionB' })()))),
-            tr(
-              td({})(
-                p(status({ text: 'statusA', color: '#FFF', localId: 'a' })),
-              ),
-            ),
-            tr(
-              td({})(p(date({ timestamp: new Date('2020-01-01').getTime() }))),
-            ),
-          ),
-        ),
-      }));
-    });
-
-    it('should test a basic table ascending', () => {
-      sortByColumn(0, SortOrder.ASC)(editorView.state, editorView.dispatch);
-
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          table({ localId: TABLE_LOCAL_ID })(
-            tr(th({})(p('Mixed{<>}'))),
-            tr(td({})(p('10'))),
-            tr(td({})(p('20'))),
-            tr(td({})(p('a1'))),
-            tr(td({})(p('b1'))),
-            tr(td({})(p(mention({ id: 'a', text: 'MentionA' })()))),
-            tr(td({})(p(mention({ id: 'a', text: 'MentionB' })()))),
-            tr(
-              td({})(p(date({ timestamp: new Date('2019-01-01').getTime() }))),
-            ),
-            tr(
-              td({})(p(date({ timestamp: new Date('2020-01-01').getTime() }))),
-            ),
-            tr(
-              td({})(
-                p(status({ text: 'statusA', color: '#FFF', localId: 'a' })),
-              ),
-            ),
-            tr(
-              td({})(
-                p(status({ text: 'statusB', color: '#FFF', localId: 'a' })),
-              ),
-            ),
-            tr(td({})(p(a({ href: '' })('LinkA')))),
-            tr(td({})(p(a({ href: '' })('LinkB')))),
-          ),
-        ),
-      );
-    });
-
-    it('should test a basic table descending', () => {
-      sortByColumn(0, SortOrder.DESC)(editorView.state, editorView.dispatch);
-
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          table({ localId: TABLE_LOCAL_ID })(
-            tr(th({})(p('Mixed{<>}'))),
-            tr(td({})(p(a({ href: '' })('LinkB')))),
-            tr(td({})(p(a({ href: '' })('LinkA')))),
-            tr(
-              td({})(
-                p(status({ text: 'statusB', color: '#FFF', localId: 'a' })),
-              ),
-            ),
-            tr(
-              td({})(
-                p(status({ text: 'statusA', color: '#FFF', localId: 'a' })),
-              ),
-            ),
-            tr(
-              td({})(p(date({ timestamp: new Date('2020-01-01').getTime() }))),
-            ),
-            tr(
-              td({})(p(date({ timestamp: new Date('2019-01-01').getTime() }))),
-            ),
-            tr(td({})(p(mention({ id: 'a', text: 'MentionB' })()))),
-            tr(td({})(p(mention({ id: 'a', text: 'MentionA' })()))),
-            tr(td({})(p('b1'))),
-            tr(td({})(p('a1'))),
-            tr(td({})(p('20'))),
-            tr(td({})(p('10'))),
-          ),
-        ),
-      );
-    });
-  });
 });

package/src/__tests__/unit/commands.ts

@@ -21,24 +21,14 @@ import {
   tdCursor,
   tdEmpty,
   thCursor,
-  thEmpty,
   th,
   tr,
-  expand,
-  bodiedExtension,
   DocBuilder,
 } from '@atlaskit/editor-test-helpers/doc-builder';
 
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import {
-  getFreshMediaProvider,
-  temporaryMediaGroup,
-} from '@atlaskit/editor-test-helpers/media-provider';
-
-import type { EditorProps } from '@atlaskit/editor-core';
 import {
   addBoldInEmptyHeaderCells,
-  clearMultipleCells,
   selectColumn,
   selectRow,
   setEditorFocus,
@@ -50,21 +40,13 @@ import {
   transformSliceToAddTableHeaders,
 } from '../../plugins/table/commands';
 import { splitCell } from '../../plugins/table/commands/split-cell';
-import { wrapTableInExpand } from '../../plugins/table/commands/collapse';
 import { handleCut } from '../../plugins/table/event-handlers';
 import { getPluginState } from '../../plugins/table/pm-plugins/plugin-factory';
 import { pluginKey } from '../../plugins/table/pm-plugins/plugin-key';
 import tablePlugin from '../../plugins/table';
-import editorDisabledPlugin from '@atlaskit/editor-core/src/plugins/editor-disabled';
-import panelPlugin from '@atlaskit/editor-core/src/plugins/panel';
-import expandPlugin from '@atlaskit/editor-core/src/plugins/expand';
-import extensionPlugin from '@atlaskit/editor-core/src/plugins/extension';
-import mediaPlugin from '@atlaskit/editor-core/src/plugins/media';
-import floatingToolbarPlugin from '@atlaskit/editor-core/src/plugins/floating-toolbar';
 
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import textFormattingPlugin from '@atlaskit/editor-core/src/plugins/text-formatting';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
@@ -82,25 +64,18 @@ describe('table plugin: actions', () => {
   });
 
   const createEditor = createProsemirrorEditorFactory();
-  const editor = (doc: DocBuilder, props: Partial<EditorProps> = {}) =>
+  const editor = (doc: DocBuilder) =>
     createEditor({
       doc,
       attachTo: document.body,
       preset: new Preset<LightEditorPlugin>()
         .add([featureFlagsPlugin, {}])
-        .add(editorDisabledPlugin)
         .add([analyticsPlugin, {}])
         .add(contentInsertionPlugin)
         .add(decorationsPlugin)
         .add(widthPlugin)
         .add(gridPlugin)
-        .add(tablePlugin)
-        .add(panelPlugin)
-        .add(textFormattingPlugin)
-        .add(extensionPlugin)
-        .add(floatingToolbarPlugin)
-        .add([mediaPlugin, { allowMediaSingle: true }])
-        .add(expandPlugin),
+        .add(tablePlugin),
       pluginKey,
     });
 
@@ -264,56 +239,6 @@ describe('table plugin: actions', () => {
     });
   });
 
-  describe('#clearMultipleCells', () => {
-    it('should empty selected cells', () => {
-      const { editorView } = editor(
-        doc(
-          p('text'),
-          table()(
-            tr(td()(p('c1')), tdEmpty),
-            tr(td()(panelNote(p('text'))), tdEmpty),
-          ),
-        ),
-      );
-      const { state, dispatch } = editorView;
-      selectColumn(0)(state, dispatch);
-      clearMultipleCells()(editorView.state, dispatch);
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          p('text'),
-          table({ localId: TABLE_LOCAL_ID })(
-            tr(tdEmpty, tdEmpty),
-            tr(tdEmpty, tdEmpty),
-          ),
-        ),
-      );
-    });
-
-    it('should empty cell with the cursor', () => {
-      const { editorView } = editor(
-        doc(
-          p('text'),
-          table()(
-            tr(td()(p('c1')), tdEmpty),
-            tr(td()(panelNote(p('te{<>}xt'))), tdEmpty),
-          ),
-        ),
-      );
-      const { state, dispatch } = editorView;
-      clearMultipleCells(state.selection.$from.pos)(editorView.state, dispatch);
-
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          p('text'),
-          table({ localId: TABLE_LOCAL_ID })(
-            tr(td()(p('c1')), tdEmpty),
-            tr(tdEmpty, tdEmpty),
-          ),
-        ),
-      );
-    });
-  });
-
   describe('#setMultipleCellAttrs', () => {
     it('should set selected cell attributes', () => {
       const { editorView } = editor(
@@ -341,31 +266,6 @@ describe('table plugin: actions', () => {
         ),
       );
     });
-    it('should set cell attributes if the cell has cursor', () => {
-      const { editorView } = editor(
-        doc(
-          p('text'),
-          table()(
-            tr(tdEmpty, tdEmpty),
-            tr(td()(panelNote(p('te{<>}xt'))), tdEmpty),
-          ),
-        ),
-      );
-      const { state, dispatch } = editorView;
-      setMultipleCellAttrs({ colspan: 2 }, state.selection.$from.pos)(
-        editorView.state,
-        dispatch,
-      );
-      expect(editorView.state).toEqualDocumentAndSelection(
-        doc(
-          p('text'),
-          table({ localId: TABLE_LOCAL_ID })(
-            tr(tdEmpty, tdEmpty, tdEmpty),
-            tr(td({ colspan: 2 })(panelNote(p('te{<>}xt'))), tdEmpty),
-          ),
-        ),
-      );
-    });
   });
 
   describe('#toggleContextualMenu', () => {
@@ -729,22 +629,6 @@ describe('table plugin: actions', () => {
     });
     describe('when the cursor is on table header cell', () => {
       describe('and the cell is empty', () => {
-        it('should add strong mark on storedMarks', () => {
-          const { editorView } = editor(
-            doc(table()(tr(thCursor), tr(td()(p(''))))),
-          );
-          const { state, dispatch } = editorView;
-
-          const tableCellHeader = findParentNodeOfType(
-            state.schema.nodes.tableHeader,
-          )(state.selection);
-
-          addBoldInEmptyHeaderCells(tableCellHeader!)(state, dispatch);
-          const result = editorView.state.storedMarks || [];
-          expect(result.length).toBeGreaterThan(0);
-          expect(result[0].type).toEqual(state.schema.marks.strong);
-        });
-
         describe('and the user removed the strong mark', () => {
           it('should not add strong mark on storedMarks', () => {
             const { editorView } = editor(
@@ -849,151 +733,5 @@ describe('table plugin: actions', () => {
         ),
       );
     });
-
-    it('should split cell with media selected', () => {
-      const { editorView } = editor(
-        doc(
-          table()(
-            tr(th()(p('')), th()(p('')), th()(p(''))),
-            tr(
-              td({ colspan: 2 })('{<node>}', temporaryMediaGroup),
-              td()(p('')),
-            ),
-          ),
-        ),
-        {
-          media: {
-            allowMediaSingle: true,
-            provider: getFreshMediaProvider(),
-          },
-        },
-      );
-
-      splitCell(editorView.state, editorView.dispatch);
-
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          table({ localId: TABLE_LOCAL_ID })(
-            tr(th()(p('')), th()(p('')), th()(p(''))),
-            tr(td()(temporaryMediaGroup), td()(p('')), td()(p(''))),
-          ),
-        ),
-      );
-    });
-  });
-
-  describe('#wrapTableInExpand', () => {
-    it('should not wrap if selection is not on a table', () => {
-      const { editorView } = editor(
-        doc(
-          p('Cursor here{<>}'),
-          table()(tr(thEmpty, thEmpty, thEmpty), tr(tdEmpty, tdEmpty, tdEmpty)),
-        ),
-        { allowExpand: true, allowTables: { allowCollapse: true } },
-      );
-
-      const result = wrapTableInExpand(editorView.state, editorView.dispatch);
-
-      expect(result).toBeFalsy();
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          p('Cursor {<>}here'),
-          table({ localId: 'test-table-local-id' })(
-            tr(thEmpty, thEmpty, thEmpty),
-            tr(tdEmpty, tdEmpty, tdEmpty),
-          ),
-        ),
-      );
-    });
-
-    it('should be able to wrap a root level table', () => {
-      const { editorView } = editor(
-        doc(
-          table()(
-            tr(thCursor, thEmpty, thEmpty),
-            tr(tdEmpty, tdEmpty, tdEmpty),
-          ),
-        ),
-        { allowExpand: true },
-      );
-
-      const result = wrapTableInExpand(editorView.state, editorView.dispatch);
-
-      expect(result).toBeTruthy();
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          expand()(
-            table({ localId: 'test-table-local-id' })(
-              tr(thEmpty, thEmpty, thEmpty),
-              tr(tdEmpty, tdEmpty, tdEmpty),
-            ),
-          ),
-        ),
-      );
-    });
-
-    it('should not wrap a table under an expand', () => {
-      const { editorView } = editor(
-        doc(
-          expand()(
-            table()(
-              tr(thCursor, thEmpty, thEmpty),
-              tr(tdEmpty, tdEmpty, tdEmpty),
-            ),
-          ),
-        ),
-        { allowExpand: true },
-      );
-
-      const result = wrapTableInExpand(editorView.state, editorView.dispatch);
-
-      expect(result).toBeFalsy();
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          expand()(
-            table({ localId: 'test-table-local-id' })(
-              tr(thEmpty, thEmpty, thEmpty),
-              tr(tdEmpty, tdEmpty, tdEmpty),
-            ),
-          ),
-        ),
-      );
-    });
-
-    it('should not wrap a table inside a bodiedExtension', () => {
-      const { editorView } = editor(
-        doc(
-          bodiedExtension({
-            extensionKey: 'key',
-            extensionType: 'type',
-            localId: 'localId',
-          })(
-            table()(
-              tr(thCursor, thEmpty, thEmpty),
-              tr(tdEmpty, tdEmpty, tdEmpty),
-            ),
-          ),
-        ),
-        { allowExpand: true, allowExtension: true },
-      );
-
-      const result = wrapTableInExpand(editorView.state, editorView.dispatch);
-
-      expect(result).toBeFalsy();
-      expect(editorView.state.doc).toEqualDocument(
-        doc(
-          bodiedExtension({
-            extensionKey: 'key',
-            extensionType: 'type',
-            localId: 'localId',
-          })(
-            table({ localId: 'test-table-local-id' })(
-              tr(thEmpty, thEmpty, thEmpty),
-              tr(tdEmpty, tdEmpty, tdEmpty),
-            ),
-          ),
-        ),
-      );
-    });
   });
 });