@atlaskit/editor-core 187.17.2 → 187.17.5

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

@@ -11,8 +11,33 @@ import React from 'react';
 import { ClipboardWrapper } from './ClipboardWrapper';
 import { DropzoneWrapper } from './DropzoneWrapper';
 import { BrowserWrapper } from './BrowserWrapper';
-import WithPluginState from '../../../../ui/WithPluginState';
-import { focusStateKey } from '../../../../plugins/base/pm-plugins/focus-handler';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+var MediaPicker = function MediaPicker(_ref) {
+  var api = _ref.api,
+    isPopupOpened = _ref.isPopupOpened,
+    appearance = _ref.appearance,
+    mediaState = _ref.mediaState,
+    onBrowseFn = _ref.onBrowseFn,
+    editorDomElement = _ref.editorDomElement;
+  var _useSharedPluginState = useSharedPluginState(api, ['focus']),
+    focusState = _useSharedPluginState.focusState;
+  var featureFlags = mediaState.mediaOptions && mediaState.mediaOptions.featureFlags;
+  var clipboard = focusState !== null && focusState !== void 0 && focusState.hasFocus ? /*#__PURE__*/React.createElement(ClipboardWrapper, {
+    mediaState: mediaState,
+    featureFlags: featureFlags
+  }) : null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, clipboard, /*#__PURE__*/React.createElement(DropzoneWrapper, {
+    mediaState: mediaState,
+    isActive: !isPopupOpened,
+    featureFlags: featureFlags,
+    editorDomElement: editorDomElement,
+    appearance: appearance
+  }), /*#__PURE__*/React.createElement(BrowserWrapper, {
+    onBrowseFn: onBrowseFn,
+    mediaState: mediaState,
+    featureFlags: featureFlags
+  }));
+};
 export var MediaPickerComponents = /*#__PURE__*/function (_React$Component) {
   _inherits(MediaPickerComponents, _React$Component);
   var _super = _createSuper(MediaPickerComponents);
@@ -46,35 +71,19 @@ export var MediaPickerComponents = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
       var _this$props = this.props,
+        api = _this$props.api,
         mediaState = _this$props.mediaState,
         editorDomElement = _this$props.editorDomElement,
         appearance = _this$props.appearance;
       var isPopupOpened = this.state.isPopupOpened;
-      var featureFlags = mediaState.mediaOptions && mediaState.mediaOptions.featureFlags;
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          focus: focusStateKey
-        },
-        render: function render(_ref) {
-          var focus = _ref.focus;
-          var clipboard = focus ? /*#__PURE__*/React.createElement(ClipboardWrapper, {
-            mediaState: mediaState,
-            featureFlags: featureFlags
-          }) : null;
-          return /*#__PURE__*/React.createElement(React.Fragment, null, clipboard, /*#__PURE__*/React.createElement(DropzoneWrapper, {
-            mediaState: mediaState,
-            isActive: !isPopupOpened,
-            featureFlags: featureFlags,
-            editorDomElement: editorDomElement,
-            appearance: appearance
-          }), /*#__PURE__*/React.createElement(BrowserWrapper, {
-            onBrowseFn: _this3.onBrowseFn,
-            mediaState: mediaState,
-            featureFlags: featureFlags
-          }));
-        }
+      return /*#__PURE__*/React.createElement(MediaPicker, {
+        mediaState: mediaState,
+        editorDomElement: editorDomElement,
+        appearance: appearance,
+        isPopupOpened: isPopupOpened,
+        onBrowseFn: this.onBrowseFn,
+        api: api
       });
     }
   }]);

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

@@ -1,10 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { browser } from '@atlaskit/editor-common/utils';
+import { browser, isEmptyDocument, bracketTyped } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
-import { isEmptyDocument, bracketTyped } from '@atlaskit/editor-common/utils';
 export var pluginKey = new PluginKey('placeholderPlugin');
