@atlaskit/editor-core 185.2.24 → 185.2.26

package/dist/esm/plugins/media/pm-plugins/main.js

@@ -11,7 +11,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { NodeSelection } from 'prosemirror-state';
+import { NodeSelection, TextSelection, AllSelection } from 'prosemirror-state';
 import { insertPoint } from 'prosemirror-transform';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { ErrorReporter, browser } from '@atlaskit/editor-common/utils';
@@ -32,6 +32,7 @@ import { isInListItem } from '../../../utils';
 import { CAPTION_PLACEHOLDER_ID } from '../ui/CaptionPlaceholder';
 import { RawIntlProvider } from 'react-intl-next';
 import { MediaTaskManager } from './mediaTaskManager';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 export { stateKey } from './plugin-key';
 export var MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 var createDropPlaceholder = function createDropPlaceholder(intl, allowDropLine) {
@@ -621,7 +622,6 @@ export var createPlugin = function createPlugin(_schema, options, reactContext,
             // we shift it to the media single parent as other code is opinionated about
             // the selection landing there. In particular the caption insertion and selection
             // action.
-
             return newState.tr.setSelection(NodeSelection.create(newState.doc, transaction.selection.$from.pos - 1));
           }
         }
@@ -645,12 +645,29 @@ export var createPlugin = function createPlugin(_schema, options, reactContext,
     },
     props: {
       decorations: function decorations(state) {
+        // Use this to indicate that the media node is selected
+        var mediaNodes = [];
+        var schema = state.schema,
+          $anchor = state.selection.$anchor,
+          doc = state.doc;
+
+        // Find any media nodes in the current selection
+        if (state.selection instanceof TextSelection || state.selection instanceof AllSelection || state.selection instanceof NodeSelection || state.selection instanceof CellSelection) {
+          doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
+            if (node.type === schema.nodes.media) {
+              mediaNodes.push(Decoration.node(pos, pos + node.nodeSize, {}, {
+                type: 'media',
+                selected: true
+              }));
+              return false;
+            }
+            return true;
+          });
+        }
         var pluginState = getMediaPluginState(state);
         if (!pluginState.showDropzone) {
-          return;
+          return DecorationSet.create(state.doc, mediaNodes);
         }
-        var schema = state.schema,
-          $anchor = state.selection.$anchor;
 
         // When a media is already selected
         if (state.selection instanceof NodeSelection) {
@@ -659,20 +676,20 @@ export var createPlugin = function createPlugin(_schema, options, reactContext,
             var deco = Decoration.node(state.selection.from, state.selection.to, {
               class: 'richMedia-selected'
             });
-            return DecorationSet.create(state.doc, [deco]);
+            return DecorationSet.create(state.doc, [deco].concat(mediaNodes));
           }
-          return;
+          return DecorationSet.create(state.doc, mediaNodes);
         }
         var pos = $anchor.pos;
         if ($anchor.parent.type !== schema.nodes.paragraph && $anchor.parent.type !== schema.nodes.codeBlock) {
           pos = insertPoint(state.doc, pos, schema.nodes.mediaGroup);
         }
         if (pos === null || pos === undefined) {
-          return;
+          return DecorationSet.create(state.doc, mediaNodes);
         }
         var dropPlaceholders = [Decoration.widget(pos, dropPlaceholder, {
           key: 'drop-placeholder'
-        })];
+        })].concat(mediaNodes);
         return DecorationSet.create(state.doc, dropPlaceholders);
       },
       nodeViews: options.nodeViews,

