@atlaskit/editor-plugin-table 2.6.4 → 2.6.5

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

@@ -1,11 +1,10 @@
-import { PluginKey } from 'prosemirror-state';
-
 import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

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

@@ -1,11 +1,10 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { isColumnSelected } from '@atlaskit/editor-tables/utils';
 import {
   createProsemirrorEditorFactory,

package/src/__tests__/unit/commands.ts

@@ -1,8 +1,3 @@
-import { Fragment, Slice } from 'prosemirror-model';
-import { TextSelection } from 'prosemirror-state';
-import { findParentNodeOfType } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
 import { uuid } from '@atlaskit/adf-schema';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
@@ -13,6 +8,10 @@ import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isRowSelected } from '@atlaskit/editor-tables/utils';
 import {

package/src/__tests__/unit/copy-paste.ts

@@ -1,12 +1,4 @@
-import {
-  Fragment,
-  Node as ProsemirrorNode,
-  Schema,
-  Slice,
-} from 'prosemirror-model';
-import { PluginKey, TextSelection, Transaction } from 'prosemirror-state';
 // @ts-ignore
-import { __serializeForClipboard, EditorView } from 'prosemirror-view';
 
 import { uuid } from '@atlaskit/adf-schema';
 import { transformSliceToRemoveOpenExpand } from '@atlaskit/editor-common/transforms';
@@ -15,6 +7,21 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import {
+  Fragment,
+  Node as ProsemirrorNode,
+  Schema,
+  Slice,
+} from '@atlaskit/editor-prosemirror/model';
+import {
+  PluginKey,
+  TextSelection,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import {
+  __serializeForClipboard,
+  EditorView,
+} from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import {
   getCellsInTable,

package/src/__tests__/unit/event-handlers/index.ts

@@ -1,10 +1,9 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/event-handlers.ts

@@ -1,5 +1,3 @@
-import { TextSelection } from 'prosemirror-state';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
@@ -7,6 +5,7 @@ import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/get-toolbar-config.ts

@@ -1,5 +1,3 @@
-import { EditorView } from 'prosemirror-view';
-
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type {
   FloatingToolbarButton,
@@ -12,6 +10,7 @@ import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/handlers.ts

@@ -1,10 +1,9 @@
-import { PluginKey, TextSelection } from 'prosemirror-state';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/hover-selection.ts

@@ -1,11 +1,10 @@
-import { PluginKey } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   getCellsInColumn,
   getCellsInRow,

package/src/__tests__/unit/index.ts

@@ -1,5 +1,3 @@
-import { TextSelection } from 'prosemirror-state';
-
 import { uuid } from '@atlaskit/adf-schema';
 import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { setNodeSelection } from '@atlaskit/editor-common/utils';
@@ -9,6 +7,7 @@ import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { uuid as tablesUuid } from '@atlaskit/editor-tables';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';

package/src/__tests__/unit/layout.ts

@@ -1,5 +1,3 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { TableLayout } from '@atlaskit/adf-schema';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
@@ -7,6 +5,7 @@ import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import {
   createProsemirrorEditorFactory,

package/src/__tests__/unit/nodeviews/TableComponent.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
 import { render } from '@testing-library/react';
-import { TextSelection } from 'prosemirror-state';
 import { replaceRaf } from 'raf-stub';
 
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { Command } from '@atlaskit/editor-common/types';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/src/utils/select-nodes';
 import {
   findTable,

package/src/__tests__/unit/nodeviews/table.ts

@@ -1,12 +1,11 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
-
 import { TableAttributes } from '@atlaskit/adf-schema';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/pm-plugins/decorations/column-controls.ts

@@ -1,5 +1,4 @@
-import { DecorationSet } from 'prosemirror-view';
-
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { createEditorState } from '@atlaskit/editor-test-helpers/create-editor-state';
 import {
   doc,

package/src/__tests__/unit/pm-plugins/decorations/column-resizing.ts

@@ -1,12 +1,11 @@
-import { PluginKey } from 'prosemirror-state';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-import { DecorationSet, EditorView } from 'prosemirror-view';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
 import { getCellsInColumn } from '@atlaskit/editor-tables/utils';
 import {
   createProsemirrorEditorFactory,

package/src/__tests__/unit/pm-plugins/decorations/plugin.ts

@@ -1,11 +1,10 @@
-import { Selection } from 'prosemirror-state';
-import { DecorationSet } from 'prosemirror-view';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { addColumnAt } from '@atlaskit/editor-tables/utils';
 import {
   createProsemirrorEditorFactory,

package/src/__tests__/unit/pm-plugins/main.ts

@@ -1,13 +1,12 @@
-import { undo } from 'prosemirror-history';
-import { NodeType } from 'prosemirror-model';
-import { Selection } from 'prosemirror-state';
-import * as pmUtils from 'prosemirror-utils';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { undo } from '@atlaskit/editor-prosemirror/history';
+import { NodeType } from '@atlaskit/editor-prosemirror/model';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import * as pmUtils from '@atlaskit/editor-prosemirror/utils';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,
@@ -34,10 +33,12 @@ import * as miscCommands from '../../../plugins/table/commands/misc';
 import { getPluginState } from '../../../plugins/table/pm-plugins/plugin-factory';
 import { pluginKey } from '../../../plugins/table/pm-plugins/plugin-key';
 
-jest.mock('prosemirror-utils', () => {
+jest.mock('@atlaskit/editor-prosemirror/utils', () => {
   // Unblock prosemirror bump:
   // Workaround to enable spy on prosemirror-utils cjs bundle
-  const originalModule = jest.requireActual('prosemirror-utils');
+  const originalModule = jest.requireActual(
+    '@atlaskit/editor-prosemirror/utils',
+  );
 
   return {
     __esModule: true,

package/src/__tests__/unit/pm-plugins/sticky-headers/tableRow.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
 import { render, screen } from '@testing-library/react';
-import { Node as ProseMirrorNode } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
 import createStub, { Stub } from 'raf-stub';
 
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
@@ -12,6 +10,8 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/pm-plugins/table-local-id.ts

@@ -1,10 +1,13 @@
-import { NodeSelection, TextSelection } from 'prosemirror-state';
 // @ts-ignore
-import { __serializeForClipboard } from 'prosemirror-view';
 import { replaceRaf } from 'raf-stub';
 
 import { uuid } from '@atlaskit/adf-schema';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import {
+  NodeSelection,
+  TextSelection,
+} from '@atlaskit/editor-prosemirror/state';
+import { __serializeForClipboard } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { selectTable } from '@atlaskit/editor-tables/utils';
 import { createEditorFactory } from '@atlaskit/editor-test-helpers/create-editor';

package/src/__tests__/unit/pm-plugins/table-resizing/event-handlers.ts

@@ -1,6 +1,3 @@
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import {
   ACTION_SUBJECT,
   EVENT_TYPE,
@@ -12,6 +9,8 @@ import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { EditorState, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   akEditorDefaultLayoutWidth,
   akEditorFullPageMaxWidth,

package/src/__tests__/unit/sort-column.ts

@@ -1,5 +1,3 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { uuid } from '@atlaskit/adf-schema';
 import { TableSortOrder as SortOrder } from '@atlaskit/adf-schema/steps';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
@@ -7,6 +5,7 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/transforms/delete-columns.ts

@@ -1,11 +1,10 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { uuid } from '@atlaskit/adf-schema';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Rect } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import {

package/src/__tests__/unit/transforms/delete-rows.ts

@@ -1,11 +1,10 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { uuid } from '@atlaskit/adf-schema';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Rect } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import {

package/src/__tests__/unit/transforms/merging.ts

@@ -1,11 +1,10 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { uuid } from '@atlaskit/adf-schema';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/ui/ContextualMenu.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { render, screen } from '@testing-library/react';
-import { EditorView } from 'prosemirror-view';
 import { createIntl } from 'react-intl-next';
 
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
@@ -9,6 +8,7 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/ui/FloatingContextualButton.tsx

@@ -1,9 +1,6 @@
 import React from 'react';
 
 import { render, screen } from '@testing-library/react';
-import * as prosemirrorUtils from 'prosemirror-utils';
-import type { ContentNodeWithPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { IntlProvider } from 'react-intl-next';
 
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
@@ -12,6 +9,9 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import * as prosemirrorUtils from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,
@@ -32,10 +32,12 @@ import FloatingContextualButton, {
   Props as FloatingContextualButtonProps,
 } from '../../../plugins/table/ui/FloatingContextualButton';
 
-jest.mock('prosemirror-utils', () => {
+jest.mock('@atlaskit/editor-prosemirror/utils', () => {
   // Unblock prosemirror bump:
   // Workaround to enable spy on prosemirror-utils cjs bundle
-  const originalModule = jest.requireActual('prosemirror-utils');
+  const originalModule = jest.requireActual(
+    '@atlaskit/editor-prosemirror/utils',
+  );
 
   return {
     __esModule: true,

package/src/__tests__/unit/ui/FloatingContextualMenu.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { render, screen } from '@testing-library/react';
-import { EditorView } from 'prosemirror-view';
 import { IntlProvider } from 'react-intl-next';
 
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
@@ -9,6 +8,7 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/ui/FloatingDeleteButton.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
 import { fireEvent, render, screen } from '@testing-library/react';
-import { EditorView } from 'prosemirror-view';
 import { IntlProvider } from 'react-intl-next';
 
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { getCellsInColumn, selectTable } from '@atlaskit/editor-tables/utils';
 import { createEditorFactory } from '@atlaskit/editor-test-helpers/create-editor';
 import {

package/src/__tests__/unit/ui/FloatingInsertButton.tsx

@@ -1,9 +1,6 @@
 import React from 'react';
 
 import { render, screen } from '@testing-library/react';
-import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
-import * as prosemirrorUtils from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { createIntl, IntlProvider } from 'react-intl-next';
 
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
@@ -13,6 +10,9 @@ import {
   CONTENT_COMPONENT,
   EVENT_TYPE,
 } from '@atlaskit/editor-common/analytics';
+import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import * as prosemirrorUtils from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { createEditorFactory } from '@atlaskit/editor-test-helpers/create-editor';
 import {
   doc,
@@ -39,10 +39,12 @@ import {
   Props as FloatingInsertButtonProps,
 } from '../../../plugins/table/ui/FloatingInsertButton';
 
-jest.mock('prosemirror-utils', () => {
+jest.mock('@atlaskit/editor-prosemirror/utils', () => {
   // Unblock prosemirror bump:
   // Workaround to enable spy on prosemirror-utils cjs bundle
-  const originalModule = jest.requireActual('prosemirror-utils');
+  const originalModule = jest.requireActual(
+    '@atlaskit/editor-prosemirror/utils',
+  );
 
   return {
     __esModule: true,

package/src/__tests__/unit/ui/TableFloatingControls.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { render, screen } from '@testing-library/react';
-import { PluginKey } from 'prosemirror-state';
 import { IntlProvider } from 'react-intl-next';
 
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
@@ -9,6 +8,7 @@ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertio
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/undo-redo.ts

@@ -1,12 +1,12 @@
 import clone from 'lodash/clone';
-import { redo, undo } from 'prosemirror-history';
-import { EditorView } from 'prosemirror-view';
 
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { redo, undo } from '@atlaskit/editor-prosemirror/history';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/__tests__/unit/utils.ts

@@ -1,10 +1,9 @@
-import { PluginKey } from 'prosemirror-state';
-
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import {
   createProsemirrorEditorFactory,
   LightEditorPlugin,

package/src/plugins/table/commands/clear.ts

@@ -1,7 +1,6 @@
 // #region Imports
-import { Selection } from 'prosemirror-state';
-
 import { Command } from '@atlaskit/editor-common/types';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import {
   emptyCell,

package/src/plugins/table/commands/go-to-next-cell.ts

@@ -1,9 +1,9 @@
 // #region Constants
-import { findParentNodeOfType } from 'prosemirror-utils';
 
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { Command } from '@atlaskit/editor-common/types';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { Direction } from '@atlaskit/editor-tables/types';
 import {

package/src/plugins/table/commands/insert.ts

@@ -1,11 +1,10 @@
 // #region Imports
-import { Selection, Transaction } from 'prosemirror-state';
-import { safeInsert } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
 import { AddColumnStep } from '@atlaskit/adf-schema/steps';
 import { Command } from '@atlaskit/editor-common/types';
 import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
+import { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import {
   addColumnAt as addColumnAtPMUtils,

package/src/plugins/table/commands/misc.ts

@@ -1,9 +1,4 @@
 // #region Imports
-import { Node as PMNode, Schema, Slice } from 'prosemirror-model';
-import { TextSelection, Transaction } from 'prosemirror-state';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
 import { Command } from '@atlaskit/editor-common/types';
 import {
@@ -12,6 +7,14 @@ import {
   isTextSelection,
   mapSlice,
 } from '@atlaskit/editor-common/utils';
+import {
+  Node as PMNode,
+  Schema,
+  Slice,
+} from '@atlaskit/editor-prosemirror/model';
+import { TextSelection, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import {

package/src/plugins/table/commands/referentiality.ts

@@ -1,6 +1,5 @@
-import { Node as PMNode } from 'prosemirror-model';
-
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 
 import { createCommand } from '../pm-plugins/plugin-factory';