-import { focusStateKey } from '../base/pm-plugins/focus-handler';
 import { isTypeAheadOpen } from '../type-ahead/utils';
 import { isComposing } from '../base/pm-plugins/composition';
 function getPlaceholderState(editorState) {
@@ -53,8 +51,7 @@ function setPlaceHolderState(placeholderText, pos) {
 var emptyPlaceholder = {
   hasPlaceholder: false
 };
-function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracketPlaceholderText) {
-  var isEditorFocused = focusStateKey.getState(editorState);
+function createPlaceHolderStateFrom(isEditorFocused, editorState, defaultPlaceholderText, bracketPlaceholderText) {
   if (isTypeAheadOpen(editorState)) {
     return emptyPlaceholder;
   }
@@ -69,7 +66,7 @@ function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracket
   }
   return emptyPlaceholder;
 }
-export function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
+export function createPlugin(defaultPlaceholderText, bracketPlaceholderText, api) {
   if (!defaultPlaceholderText && !bracketPlaceholderText) {
     return;
   }
@@ -77,19 +74,22 @@ export function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
     key: pluginKey,
     state: {
       init: function init(_, state) {
-        return createPlaceHolderStateFrom(state, defaultPlaceholderText, bracketPlaceholderText);
+        var _api$dependencies$foc;
+        return createPlaceHolderStateFrom(Boolean(api === null || api === void 0 ? void 0 : (_api$dependencies$foc = api.dependencies.focus.sharedState.currentState()) === null || _api$dependencies$foc === void 0 ? void 0 : _api$dependencies$foc.hasFocus), state, defaultPlaceholderText, bracketPlaceholderText);
       },
       apply: function apply(tr, _oldPluginState, _oldEditorState, newEditorState) {
+        var _api$dependencies$foc2;
         var meta = tr.getMeta(pluginKey);
+        var isEditorFocused = Boolean(api === null || api === void 0 ? void 0 : (_api$dependencies$foc2 = api.dependencies.focus.sharedState.currentState()) === null || _api$dependencies$foc2 === void 0 ? void 0 : _api$dependencies$foc2.hasFocus);
         if (meta) {
           if (meta.removePlaceholder) {
             return emptyPlaceholder;
           }
           if (meta.applyPlaceholderIfEmpty) {
-            return createPlaceHolderStateFrom(newEditorState, defaultPlaceholderText, bracketPlaceholderText);
+            return createPlaceHolderStateFrom(isEditorFocused, newEditorState, defaultPlaceholderText, bracketPlaceholderText);
           }
         }
-        return createPlaceHolderStateFrom(newEditorState, defaultPlaceholderText, bracketPlaceholderText);
+        return createPlaceHolderStateFrom(isEditorFocused, newEditorState, defaultPlaceholderText, bracketPlaceholderText);
       }
     },
     props: {
@@ -106,14 +106,14 @@ export function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
     }
   });
 }
