@atlaskit/editor-plugin-table 2.6.4 → 2.6.6

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';
 

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

@@ -1,6 +1,3 @@
-import { Node as PmNode, ResolvedPos } from 'prosemirror-model';
-import { Selection, TextSelection } from 'prosemirror-state';
-
 import {
   EditorSelectionAPI,
   GapCursorSelection,
@@ -10,6 +7,11 @@ import {
   Side,
 } from '@atlaskit/editor-common/selection';
 import type { Command } from '@atlaskit/editor-common/types';
+import {
+  Node as PmNode,
+  ResolvedPos,
+} from '@atlaskit/editor-prosemirror/model';
+import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';

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

@@ -1,6 +1,3 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { EditorState, Selection, Transaction } from 'prosemirror-state';
-
 import { CardAttributes, DataType, UrlType } from '@atlaskit/adf-schema';
 import {
   TableSortOrder as SortOrder,
@@ -8,6 +5,12 @@ import {
 } from '@atlaskit/adf-schema/steps';
 import { Command } from '@atlaskit/editor-common/types';
 import { createCompareNodes } from '@atlaskit/editor-common/utils';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import {
+  EditorState,
+  Selection,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import {
   convertArrayOfRowsToTableNode,

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

@@ -1,8 +1,8 @@
 //#region Imports
-import { Transaction } from 'prosemirror-state';
 
 import { TableLayout } from '@atlaskit/adf-schema';
 import { Command } from '@atlaskit/editor-common/types';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { findTable, toggleHeader } from '@atlaskit/editor-tables/utils';
 
 import { createCommand } from '../pm-plugins/plugin-factory';

package/src/plugins/table/commands-with-analytics.ts

@@ -1,5 +1,3 @@
-import { Selection } from 'prosemirror-state';
-
 import { tableBackgroundColorPalette, TableLayout } from '@atlaskit/adf-schema';
 import { TableSortOrder as SortOrder } from '@atlaskit/adf-schema/steps';
 import {
@@ -17,6 +15,7 @@ import type {
   Command,
   GetEditorContainerWidth,
 } from '@atlaskit/editor-common/types';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Rect } from '@atlaskit/editor-tables/table-map';
 import {

package/src/plugins/table/event-handlers.ts

@@ -1,12 +1,3 @@
-import { Node as PmNode } from 'prosemirror-model';
-import {
-  EditorState,
-  Selection,
-  TextSelection,
-  Transaction,
-} from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import {
   ACTION_SUBJECT,
@@ -21,6 +12,14 @@ import {
   isLastItemMediaGroup,
   setNodeSelection,
 } from '@atlaskit/editor-common/utils';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import {
+  EditorState,
+  Selection,
+  TextSelection,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+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/handlers.ts

@@ -1,11 +1,16 @@
 // #region Imports
-import { NodeType } from 'prosemirror-model';
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-import { ReadonlyTransaction, Transaction } from 'prosemirror-state';
-import { ContentNodeWithPos, findParentNodeOfType } from 'prosemirror-utils';
-
 import { TableColumnOrdering, TableSortStep } from '@atlaskit/adf-schema/steps';
 import { isTextInput } from '@atlaskit/editor-common/utils';
+import { NodeType } from '@atlaskit/editor-prosemirror/model';
+// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
+import {
+  ReadonlyTransaction,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import {
+  ContentNodeWithPos,
+  findParentNodeOfType,
+} from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
 import { defaultTableSelection } from './pm-plugins/default-table-selection';

package/src/plugins/table/index.tsx

@@ -1,8 +1,5 @@
 import React from 'react';
 
-import { Transaction } from 'prosemirror-state';
-import type { EditorView } from 'prosemirror-view';
-
 import {
   table,
   tableCell,
@@ -38,6 +35,8 @@ import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { widthPlugin } from '@atlaskit/editor-plugin-width';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
 import { createTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/nodeviews/TableComponent.tsx

@@ -2,8 +2,6 @@ import React, { CSSProperties } from 'react';
 
 import classnames from 'classnames';
 import memoizeOne from 'memoize-one';
-import { Node as PmNode } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
 import rafSchedule from 'raf-schd';
 
 import type { TableColumnOrdering } from '@atlaskit/adf-schema/steps';
@@ -15,6 +13,8 @@ import type {
   GetEditorFeatureFlags,
 } from '@atlaskit/editor-common/types';
 import { browser, isValidPosition } from '@atlaskit/editor-common/utils';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorTableToolbarSize as tableToolbarSize } from '@atlaskit/editor-shared-styles';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/nodeviews/TableContainer.tsx

@@ -6,14 +6,14 @@ import React, {
 } from 'react';
 
 import classNames from 'classnames';
-import { Node as PMNode } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
 
 import { TableEventPayload } from '@atlaskit/editor-common/analytics';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { calcTableWidth } from '@atlaskit/editor-common/styles';
 import { EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { GuidelineConfig } from '@atlaskit/editor-plugin-guideline';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 
 import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
@@ -118,7 +118,7 @@ export const ResizableTableContainer = ({
 
   const attachAnalyticsEvent = useCallback(
     (payload: TableEventPayload) => {
-      return pluginInjectionApi?.dependencies?.analytics.actions.attachAnalyticsEvent(
+      return pluginInjectionApi?.dependencies?.analytics?.actions.attachAnalyticsEvent(
         payload,
       );
     },

package/src/plugins/table/nodeviews/TableResizer.tsx

@@ -6,9 +6,6 @@ import React, {
   useState,
 } from 'react';
 
-import { Node as PMNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
 import rafSchd from 'raf-schd';
 
 import {
@@ -24,6 +21,9 @@ import {
   ResizerNext,
 } from '@atlaskit/editor-common/resizer';
 import type { GuidelineConfig } from '@atlaskit/editor-plugin-guideline';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables';
 import { findTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/nodeviews/table.tsx

@@ -1,13 +1,5 @@
 import React from 'react';
 
-import {
-  DOMOutputSpec,
-  DOMSerializer,
-  Node as PmNode,
-} from 'prosemirror-model';
-import { EditorState, PluginKey } from 'prosemirror-state';
-import { EditorView, NodeView } from 'prosemirror-view';
-
 import type { TableColumnOrdering } from '@atlaskit/adf-schema/steps';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
@@ -20,6 +12,13 @@ import type {
   getPosHandlerNode,
 } from '@atlaskit/editor-common/types';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
+import {
+  DOMOutputSpec,
+  DOMSerializer,
+  Node as PmNode,
+} from '@atlaskit/editor-prosemirror/model';
+import { EditorState, PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 

package/src/plugins/table/nodeviews/tableCell.tsx

@@ -1,5 +1,3 @@
-import { DOMSerializer, Node } from 'prosemirror-model';
-import { EditorView, NodeView } from 'prosemirror-view';
 import uuid from 'uuid';
 
 import {
@@ -12,6 +10,8 @@ import type {
   GetEditorFeatureFlags,
   getPosHandler,
 } from '@atlaskit/editor-common/types';
+import { DOMSerializer, Node } from '@atlaskit/editor-prosemirror/model';
+import { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 
 const DEFAULT_COL_SPAN = 1;
 const DEFAULT_ROW_SPAN = 1;

package/src/plugins/table/nodeviews/types.ts

@@ -1,12 +1,11 @@
-import { Node as PmNode } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
-
 import { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type {
   GetEditorContainerWidth,
   GetEditorFeatureFlags,
 } from '@atlaskit/editor-common/types';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 
 import type { PluginInjectionAPI } from '../types';
 

package/src/plugins/table/pm-plugins/decorations/plugin.ts

@@ -1,13 +1,12 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import {
   EditorState,
   PluginKey,
   // @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
   ReadonlyTransaction,
   Transaction,
-} from 'prosemirror-state';
-import { DecorationSet } from 'prosemirror-view';
-
-import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+} from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 
 import { pluginKey as tablePluginKey } from '../plugin-key';

package/src/plugins/table/pm-plugins/decorations/utils/column-controls.ts

@@ -1,7 +1,9 @@
 // @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-import { ReadonlyTransaction, Transaction } from 'prosemirror-state';
-import { DecorationSet } from 'prosemirror-view';
-
+import {
+  ReadonlyTransaction,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/pm-plugins/decorations/utils/column-resizing.ts

@@ -1,4 +1,4 @@
-import { Decoration, DecorationSet } from 'prosemirror-view';
+import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 
 import { TableDecorations } from '../../../types';
 import {

package/src/plugins/table/pm-plugins/decorations/utils/compose-decorations.ts

@@ -1,4 +1,4 @@
-import { DecorationSet } from 'prosemirror-view';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 
 import { DecorationTransformer } from './types';
 

package/src/plugins/table/pm-plugins/decorations/utils/types.ts

@@ -1,6 +1,9 @@
 // @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-import { ReadonlyTransaction, Transaction } from 'prosemirror-state';
-import { DecorationSet } from 'prosemirror-view';
+import {
+  ReadonlyTransaction,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 
 export type DecorationTransformer = ({
   decorationSet,

package/src/plugins/table/pm-plugins/keymap.ts

@@ -1,6 +1,3 @@
-import { chainCommands } from 'prosemirror-commands';
-import { keymap } from 'prosemirror-keymap';
-
 import {
   ACTION,
   ACTION_SUBJECT,
@@ -12,6 +9,8 @@ import {
 import * as keymaps from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
+import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
+import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 
 import {
   createTable,

package/src/plugins/table/pm-plugins/main.ts

@@ -1,11 +1,3 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model';
-import { EditorState, TextSelection, Transaction } from 'prosemirror-state';
-import {
-  findParentDomRefOfType,
-  findParentNodeOfType,
-} from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
 import {
   ACTION,
   ACTION_SUBJECT,
@@ -34,6 +26,17 @@ import type {
   getPosHandler,
 } from '@atlaskit/editor-common/types';
 import { browser, closestElement } from '@atlaskit/editor-common/utils';
+import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
+import {
+  EditorState,
+  TextSelection,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import {
+  findParentDomRefOfType,
+  findParentNodeOfType,
+} from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
 import {

package/src/plugins/table/pm-plugins/plugin-key.ts

@@ -1,4 +1,4 @@
-import { PluginKey } from 'prosemirror-state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 
 import { TablePluginState } from '../types';
 

package/src/plugins/table/pm-plugins/safari-delete-composition-text-issue-workaround.ts

@@ -3,10 +3,13 @@
  * https://github.com/ProseMirror/prosemirror/issues/934
  * We will remove this plugin when Webkit fix the problem itself.
  */
-import { PluginKey } from 'prosemirror-state';
-import { Decoration, DecorationSet, EditorView } from 'prosemirror-view';
-
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import {
+  Decoration,
+  DecorationSet,
+  EditorView,
+} from '@atlaskit/editor-prosemirror/view';
 
 interface SafariDeleteCompositionTextIssueWorkaroundPluginState {
   renderSpan: boolean;

package/src/plugins/table/pm-plugins/sticky-headers/nodeviews/tableRow.ts

@@ -1,12 +1,12 @@
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
-import { Node as PmNode } from 'prosemirror-model';
-import { EditorView, NodeView } from 'prosemirror-view';
 
 import { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { mapChildren } from '@atlaskit/editor-common/utils';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 
 import {
   TableCssClassName as ClassName,

package/src/plugins/table/pm-plugins/sticky-headers/plugin-key.ts

@@ -1,4 +1,4 @@
-import { PluginKey } from 'prosemirror-state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 
 import { StickyPluginState } from './types';
 

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

@@ -10,14 +10,14 @@
  * TODO: https://product-fabric.atlassian.net/browse/ED-12714
  *
  */
-import { Node as ProsemirrorNode } from 'prosemirror-model';
-import { EditorState, PluginKey } from 'prosemirror-state';
 import rafSchedule from 'raf-schd';
 
 import { uuid } from '@atlaskit/adf-schema';
 import { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepHasSlice } from '@atlaskit/editor-common/utils';
+import { Node as ProsemirrorNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorState, PluginKey } from '@atlaskit/editor-prosemirror/state';
 
 interface TableLocalIdPluginState {
   // One time parse for initial load with existing tables without localIds

package/src/plugins/table/pm-plugins/table-resizing/commands.ts

@@ -1,8 +1,7 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-
 import type { Command } from '@atlaskit/editor-common/types';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 
 import { updateColumnWidths } from '../../transforms';

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

@@ -1,5 +1,3 @@
-import { EditorView } from 'prosemirror-view';
-
 import { CellAttributes, TableLayout } from '@atlaskit/adf-schema';
 import {
   ACTION_SUBJECT,
@@ -13,6 +11,7 @@ import type {
   GetEditorContainerWidth,
   GetEditorFeatureFlags,
 } from '@atlaskit/editor-common/types';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';

package/src/plugins/table/pm-plugins/table-resizing/plugin-factory.ts

@@ -1,7 +1,6 @@
 // @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-import { ReadonlyTransaction } from 'prosemirror-state';
-
 import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
 
 import { ColumnResizingPluginState } from '../../types';
 

package/src/plugins/table/pm-plugins/table-resizing/plugin-key.ts

@@ -1,4 +1,4 @@
-import { PluginKey } from 'prosemirror-state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 
 import { ColumnResizingPluginState } from '../../types';
 

package/src/plugins/table/pm-plugins/table-resizing/utils/colgroup.ts

@@ -1,7 +1,9 @@
-import { DOMSerializer, Node as PmNode } from 'prosemirror-model';
-
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { getFragmentBackingArray } from '@atlaskit/editor-common/utils';
+import {
+  DOMSerializer,
+  Node as PmNode,
+} from '@atlaskit/editor-prosemirror/model';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 

package/src/plugins/table/pm-plugins/table-resizing/utils/column-state.ts

@@ -1,7 +1,6 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { findDomRefAtPos } from 'prosemirror-utils';
-
 import { tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 
 import { contentWidth } from './content-width';

package/src/plugins/table/pm-plugins/table-resizing/utils/dom.ts

@@ -1,6 +1,3 @@
-import { EditorState } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import {
   tableCellBorderWidth,
   tableMarginTop,
@@ -11,6 +8,8 @@ import {
   containsClassName,
   parsePx,
 } from '@atlaskit/editor-common/utils';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 
 import { updateOverflowShadows } from '../../../nodeviews/update-overflow-shadows';
 import { TableCssClassName as ClassName } from '../../../types';

package/src/plugins/table/pm-plugins/table-resizing/utils/misc.ts

@@ -1,7 +1,3 @@
-import { NodeSpec, Node as PMNode, ResolvedPos } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import { CellAttributes, TableLayout } from '@atlaskit/adf-schema';
 import {
   getParentNodeWidth,
@@ -14,6 +10,13 @@ import {
   mapBreakpointToLayoutMaxWidth,
 } from '@atlaskit/editor-common/ui';
 import { containsClassName } from '@atlaskit/editor-common/utils';
+import {
+  NodeSpec,
+  Node as PMNode,
+  ResolvedPos,
+} from '@atlaskit/editor-prosemirror/model';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   akEditorFullWidthLayoutWidth,
   akEditorGutterPadding,

package/src/plugins/table/pm-plugins/table-resizing/utils/resize-state.ts

@@ -1,6 +1,3 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-
 import { TableLayout } from '@atlaskit/adf-schema';
 import {
   tableCellMinWidth,
@@ -8,6 +5,8 @@ import {
 } from '@atlaskit/editor-common/styles';
 import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Rect } from '@atlaskit/editor-tables/table-map';
 
 import { getSelectedTableInfo } from '../../../utils';

package/src/plugins/table/pm-plugins/table-resizing/utils/scale-table.ts

@@ -1,9 +1,8 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import type { DomAtPos } from 'prosemirror-utils';
-
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { DomAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 
 import { updateColumnWidths } from '../../../transforms';

package/src/plugins/table/pm-plugins/table-resizing/utils/types.ts

@@ -1,4 +1,4 @@
-import { ContentNodeWithPos } from 'prosemirror-utils';
+import { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 
 import { ColumnState } from './column-state';
 

package/src/plugins/table/pm-plugins/table-selection-keymap.ts

@@ -1,5 +1,3 @@
-import { keymap } from 'prosemirror-keymap';
-
 import {
   bindKeymapWithCommand,
   moveLeft,
@@ -7,6 +5,7 @@ import {
 } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
+import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 
 import { arrowLeftFromTable, arrowRightFromTable } from '../commands/selection';
 

package/src/plugins/table/pm-plugins/table-width.ts

@@ -3,12 +3,12 @@
  * Has login to scan the document, add width value to table's width attribute when necessary
  * Also holds resizing state to hide / show table controls
  */
-import { PluginKey } from 'prosemirror-state';
-import { ReplaceStep } from 'prosemirror-transform';
 
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import {
   akEditorFullWidthLayoutWidth,
   akEditorWideLayoutWidth,