@atlaskit/editor-core 187.41.0 → 187.41.1

package/dist/es2019/plugins/media/ui/ToolbarMedia/index.js

@@ -1,45 +1,37 @@
 import React from 'react';
 import AttachmentIcon from '@atlaskit/icon/glyph/editor/attachment';
-import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
-import WithPluginState from '../../../../ui/WithPluginState';
+import { ToolbarButton, TOOLBAR_BUTTON } from '@atlaskit/editor-common/ui-menu';
 import { toolbarMediaMessages } from './toolbar-media-messages';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { injectIntl } from 'react-intl-next';
 const onClickMediaButton = pluginState => () => {
   pluginState.showMediaPicker();
   return true;
 };
 const ToolbarMedia = ({
-  editorView,
-  eventDispatcher,
-  pluginKey,
   isDisabled,
   isReducedSpacing,
-  intl
-}) => /*#__PURE__*/React.createElement(WithPluginState, {
-  editorView: editorView,
-  eventDispatcher: eventDispatcher,
-  plugins: {
-    mediaPlugin: pluginKey
-  },
-  render: ({
-    mediaPlugin
-  }) => {
-    if (!(mediaPlugin !== null && mediaPlugin !== void 0 && mediaPlugin.allowsUploads)) {
-      return null;
-    }
-    const {
-      toolbarMediaTitle
-    } = toolbarMediaMessages;
-    return /*#__PURE__*/React.createElement(ToolbarButton, {
-      buttonId: TOOLBAR_BUTTON.MEDIA,
-      onClick: onClickMediaButton(mediaPlugin),
-      disabled: isDisabled,
-      title: intl.formatMessage(toolbarMediaTitle),
-      spacing: isReducedSpacing ? 'none' : 'default',
-      iconBefore: /*#__PURE__*/React.createElement(AttachmentIcon, {
-        label: intl.formatMessage(toolbarMediaTitle)
-      })
-    });
+  intl,
+  api
+}) => {
+  const {
+    mediaState
+  } = useSharedPluginState(api, ['media']);
+  if (!(mediaState !== null && mediaState !== void 0 && mediaState.allowsUploads)) {
+    return null;
   }
-});
+  const {
+    toolbarMediaTitle
+  } = toolbarMediaMessages;
+  return /*#__PURE__*/React.createElement(ToolbarButton, {
+    buttonId: TOOLBAR_BUTTON.MEDIA,
+    onClick: onClickMediaButton(mediaState),
+    disabled: isDisabled,
+    title: intl.formatMessage(toolbarMediaTitle),
+    spacing: isReducedSpacing ? 'none' : 'default',
+    iconBefore: /*#__PURE__*/React.createElement(AttachmentIcon, {
+      label: intl.formatMessage(toolbarMediaTitle)
+    })
+  });
+};
 export default injectIntl(ToolbarMedia);

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.41.0";
+export const version = "187.41.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/media/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { PluginKey, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { media, mediaGroup, mediaInline, mediaSingleSpec } from '@atlaskit/adf-schema';
@@ -16,19 +17,34 @@ import { ReactMediaSingleNode } from './nodeviews/mediaSingle';
 import { floatingToolbar as _floatingToolbar } from './toolbar';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { IconImages } from '@atlaskit/editor-common/quick-insert';
-import WithPluginState from '../../ui/WithPluginState';
 import { MediaPickerComponents } from './ui/MediaPicker';
-import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
 import { ReactMediaInlineNode } from './nodeviews/mediaInline';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { stateKey } from './pm-plugins/plugin-key';
 export { insertMediaSingleNode } from './utils/media-single';
