@atlaskit/editor-plugin-table 2.6.4 → 2.6.6

package/src/plugins/table/toolbar.tsx

@@ -1,9 +1,5 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { Node as PMNode } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { findParentDomRefOfType } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { defineMessages } from 'react-intl-next';
 
 import { TableSortOrder as SortOrder } from '@atlaskit/adf-schema/steps';
@@ -37,6 +33,10 @@ import {
   getNodeName,
   isReferencedSource,
 } from '@atlaskit/editor-common/utils';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { findParentDomRefOfType } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { Rect } from '@atlaskit/editor-tables/table-map';

package/src/plugins/table/transforms/column-width.ts

@@ -1,8 +1,3 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import {
@@ -10,6 +5,10 @@ import {
   tableNewColumnMinWidth,
 } from '@atlaskit/editor-common/styles';
 import type { GetEditorContainerWidth } 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 { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';

package/src/plugins/table/transforms/delete-columns.ts

@@ -1,8 +1,7 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { Selection, Transaction } from 'prosemirror-state';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
 import { AddColumnStep } from '@atlaskit/adf-schema/steps';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/transforms/delete-rows.ts

@@ -1,7 +1,6 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { Selection, Transaction } from 'prosemirror-state';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/transforms/fix-tables.ts

@@ -1,9 +1,8 @@
-import { Node as PMNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import { TableLayout } from '@atlaskit/adf-schema';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   akEditorDefaultLayoutWidth,
   akEditorWideLayoutWidth,

package/src/plugins/table/transforms/merge.ts

@@ -1,7 +1,6 @@
-import { Fragment, Node as PMNode } from 'prosemirror-model';
-import { Selection, Transaction } from 'prosemirror-state';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
+import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect } from '@atlaskit/editor-tables/utils';

package/src/plugins/table/transforms/replace-table.ts

@@ -1,6 +1,3 @@
-import { Fragment, Slice } from 'prosemirror-model';
-import { EditorState, TextSelection, Transaction } from 'prosemirror-state';
-
 import {
   ACTION_SUBJECT,
   EVENT_TYPE,
@@ -8,6 +5,12 @@ import {
   TABLE_ACTION,
 } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import {
+  EditorState,
+  TextSelection,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 
 import { getSelectedTableInfo } from '../utils';

package/src/plugins/table/transforms/split.ts

@@ -1,7 +1,6 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
+import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 
 /**

package/src/plugins/table/types.ts

@@ -1,6 +1,3 @@
-import { Node as PmNode } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import { DecorationSet } from 'prosemirror-view';
 import { IntlShape } from 'react-intl-next';
 
 import {
@@ -13,6 +10,9 @@ import { TableColumnOrdering } from '@atlaskit/adf-schema/steps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { Rect } from '@atlaskit/editor-tables/table-map';
 
 import type tablePlugin from './index';

package/src/plugins/table/ui/FloatingContextualButton/index.tsx

@@ -2,9 +2,6 @@
 import React from 'react';
 
 import { jsx } from '@emotion/react';
-import { Node as PMNode } from 'prosemirror-model';
-import { findDomRefAtPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { injectIntl, WrappedComponentProps } from 'react-intl-next';
 
 import { TableLayout } from '@atlaskit/adf-schema';
@@ -15,6 +12,9 @@ import {
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ThemeProps } from '@atlaskit/theme/types';

package/src/plugins/table/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -2,7 +2,6 @@
 import { Component } from 'react';
 
 import { jsx } from '@emotion/react';
-import { EditorView } from 'prosemirror-view';
 import {
   defineMessages,
   injectIntl,
@@ -41,6 +40,7 @@ import {
 } from '@atlaskit/editor-common/ui-menu';
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { Rect } from '@atlaskit/editor-tables/table-map';
 import { splitCell } from '@atlaskit/editor-tables/utils';

package/src/plugins/table/ui/FloatingContextualMenu/index.tsx

@@ -1,7 +1,5 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { findDomRefAtPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type {
@@ -9,6 +7,8 @@ import type {
   GetEditorFeatureFlags,
 } from '@atlaskit/editor-common/types';
 import { Popup } from '@atlaskit/editor-common/ui';
+import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import {
   akEditorFloatingDialogZIndex,
   akEditorFloatingOverlapPanelZIndex,

package/src/plugins/table/ui/FloatingDeleteButton/index.tsx

@@ -1,13 +1,13 @@
 import React, { Component, SyntheticEvent } from 'react';
 
-import { Selection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
 import { createPortal } from 'react-dom';
 
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '@atlaskit/editor-common/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import {

package/src/plugins/table/ui/FloatingInsertButton/index.tsx

@@ -1,8 +1,5 @@
 import React from 'react';
 
-import { Node as PmNode } from 'prosemirror-model';
-import { findDomRefAtPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { injectIntl, WrappedComponentProps } from 'react-intl-next';
 
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
@@ -18,6 +15,9 @@ import {
 import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '@atlaskit/editor-common/utils';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { findDomRefAtPos } 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 { findTable } from '@atlaskit/editor-tables/utils';

package/src/plugins/table/ui/LayoutButton/index.tsx

@@ -1,8 +1,6 @@
 import React, { createRef } from 'react';
 
 import classnames from 'classnames';
-import { findDomRefAtPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { injectIntl, WrappedComponentProps } from 'react-intl-next';
 
 import { TableLayout } from '@atlaskit/adf-schema';
@@ -11,6 +9,8 @@ import commonMessages from '@atlaskit/editor-common/messages';
 import { Popup } from '@atlaskit/editor-common/ui';
 import type { PopupPosition } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 

package/src/plugins/table/ui/TableFloatingControls/CornerControls/index.tsx

@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 
 import classnames from 'classnames';
-import { EditorView } from 'prosemirror-view';
 import type { WrappedComponentProps } from 'react-intl-next';
 import { defineMessages, injectIntl } from 'react-intl-next';
 
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import {
   findTable,

package/src/plugins/table/ui/TableFloatingControls/NumberColumn/index.tsx

@@ -1,8 +1,7 @@
 import React, { Component } from 'react';
 
-import { Selection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { isRowSelected } from '@atlaskit/editor-tables/utils';
 
 import { clearHoverSelection } from '../../../commands';

package/src/plugins/table/ui/TableFloatingControls/RowControls/index.tsx

@@ -1,9 +1,10 @@
 import React, { Component } from 'react';
 
-import { EditorView } from 'prosemirror-view';
 import type { WrappedComponentProps } from 'react-intl-next';
 import { defineMessages, injectIntl } from 'react-intl-next';
 
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
+
 import { clearHoverSelection } from '../../../commands';
 import { TableCssClassName as ClassName } from '../../../types';
 import {

package/src/plugins/table/ui/TableFloatingControls/index.tsx

@@ -1,11 +1,10 @@
 import React, { Component } from 'react';
 
-import { Selection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-
 import type { TableColumnOrdering } from '@atlaskit/adf-schema/steps';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import { browser } from '@atlaskit/editor-common/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 
 import { hoverRows, selectRow } from '../../commands';
 import { RowStickyState } from '../../pm-plugins/sticky-headers';

package/src/plugins/table/utils/analytics.ts

@@ -1,11 +1,10 @@
-import { Selection } from 'prosemirror-state';
-
 import type {
   AnalyticsEventPayload,
   AnalyticsEventPayloadCallback,
   EditorAnalyticsAPI,
 } from '@atlaskit/editor-common/analytics';
 import { HigherOrderCommand } from '@atlaskit/editor-common/types';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/utils/collapse.ts

@@ -1,8 +1,10 @@
-import { NodeRange, NodeType } from 'prosemirror-model';
+import { NodeRange, 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 'prosemirror-state';
-import { findWrapping } from 'prosemirror-transform';
-
+import {
+  ReadonlyTransaction,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
 interface IsTableCollapsibleResult {

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

@@ -1,8 +1,7 @@
-import { Selection } from 'prosemirror-state';
-import { findDomRefAtPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
 import { maphElem } from '@atlaskit/editor-common/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { findDomRefAtPos } 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/utils/decoration.ts

@@ -1,11 +1,14 @@
-import { Node as PmNode } from 'prosemirror-model';
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-import { ReadonlyTransaction, Selection, Transaction } from 'prosemirror-state';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-import { Decoration, DecorationSet } from 'prosemirror-view';
-
 import { CellAttributes } from '@atlaskit/adf-schema';
 import { nonNullable } from '@atlaskit/editor-common/utils';
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
+import {
+  ReadonlyTransaction,
+  Selection,
+  Transaction,
+} from '@atlaskit/editor-prosemirror/state';
+import { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import {
   findTable,

package/src/plugins/table/utils/get-allow-add-column-custom-step.ts

@@ -1,4 +1,4 @@
-import { EditorState } from 'prosemirror-state';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
 
 import { getPluginState } from '../pm-plugins/plugin-factory';
 

package/src/plugins/table/utils/nodes.ts

@@ -1,7 +1,6 @@
-import { Node as PmNode } from 'prosemirror-model';
-import { EditorState, Selection } from 'prosemirror-state';
-import { hasParentNodeOfType } from 'prosemirror-utils';
-
+import { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
+import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/utils/paste.ts

@@ -1,8 +1,12 @@
-import { Fragment, Node as PMNode, Schema, Slice } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { flatten } from 'prosemirror-utils';
-
 import { flatmap, mapSlice } from '@atlaskit/editor-common/utils';
+import {
+  Fragment,
+  Node as PMNode,
+  Schema,
+  Slice,
+} from '@atlaskit/editor-prosemirror/model';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { flatten } from '@atlaskit/editor-prosemirror/utils';
 
 import { getPluginState } from '../pm-plugins/plugin-factory';
 

package/src/plugins/table/utils/row-controls.ts

@@ -1,8 +1,7 @@
-import { Node as PMNode, Schema } from 'prosemirror-model';
-import { Selection, Transaction } from 'prosemirror-state';
-import { safeInsert } from 'prosemirror-utils';
-
 import { parsePx } from '@atlaskit/editor-common/utils';
+import { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import {

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

@@ -1,5 +1,4 @@
-import { Selection, Transaction } from 'prosemirror-state';
-
+import { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import {

package/src/plugins/table/utils/table.ts

@@ -1,5 +1,4 @@
-import { Transaction } from 'prosemirror-state';
-
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 

package/src/plugins/table/utils/update-plugin-state-decorations.ts

@@ -1,5 +1,5 @@
-import { EditorState } from 'prosemirror-state';
-import { Decoration, DecorationSet } from 'prosemirror-view';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 
 import { getDecorations } from '../pm-plugins/decorations/plugin';
 import { TableDecorations } from '../types';