@atlaskit/editor-core 187.17.2 → 187.17.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 187.17.3
+
+### Patch Changes
+
+- [`7a438d76a8a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7a438d76a8a) - [ED-16733] Extract Focus plugin to its own plugin
+- Updated dependencies
+
 ## 187.17.2
 
 ### Patch Changes

package/dist/cjs/labs/next/presets/default.js

@@ -14,6 +14,7 @@ var _textFormatting = _interopRequireDefault(require("../../../plugins/text-form
 var _editorPluginWidth = require("@atlaskit/editor-plugin-width");
 var _unsupportedContent = _interopRequireDefault(require("../../../plugins/unsupported-content"));
 var _base = _interopRequireDefault(require("../../../plugins/base"));
+var _editorPluginFocus = require("@atlaskit/editor-plugin-focus");
 var _editorPluginEditorDisabled = require("@atlaskit/editor-plugin-editor-disabled");
 var _typeAhead = _interopRequireDefault(require("../../../plugins/type-ahead"));
 var _submitEditor = _interopRequireDefault(require("../../../plugins/submit-editor"));
@@ -60,7 +61,7 @@ function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([_paste.default, options.paste]).add(_clipboard.default).add([_base.default, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
+  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add([_base.default, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/cjs/plugins/base/index.js

@@ -11,7 +11,6 @@ var _history = require("@atlaskit/editor-prosemirror/history");
 var _utils = require("@atlaskit/editor-common/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _filterSteps = _interopRequireDefault(require("./pm-plugins/filter-steps"));
-var _focusHandler = _interopRequireDefault(require("./pm-plugins/focus-handler"));
 var _fixChrome88Selection = _interopRequireDefault(require("./pm-plugins/fix-chrome-88-selection"));
 var _disableSpellChecking = _interopRequireDefault(require("./pm-plugins/disable-spell-checking"));
 var _contextIdentifier = _interopRequireDefault(require("./pm-plugins/context-identifier"));
@@ -55,19 +54,13 @@ var basePlugin = function basePlugin(options, api) {
         }
       });
       plugins.push({
-        name: 'focusHandlerPlugin',
-        plugin: function plugin(_ref2) {
-          var dispatch = _ref2.dispatch;
-          return (0, _focusHandler.default)(dispatch);
-        }
-      }, {
         name: 'newlinePreserveMarksPlugin',
         plugin: _newlinePreserveMarks.default
       }, {
         name: 'frozenEditor',
-        plugin: function plugin(_ref3) {
+        plugin: function plugin(_ref2) {
           var _options$inputTrackin;
-          var dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
+          var dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
           return options !== null && options !== void 0 && (_options$inputTrackin = options.inputTracking) !== null && _options$inputTrackin !== void 0 && _options$inputTrackin.enabled || options !== null && options !== void 0 && options.ufo ? (0, _frozenEditor.default)(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking, options.ufo) : undefined;
         }
       }, {
@@ -91,9 +84,9 @@ var basePlugin = function basePlugin(options, api) {
         }
       }, {
         name: 'contextIdentifier',
-        plugin: function plugin(_ref4) {
-          var dispatch = _ref4.dispatch,
-            providerFactory = _ref4.providerFactory;
+        plugin: function plugin(_ref3) {
+          var dispatch = _ref3.dispatch,
+            providerFactory = _ref3.providerFactory;
           return (0, _contextIdentifier.default)(dispatch, providerFactory);
         }
       });

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

@@ -34,8 +34,8 @@ var _MediaPicker = require("./ui/MediaPicker");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _mediaNodeView = require("./nodeviews/mediaNodeView");
 var _mediaInline = require("./nodeviews/mediaInline");
-var _pluginKey = require("./pm-plugins/plugin-key");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _pluginKey = require("./pm-plugins/plugin-key");
 var _mediaSingle2 = require("./utils/media-single");
 var mediaPlugin = function mediaPlugin() {
   var _api$dependencies, _api$dependencies$fea;
@@ -210,7 +210,8 @@ var mediaPlugin = function mediaPlugin() {
           return /*#__PURE__*/_react.default.createElement(_MediaPicker.MediaPickerComponents, {
             editorDomElement: editorView.dom,
             mediaState: mediaState,
-            appearance: appearance
+            appearance: appearance,
+            api: api
           });
         }
       }));

package/dist/cjs/plugins/media/next-plugin-type.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -16,10 +16,35 @@ var _react = _interopRequireDefault(require("react"));
 var _ClipboardWrapper = require("./ClipboardWrapper");
 var _DropzoneWrapper = require("./DropzoneWrapper");
 var _BrowserWrapper = require("./BrowserWrapper");
-var _WithPluginState = _interopRequireDefault(require("../../../../ui/WithPluginState"));
-var _focusHandler = require("../../../../plugins/base/pm-plugins/focus-handler");
+var _hooks = require("@atlaskit/editor-common/hooks");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
+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 = (0, _hooks.useSharedPluginState)(api, ['focus']),
+    focusState = _useSharedPluginState.focusState;
+  var featureFlags = mediaState.mediaOptions && mediaState.mediaOptions.featureFlags;
+  var clipboard = focusState !== null && focusState !== void 0 && focusState.hasFocus ? /*#__PURE__*/_react.default.createElement(_ClipboardWrapper.ClipboardWrapper, {
+    mediaState: mediaState,
+    featureFlags: featureFlags
+  }) : null;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, clipboard, /*#__PURE__*/_react.default.createElement(_DropzoneWrapper.DropzoneWrapper, {
+    mediaState: mediaState,
+    isActive: !isPopupOpened,
+    featureFlags: featureFlags,
+    editorDomElement: editorDomElement,
+    appearance: appearance
+  }), /*#__PURE__*/_react.default.createElement(_BrowserWrapper.BrowserWrapper, {
+    onBrowseFn: onBrowseFn,
+    mediaState: mediaState,
+    featureFlags: featureFlags
+  }));
+};
 var MediaPickerComponents = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(MediaPickerComponents, _React$Component);
   var _super = _createSuper(MediaPickerComponents);
@@ -53,35 +78,19 @@ 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.default.createElement(_WithPluginState.default, {
-        plugins: {
-          focus: _focusHandler.focusStateKey
-        },
-        render: function render(_ref) {
-          var focus = _ref.focus;
-          var clipboard = focus ? /*#__PURE__*/_react.default.createElement(_ClipboardWrapper.ClipboardWrapper, {
-            mediaState: mediaState,
-            featureFlags: featureFlags
-          }) : null;
-          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, clipboard, /*#__PURE__*/_react.default.createElement(_DropzoneWrapper.DropzoneWrapper, {
-            mediaState: mediaState,
-            isActive: !isPopupOpened,
-            featureFlags: featureFlags,
-            editorDomElement: editorDomElement,
-            appearance: appearance
-          }), /*#__PURE__*/_react.default.createElement(_BrowserWrapper.BrowserWrapper, {
-            onBrowseFn: _this3.onBrowseFn,
-            mediaState: mediaState,
-            featureFlags: featureFlags
-          }));
-        }
+      return /*#__PURE__*/_react.default.createElement(MediaPicker, {
+        mediaState: mediaState,
+        editorDomElement: editorDomElement,
+        appearance: appearance,
+        isPopupOpened: isPopupOpened,
+        onBrowseFn: this.onBrowseFn,
+        api: api
       });
     }
   }]);

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

@@ -10,7 +10,6 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _focusHandler = require("../base/pm-plugins/focus-handler");
 var _utils2 = require("../type-ahead/utils");
 var _composition = require("../base/pm-plugins/composition");
 var pluginKey = new _state.PluginKey('placeholderPlugin');
@@ -62,8 +61,7 @@ function setPlaceHolderState(placeholderText, pos) {
 var emptyPlaceholder = {
   hasPlaceholder: false
 };
-function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracketPlaceholderText) {
-  var isEditorFocused = _focusHandler.focusStateKey.getState(editorState);
+function createPlaceHolderStateFrom(isEditorFocused, editorState, defaultPlaceholderText, bracketPlaceholderText) {
   if ((0, _utils2.isTypeAheadOpen)(editorState)) {
     return emptyPlaceholder;
   }
@@ -78,7 +76,7 @@ function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracket
   }
   return emptyPlaceholder;
 }
-function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
+function createPlugin(defaultPlaceholderText, bracketPlaceholderText, api) {
   if (!defaultPlaceholderText && !bracketPlaceholderText) {
     return;
   }
@@ -86,19 +84,22 @@ 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: {
@@ -115,14 +116,14 @@ 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/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.17.2";
+var version = "187.17.3";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/labs/next/presets/default.js

@@ -8,6 +8,7 @@ import textFormattingPlugin from '../../../plugins/text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import unsupportedContentPlugin from '../../../plugins/unsupported-content';
 import basePlugin from '../../../plugins/base';
+import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
@@ -56,7 +57,7 @@ export function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, (p, builder) => {
+  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, (p, builder) => {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/es2019/plugins/base/index.js

@@ -3,7 +3,6 @@ import { history } from '@atlaskit/editor-prosemirror/history';
 import { browser } from '@atlaskit/editor-common/utils';
 import { doc, paragraph, text } from '@atlaskit/adf-schema';
 import filterStepsPlugin from './pm-plugins/filter-steps';
-import focusHandlerPlugin from './pm-plugins/focus-handler';
 import fixChrome88SelectionPlugin from './pm-plugins/fix-chrome-88-selection';
 import disableSpellcheckingPlugin from './pm-plugins/disable-spell-checking';
 import contextIdentifierPlugin from './pm-plugins/context-identifier';
@@ -41,11 +40,6 @@ const basePlugin = (options, api) => {
         plugin: () => options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined
       });
       plugins.push({
-        name: 'focusHandlerPlugin',
-        plugin: ({
-          dispatch
-        }) => focusHandlerPlugin(dispatch)
-      }, {
         name: 'newlinePreserveMarksPlugin',
         plugin: newlinePreserveMarksPlugin
       }, {

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

@@ -21,8 +21,8 @@ import { MediaPickerComponents } from './ui/MediaPicker';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
 import { ReactMediaInlineNode } from './nodeviews/mediaInline';
-import { stateKey } from './pm-plugins/plugin-key';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { stateKey } from './pm-plugins/plugin-key';
 export { insertMediaSingleNode } from './utils/media-single';
 const mediaPlugin = (options = {}, api) => {
   var _api$dependencies, _api$dependencies$fea;
@@ -197,7 +197,8 @@ const mediaPlugin = (options = {}, api) => {
         }) => /*#__PURE__*/React.createElement(MediaPickerComponents, {
           editorDomElement: editorView.dom,
           mediaState: mediaState,
-          appearance: appearance
+          appearance: appearance,
+          api: api
         })
       }));
     },

package/dist/es2019/plugins/media/next-plugin-type.js

@@ -0,0 +1 @@
+export {};

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

@@ -3,8 +3,35 @@ 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';
+const MediaPicker = ({
+  api,
+  isPopupOpened,
+  appearance,
+  mediaState,
+  onBrowseFn,
+  editorDomElement
+}) => {
+  const {
+    focusState
+  } = useSharedPluginState(api, ['focus']);
+  const featureFlags = mediaState.mediaOptions && mediaState.mediaOptions.featureFlags;
+  const 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 class MediaPickerComponents extends React.Component {
   constructor(...args) {
     super(...args);
@@ -30,6 +57,7 @@ export class MediaPickerComponents extends React.Component {
   }
   render() {
     const {
+      api,
       mediaState,
       editorDomElement,
       appearance
@@ -37,30 +65,13 @@ export class MediaPickerComponents extends React.Component {
     const {
       isPopupOpened
     } = this.state;
-    const featureFlags = mediaState.mediaOptions && mediaState.mediaOptions.featureFlags;
-    return /*#__PURE__*/React.createElement(WithPluginState, {
-      plugins: {
-        focus: focusStateKey
-      },
-      render: ({
-        focus
-      }) => {
-        const 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: this.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/es2019/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 const 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) {
@@ -52,8 +50,7 @@ function setPlaceHolderState(placeholderText, pos) {
 const emptyPlaceholder = {
   hasPlaceholder: false
 };
-function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracketPlaceholderText) {
-  const isEditorFocused = focusStateKey.getState(editorState);
+function createPlaceHolderStateFrom(isEditorFocused, editorState, defaultPlaceholderText, bracketPlaceholderText) {
   if (isTypeAheadOpen(editorState)) {
     return emptyPlaceholder;
   }
@@ -70,25 +67,30 @@ function createPlaceHolderStateFrom(editorState, defaultPlaceholderText, bracket
   }
   return emptyPlaceholder;
 }
-export function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
+export function createPlugin(defaultPlaceholderText, bracketPlaceholderText, api) {
   if (!defaultPlaceholderText && !bracketPlaceholderText) {
     return;
   }
   return new SafePlugin({
     key: pluginKey,
     state: {
-      init: (_, state) => createPlaceHolderStateFrom(state, defaultPlaceholderText, bracketPlaceholderText),
+      init: (_, state) => {
+        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: (tr, _oldPluginState, _oldEditorState, newEditorState) => {
+        var _api$dependencies$foc2;
         const meta = tr.getMeta(pluginKey);
+        const 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,12 +108,12 @@ export function createPlugin(defaultPlaceholderText, bracketPlaceholderText) {
     }
   });
 }
-const placeholderPlugin = options => ({
+const placeholderPlugin = (options, api) => ({
   name: 'placeholder',
   pmPlugins() {
     return [{
       name: 'placeholder',
-      plugin: () => createPlugin(options && options.placeholder, options && options.placeholderBracketHint)
+      plugin: () => createPlugin(options && options.placeholder, options && options.placeholderBracketHint, api)
     }];
   }
 });

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

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

package/dist/esm/labs/next/presets/default.js

@@ -8,6 +8,7 @@ import textFormattingPlugin from '../../../plugins/text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import unsupportedContentPlugin from '../../../plugins/unsupported-content';
 import basePlugin from '../../../plugins/base';
+import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
@@ -52,7 +53,7 @@ export function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, function (p, builder) {
+  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

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

@@ -6,7 +6,6 @@ import { history } from '@atlaskit/editor-prosemirror/history';
 import { browser } from '@atlaskit/editor-common/utils';
 import { doc, paragraph, text } from '@atlaskit/adf-schema';
 import filterStepsPlugin from './pm-plugins/filter-steps';
-import focusHandlerPlugin from './pm-plugins/focus-handler';
 import fixChrome88SelectionPlugin from './pm-plugins/fix-chrome-88-selection';
 import disableSpellcheckingPlugin from './pm-plugins/disable-spell-checking';
 import contextIdentifierPlugin from './pm-plugins/context-identifier';
@@ -47,19 +46,13 @@ var basePlugin = function basePlugin(options, api) {
         }
       });
       plugins.push({
-        name: 'focusHandlerPlugin',
-        plugin: function plugin(_ref2) {
-          var dispatch = _ref2.dispatch;
-          return focusHandlerPlugin(dispatch);
-        }
-      }, {
         name: 'newlinePreserveMarksPlugin',
         plugin: newlinePreserveMarksPlugin
       }, {
         name: 'frozenEditor',
-        plugin: function plugin(_ref3) {
+        plugin: function plugin(_ref2) {
           var _options$inputTrackin;
-          var dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
+          var dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
           return options !== null && options !== void 0 && (_options$inputTrackin = options.inputTracking) !== null && _options$inputTrackin !== void 0 && _options$inputTrackin.enabled || options !== null && options !== void 0 && options.ufo ? frozenEditor(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking, options.ufo) : undefined;
         }
       }, {
@@ -83,9 +76,9 @@ var basePlugin = function basePlugin(options, api) {
         }
       }, {
         name: 'contextIdentifier',
-        plugin: function plugin(_ref4) {
-          var dispatch = _ref4.dispatch,
-            providerFactory = _ref4.providerFactory;
+        plugin: function plugin(_ref3) {
+          var dispatch = _ref3.dispatch,
+            providerFactory = _ref3.providerFactory;
           return contextIdentifierPlugin(dispatch, providerFactory);
         }
       });

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

@@ -21,8 +21,8 @@ import { MediaPickerComponents } from './ui/MediaPicker';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
 import { ReactMediaInlineNode } from './nodeviews/mediaInline';
-import { stateKey } from './pm-plugins/plugin-key';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { stateKey } from './pm-plugins/plugin-key';
 export { insertMediaSingleNode } from './utils/media-single';
 var mediaPlugin = function mediaPlugin() {
   var _api$dependencies, _api$dependencies$fea;
@@ -197,7 +197,8 @@ var mediaPlugin = function mediaPlugin() {
           return /*#__PURE__*/React.createElement(MediaPickerComponents, {
             editorDomElement: editorView.dom,
             mediaState: mediaState,
-            appearance: appearance
+            appearance: appearance,
+            api: api
           });
         }
       }));

package/dist/esm/plugins/media/next-plugin-type.js

@@ -0,0 +1 @@
+export {};