-var placeholderPlugin = function placeholderPlugin(options) {
+var placeholderPlugin = function placeholderPlugin(options, api) {
   return {
     name: 'placeholder',
     pmPlugins: function pmPlugins() {
       return [{
         name: 'placeholder',
         plugin: function plugin() {
-          return createPlugin(options && options.placeholder, options && options.placeholderBracketHint);
+          return createPlugin(options && options.placeholder, options && options.placeholderBracketHint, api);
         }
       }];
     }

package/dist/esm/plugins/text-formatting/commands/clear-formatting.js

@@ -2,7 +2,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { cellSelectionNodesBetween } from '../utils/cell-selection';
-export var FORMATTING_NODE_TYPES = ['heading', 'codeBlock', 'blockquote'];
+export var FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 export var FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup'];
 var formatTypes = {
   em: ACTION_SUBJECT_ID.FORMAT_ITALIC,

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.17.2";
+export var version = "187.17.5";
 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": "187.17.2",
+	"version": "187.17.5",
 	"sideEffects": false
 }

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

@@ -1,31 +1,8 @@
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
-import type { NextEditorPlugin } from '../../types';
-import type { OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { MediaState } from './pm-plugins/main';
-import type { CustomMediaPicker, MediaOptions } from './types';
-import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
-import type { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
-import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import type { widthPlugin } from '@atlaskit/editor-plugin-width';
-import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
-import type { MediaPluginState } from './pm-plugins/types';
-import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
-import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { CustomMediaPicker } from './types';
+import type { MediaNextEditorPluginType } from './next-plugin-type';
 export type { MediaState, MediaProvider, CustomMediaPicker };
 export { insertMediaSingleNode } from './utils/media-single';
-declare const mediaPlugin: NextEditorPlugin<'media', {
-    pluginConfiguration: MediaOptions | undefined;
-    dependencies: [
-        typeof featureFlagsPlugin,
-        OptionalPlugin<typeof analyticsPlugin>,
-        typeof guidelinePlugin,
-        typeof gridPlugin,
-        typeof widthPlugin,
-        typeof decorationsPlugin,
-        FloatingToolbarPlugin,
-        EditorDisabledPlugin
-    ];
-    sharedState: MediaPluginState | null;
-}>;
+declare const mediaPlugin: MediaNextEditorPluginType;
 export default mediaPlugin;

package/dist/types/plugins/media/next-plugin-type.d.ts

@@ -0,0 +1,27 @@
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
+import type { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
+import type { widthPlugin } from '@atlaskit/editor-plugin-width';
+import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { MediaPluginState } from './pm-plugins/types';
+import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { MediaOptions } from './types';
+export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
+    pluginConfiguration: MediaOptions | undefined;
+    dependencies: [
+        typeof featureFlagsPlugin,
+        OptionalPlugin<typeof analyticsPlugin>,
+        typeof guidelinePlugin,
+        typeof gridPlugin,
+        typeof widthPlugin,
+        typeof decorationsPlugin,
+        FloatingToolbarPlugin,
+        EditorDisabledPlugin,
+        FocusPlugin
+    ];
+    sharedState: MediaPluginState | null;
+}>;

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

@@ -1,10 +1,12 @@
 import React from 'react';
-import { MediaPluginState } from '../../pm-plugins/types';
-import { EditorAppearance } from '../../../../types/editor-appearance';
+import type { MediaPluginState } from '../../pm-plugins/types';
+import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { MediaNextEditorPluginType } from '../../next-plugin-type';
 type Props = {
     mediaState: MediaPluginState;
     editorDomElement: Element;
     appearance: EditorAppearance;
+    api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
 };
 type State = {
     isPopupOpened: boolean;

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

@@ -2,16 +2,18 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { focusPlugin } from '@atlaskit/editor-plugin-focus';
 export declare const pluginKey: PluginKey<any>;
 export declare const placeholderTestId = "placeholder-test-id";
 export declare function createPlaceholderDecoration(editorState: EditorState, placeholderText: string, pos?: number): DecorationSet;
-export declare function createPlugin(defaultPlaceholderText?: string, bracketPlaceholderText?: string): SafePlugin | undefined;
+export declare function createPlugin(defaultPlaceholderText?: string, bracketPlaceholderText?: string, api?: ExtractInjectionAPI<typeof placeholderPlugin>): SafePlugin | undefined;
 export interface PlaceholderPluginOptions {
     placeholder?: string;
     placeholderBracketHint?: string;
 }
 declare const placeholderPlugin: NextEditorPlugin<'placeholder', {
     pluginConfiguration: PlaceholderPluginOptions | undefined;
+    dependencies: [typeof focusPlugin];
 }>;
 export default placeholderPlugin;

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

@@ -1,31 +1,8 @@
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
-import type { NextEditorPlugin } from '../../types';
-import type { OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { MediaState } from './pm-plugins/main';
-import type { CustomMediaPicker, MediaOptions } from './types';
-import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
-import type { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
-import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import type { widthPlugin } from '@atlaskit/editor-plugin-width';
-import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
-import type { MediaPluginState } from './pm-plugins/types';
-import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
-import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { CustomMediaPicker } from './types';
+import type { MediaNextEditorPluginType } from './next-plugin-type';
 export type { MediaState, MediaProvider, CustomMediaPicker };
 export { insertMediaSingleNode } from './utils/media-single';
-declare const mediaPlugin: NextEditorPlugin<'media', {
-    pluginConfiguration: MediaOptions | undefined;
-    dependencies: [
-        typeof featureFlagsPlugin,
-        OptionalPlugin<typeof analyticsPlugin>,
-        typeof guidelinePlugin,
-        typeof gridPlugin,
-        typeof widthPlugin,
-        typeof decorationsPlugin,
-        FloatingToolbarPlugin,
-        EditorDisabledPlugin
-    ];
-    sharedState: MediaPluginState | null;
-}>;
+declare const mediaPlugin: MediaNextEditorPluginType;
 export default mediaPlugin;

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

@@ -0,0 +1,27 @@
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
+import type { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import type { gridPlugin } from '@atlaskit/editor-plugin-grid';
+import type { widthPlugin } from '@atlaskit/editor-plugin-width';
+import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { MediaPluginState } from './pm-plugins/types';
+import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
+import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { MediaOptions } from './types';
+export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
+    pluginConfiguration: MediaOptions | undefined;
+    dependencies: [
+        typeof featureFlagsPlugin,
+        OptionalPlugin<typeof analyticsPlugin>,
+        typeof guidelinePlugin,
+        typeof gridPlugin,
+        typeof widthPlugin,
+        typeof decorationsPlugin,
+        FloatingToolbarPlugin,
+        EditorDisabledPlugin,
+        FocusPlugin
+    ];
+    sharedState: MediaPluginState | null;
+}>;

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

@@ -1,10 +1,12 @@
 import React from 'react';
-import { MediaPluginState } from '../../pm-plugins/types';
-import { EditorAppearance } from '../../../../types/editor-appearance';
+import type { MediaPluginState } from '../../pm-plugins/types';
+import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { MediaNextEditorPluginType } from '../../next-plugin-type';
 type Props = {
     mediaState: MediaPluginState;
     editorDomElement: Element;
     appearance: EditorAppearance;
+    api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
 };
 type State = {
     isPopupOpened: boolean;

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

@@ -2,16 +2,20 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { focusPlugin } from '@atlaskit/editor-plugin-focus';
 export declare const pluginKey: PluginKey<any>;
 export declare const placeholderTestId = "placeholder-test-id";
 export declare function createPlaceholderDecoration(editorState: EditorState, placeholderText: string, pos?: number): DecorationSet;
-export declare function createPlugin(defaultPlaceholderText?: string, bracketPlaceholderText?: string): SafePlugin | undefined;
+export declare function createPlugin(defaultPlaceholderText?: string, bracketPlaceholderText?: string, api?: ExtractInjectionAPI<typeof placeholderPlugin>): SafePlugin | undefined;
 export interface PlaceholderPluginOptions {
     placeholder?: string;
     placeholderBracketHint?: string;
 }
 declare const placeholderPlugin: NextEditorPlugin<'placeholder', {
     pluginConfiguration: PlaceholderPluginOptions | undefined;
+    dependencies: [
+        typeof focusPlugin
+    ];
 }>;
 export default placeholderPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.17.2",
+  "version": "187.17.5",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@atlaskit/activity-provider": "^2.4.0",
-    "@atlaskit/adf-schema": "^28.0.0",
+    "@atlaskit/adf-schema": "^28.1.0",
     "@atlaskit/adf-utils": "^19.0.0",
     "@atlaskit/analytics-gas-types": "^5.1.0",
     "@atlaskit/analytics-listeners": "^8.7.0",
@@ -67,6 +67,7 @@
     "@atlaskit/editor-plugin-editor-disabled": "^0.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^0.1.0",
     "@atlaskit/editor-plugin-floating-toolbar": "^0.3.0",
+    "@atlaskit/editor-plugin-focus": "^0.1.0",
     "@atlaskit/editor-plugin-grid": "^0.1.0",
     "@atlaskit/editor-plugin-guideline": "^0.3.4",
     "@atlaskit/editor-plugin-hyperlink": "^0.3.0",

package/report.api.md

@@ -77,6 +77,7 @@ import { FC } from 'react';
 import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
+import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
 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';
@@ -109,7 +110,7 @@ import { MentionResource } from '@atlaskit/mention/resource';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { MessageDescriptor } from 'react-intl-next';
 import { default as messages } from '@atlaskit/editor-common/messages';
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
 import { Node as Node_2 } from '@atlaskit/editor-prosemirror/model';
 import { NodeConfig } from '@atlaskit/editor-common/types';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
@@ -1245,6 +1246,26 @@ export const measurements: {
   PASTE: string;
 };
 
+// @public (undocumented)
+type MediaNextEditorPluginType = NextEditorPlugin<
+  'media',
+  {
+    pluginConfiguration: MediaOptions | undefined;
+    dependencies: [
+      typeof featureFlagsPlugin,
+      OptionalPlugin<typeof analyticsPlugin>,
+      typeof guidelinePlugin,
+      typeof gridPlugin,
+      typeof widthPlugin,
+      typeof decorationsPlugin,
+      FloatingToolbarPlugin,
+      EditorDisabledPlugin,
+      FocusPlugin,
+    ];
+    sharedState: MediaPluginState | null;
+  }
+>;
+
 // @public (undocumented)
 interface MediaNodeWithPosHandler {
   // (undocumented)
@@ -1314,23 +1335,7 @@ export interface MediaOptions {
 }
 
 // @public (undocumented)
-export const mediaPlugin: NextEditorPlugin<
-  'media',
-  {
-    pluginConfiguration: MediaOptions | undefined;
-    dependencies: [
-      typeof featureFlagsPlugin,
-      OptionalPlugin<typeof analyticsPlugin>,
-      typeof guidelinePlugin,
-      typeof gridPlugin,
-      typeof widthPlugin,
-      typeof decorationsPlugin,
-      FloatingToolbarPlugin,
-      EditorDisabledPlugin,
-    ];
-    sharedState: MediaPluginState | null;
-  }
->;
+export const mediaPlugin: MediaNextEditorPluginType;
 
 // @public (undocumented)
 export const mediaPluginKey: PluginKey<MediaPluginState>;

package/tmp/api-report-tmp.d.ts

@@ -66,6 +66,7 @@ import { FC } from 'react';
 import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import type { FireAnalyticsCallback } from '@atlaskit/editor-common/analytics';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
+import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
 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';
@@ -98,7 +99,7 @@ import { MentionResource } from '@atlaskit/mention/resource';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { MessageDescriptor } from 'react-intl-next';
 import { default as messages } from '@atlaskit/editor-common/messages';
-import { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
 import { Node as Node_2 } from '@atlaskit/editor-prosemirror/model';
 import { NodeConfig } from '@atlaskit/editor-common/types';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
@@ -1109,6 +1110,23 @@ export const measurements: {
     PASTE: string;
 };
 
+// @public (undocumented)
+type MediaNextEditorPluginType = NextEditorPlugin<'media', {
+    pluginConfiguration: MediaOptions | undefined;
+    dependencies: [
+    typeof featureFlagsPlugin,
+    OptionalPlugin<typeof analyticsPlugin>,
+    typeof guidelinePlugin,
+    typeof gridPlugin,
+    typeof widthPlugin,
+    typeof decorationsPlugin,
+    FloatingToolbarPlugin,
+    EditorDisabledPlugin,
+    FocusPlugin
+    ];
+    sharedState: MediaPluginState | null;
+}>;
+
 // @public (undocumented)
 interface MediaNodeWithPosHandler {
     // (undocumented)
@@ -1178,20 +1196,7 @@ export interface MediaOptions {
 }
 
 // @public (undocumented)
-export const mediaPlugin: NextEditorPlugin<'media', {
-    pluginConfiguration: MediaOptions | undefined;
-    dependencies: [
-    typeof featureFlagsPlugin,
-    OptionalPlugin<typeof analyticsPlugin>,
-    typeof guidelinePlugin,
-    typeof gridPlugin,
-    typeof widthPlugin,
-    typeof decorationsPlugin,
-    FloatingToolbarPlugin,
-    EditorDisabledPlugin
-    ];
-    sharedState: MediaPluginState | null;
-}>;
+export const mediaPlugin: MediaNextEditorPluginType;
 
 // @public (undocumented)
 export const mediaPluginKey: PluginKey<MediaPluginState>;

package/dist/cjs/plugins/base/pm-plugins/focus-handler.js

@@ -1,56 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.focusStateKey = exports.default = void 0;
-var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _state = require("@atlaskit/editor-prosemirror/state");
-var focusStateKey = new _state.PluginKey('focusStatePlugin');
-exports.focusStateKey = focusStateKey;
-var _default = function _default(dispatch) {
-  return new _safePlugin.SafePlugin({
-    key: focusStateKey,
-    state: {
-      init: function init() {
-        return true;
-      },
-      apply: function apply(tr, wasEditorFocused) {
-        var meta = tr.getMeta(focusStateKey);
-        if (typeof meta === 'boolean') {
-          if (meta !== wasEditorFocused) {
-            dispatch(focusStateKey, meta);
-            return meta;
-          }
-        }
-        return wasEditorFocused;
-      }
-    },
-    props: {
-      handleDOMEvents: {
-        click: function click(view) {
-          var isEditorFocused = focusStateKey.getState(view.state);
-          if (!isEditorFocused) {
-            view.dispatch(view.state.tr.setMeta(focusStateKey, view.hasFocus()));
-          }
-          return false;
-        },
-        focus: function focus(view) {
-          var isEditorFocused = focusStateKey.getState(view.state);
-          if (!isEditorFocused) {
-            view.dispatch(view.state.tr.setMeta(focusStateKey, true));
-          }
-          return false;
-        },
-        blur: function blur(view) {
-          var isEditorFocused = focusStateKey.getState(view.state);
-          if (isEditorFocused) {
-            view.dispatch(view.state.tr.setMeta(focusStateKey, false));
-          }
-          return false;
-        }
-      }
-    }
-  });
-};
-exports.default = _default;

package/dist/es2019/plugins/base/pm-plugins/focus-handler.js

@@ -1,44 +0,0 @@
-import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-export const focusStateKey = new PluginKey('focusStatePlugin');
-export default (dispatch => new SafePlugin({
-  key: focusStateKey,
-  state: {
-    init: () => true,
-    apply: (tr, wasEditorFocused) => {
-      const meta = tr.getMeta(focusStateKey);
-      if (typeof meta === 'boolean') {
-        if (meta !== wasEditorFocused) {
-          dispatch(focusStateKey, meta);
-          return meta;
-        }
-      }
-      return wasEditorFocused;
-    }
-  },
-  props: {
-    handleDOMEvents: {
-      click: view => {
-        const isEditorFocused = focusStateKey.getState(view.state);
-        if (!isEditorFocused) {
-          view.dispatch(view.state.tr.setMeta(focusStateKey, view.hasFocus()));
-        }
-        return false;
-      },
-      focus: view => {
-        const isEditorFocused = focusStateKey.getState(view.state);
-        if (!isEditorFocused) {
-          view.dispatch(view.state.tr.setMeta(focusStateKey, true));
-        }
-        return false;
-      },
-      blur: view => {
-        const isEditorFocused = focusStateKey.getState(view.state);
-        if (isEditorFocused) {
-          view.dispatch(view.state.tr.setMeta(focusStateKey, false));
-        }
-        return false;
-      }
-    }
-  }
-}));