package/dist/esm/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -7,7 +7,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
-import { ReactNodeView } from '../../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import DecisionItem from '../ui/Decision';
 import { isTypeAheadOpen } from '../../type-ahead/utils';
 var Decision = /*#__PURE__*/function (_ReactNodeView) {

package/dist/esm/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
-import { ReactNodeView } from '../../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import WithPluginState from '../../../ui/WithPluginState';
 import { stateKey as taskPluginKey } from '../pm-plugins/plugin-key';
 import TaskItem from '../ui/Task';

package/dist/esm/plugins/unsupported-content/index.js

@@ -3,7 +3,7 @@ import { PluginKey } from 'prosemirror-state';
 import { confluenceUnsupportedBlock, confluenceUnsupportedInline, unsupportedBlock, unsupportedInline, unsupportedMark, unsupportedNodeAttribute } from '@atlaskit/adf-schema';
 import { UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { UnsupportedInlineNodeView } from './unsupported-inline-node-view';
-import { ReactNodeView } from '../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 export var pluginKey = new PluginKey('unsupportedContentPlugin');
 var createPlugin = function createPlugin(pmPluginFactoryParams) {

package/dist/esm/test-utils.js

@@ -90,7 +90,6 @@ export var createPMSchemaAndPlugins = function createPMSchemaAndPlugins() {
     };
   };
 };
-export { PortalProviderAPI } from './ui/PortalProvider';
 export { EventDispatcher } from './event-dispatcher';
 export { GapCursorSelection, Side as GapCursorSide } from './plugins/selection/gap-cursor/selection';
 export function setTextSelection(view, anchor, head) {

package/dist/esm/ui/ContextPanel/index.js

@@ -22,7 +22,6 @@ import { N30 } from '@atlaskit/theme/colors';
 import { akEditorSwoopCubicBezier, akEditorDefaultLayoutWidth, akEditorWideLayoutWidth, akEditorBreakoutPadding, akEditorContextPanelWidth, ATLASSIAN_NAVIGATION_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
 import WithPluginState from '../WithPluginState';
-import { pluginKey as contextPanelPluginKey } from '../../plugins/context-panel';
 import WithEditorActions from '../WithEditorActions';
 import { getChildBreakoutModes } from '../../utils/document';
 import { WidthContext } from '@atlaskit/editor-common/ui';
@@ -170,6 +169,14 @@ var widthPluginKey = {
     return state['widthPlugin$'];
   }
 };
+
+// @ts-ignore
+var contextPanelPluginKey = {
+  key: 'contextPanelPluginKey$',
+  getState: function getState(state) {
+    return state['contextPanelPluginKey$'];
+  }
+};
 function ContextPanelWithActions(_ref2) {
   var actions = _ref2.actions,
     props = _objectWithoutProperties(_ref2, _excluded);

package/dist/esm/utils/action.js

@@ -20,7 +20,7 @@ function _temporaryFixForConfigPanel() {
           }
           _context.next = 4;
           return new Promise(function (resolve) {
-            forceAutoSave(resolve)(editorView.state, editorView.dispatch);
+            forceAutoSave(extensionPluginState.applyChangeToContextPanel)(resolve)(editorView.state, editorView.dispatch);
           });
         case 4:
         case "end":

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.2.24";
+export var version = "185.2.26";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.2.24",
+	"version": "185.2.26",
 	"sideEffects": false
 }

package/dist/types/create-editor/ReactEditorViewInternal.d.ts

@@ -13,7 +13,7 @@ import { Dispatch, EventDispatcher } from '../event-dispatcher';
 import { AnalyticsEventPayload, DispatchAnalyticsEvent, FULL_WIDTH_MODE } from '@atlaskit/editor-common/analytics';
 import { EditorAppearance, EditorConfig, EditorReactContext, EditorPlugin, EditorProps } from '../types';
 import type { EditorNextProps } from '../types/editor-props';
-import { PortalProviderAPI } from '../ui/PortalProvider';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { SEVERITY } from '@atlaskit/editor-common/utils';
 import { TransactionTracker } from '../utils/performance/track-transactions';
 import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';

package/dist/types/index.d.ts

@@ -68,7 +68,7 @@ export { getDefaultPresetOptionsFromEditorProps } from './create-editor';
 export type { Command, EditorPlugin, EditorProps, EditorInstance, CommandDispatch, } from './types';
 export { default as EditorActions } from './actions';
 export type { MacroProvider, MacroAttributes, ExtensionType, CardProvider, } from '@atlaskit/editor-common/provider-factory';
-export { PortalProvider, PortalProviderAPI, PortalRenderer, } from './ui/PortalProvider';
+export { PortalProvider, PortalProviderAPI, PortalRenderer, } from '@atlaskit/editor-common/portal-provider';
 export { GapCursorSelection, Side as GapCursorSide, } from './plugins/selection/gap-cursor-selection';
 export type { HistoryPluginState } from './plugins/history/types';
 export type { MentionPluginState } from './plugins/mentions/types';

package/dist/types/labs/next/internal/components/EditorInternal.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 import { WrappedComponentProps } from 'react-intl-next';
 export declare const EditorInternal: React.FC<import("react-intl-next").WithIntlProps<import("../editor-props-type").EditorProps & {
-    portalProviderAPI: import("../../../..").PortalProviderAPI;
+    portalProviderAPI: import("@atlaskit/editor-common/portal-provider").PortalProviderAPI;
 } & WrappedComponentProps<"intl">>> & {
     WrappedComponent: React.ComponentType<import("../editor-props-type").EditorProps & {
-        portalProviderAPI: import("../../../..").PortalProviderAPI;
+        portalProviderAPI: import("@atlaskit/editor-common/portal-provider").PortalProviderAPI;
     } & WrappedComponentProps<"intl">>;
 };

package/dist/types/labs/next/internal/editor-props-type.d.ts

@@ -4,7 +4,7 @@ import EditorActions from '../../../actions';
 import { Transformer } from '@atlaskit/editor-common/types';
 import { EditorPlugin } from '../../../types';
 import { FireAnalyticsCallback } from '../../../plugins/analytics';
-import { PortalProviderAPI } from '../../../ui/PortalProvider';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 export type EditorProps = {
     plugins?: Array<EditorPlugin>;
     transformer?: (schema: Schema) => Transformer<any>;

package/dist/types/labs/next/internal/hooks/use-editor/create-editor.d.ts

@@ -1,7 +1,7 @@
 import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import EditorActions from '../../../../../actions';
-import { PortalProviderAPI } from '../../../../../ui/PortalProvider';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { EditorSharedConfig } from '../../context/shared-config';
 import { EditorPropsExtended } from '../../editor-props-type';
 import { FeatureFlags } from '../../../../../types/feature-flags';

package/dist/types/labs/next/presets/cxhtml.d.ts

@@ -117,7 +117,15 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };
@@ -140,7 +148,15 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };

package/dist/types/labs/next/presets/default.d.ts

@@ -146,7 +146,15 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };
@@ -169,7 +177,15 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };
@@ -381,7 +397,15 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };
@@ -404,7 +428,15 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };

