@atlaskit/editor-core 187.7.2 → 187.8.3

package/dist/types-ts4.5/ui/ToolbarArrowKeyNavigationProvider/index.d.ts

@@ -1,10 +1,11 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { EditorAppearance } from '../../types';
-import { EditorView } from 'prosemirror-view';
-import React, { ReactNode } from 'react';
-import { UseStickyToolbarType } from '../../types/editor-props';
-import { IntlShape } from 'react-intl-next/src/types';
+import type { EditorAppearance } from '../../types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { ReactNode } from 'react';
+import React from 'react';
+import type { UseStickyToolbarType } from '../../types/editor-props';
+import type { IntlShape } from 'react-intl-next/src/types';
 export interface KeyDownHandlerContext {
     handleArrowLeft: () => void;
     handleArrowRight: () => void;

package/dist/types-ts4.5/utils/action.d.ts

@@ -1,5 +1,5 @@
 /// <reference path="../../../../../../typings/prosemirror.d.ts" />
-import type { EditorView } from 'prosemirror-view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { Command } from '../types/command';
 export declare function __temporaryFixForConfigPanel(editorView: EditorView): Promise<void>;
 export declare function getEditorValueWithMedia(editorView: EditorView): Promise<{

package/dist/types-ts4.5/utils/commands.d.ts

@@ -1,6 +1,6 @@
-import type { EditorState, Transaction } from 'prosemirror-state';
-import type { EditorView } from 'prosemirror-view';
-import type { ResolvedPos, MarkType, Mark, Node as PMNode, Fragment } from 'prosemirror-model';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { ResolvedPos, MarkType, Mark, Node as PMNode, Fragment } from '@atlaskit/editor-prosemirror/model';
 import type { Command, HigherOrderCommand } from '@atlaskit/editor-common/types';
 declare const isEmptySelectionAtStart: (state: EditorState) => boolean;
 declare const isEmptySelectionAtEnd: (state: EditorState) => boolean;

package/dist/types-ts4.5/utils/count-nodes.d.ts

@@ -1,4 +1,4 @@
-import { EditorState } from 'prosemirror-state';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 type NodeCount = Record<string, number>;
 type NodesCount = {
     nodeCount: NodeCount;

package/dist/types-ts4.5/utils/document-logger.d.ts

@@ -1,4 +1,4 @@
-import { Node as PMNode } from 'prosemirror-model';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { SimplifiedNode } from '@atlaskit/editor-common/analytics';
 export type { SimplifiedNode };
 export declare const getDocStructure: (doc: PMNode, options?: {

package/dist/types-ts4.5/utils/document.d.ts

@@ -1,10 +1,11 @@
-import { Node, Fragment, Schema, ResolvedPos } from 'prosemirror-model';
-import { Transaction, ReadonlyTransaction, EditorState } from 'prosemirror-state';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { Transformer, ReplaceRawValue } from '@atlaskit/editor-common/types';
-import { DispatchAnalyticsEvent } from '../plugins/analytics/types/dispatch-analytics-event';
-import { BreakoutMarkAttrs } from '@atlaskit/adf-schema';
+import type { Node, Schema, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction, ReadonlyTransaction, EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type { Transformer, ReplaceRawValue } from '@atlaskit/editor-common/types';
+import type { DispatchAnalyticsEvent } from '../plugins/analytics/types/dispatch-analytics-event';
+import type { BreakoutMarkAttrs } from '@atlaskit/adf-schema';
 /**
  * Returns false if node contains only empty inline nodes and hardBreaks.
  */

package/dist/types-ts4.5/utils/getAttrsWithChangesRecorder.d.ts

@@ -1,4 +1,4 @@
-import { Node } from 'prosemirror-model';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
 export interface GetAttrsChange<T, V> {
     node: Node;
     prevAttrs?: T;

package/dist/types-ts4.5/utils/index.d.ts

@@ -1,5 +1,5 @@
-import type { MarkType, Node, ResolvedPos, Schema, Slice } from 'prosemirror-model';
-import type { EditorState, Selection } from 'prosemirror-state';
+import type { MarkType, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import type { JSONDocNode, JSONNode } from '@atlaskit/editor-json-transformer';
 export { insideTable } from '@atlaskit/editor-common/core-utils';
 export { hasVisibleContent, isNodeEmpty, findFarthestParentNode, isSelectionEndOfParagraph, nodesBetweenChanged, getNodesCount, } from './document';

package/dist/types-ts4.5/utils/input-rules.d.ts

@@ -1,5 +1,5 @@
-import type { Node as PMNode, NodeType } from 'prosemirror-model';
-import type { EditorState } from 'prosemirror-state';
+import type { Node as PMNode, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InputRuleWrapper } from '@atlaskit/prosemirror-input-rules';
 import type { AnalyticsEventPayload } from '../plugins/analytics/types';
 import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';

package/dist/types-ts4.5/utils/is-text-input.d.ts

@@ -1,2 +1,2 @@
-import { Transaction, ReadonlyTransaction } from 'prosemirror-state';
+import type { Transaction, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
 export declare const isTextInput: (tr: Transaction | ReadonlyTransaction) => boolean;

package/dist/types-ts4.5/utils/list-commands.d.ts

@@ -1,7 +1,7 @@
-import { indentList, outdentList, toggleOrderedList, toggleBulletList } from '../plugins/list/commands';
+/// <reference path="../../../../../../typings/prosemirror.d.ts" />
 export declare const getListCommands: () => {
-    indentList: typeof indentList;
-    outdentList: typeof outdentList;
-    toggleOrderedList: typeof toggleOrderedList;
-    toggleBulletList: typeof toggleBulletList;
+    indentList: (editorAnalyticsAPI: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI | undefined) => (inputMethod?: import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) => import("..").Command;
+    outdentList: (editorAnalyticsAPI: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI | undefined) => (inputMethod: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined, featureFlags: import("@atlaskit/editor-common/types").FeatureFlags) => import("..").Command;
+    toggleOrderedList: (editorAnalyticsAPI: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI | undefined) => (view: import("prosemirror-view").EditorView, inputMethod?: import("../plugins/list/commands").InputMethod) => boolean;
+    toggleBulletList: (editorAnalyticsAPI: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI | undefined) => (view: import("prosemirror-view").EditorView, inputMethod?: import("../plugins/list/commands").InputMethod) => boolean;
 };

package/dist/types-ts4.5/utils/lists.d.ts

@@ -1,2 +1,2 @@
-import { Selection } from 'prosemirror-state';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const doesSelectionWhichStartsOrEndsInListContainEntireList: (selection: Selection) => boolean;

package/dist/types-ts4.5/utils/mark.d.ts

@@ -1,5 +1,5 @@
-import { Node, Mark, MarkType, NodeType } from 'prosemirror-model';
-import { SelectionRange, EditorState, Transaction } from 'prosemirror-state';
+import type { Node, Mark, MarkType, NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { SelectionRange, EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const isMarkAllowedInRange: (doc: Node, ranges: readonly SelectionRange[], type: MarkType) => boolean;
 export declare const isMarkExcluded: (type: MarkType, marks?: readonly Mark[] | null) => boolean;
 export declare const removeBlockMarks: (state: EditorState, marks: Array<MarkType | undefined>) => Transaction | undefined;

package/dist/types-ts4.5/utils/node-width.d.ts

@@ -1,5 +1,5 @@
-import { Node as PMNode, MarkType } from 'prosemirror-model';
-import { BreakoutMarkAttrs } from '@atlaskit/adf-schema';
+import type { Node as PMNode, MarkType } from '@atlaskit/editor-prosemirror/model';
+import type { BreakoutMarkAttrs } from '@atlaskit/adf-schema';
 export { getParentNodeWidth } from '@atlaskit/editor-common/node-width';
 /**
  * Returns the breakout mode of a given node

package/dist/types-ts4.5/utils/nodes-by-localIds.d.ts

@@ -1,5 +1,5 @@
-import { EditorState } from 'prosemirror-state';
-import { NodeWithPos } from 'prosemirror-utils';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 type FindNodesByIdsOption = {
     includeDocNode?: boolean;
 };

package/dist/types-ts4.5/utils/performance/instrumented-plugin.d.ts

@@ -1,8 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { SafePluginSpec } from 'prosemirror-state';
-import { EditorProps } from '../../types/editor-props';
-import { TransactionTracker } from './track-transactions';
-import { FeatureFlags } from '../../types/feature-flags';
+import type { SafePluginSpec } from '@atlaskit/editor-prosemirror/state';
+import type { EditorProps } from '../../types/editor-props';
+import type { TransactionTracker } from './track-transactions';
+import type { FeatureFlags } from '../../types/feature-flags';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 type InstrumentedPluginOptions = EditorProps['performanceTracking'] & {
     saferDispatchedTransactions?: FeatureFlags['saferDispatchedTransactions'];

package/dist/types-ts4.5/utils/prosemirror/autojoin.d.ts

@@ -1,5 +1,5 @@
-import { Node } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 /**
  * Checks whether two adjacent nodes can be joined. If so, the document
  * will be updated to join those nodes. If not, the original transaction

package/dist/types-ts4.5/utils/prosemirror/position.d.ts

@@ -1,5 +1,5 @@
-import { ResolvedPos } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
+import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export declare function atTheEndOfDoc(state: EditorState): boolean;
 export declare function atTheBeginningOfDoc(state: EditorState): boolean;
 export declare function atTheEndOfBlock(state: EditorState): boolean;

package/dist/types-ts4.5/utils/selection.d.ts

@@ -1,7 +1,7 @@
-import { EditorView } from 'prosemirror-view';
-import { EditorState, Selection } from 'prosemirror-state';
-import { Node } from 'prosemirror-model';
-import { Side } from '@atlaskit/editor-common/selection';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
+import type { Side } from '@atlaskit/editor-common/selection';
 export { setNodeSelection, setTextSelection, } from '@atlaskit/editor-common/utils';
 export declare function setAllSelection(view: EditorView): void;
 export declare function setGapCursorSelection(view: EditorView, pos: number, side: Side): void;

package/dist/types-ts4.5/utils/table.d.ts

@@ -1,2 +1,2 @@
-import { ResolvedPos, Schema } from 'prosemirror-model';
+import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
 export declare function isPositionNearTableRow(pos: ResolvedPos, schema: Schema, direction: 'before' | 'after'): boolean;

package/docs/3-annotations.tsx

@@ -1,6 +1,7 @@
+import { token } from '@atlaskit/tokens';
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 import React from 'react';
-import { EditorView } from 'prosemirror-view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
 import { md, code } from '@atlaskit/docs';
 import { N20, N30 } from '@atlaskit/theme/colors';
@@ -194,8 +195,8 @@ class SplitExample extends React.Component<{ initialAdf: object }> {
       >
         <div
           style={{
-            margin: '8px',
-            padding: '8px',
+            margin: token('space.100', '8px'),
+            padding: token('space.100', '8px'),
             backgroundColor: N20,
             border: `1px solid ${N30}`,
             flex: 1,
@@ -207,7 +208,7 @@ class SplitExample extends React.Component<{ initialAdf: object }> {
           style={{
             flex: 2,
             overflow: 'auto',
-            margin: '8px',
+            margin: token('space.100', '8px'),
           }}
         >
           <p>Paragraph node's content:</p>
@@ -234,8 +235,8 @@ These denote a comment thread about the given text, and are denoted by a yellow
 ${(
   <div
     style={{
-      margin: '8px',
-      padding: '8px',
+      margin: token('space.100', '8px'),
+      padding: token('space.100', '8px'),
       backgroundColor: N20,
       border: `1px solid ${N30}`,
     }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.7.2",
+  "version": "187.8.3",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -61,7 +61,7 @@
     "@atlaskit/editor-palette": "1.5.1",
     "@atlaskit/editor-plugin-analytics": "^0.1.0",
     "@atlaskit/editor-plugin-card": "^0.3.0",
-    "@atlaskit/editor-plugin-content-insertion": "^0.0.6",
+    "@atlaskit/editor-plugin-content-insertion": "^0.0.7",
     "@atlaskit/editor-plugin-context-panel": "^0.1.0",
     "@atlaskit/editor-plugin-decorations": "^0.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^0.1.0",
@@ -71,6 +71,7 @@
     "@atlaskit/editor-plugin-hyperlink": "^0.2.0",
     "@atlaskit/editor-plugin-table": "^2.6.0",
     "@atlaskit/editor-plugin-width": "^0.1.0",
+    "@atlaskit/editor-prosemirror": "1.0.2",
     "@atlaskit/editor-shared-styles": "^2.5.0",
     "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/emoji": "^67.4.0",
@@ -95,7 +96,7 @@
     "@atlaskit/radio": "^5.6.0",
     "@atlaskit/section-message": "^6.4.0",
     "@atlaskit/select": "^16.5.0",
-    "@atlaskit/smart-card": "^26.12.0",
+    "@atlaskit/smart-card": "^26.13.0",
     "@atlaskit/smart-user-picker": "^6.1.0",
     "@atlaskit/spinner": "^15.5.0",
     "@atlaskit/status": "^1.3.0",
@@ -120,14 +121,6 @@
     "lodash": "^4.17.21",
     "memoize-one": "^6.0.0",
     "prop-types": "^15.5.10",
-    "prosemirror-commands": "1.1.11",
-    "prosemirror-history": "^1.1.3",
-    "prosemirror-keymap": "1.1.4",
-    "prosemirror-model": "1.16.0",
-    "prosemirror-state": "1.3.4",
-    "prosemirror-transform": "1.3.2",
-    "prosemirror-utils": "^1.0.0-0",
-    "prosemirror-view": "1.23.7",
     "raf-schd": "^4.0.3",
     "react-loadable": "^5.1.0",
     "react-transition-group": "^4.4.1",
@@ -146,7 +139,7 @@
     "@af/editor-libra": "*",
     "@af/integration-testing": "*",
     "@atlaskit/code": "^14.6.0",
-    "@atlaskit/collab-provider": "9.7.3",
+    "@atlaskit/collab-provider": "9.7.4",
     "@atlaskit/dropdown-menu": "^11.11.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/editor-plugin-table": "^2.6.0",

package/report.api.md

@@ -25,7 +25,7 @@ import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import type { ActivityProvider } from '@atlaskit/activity-provider';
 import type { AllEditorPresetPluginTypes } from '@atlaskit/editor-common/types';
 import { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
-import { AnalyticsEventPayload as AnalyticsEventPayload_2 } from '@atlaskit/analytics-next/AnalyticsEvent';
+import type { AnalyticsEventPayload as AnalyticsEventPayload_2 } from '@atlaskit/analytics-next/AnalyticsEvent';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { BrowserFreezetracking } from '@atlaskit/editor-common/types';
@@ -35,31 +35,32 @@ import { Color } from '@atlaskit/status/element';
 import { Command as Command_2 } from '@atlaskit/editor-common/types';
 import { ComponentType } from 'react';
 import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
-import { ContextUpdateHandler } from '@atlaskit/editor-common/types';
+import type { ContextUpdateHandler } from '@atlaskit/editor-common/types';
 import { createTable } from '@atlaskit/editor-plugin-table/commands';
 import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { CreateUIAnalyticsEvent as CreateUIAnalyticsEvent_2 } from '@atlaskit/analytics-next/types';
+import type { CreateUIAnalyticsEvent as CreateUIAnalyticsEvent_2 } from '@atlaskit/analytics-next/types';
 import { darkModeStatusColorPalette } from '@atlaskit/editor-common/ui-color';
-import { DecorationSet } from 'prosemirror-view';
+import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import { DEFAULT_BORDER_COLOR } from '@atlaskit/editor-common/ui-color';
-import type { DirectEditorProps } from 'prosemirror-view';
+import type { DirectEditorProps } from '@atlaskit/editor-prosemirror/view';
 import { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { DropdownOptionT } from '@atlaskit/editor-common/types';
-import { EditorActionsOptions } from '@atlaskit/editor-common/types';
+import type { EditorActionsOptions } from '@atlaskit/editor-common/types';
 import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { EditorAppearance } from '@atlaskit/editor-common/types';
 import { FeatureFlags as EditorFeatureFlags } from '@atlaskit/editor-common/types';
 import { EditorPlugin } from '@atlaskit/editor-common/types';
 import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import { EditorReactContext } from '@atlaskit/editor-common/types';
-import { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
-import { EditorState } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
+import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import { EditorView as EditorView_2 } from 'prosemirror-view';
 import { EmojiResource } from '@atlaskit/emoji/resource';
 import { EmptyStateHandler } from '@atlaskit/editor-common/types';
-import { ErrorReporter } from '@atlaskit/editor-common/utils';
+import type { ErrorReporter } from '@atlaskit/editor-common/utils';
 import type { ErrorReportingHandler } from '@atlaskit/editor-common/utils';
 import { EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
@@ -85,9 +86,9 @@ import { FloatingToolbarSelect } from '@atlaskit/editor-common/types';
 import { FULL_WIDTH_MODE } from '@atlaskit/editor-common/analytics';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { Side as GapCursorSide } from '@atlaskit/editor-common/selection';
-import { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
+import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import { HeadingLevelsAndNormalText } from '@atlaskit/editor-common/types';
+import type { HeadingLevelsAndNormalText } from '@atlaskit/editor-common/types';
 import type { HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { InputMethodInsertMedia } from '@atlaskit/editor-common/analytics';
@@ -101,9 +102,9 @@ import { MacroAttributes } from '@atlaskit/editor-common/provider-factory';
 import { MacroProvider } from '@atlaskit/editor-common/provider-factory';
 import { MarkConfig } from '@atlaskit/editor-common/types';
 import { MediaClientConfig } from '@atlaskit/media-core';
-import { MediaFeatureFlags } from '@atlaskit/media-common';
+import type { MediaFeatureFlags } from '@atlaskit/media-common';
 import { MediaFeatureFlags as MediaFeatureFlags_2 } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaFile } from '@atlaskit/media-picker/types';
+import type { MediaFile } from '@atlaskit/media-picker/types';
 import type { MediaProvider as MediaProvider_2 } from '@atlaskit/editor-common/provider-factory';
 import type { MentionDescription } from '@atlaskit/mention';
 import { MentionProvider } from '@atlaskit/mention/resource';
@@ -112,15 +113,15 @@ import { MentionResource } from '@atlaskit/mention/resource';
 import { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import { default as messages } from '@atlaskit/editor-common/messages';
 import { NextEditorPlugin } from '@atlaskit/editor-common/types';
-import { Node as Node_2 } from 'prosemirror-model';
+import { Node as Node_2 } from '@atlaskit/editor-prosemirror/model';
 import { NodeConfig } from '@atlaskit/editor-common/types';
-import { NodeType } from 'prosemirror-model';
-import { NodeView } from 'prosemirror-view';
+import type { NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { OptionalPlugin } from '@atlaskit/editor-common/types';
 import { PaletteColor } from '@atlaskit/editor-common/ui-color';
 import { PerformanceTracking } from '@atlaskit/editor-common/types';
 import type { PluginConfig } from '@atlaskit/editor-plugin-table/types';
-import { PluginKey } from 'prosemirror-state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { PMPlugin } from '@atlaskit/editor-common/types';
 import { PortalProvider } from '@atlaskit/editor-common/portal-provider';
 import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
@@ -129,7 +130,7 @@ import { PositionType } from '@atlaskit/tooltip/types';
 import { PresenceProvider } from '@atlaskit/mention/resource';
 import { PresenceResource } from '@atlaskit/mention/resource';
 import PropTypes from 'prop-types';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { Providers } from '@atlaskit/editor-common/provider-factory';
 import { PureComponent } from 'react';
 import { QuickInsertActionInsert } from '@atlaskit/editor-common/provider-factory';
@@ -140,10 +141,10 @@ import { default as React_2 } from 'react';
 import { ReactElement } from 'react';
 import type { ReactHookFactory } from '@atlaskit/editor-common/types';
 import type { RefObject } from 'react';
-import { ReplaceRawValue } from '@atlaskit/editor-common/types';
+import type { ReplaceRawValue } from '@atlaskit/editor-common/types';
 import type { ResolvedEditorState } from '@atlaskit/collab-provider';
 import type { RichMediaLayout } from '@atlaskit/adf-schema';
-import type { Schema } from 'prosemirror-model';
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { SearchProvider } from '@atlaskit/editor-common/provider-factory';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 import type { SelectOption } from '@atlaskit/editor-common/types';
@@ -152,7 +153,7 @@ import type { SEVERITY } from '@atlaskit/editor-common/utils';
 import type { TaskDecisionProvider } from '@atlaskit/task-decision';
 import { TeamMentionResource } from '@atlaskit/mention/team-resource';
 import { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
-import { Transaction } from 'prosemirror-state';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { TransactionTracking } from '@atlaskit/editor-common/types';
 import type { Transformer as Transformer_2 } from '@atlaskit/editor-common/types';
 import type { TypeAheadHandler } from '@atlaskit/editor-common/types';
@@ -1129,10 +1130,21 @@ export function getDefaultPresetOptionsFromEditorProps(
 
 // @public (undocumented)
 export const getListCommands: () => {
-  indentList: typeof indentList;
-  outdentList: typeof outdentList;
-  toggleOrderedList: typeof toggleOrderedList;
-  toggleBulletList: typeof toggleBulletList;
+  indentList: (
+    editorAnalyticsAPI: EditorAnalyticsAPI | undefined,
+  ) => (inputMethod?: INPUT_METHOD | INPUT_METHOD) => Command;
+  outdentList: (
+    editorAnalyticsAPI: EditorAnalyticsAPI | undefined,
+  ) => (
+    inputMethod: (INPUT_METHOD | INPUT_METHOD) | undefined,
+    featureFlags: EditorFeatureFlags,
+  ) => Command;
+  toggleOrderedList: (
+    editorAnalyticsAPI: EditorAnalyticsAPI | undefined,
+  ) => (view: EditorView_2, inputMethod?: ListInputMethod) => boolean;
+  toggleBulletList: (
+    editorAnalyticsAPI: EditorAnalyticsAPI | undefined,
+  ) => (view: EditorView_2, inputMethod?: ListInputMethod) => boolean;
 };
 
 // @public (undocumented)
@@ -1158,9 +1170,6 @@ export interface HistoryPluginState {
   canUndo: boolean;
 }
 
-// @public (undocumented)
-function indentList(inputMethod?: InputMethod): Command;
-
 // @public (undocumented)
 export type InlineCommentAnnotationProvider = AnnotationTypeProvider<
   AnnotationTypes.INLINE_COMMENT,
@@ -1190,12 +1199,6 @@ export type InlineCommentViewComponentProps = AnnotationComponentProps & {
 
 export { INPUT_METHOD };
 
-// @public (undocumented)
-type InputMethod = INPUT_METHOD.KEYBOARD | INPUT_METHOD.TOOLBAR;
-
-// @public (undocumented)
-type InputMethod_2 = INPUT_METHOD.KEYBOARD | INPUT_METHOD.TOOLBAR;
-
 // @public (undocumented)
 export type InsertBlockInputMethodToolbar =
   | INPUT_METHOD.INSERT_MENU
@@ -1696,12 +1699,6 @@ type OnEditorViewStateUpdated = (props: {
 // @public (undocumented)
 export const openDatePicker: () => Command;
 
-// @public (undocumented)
-function outdentList(
-  inputMethod: InputMethod_2 | undefined,
-  featureFlags: EditorFeatureFlags,
-): Command;
-
 export { PaletteColor };
 
 // @public (undocumented)
@@ -2274,12 +2271,6 @@ interface TextSelectionData {
   type: 'text';
 }
 
-// @public (undocumented)
-function toggleBulletList(
-  view: EditorView,
-  inputMethod?: ListInputMethod,
-): boolean;
-
 // @public (undocumented)
 export const toggleCode: () => Command_2;
 
@@ -2304,12 +2295,6 @@ export const toggleEmWithAnalytics: (
   inputMethod: TextFormattingInputMethodBasic;
 }) => Command_2;
 
-// @public (undocumented)
-function toggleOrderedList(
-  view: EditorView,
-  inputMethod?: ListInputMethod,
-): boolean;
-
 // @public (undocumented)
 export const toggleStrike: () => Command_2;