-var mediaPlugin = function mediaPlugin(_ref) {
+var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_ref) {
+  var api = _ref.api,
+    editorDomElement = _ref.editorDomElement,
+    appearance = _ref.appearance;
+  var _useSharedPluginState = useSharedPluginState(api, ['media']),
+    mediaState = _useSharedPluginState.mediaState;
+  if (!mediaState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(MediaPickerComponents, {
+    editorDomElement: editorDomElement,
+    mediaState: mediaState,
+    appearance: appearance,
+    api: api
+  });
+};
+var mediaPlugin = function mediaPlugin(_ref2) {
   var _api$featureFlags;
-  var _ref$config = _ref.config,
-    options = _ref$config === void 0 ? {} : _ref$config,
-    api = _ref.api;
+  var _ref2$config = _ref2.config,
+    options = _ref2$config === void 0 ? {} : _ref2$config,
+    api = _ref2.api;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'media',
@@ -39,12 +55,12 @@ var mediaPlugin = function mediaPlugin(_ref) {
       return stateKey.getState(editorState) || null;
     },
     nodes: function nodes() {
-      var _ref2 = options || {},
-        _ref2$allowMediaGroup = _ref2.allowMediaGroup,
-        allowMediaGroup = _ref2$allowMediaGroup === void 0 ? true : _ref2$allowMediaGroup,
-        _ref2$allowMediaSingl = _ref2.allowMediaSingle,
-        allowMediaSingle = _ref2$allowMediaSingl === void 0 ? false : _ref2$allowMediaSingl,
-        mediaFeatureFlags = _ref2.featureFlags;
+      var _ref3 = options || {},
+        _ref3$allowMediaGroup = _ref3.allowMediaGroup,
+        allowMediaGroup = _ref3$allowMediaGroup === void 0 ? true : _ref3$allowMediaGroup,
+        _ref3$allowMediaSingl = _ref3.allowMediaSingle,
+        allowMediaSingle = _ref3$allowMediaSingl === void 0 ? false : _ref3$allowMediaSingl,
+        mediaFeatureFlags = _ref3.featureFlags;
       var captions = getMediaFeatureFlag('captions', mediaFeatureFlags);
       var allowMediaInline = getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
       var mediaSingleOption = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
@@ -83,22 +99,23 @@ var mediaPlugin = function mediaPlugin(_ref) {
     pmPlugins: function pmPlugins() {
       var pmPlugins = [{
         name: 'media',
-        plugin: function plugin(_ref3) {
-          var schema = _ref3.schema,
-            dispatch = _ref3.dispatch,
-            getIntl = _ref3.getIntl,
-            eventDispatcher = _ref3.eventDispatcher,
-            providerFactory = _ref3.providerFactory,
-            errorReporter = _ref3.errorReporter,
-            portalProviderAPI = _ref3.portalProviderAPI,
-            reactContext = _ref3.reactContext,
-            dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref4) {
+          var schema = _ref4.schema,
+            dispatch = _ref4.dispatch,
+            getIntl = _ref4.getIntl,
+            eventDispatcher = _ref4.eventDispatcher,
+            providerFactory = _ref4.providerFactory,
+            errorReporter = _ref4.errorReporter,
+            portalProviderAPI = _ref4.portalProviderAPI,
+            reactContext = _ref4.reactContext,
+            dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
           return createPlugin(schema, {
             providerFactory: providerFactory,
             nodeViews: {
               mediaGroup: ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api),
               mediaSingle: ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options),
               media: ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api),
+              // @ts-expect-error
               mediaInline: ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, api)
             },
             errorReporter: errorReporter,
@@ -119,8 +136,8 @@ var mediaPlugin = function mediaPlugin(_ref) {
       if (options && options.allowMediaSingle) {
         pmPlugins.push({
           name: 'mediaSingleKeymap',
-          plugin: function plugin(_ref4) {
-            var schema = _ref4.schema;
+          plugin: function plugin(_ref5) {
+            var schema = _ref5.schema;
             return keymapMediaSinglePlugin(schema);
           }
         });
@@ -132,9 +149,9 @@ var mediaPlugin = function mediaPlugin(_ref) {
         });
         pmPlugins.push({
           name: 'mediaAltTextKeymap',
-          plugin: function plugin(_ref5) {
+          plugin: function plugin(_ref6) {
             var _api$analytics2;
-            var schema = _ref5.schema;
+            var schema = _ref6.schema;
             return keymapMediaAltTextPlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
           }
         });
@@ -142,15 +159,15 @@ var mediaPlugin = function mediaPlugin(_ref) {
       if (options && options.allowLinking) {
         pmPlugins.push({
           name: 'mediaLinking',
-          plugin: function plugin(_ref6) {
-            var dispatch = _ref6.dispatch;
+          plugin: function plugin(_ref7) {
+            var dispatch = _ref7.dispatch;
             return linkingPlugin(dispatch);
           }
         });
         pmPlugins.push({
           name: 'mediaLinkingKeymap',
-          plugin: function plugin(_ref7) {
-            var schema = _ref7.schema;
+          plugin: function plugin(_ref8) {
+            var schema = _ref8.schema;
             return keymapLinkingPlugin(schema);
           }
         });
@@ -186,35 +203,23 @@ var mediaPlugin = function mediaPlugin(_ref) {
       });
       return pmPlugins;
     },
-    contentComponent: function contentComponent(_ref8) {
-      var editorView = _ref8.editorView,
-        appearance = _ref8.appearance;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WithPluginState, {
-        editorView: editorView,
-        plugins: {
-          mediaState: pluginKey
-        },
-        render: function render(_ref9) {
-          var mediaState = _ref9.mediaState;
-          return /*#__PURE__*/React.createElement(MediaPickerComponents, {
-            editorDomElement: editorView.dom,
-            mediaState: mediaState,
-            appearance: appearance,
-            api: api
-          });
-        }
-      }));
+    contentComponent: function contentComponent(_ref9) {
+      var editorView = _ref9.editorView,
+        appearance = _ref9.appearance;
+      return /*#__PURE__*/React.createElement(MediaPickerFunctionalComponent, {
+        editorDomElement: editorView.dom,
+        appearance: appearance,
+        api: api
+      });
     },
     secondaryToolbarComponent: function secondaryToolbarComponent(_ref10) {
       var editorView = _ref10.editorView,
         eventDispatcher = _ref10.eventDispatcher,
         disabled = _ref10.disabled;
       return /*#__PURE__*/React.createElement(ToolbarMedia, {
-        editorView: editorView,
-        eventDispatcher: eventDispatcher,
-        pluginKey: pluginKey,
         isDisabled: disabled,
-        isReducedSpacing: true
+        isReducedSpacing: true,
+        api: api
       });
     },
     pluginsOptions: {

package/dist/esm/plugins/media/nodeviews/mediaInline.js

@@ -14,11 +14,10 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useEffect, useState } from 'react';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
-import WithPluginState from '../../../ui/WithPluginState';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { MediaInlineNodeSelector } from './styles';
-import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { MediaInlineCardLoadingView } from '@atlaskit/media-ui';
 export var createMediaNodeUpdater = function createMediaNodeUpdater(props) {
@@ -174,6 +173,31 @@ export var MediaInline = function MediaInline(props) {
     mediaClientConfig: viewMediaClientConfig
   });
 };
+var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
+  var identifier = _ref3.identifier,
+    mediaProvider = _ref3.mediaProvider,
+    node = _ref3.node,
+    isSelected = _ref3.isSelected,
+    getPos = _ref3.getPos,
+    contextIdentifierProvider = _ref3.contextIdentifierProvider,
+    api = _ref3.api,
+    view = _ref3.view;
+  var _useSharedPluginState = useSharedPluginState(api, ['media']),
+    mediaState = _useSharedPluginState.mediaState;
+  if (!mediaState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(MediaInline, {
+    identifier: identifier,
+    mediaProvider: mediaProvider,
+    mediaPluginState: mediaState,
+    node: node,
+    isSelected: isSelected,
+    view: view,
+    getPos: getPos,
+    contextIdentifierProvider: contextIdentifierProvider
+  });
+};
 export var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   _inherits(MediaInlineNodeView, _SelectionBasedNodeVi);
   var _super = _createSuper(MediaInlineNodeView);
@@ -214,38 +238,28 @@ export var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     key: "render",
     value: function render(props) {
       var _this = this;
-      var providerFactory = props.providerFactory;
+      var providerFactory = props.providerFactory,
+        api = props.api;
+      var view = this.view;
       var getPos = this.getPos;
       return /*#__PURE__*/React.createElement(WithProviders, {
         providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
-        renderNode: function renderNode(_ref3) {
-          var mediaProvider = _ref3.mediaProvider,
-            contextIdentifierProvider = _ref3.contextIdentifierProvider;
+        renderNode: function renderNode(_ref4) {
+          var mediaProvider = _ref4.mediaProvider,
+            contextIdentifierProvider = _ref4.contextIdentifierProvider;
           if (!mediaProvider) {
             return null;
           }
-          return /*#__PURE__*/React.createElement(WithPluginState, {
-            editorView: _this.view,
-            plugins: {
-              mediaPluginState: mediaStateKey
-            },
-            render: function render(_ref4) {
-              var mediaPluginState = _ref4.mediaPluginState;
-              if (!mediaPluginState) {
-                return null;
-              }
-              return /*#__PURE__*/React.createElement(MediaInline, {
-                identifier: _this.node.attrs.id,
-                mediaProvider: mediaProvider,
-                mediaPluginState: mediaPluginState,
-                node: _this.node,
-                isSelected: _this.nodeInsideSelection(),
-                view: _this.view,
-                getPos: getPos,
-                contextIdentifierProvider: contextIdentifierProvider
-              });
-            }
+          return /*#__PURE__*/React.createElement(MediaInlineSharedState, {
+            identifier: _this.node.attrs.id,
+            mediaProvider: mediaProvider,
+            node: _this.node,
+            isSelected: _this.nodeInsideSelection(),
+            view: view,
+            getPos: getPos,
+            contextIdentifierProvider: contextIdentifierProvider,
+            api: api
           });
         }
       });
@@ -253,11 +267,12 @@ export var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   }]);
   return MediaInlineNodeView;
 }(SelectionBasedNodeView);
-export var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, pluginInjectionApi, dispatchAnalyticsEvent) {
+export var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
   return function (node, view, getPos) {
     return new MediaInlineNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      api: api
     }).init();
   };
 };

package/dist/esm/plugins/media/ui/ToolbarMedia/index.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import AttachmentIcon from '@atlaskit/icon/glyph/editor/attachment';
-import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
-import WithPluginState from '../../../../ui/WithPluginState';
+import { ToolbarButton, TOOLBAR_BUTTON } from '@atlaskit/editor-common/ui-menu';
 import { toolbarMediaMessages } from './toolbar-media-messages';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { injectIntl } from 'react-intl-next';
 var onClickMediaButton = function onClickMediaButton(pluginState) {
   return function () {
@@ -11,35 +11,25 @@ var onClickMediaButton = function onClickMediaButton(pluginState) {
   };
 };
 var ToolbarMedia = function ToolbarMedia(_ref) {
-  var editorView = _ref.editorView,
-    eventDispatcher = _ref.eventDispatcher,
-    pluginKey = _ref.pluginKey,
-    isDisabled = _ref.isDisabled,
+  var isDisabled = _ref.isDisabled,
     isReducedSpacing = _ref.isReducedSpacing,
-    intl = _ref.intl;
-  return /*#__PURE__*/React.createElement(WithPluginState, {
-    editorView: editorView,
-    eventDispatcher: eventDispatcher,
-    plugins: {
-      mediaPlugin: pluginKey
-    },
-    render: function render(_ref2) {
-      var mediaPlugin = _ref2.mediaPlugin;
-      if (!(mediaPlugin !== null && mediaPlugin !== void 0 && mediaPlugin.allowsUploads)) {
-        return null;
-      }
-      var toolbarMediaTitle = toolbarMediaMessages.toolbarMediaTitle;
-      return /*#__PURE__*/React.createElement(ToolbarButton, {
-        buttonId: TOOLBAR_BUTTON.MEDIA,
-        onClick: onClickMediaButton(mediaPlugin),
-        disabled: isDisabled,
-        title: intl.formatMessage(toolbarMediaTitle),
-        spacing: isReducedSpacing ? 'none' : 'default',
-        iconBefore: /*#__PURE__*/React.createElement(AttachmentIcon, {
-          label: intl.formatMessage(toolbarMediaTitle)
-        })
-      });
-    }
+    intl = _ref.intl,
+    api = _ref.api;
+  var _useSharedPluginState = useSharedPluginState(api, ['media']),
+    mediaState = _useSharedPluginState.mediaState;
+  if (!(mediaState !== null && mediaState !== void 0 && mediaState.allowsUploads)) {
+    return null;
+  }
+  var toolbarMediaTitle = toolbarMediaMessages.toolbarMediaTitle;
+  return /*#__PURE__*/React.createElement(ToolbarButton, {
+    buttonId: TOOLBAR_BUTTON.MEDIA,
+    onClick: onClickMediaButton(mediaState),
+    disabled: isDisabled,
+    title: intl.formatMessage(toolbarMediaTitle),
+    spacing: isReducedSpacing ? 'none' : 'default',
+    iconBefore: /*#__PURE__*/React.createElement(AttachmentIcon, {
+      label: intl.formatMessage(toolbarMediaTitle)
+    })
   });
 };
 export default injectIntl(ToolbarMedia);

package/dist/esm/version-wrapper.js

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

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

@@ -1,8 +1,8 @@
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { MediaState } from './pm-plugins/main';
 import type { CustomMediaPicker } from './types';
-import type { MediaNextEditorPluginType } from './next-plugin-type';
 export type { MediaState, MediaProvider, CustomMediaPicker };
 export { insertMediaSingleNode } from './utils/media-single';
+import type { MediaNextEditorPluginType } from './next-plugin-type';
 declare const mediaPlugin: MediaNextEditorPluginType;
 export default mediaPlugin;

package/dist/types/plugins/media/nodeviews/mediaInline.d.ts

@@ -1,8 +1,8 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import React from 'react';
-import type { EventDispatcher } from '../../../event-dispatcher';
-import type { getPosHandler, ProsemirrorGetPosHandler } from '../../../nodeviews/';
+import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
+import type { getPosHandler as ProsemirrorGetPosHandler, getPosHandler } from '../types';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import type { FileIdentifier } from '@atlaskit/media-client';
 import type { MediaProvider, ProviderFactory, ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
@@ -11,7 +11,7 @@ import type { MediaPluginState } from '../pm-plugins/types';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type mediaPlugin from '../index';
+import type { MediaNextEditorPluginType } from '../next-plugin-type';
 export interface MediaInlineProps {
     mediaProvider: Promise<MediaProvider>;
     identifier: FileIdentifier;
@@ -35,6 +35,7 @@ export declare const handleNewNode: (props: MediaInlineProps) => void;
 export declare const MediaInline: React.FC<MediaInlineProps>;
 export interface MediaInlineNodeViewProps {
     providerFactory: ProviderFactory;
+    api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
 }
 export declare class MediaInlineNodeView extends SelectionBasedNodeView<MediaInlineNodeViewProps> {
@@ -46,4 +47,4 @@ export declare class MediaInlineNodeView extends SelectionBasedNodeView<MediaInl
     viewShouldUpdate(nextNode: PMNode): boolean;
     render(props: MediaInlineNodeViewProps): JSX.Element;
 }
-export declare const ReactMediaInlineNode: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, pluginInjectionApi: ExtractInjectionAPI<typeof mediaPlugin> | undefined, dispatchAnalyticsEvent?: DispatchAnalyticsEvent) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
+export declare const ReactMediaInlineNode: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined, dispatchAnalyticsEvent?: DispatchAnalyticsEvent) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;

package/dist/types/plugins/media/types.d.ts

@@ -8,7 +8,9 @@ import type { MediaFeatureFlags } from '@atlaskit/media-common';
 import type { UploadParams, MediaFile } from '@atlaskit/media-picker/types';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
-import type { PlaceholderTextOptions } from '../../plugins/placeholder-text/types';
+interface PlaceholderTextOptions {
+    allowInserting?: boolean;
+}
 export type MediaStateStatus = 'unknown' | 'ready' | 'cancelled' | 'preview' | 'error' | 'mobile-upload-end';
 export type MediaSingleWithType = 'pixel' | 'percentage';
 export interface MediaOptions {
@@ -106,3 +108,10 @@ export type MediaDecorationSpec = {
     type: 'media';
     selected: boolean;
 };
+export type getPosHandler = getPosHandlerNode;
+export type getPosHandlerNode = () => number | undefined;
+export interface ReactNodeProps {
+    selected: boolean;
+}
+export type ForwardRef = (node: HTMLElement | null) => void;
+export {};

package/dist/types/plugins/media/ui/ToolbarMedia/index.d.ts

@@ -1,17 +1,13 @@
 import React from 'react';
-import type { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { EventDispatcher } from '../../../../event-dispatcher';
-import type { MediaPluginState } from '../../pm-plugins/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { MediaNextEditorPluginType } from '../../next-plugin-type';
 import type { WrappedComponentProps } from 'react-intl-next';
-export interface Props<T extends MediaPluginState> {
-    editorView: EditorView;
-    pluginKey: PluginKey<T>;
-    eventDispatcher: EventDispatcher;
+export interface Props {
     isDisabled?: boolean;
     isReducedSpacing?: boolean;
+    api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
 }
-declare const _default: React.FC<import("react-intl-next").WithIntlProps<Props<MediaPluginState> & WrappedComponentProps<"intl">>> & {
-    WrappedComponent: React.ComponentType<Props<MediaPluginState> & WrappedComponentProps<"intl">>;
+declare const _default: React.FC<import("react-intl-next").WithIntlProps<Props & WrappedComponentProps<"intl">>> & {
+    WrappedComponent: React.ComponentType<Props & WrappedComponentProps<"intl">>;
 };
 export default _default;

package/dist/types-ts4.5/plugins/media/index.d.ts

@@ -1,8 +1,8 @@
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { MediaState } from './pm-plugins/main';
 import type { CustomMediaPicker } from './types';
-import type { MediaNextEditorPluginType } from './next-plugin-type';
 export type { MediaState, MediaProvider, CustomMediaPicker };
 export { insertMediaSingleNode } from './utils/media-single';
+import type { MediaNextEditorPluginType } from './next-plugin-type';
 declare const mediaPlugin: MediaNextEditorPluginType;
 export default mediaPlugin;

package/dist/types-ts4.5/plugins/media/nodeviews/mediaInline.d.ts

@@ -1,8 +1,8 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import React from 'react';
-import type { EventDispatcher } from '../../../event-dispatcher';
-import type { getPosHandler, ProsemirrorGetPosHandler } from '../../../nodeviews/';
+import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
+import type { getPosHandler as ProsemirrorGetPosHandler, getPosHandler } from '../types';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import type { FileIdentifier } from '@atlaskit/media-client';
 import type { MediaProvider, ProviderFactory, ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
@@ -11,7 +11,7 @@ import type { MediaPluginState } from '../pm-plugins/types';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type mediaPlugin from '../index';
+import type { MediaNextEditorPluginType } from '../next-plugin-type';
 export interface MediaInlineProps {
     mediaProvider: Promise<MediaProvider>;
     identifier: FileIdentifier;
@@ -35,6 +35,7 @@ export declare const handleNewNode: (props: MediaInlineProps) => void;
 export declare const MediaInline: React.FC<MediaInlineProps>;
 export interface MediaInlineNodeViewProps {
     providerFactory: ProviderFactory;
+    api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
 }
 export declare class MediaInlineNodeView extends SelectionBasedNodeView<MediaInlineNodeViewProps> {
@@ -46,4 +47,4 @@ export declare class MediaInlineNodeView extends SelectionBasedNodeView<MediaInl
     viewShouldUpdate(nextNode: PMNode): boolean;
     render(props: MediaInlineNodeViewProps): JSX.Element;
 }
-export declare const ReactMediaInlineNode: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, pluginInjectionApi: ExtractInjectionAPI<typeof mediaPlugin> | undefined, dispatchAnalyticsEvent?: DispatchAnalyticsEvent) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;
+export declare const ReactMediaInlineNode: (portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined, dispatchAnalyticsEvent?: DispatchAnalyticsEvent) => (node: PMNode, view: EditorView, getPos: getPosHandler) => NodeView;

package/dist/types-ts4.5/plugins/media/types.d.ts

@@ -8,7 +8,9 @@ import type { MediaFeatureFlags } from '@atlaskit/media-common';
 import type { UploadParams, MediaFile } from '@atlaskit/media-picker/types';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
-import type { PlaceholderTextOptions } from '../../plugins/placeholder-text/types';
+interface PlaceholderTextOptions {
+    allowInserting?: boolean;
+}
 export type MediaStateStatus = 'unknown' | 'ready' | 'cancelled' | 'preview' | 'error' | 'mobile-upload-end';
 export type MediaSingleWithType = 'pixel' | 'percentage';
 export interface MediaOptions {
@@ -106,3 +108,10 @@ export type MediaDecorationSpec = {
     type: 'media';
     selected: boolean;
 };
+export type getPosHandler = getPosHandlerNode;
+export type getPosHandlerNode = () => number | undefined;
+export interface ReactNodeProps {
+    selected: boolean;
+}
+export type ForwardRef = (node: HTMLElement | null) => void;
+export {};

package/dist/types-ts4.5/plugins/media/ui/ToolbarMedia/index.d.ts

@@ -1,17 +1,13 @@
 import React from 'react';
-import type { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { EventDispatcher } from '../../../../event-dispatcher';
-import type { MediaPluginState } from '../../pm-plugins/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { MediaNextEditorPluginType } from '../../next-plugin-type';
 import type { WrappedComponentProps } from 'react-intl-next';
-export interface Props<T extends MediaPluginState> {
-    editorView: EditorView;
-    pluginKey: PluginKey<T>;
-    eventDispatcher: EventDispatcher;
+export interface Props {
     isDisabled?: boolean;
     isReducedSpacing?: boolean;
+    api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
 }
-declare const _default: React.FC<import("react-intl-next").WithIntlProps<Props<MediaPluginState> & WrappedComponentProps<"intl">>> & {
-    WrappedComponent: React.ComponentType<Props<MediaPluginState> & WrappedComponentProps<"intl">>;
+declare const _default: React.FC<import("react-intl-next").WithIntlProps<Props & WrappedComponentProps<"intl">>> & {
+    WrappedComponent: React.ComponentType<Props & WrappedComponentProps<"intl">>;
 };
 export default _default;