package/dist/types/labs/next/presets/mobile.d.ts

@@ -120,7 +120,15 @@ export declare function useMobilePreset({ media, placeholder, maxContentSize, cr
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };
@@ -143,7 +151,15 @@ export declare function useMobilePreset({ media, placeholder, maxContentSize, cr
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType<any> | import("prosemirror-model").NodeType<any>[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
-    }>];
+    }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"contextPanel", {
+        actions: {
+            applyChange: (tr: import("prosemirror-state").Transaction<any>) => import("prosemirror-state").Transaction<any>;
+        };
+    }>>];
     actions: {
         forceFocusSelector: import("@atlaskit/editor-plugin-floating-toolbar").ForceFocusSelector;
     };

package/dist/types/nodeviews/index.d.ts

@@ -1,3 +1 @@
 export type { ProsemirrorGetPosHandler, ReactNodeProps, ReactComponentProps, getPosHandler, getPosHandlerNode, ForwardRef, } from './types';
-export { default as ReactNodeView } from './ReactNodeView';
-export { SelectionBasedNodeView } from './SelectionBasedNodeView';

package/dist/types/plugins/annotation/index.d.ts

@@ -1,8 +1,10 @@
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
 import { AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, AnnotationState, InlineCommentState, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationTypeProvider } from './types';
 import { UpdateEvent, AnnotationUpdateEmitter } from './update-provider';
+import type { InlineCommentPluginState } from './pm-plugins/types';
 declare const annotationPlugin: NextEditorPlugin<'annotation', {
     pluginConfiguration: AnnotationProviders | undefined;
+    sharedState: InlineCommentPluginState | undefined;
 }>;
 export default annotationPlugin;
 export { AnnotationUpdateEmitter };

package/dist/types/plugins/annotation/nodeviews/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
-import { ReactNodeView, ForwardRef } from '../../../nodeviews';
+import { ForwardRef } from '../../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 export declare class AnnotationNodeView extends ReactNodeView {
     createDomRef(): HTMLSpanElement;
     getContentDOM(): {

package/dist/types/plugins/annotation/pm-plugins/types.d.ts

@@ -1,7 +1,7 @@
 import { DecorationSet } from 'prosemirror-view';
 import { EditorState, SelectionBookmark } from 'prosemirror-state';
-import { PortalProviderAPI } from '../../../ui/PortalProvider';
-import { Dispatch, EventDispatcher } from '../../../event-dispatcher';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
+import { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { InlineCommentAnnotationProvider, AnnotationInfo } from '../types';
 export declare enum ACTIONS {
     UPDATE_INLINE_COMMENT_STATE = 0,

package/dist/types/plugins/caption/index.d.ts

@@ -1,5 +1,5 @@
 import { NextEditorPlugin } from '@atlaskit/editor-common/types';
-import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 declare const captionPlugin: NextEditorPlugin<'caption', {
     dependencies: [typeof analyticsPlugin];
 }>;

package/dist/types/plugins/caption/nodeviews/index.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="react" />
 import { EditorView } from 'prosemirror-view';
 import { Node as PMNode } from 'prosemirror-model';
-import { getPosHandler, ForwardRef, SelectionBasedNodeView } from '../../../nodeviews/';
-import { PortalProviderAPI } from '../../../ui/PortalProvider';
-import { EventDispatcher } from '../../../event-dispatcher';
+import { getPosHandler, ForwardRef } from '../../../nodeviews/';
+import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
+import { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type captionPlugin from '../index';
 export declare class CaptionNodeView extends SelectionBasedNodeView {
     private selected;
     createDomRef(): HTMLElement;
@@ -13,4 +16,4 @@ export declare class CaptionNodeView extends SelectionBasedNodeView {
     render(_props: never, forwardRef: ForwardRef): JSX.Element;
     viewShouldUpdate(nextNode: PMNode): boolean;
 }
-export default function captionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher): (node: PMNode, view: EditorView, getPos: getPosHandler) => CaptionNodeView;
+export default function captionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, pluginInjectionApi: ExtractInjectionAPI<typeof captionPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => CaptionNodeView;

package/dist/types/plugins/caption/pm-plugins/main.d.ts

@@ -1,7 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PortalProviderAPI } from '../../../ui/PortalProvider';
-import { Dispatch, EventDispatcher } from '../../../event-dispatcher';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
+import { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-declare const _default: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, analyticsApi: EditorAnalyticsAPI | undefined) => SafePlugin<any, any>;
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type captionPlugin from '../index';
+declare const _default: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, dispatch: Dispatch, pluginInjectionApi: ExtractInjectionAPI<typeof captionPlugin> | undefined) => SafePlugin<any, any>;
 export default _default;

package/dist/types/plugins/card/nodeviews/embedCard.d.ts

@@ -3,7 +3,7 @@ import { Node as PMNode } from 'prosemirror-model';
 import PropTypes from 'prop-types';
 import { SmartCardProps } from './genericCard';
 import { RichMediaLayout } from '@atlaskit/adf-schema';
-import { SelectionBasedNodeView } from '../../../nodeviews/';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 export type EmbedCardState = {
     hasPreview: boolean;
     liveHeight?: number;
@@ -39,7 +39,7 @@ export declare class EmbedCardComponent extends React.PureComponent<SmartCardPro
     render(): JSX.Element;
 }
 export type EmbedCardNodeViewProps = Pick<SmartCardProps, 'eventDispatcher' | 'allowResizing' | 'platform' | 'fullWidthMode' | 'dispatchAnalyticsEvent' | 'pluginInjectionApi'>;
-export declare class EmbedCard extends SelectionBasedNodeView<EmbedCardNodeViewProps> {
+export declare class EmbedCard extends ReactNodeView<EmbedCardNodeViewProps> {
     viewShouldUpdate(nextNode: PMNode): boolean;
     createDomRef(): HTMLElement;
     render(): JSX.Element;

package/dist/types/plugins/extension/actions.d.ts

@@ -6,6 +6,7 @@ import { MacroProvider } from '@atlaskit/editor-common/provider-factory';
 export { transformSliceToRemoveOpenBodiedExtension } from '@atlaskit/editor-common/transforms';
 import { Command, CommandDispatch } from '../../types';
 import EditorActions from '../../actions';
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
 export declare const buildExtensionNode: <S extends Schema<any, any>>(type: 'inlineExtension' | 'extension' | 'bodiedExtension', schema: S, attrs: object, content?: Fragment, marks?: Mark<S>[] | undefined) => PmNode<Schema<any, any>>;
 export declare const performNodeUpdate: (type: 'inlineExtension' | 'extension' | 'bodiedExtension', newAttrs: object, content: Fragment<any>, marks: Mark[], shouldScrollIntoView: boolean) => Command;
 export declare const updateExtensionParams: (updateExtension: UpdateExtension<object>, node: {
@@ -13,4 +14,4 @@ export declare const updateExtensionParams: (updateExtension: UpdateExtension<ob
     pos: number;
 }, actions: ExtensionAPI) => (state: EditorState, dispatch?: CommandDispatch, view?: EditorView) => Promise<boolean>;
 export declare const editSelectedExtension: (editorActions: EditorActions) => boolean;
-export declare const editExtension: (macroProvider: MacroProvider | null, updateExtension?: Promise<UpdateExtension<object> | void>) => Command;
+export declare const editExtension: (macroProvider: MacroProvider | null, applyChangeToContextPanel: ApplyChangeHandler | undefined, updateExtension?: Promise<UpdateExtension<object> | void>) => Command;

package/dist/types/plugins/extension/commands.d.ts

@@ -2,10 +2,11 @@ import { ExtensionLayout } from '@atlaskit/adf-schema';
 import { Node as PMNode } from 'prosemirror-model';
 import { ExtensionState } from './types';
 import { Parameters, TransformBefore, TransformAfter } from '@atlaskit/editor-common/src/extensions';
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
 export declare function updateState(state: Partial<ExtensionState>): import("@atlaskit/editor-common/types").Command;
-export declare function setEditingContextToContextPanel<T extends Parameters = Parameters>(processParametersBefore: TransformBefore<T>, processParametersAfter: TransformAfter<T>): import("@atlaskit/editor-common/types").Command;
-export declare const clearEditingContext: import("@atlaskit/editor-common/types").Command;
-export declare const forceAutoSave: (resolve: () => void, reject?: ((reason?: any) => void) | undefined) => import("@atlaskit/editor-common/types").Command;
+export declare function setEditingContextToContextPanel<T extends Parameters = Parameters>(processParametersBefore: TransformBefore<T>, processParametersAfter: TransformAfter<T>, applyChangeToContextPanel: ApplyChangeHandler | undefined): import("@atlaskit/editor-common/types").Command;
+export declare const clearEditingContext: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => import("@atlaskit/editor-common/types").Command;
+export declare const forceAutoSave: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => (resolve: () => void, reject?: ((reason?: any) => void) | undefined) => import("@atlaskit/editor-common/types").Command;
 export declare const updateExtensionLayout: (layout: ExtensionLayout) => import("@atlaskit/editor-common/types").Command;
 export declare const removeExtension: () => import("@atlaskit/editor-common/types").Command;
 export declare const removeDescendantNodes: (sourceNode?: PMNode) => import("@atlaskit/editor-common/types").Command;

package/dist/types/plugins/extension/context-panel.d.ts

@@ -3,5 +3,6 @@ import { EditorState } from 'prosemirror-state';
 import { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorView } from 'prosemirror-view';
 import type { ContentNodeWithPos } from 'prosemirror-utils';
-export declare const getContextPanel: (allowAutoSave?: boolean, featureFlags?: FeatureFlags) => (state: EditorState) => JSX.Element | undefined;
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
+export declare const getContextPanel: (allowAutoSave?: boolean, featureFlags?: FeatureFlags, applyChange?: ApplyChangeHandler) => (state: EditorState) => JSX.Element | undefined;
 export declare function onChangeAction(editorView: EditorView, updatedParameters: object | undefined, oldParameters: object | undefined, nodeWithPos: ContentNodeWithPos, onSaving?: () => void): Promise<void>;

package/dist/types/plugins/extension/extension-api.d.ts

@@ -1,6 +1,7 @@
 import { ExtensionAPI } from '@atlaskit/editor-common/extensions';
 import type { EditorView } from 'prosemirror-view';
 import { MacroProvider } from '../macro';
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
 interface EditInLegacyMacroBrowserArgs {
     view: EditorView;
     macroProvider?: MacroProvider;
@@ -8,6 +9,7 @@ interface EditInLegacyMacroBrowserArgs {
 export declare const getEditInLegacyMacroBrowser: ({ view, macroProvider, }: EditInLegacyMacroBrowserArgs) => () => void;
 interface CreateExtensionAPIOptions {
     editorView: EditorView;
+    applyChange: ApplyChangeHandler | undefined;
     editInLegacyMacroBrowser?: () => void;
 }
 export declare const createExtensionAPI: (options: CreateExtensionAPIOptions) => ExtensionAPI;

package/dist/types/plugins/extension/index.d.ts

@@ -1,9 +1,10 @@
 import { ExtensionHandlers } from '@atlaskit/editor-common/extensions';
 import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
-import { NextEditorPlugin, EditorAppearance } from '../../types';
+import { NextEditorPlugin, EditorAppearance, OptionalPlugin } from '@atlaskit/editor-common/types';
 import { LongPressSelectionPluginOptions } from '../selection/types';
 import type { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 interface ExtensionPluginOptions extends LongPressSelectionPluginOptions {
     allowAutoSave?: boolean;
     breakoutEnabled?: boolean;
@@ -15,7 +16,8 @@ declare const extensionPlugin: NextEditorPlugin<'extension', {
     dependencies: [
         typeof featureFlagsPlugin,
         typeof widthPlugin,
-        typeof decorationsPlugin
+        typeof decorationsPlugin,
+        OptionalPlugin<typeof contextPanelPlugin>
     ];
 }>;
 export default extensionPlugin;

package/dist/types/plugins/extension/nodeviews/extension.d.ts

@@ -5,8 +5,9 @@ import type { ExtensionHandlers } from '@atlaskit/editor-common/extensions';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { PluginInjectionAPIWithDependency } from '@atlaskit/editor-common/types';
 import { EditorAppearance } from '../../../types/editor-appearance';
-import { ForwardRef, getPosHandler, ReactNodeView } from '../../../nodeviews';
-import { PortalProviderAPI } from '../../../ui/PortalProvider';
+import { ForwardRef, getPosHandler } from '../../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { EventDispatcher } from '../../../event-dispatcher';
 import type { widthPlugin } from '@atlaskit/editor-plugin-width';
 interface ExtensionNodeViewOptions {

package/dist/types/plugins/extension/pm-plugins/keymap.d.ts

@@ -1,2 +1,3 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export default function keymapPlugin(): SafePlugin;
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
+export default function keymapPlugin(applyChange: ApplyChangeHandler | undefined): SafePlugin;

package/dist/types/plugins/extension/pm-plugins/main.d.ts

@@ -6,18 +6,20 @@ import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
 import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { EditorAppearance } from '../../../types/editor-appearance';
-import { Dispatch, EventDispatcher } from '../../../event-dispatcher';
-import { PortalProviderAPI } from '../../../ui/PortalProvider';
+import { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
+import { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { getPluginState, createCommand } from '../plugin-factory';
 import { pluginKey } from '../plugin-key';
 import type extensionPlugin from '../index';
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
 export declare const createExtensionProviderHandler: (view: EditorView) => (name: string, provider?: Promise<ExtensionProvider>) => Promise<void>;
 export declare const createContextIdentifierProviderHandler: (view: EditorView) => (name: string, provider?: Promise<ContextIdentifierProvider>) => Promise<void>;
-export declare const handleUpdate: ({ view, prevState, domAtPos, extensionHandlers, }: {
+export declare const handleUpdate: ({ view, prevState, domAtPos, extensionHandlers, applyChange, }: {
     view: EditorView;
     prevState: EditorState;
     domAtPos: EditorView['domAtPos'];
     extensionHandlers: ExtensionHandlers;
+    applyChange: ApplyChangeHandler | undefined;
 }) => true | undefined;
 declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, pluginInjectionApi: ExtractInjectionAPI<typeof extensionPlugin> | undefined, useLongPressSelection?: boolean, options?: {
     appearance?: EditorAppearance;